Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
reobf committed Aug 1, 2024
1 parent 6ae68d2 commit 89b2868
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 10 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ catch (Exception ignored) {

// Pulls version first from the VERSION env and then git tag
String identifiedVersion = null
String versionOverride = '0.0.18'
String versionOverride = '0.0.18p1'
try {
// Produce a version based on the tag, or for branches something like 0.2.2-configurable-maven-and-extras.38+43090270b6-dirty
if (versionOverride == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,17 @@ public class BufferedDualInputHatch extends DualInputHatch implements IRecipePro

@Override
public int getInventoryFluidLimit() {
long val= fluidBuff()*(int) (4000 * Math.pow(2, mTier) / (mMultiFluid ? 4 : 1))*(mTier+1)
/*long val= fluidBuff()*(int) (4000 * Math.pow(2, mTier) / (mMultiFluid ? 4 : 1))*(mTier+1)
;
return (int) Math.min(val, Integer.MAX_VALUE);
return (int) Math.min(val, Integer.MAX_VALUE); */
//return super.getInventoryFluidLimit();

return (int) ((int) (32000 * Math.pow(2, mTier) / (mMultiFluid ? 4 : 1)));
}
public int fluidLimit() {

return (int) ((int) (64000 * Math.pow(2, mTier) / (mMultiFluid ? 4 : 1)));
return (int) ((int) (128000 * Math.pow(2, mTier) / (mMultiFluid ? 4 : 1)));
}

public int itemLimit() {
Expand All @@ -136,7 +138,7 @@ public int itemLimit() {

private static int fluidLimit(int mTier,boolean mMultiFluid) {

return (int) ((int) (64000 * Math.pow(2, mTier) / (mMultiFluid ? 4 : 1)));
return (int) ((int) (128000 * Math.pow(2, mTier) / (mMultiFluid ? 4 : 1)));
}

private static int itemLimit(int mTier) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
import com.gtnewhorizons.modularui.common.widget.TextWidget;

import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.networking.security.BaseActionSource;
import appeng.api.storage.data.IAEFluidStack;
Expand Down Expand Up @@ -557,12 +558,27 @@ private boolean moveToOutpusME(IDualInputInventory opt) {


for(int index=0;index<i.length;++index){
i[index].stackSize=((GT_MetaTileEntity_Hatch_OutputBus_ME)mOutputBusses.get(index)).store(i[index]);
try {
IAEItemStack notadded = ((GT_MetaTileEntity_Hatch_OutputBus_ME)mOutputBusses.get(index))
.getProxy().getStorage().getItemInventory().injectItems(AEApi.instance()
.storage()
.createItemStack(i[index]), Actionable.MODULATE, getActionSourceFor(mOutputBusses.get(index)));
i[index].stackSize=Optional.ofNullable(notadded).map(s->s.getStackSize()).orElse(0l).intValue();
} catch (GridAccessException e) {}



}

for(int index=0;index<f.length;++index){
f[index].amount-=((GT_MetaTileEntity_Hatch_Output_ME)mOutputHatches.get(index)).tryFillAE(f[index]);
}
try {
IAEFluidStack notadded = ((GT_MetaTileEntity_Hatch_Output_ME)mOutputHatches.get(index))
.getProxy().getStorage().getFluidInventory().injectItems(AEApi.instance()
.storage()
.createFluidStack(f[index]), Actionable.MODULATE, getActionSourceFor(mOutputHatches.get(index)));
f[index].amount=Optional.ofNullable(notadded).map(s->s.getStackSize()).orElse(0l).intValue();
} catch (GridAccessException e) {}
}
mInputBusses.forEach(s->s.updateSlots());
mInputHatches.forEach(s->s.updateSlots());

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/proghatches/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ buffer.ingredientbuffer.name.0=Ingredient Buffer (T0)
buffer.ingredientbuffer.name.1=Ingredient Buffer (T1)
proghatches.provider.waila.disabled=Cannot connect ME network when working as part of a Multiblock
GT5U.gui.text.proghatches.largepcp.running=Providing Programming Circuit Crafting
multimachine.largeprogrammingcircuitprovider.name=Large Programming Circuit Provider(WIP)
multimachine.largeprogrammingcircuitprovider.name=Large Programming Circuit Provider
providerchainer.name=Provider Access Hatch
GT5U.gui.text.proghatch.access_loop=A loop is detected. Check your Provider Access Hatch.
proghatches.largepcp.eu=Hatches:%1$s Power:%2$s EU/t
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/proghatches/lang/zh_CN.lang
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ buffer.ingredientbuffer.name.0=原材料缓存仓 (T0)
buffer.ingredientbuffer.name.1=原材料缓存仓 (T1)
proghatches.provider.waila.disabled=作为多方块结构成型时无法连入ME网络
GT5U.gui.text.proghatches.largepcp.running=正在提供编程器电路合成
multimachine.largeprogrammingcircuitprovider.name=大型编程器电路提供器(WIP)
multimachine.largeprogrammingcircuitprovider.name=大型编程器电路提供器
providerchainer.name=提供器访问仓
GT5U.gui.text.proghatch.access_loop=检测到环 请检查提供器访问仓的连接
proghatches.largepcp.eu=仓室个数:%1$s 功率:%2$s EU/t
Expand Down

0 comments on commit 89b2868

Please sign in to comment.