diff options
| -rw-r--r-- | dependencies.gradle | 8 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java | 34 |
2 files changed, 14 insertions, 28 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index fd3a21e6bb..6db02445aa 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -45,7 +45,7 @@ dependencies { implementation("com.github.GTNewHorizons:Avaritia:1.49:dev") - compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha35:api') { transitive = false } + compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha36:api') { transitive = false } compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.0:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.7.1:dev") { transitive = false } @@ -54,8 +54,8 @@ dependencies { compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.15.7:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:EnderCore:0.4.6:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Galacticraft:3.1.3-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.11.13-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Galacticraft:3.1.4-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.11.14-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Chisel:2.14.1-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Translocators:1.2.1:dev") { transitive = false } compileOnly("curse.maven:cofh-core-69162:2388751") { transitive = false } @@ -82,5 +82,5 @@ dependencies { functionalTestImplementation('org.junit.platform:junit-platform-launcher') functionalTestImplementation('org.junit.platform:junit-platform-reporting') - runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.2.2:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.2.3:dev") } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java index c4028f1819..075b4e19a1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java @@ -404,7 +404,7 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D "GT5U.gui.text.pump_rate.1", EnumChatFormatting.AQUA + numberFormat.format(getFlowRatePerTick())) + StatCollector.translateToLocal("GT5U.gui.text.pump_rate.2"), - getReservoirContents() + StatCollector.translateToLocal("GT5U.gui.text.pump_recovery.2")); + mOilFlow + StatCollector.translateToLocal("GT5U.gui.text.pump_recovery.2")); } else { builder.add(failureReason); } @@ -438,22 +438,8 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D } private @NotNull String clientFluidType = ""; - private int clientPumpRate = 0; - private @NotNull String clientReservoirContents = ""; - - @NotNull - private String getReservoirContents() { - int amount = 0; - for (Chunk chunk : mOilFieldChunks) { - final FluidStack fluidStack = undergroundOil(chunk, -1); - if (fluidStack != null) { - amount += fluidStack.amount; - } - } - - return StatCollector - .translateToLocalFormatted("GT5U.gui.text.pump_recovery.1", GT_Utility.formatNumbers(amount)); - } + private int clientFlowPerTick = 0; + private int clientFlowPerOperation = 0; protected static final NumberFormatMUI numberFormat = new NumberFormatMUI(); @@ -474,7 +460,7 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D () -> EnumChatFormatting.GRAY + StatCollector.translateToLocalFormatted( "GT5U.gui.text.pump_rate.1", - EnumChatFormatting.AQUA + numberFormat.format(clientPumpRate)) + EnumChatFormatting.AQUA + numberFormat.format(clientFlowPerTick)) + EnumChatFormatting.GRAY + StatCollector.translateToLocal("GT5U.gui.text.pump_rate.2")) .setTextAlignment(Alignment.CenterLeft) @@ -482,18 +468,18 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D .widget( new TextWidget() .setStringSupplier( - () -> EnumChatFormatting.GRAY + clientReservoirContents + () -> EnumChatFormatting.GRAY + + StatCollector.translateToLocalFormatted( + "GT5U.gui.text.pump_recovery.1", + EnumChatFormatting.AQUA + numberFormat.format(clientFlowPerOperation)) + EnumChatFormatting.GRAY + StatCollector.translateToLocal("GT5U.gui.text.pump_recovery.2")) .setTextAlignment(Alignment.CenterLeft) .setEnabled(widget -> getBaseMetaTileEntity().isActive() && workState == STATE_AT_BOTTOM)) .widget(new FakeSyncWidget.IntegerSyncer(() -> workState, newInt -> workState = newInt)) .widget(new FakeSyncWidget.StringSyncer(this::getFluidName, newString -> clientFluidType = newString)) - .widget(new FakeSyncWidget.IntegerSyncer(this::getFlowRatePerTick, newInt -> clientPumpRate = newInt)) - .widget( - new FakeSyncWidget.StringSyncer( - this::getReservoirContents, - newString -> clientReservoirContents = newString)); + .widget(new FakeSyncWidget.IntegerSyncer(this::getFlowRatePerTick, newInt -> clientFlowPerTick = newInt)) + .widget(new FakeSyncWidget.IntegerSyncer(() -> mOilFlow, newInt -> clientFlowPerOperation = newInt)); } @Override |