From 56703bf498aedc7149f7d20dc33c555d5275174f Mon Sep 17 00:00:00 2001 From: lordIcocain <62835225+lordIcocain@users.noreply.github.com> Date: Mon, 21 Apr 2025 08:51:46 +0300 Subject: [PATCH 1/3] Fix math when cell restricted and new fluid added (#284) Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../glodblock/github/common/storage/FluidCellInventory.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java b/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java index 034f9889..436d458e 100644 --- a/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java +++ b/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java @@ -397,8 +397,10 @@ public class FluidCellInventory implements IFluidCellInventory { if (cardDistribution) { remainingFluidCount = this.getRemainingFluidCountDist(null); } else { - remainingFluidCount = this.getRemainingFluidCount() - - ((long) this.getBytesPerType() * singleByteAmount); + remainingFluidCount = Math.min( + getRemainingFluidCount(), + getFreeBytes() * singleByteAmount + getUnusedFluidCount() + - (long) getBytesPerType() * singleByteAmount); } if (remainingFluidCount > 0) { From a03db709bad1addd5f129d583eaeea0aa663164d Mon Sep 17 00:00:00 2001 From: lordIcocain <62835225+lordIcocain@users.noreply.github.com> Date: Mon, 21 Apr 2025 08:55:27 +0300 Subject: [PATCH 2/3] copy of fix interface terminal crash (#285) Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../com/glodblock/github/client/gui/GuiInterfaceWireless.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glodblock/github/client/gui/GuiInterfaceWireless.java b/src/main/java/com/glodblock/github/client/gui/GuiInterfaceWireless.java index 3d81fd60..c6f83354 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiInterfaceWireless.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiInterfaceWireless.java @@ -1381,11 +1381,11 @@ public class GuiInterfaceWireless extends FCBaseMEGui implements IDropToFillText return true; } - int offsetY = mouseY - dispY; + int offsetY = mouseY - dispY - 1; int offsetX = mouseX - (VIEW_WIDTH - rowSize * 18) - 1; if (offsetX >= 0 && offsetX < (rowSize * 18) && mouseY > Math.max(dispY, InterfaceWirelessSection.TITLE_HEIGHT) - && offsetY < Math.min(viewHeight - dispY, guiHeight)) { + && offsetY < Math.min(viewHeight - dispY, guiHeight - 1)) { final int col = offsetX / 18; final int row = offsetY / 18; final int slotIdx = row * rowSize + col; From bd67f35f368920d1673fd073cdaa1cca35cedba4 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Mon, 21 Apr 2025 10:21:36 +0200 Subject: [PATCH 3/3] update --- dependencies.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 754d8329..f7f4bad2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,7 +35,7 @@ */ dependencies { api('com.github.GTNewHorizons:NotEnoughItems:2.7.38-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-584-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-586-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.8.4:dev') api("com.github.GTNewHorizons:GTNHLib:0.6.19:dev") @@ -46,9 +46,9 @@ dependencies { compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.1.6-GTNH:dev') compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false } - compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.6:dev') + compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.7:dev') compileOnly('com.github.GTNewHorizons:EnderIO:2.9.7:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.240:dev') { + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.244:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } @@ -57,7 +57,7 @@ dependencies { compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.13-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.7-GTNH:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.35:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.37:dev") { transitive = false } runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev") }