From 89b2868cea8e6bb31eea1208a3e6e7f4c1486c0f Mon Sep 17 00:00:00 2001 From: reobf <2215595288@qq.com> Date: Thu, 1 Aug 2024 16:20:06 +0800 Subject: [PATCH] update --- build.gradle | 2 +- .../BufferedDualInputHatch.java | 10 +++++---- .../multi/IngredientDistributor.java | 22 ++++++++++++++++--- .../assets/proghatches/lang/en_US.lang | 2 +- .../assets/proghatches/lang/zh_CN.lang | 2 +- 5 files changed, 28 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 752e40d..4503af6 100644 --- a/build.gradle +++ b/build.gradle @@ -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) { diff --git a/src/main/java/reobf/proghatches/gt/metatileentity/BufferedDualInputHatch.java b/src/main/java/reobf/proghatches/gt/metatileentity/BufferedDualInputHatch.java index c77ee1b..82c084a 100644 --- a/src/main/java/reobf/proghatches/gt/metatileentity/BufferedDualInputHatch.java +++ b/src/main/java/reobf/proghatches/gt/metatileentity/BufferedDualInputHatch.java @@ -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() { @@ -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) { diff --git a/src/main/java/reobf/proghatches/gt/metatileentity/multi/IngredientDistributor.java b/src/main/java/reobf/proghatches/gt/metatileentity/multi/IngredientDistributor.java index fa93bfe..57ded8b 100644 --- a/src/main/java/reobf/proghatches/gt/metatileentity/multi/IngredientDistributor.java +++ b/src/main/java/reobf/proghatches/gt/metatileentity/multi/IngredientDistributor.java @@ -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; @@ -557,12 +558,27 @@ private boolean moveToOutpusME(IDualInputInventory opt) { for(int index=0;indexs.getStackSize()).orElse(0l).intValue(); + } catch (GridAccessException e) {} + + + } for(int index=0;indexs.getStackSize()).orElse(0l).intValue(); + } catch (GridAccessException e) {} + } mInputBusses.forEach(s->s.updateSlots()); mInputHatches.forEach(s->s.updateSlots()); diff --git a/src/main/resources/assets/proghatches/lang/en_US.lang b/src/main/resources/assets/proghatches/lang/en_US.lang index 59f2bb1..e477be0 100644 --- a/src/main/resources/assets/proghatches/lang/en_US.lang +++ b/src/main/resources/assets/proghatches/lang/en_US.lang @@ -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 diff --git a/src/main/resources/assets/proghatches/lang/zh_CN.lang b/src/main/resources/assets/proghatches/lang/zh_CN.lang index 0bb6d8b..cae527d 100644 --- a/src/main/resources/assets/proghatches/lang/zh_CN.lang +++ b/src/main/resources/assets/proghatches/lang/zh_CN.lang @@ -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