From 5c0169b7ea7ac7e45c63162afd205905e944637a Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Mon, 29 Sep 2025 15:51:56 +0800 Subject: [PATCH 1/4] Update TileEntityApimancersDrainerCommon.java --- .../tileentity/TileEntityApimancersDrainerCommon.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/magicbees/tileentity/TileEntityApimancersDrainerCommon.java b/src/main/java/magicbees/tileentity/TileEntityApimancersDrainerCommon.java index 7e2f73d..3be62a7 100644 --- a/src/main/java/magicbees/tileentity/TileEntityApimancersDrainerCommon.java +++ b/src/main/java/magicbees/tileentity/TileEntityApimancersDrainerCommon.java @@ -159,7 +159,7 @@ public class TileEntityApimancersDrainerCommon extends TileEntity this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); } if (this.essentia.getAmount(tag) >= amount) { - this.essentia.reduce(tag, amount); + this.essentia.remove(tag, amount); return true; } return false; @@ -177,7 +177,7 @@ public class TileEntityApimancersDrainerCommon extends TileEntity } if (hasIt) { for (Aspect next : ot.aspects.keySet()) { - essentia.reduce(next, ot.getAmount(next)); + essentia.remove(next, ot.getAmount(next)); } return true; } From 49a39bbd6c2c86207a88e6b84ac9d07375e27ee7 Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Mon, 29 Sep 2025 16:15:29 +0800 Subject: [PATCH 2/4] Update settings.gradle --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index ff436f2..9f80246 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.43' } From b4da6ce38fba76c34ff14208c5990b5ac6e8d95f Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Mon, 29 Sep 2025 16:30:04 +0800 Subject: [PATCH 3/4] Update dependencies.gradle --- dependencies.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 7a25324..ef696c6 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,14 +1,14 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:ForestryMC:4.10.11:dev') + api('com.github.GTNewHorizons:ForestryMC:4.10.17:dev') - compileOnly('com.github.GTNewHorizons:BloodMagic:1.7.36:dev') - compileOnly('com.github.GTNewHorizons:ThaumicHorizons:1.7.4:dev') - compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.1.8-GTNH:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:Botania:1.12.10-GTNH:api') {transitive = false} + compileOnly('com.github.GTNewHorizons:BloodMagic:1.7.51:dev') + compileOnly('com.github.GTNewHorizons:ThaumicHorizons:1.7.8:dev') + compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.1.15-GTNH:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:Botania:1.12.26-GTNH:api') {transitive = false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.336:dev') - compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.7-GTNH:dev') + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.00:dev') + compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.14-GTNH:dev') } From 7ce76d77cd29a2ff00925561a8935d28a2e575ea Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Mon, 29 Sep 2025 17:03:38 +0800 Subject: [PATCH 4/4] Update TileEntityApimancersDrainerCommon.java --- .../tileentity/TileEntityApimancersDrainerCommon.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/magicbees/tileentity/TileEntityApimancersDrainerCommon.java b/src/main/java/magicbees/tileentity/TileEntityApimancersDrainerCommon.java index 3be62a7..e524908 100644 --- a/src/main/java/magicbees/tileentity/TileEntityApimancersDrainerCommon.java +++ b/src/main/java/magicbees/tileentity/TileEntityApimancersDrainerCommon.java @@ -224,12 +224,10 @@ public class TileEntityApimancersDrainerCommon extends TileEntity if (!this.worldObj.isRemote) { this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); } - if (amount > this.essentia.getAmount(aspect)) { - int total = this.essentia.getAmount(aspect); - this.essentia.reduce(aspect, total); - return total; - } - this.essentia.reduce(aspect, amount); + + int total = this.essentia.getAmount(aspect); + this.essentia.remove(aspect, amount); // if amount >= total then it will also remove aspect. + if (amount > total) return total; return amount; } return 0;