From 5bc849f61c8c8a62810e2db8504f987d3656bf1d Mon Sep 17 00:00:00 2001 From: Kogepan229 <73163994+Kogepan229@users.noreply.github.com> Date: Sat, 19 Apr 2025 23:21:20 +0900 Subject: [PATCH] Adapt to AE2 changes (#84) --- dependencies.gradle | 12 ++++++------ gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- repositories.gradle | 4 +++- .../client/gui/GuiCraftAmountBridge.java | 13 ++----------- .../inventory/HandlerWirelessEssentiaTerminal.java | 6 ++++++ 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 01cdceb4..19d07458 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,20 +1,20 @@ // Add your dependencies here dependencies { - implementation("com.github.GTNewHorizons:NotEnoughItems:2.7.29-GTNH:dev") + implementation("com.github.GTNewHorizons:NotEnoughItems:2.7.38-GTNH:dev") implementation("com.github.GTNewHorizons:CodeChickenCore:1.4.1:dev") - implementation("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-538-GTNH:dev") + implementation("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-584-GTNH:dev") implementation("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") implementation("curse.maven:thaumcraft-nei-plugin-225095:2241913") { transitive = false } compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false } - compileOnly('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.28-gtnh:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:waila:1.8.2:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.121:dev") { transitive = false } + compileOnly('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.46-gtnh:dev') { transitive = false } + compileOnly("com.github.GTNewHorizons:waila:1.8.4:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.240:dev") { transitive = false } compileOnly("curse.maven:computercraft-67504:2269339") { transitive = false } compileOnly("curse.maven:cofh-lib-220333:2388748") { transitive = false } compileOnly("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") { transitive = false } - runtimeOnlyNonPublishable('com.github.GTNewHorizons:GTNHLib:0.6.10:dev') + runtimeOnlyNonPublishable('com.github.GTNewHorizons:GTNHLib:0.6.19:dev') runtimeOnly("com.github.GTNewHorizons:Baubles:1.0.4:dev") } diff --git a/gradle.properties b/gradle.properties index 318d923d..9e30f146 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ modId = thaumicenergistics modGroup = thaumicenergistics # Whether to use modGroup as the maven publishing group. -# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods. +# When false, com.github.GTNewHorizons is used. useModGroupForPublishing = false # Updates your build.gradle and settings.gradle automatically whenever an update is available. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c82..37f853b1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/repositories.gradle b/repositories.gradle index ed54091d..033d07fd 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -1,3 +1,5 @@ // Add any additional repositories for your dependencies here -repositories {} +repositories { + mavenLocal() +} diff --git a/src/main/java/thaumicenergistics/client/gui/GuiCraftAmountBridge.java b/src/main/java/thaumicenergistics/client/gui/GuiCraftAmountBridge.java index 4fc2f5d6..ff7cbed1 100644 --- a/src/main/java/thaumicenergistics/client/gui/GuiCraftAmountBridge.java +++ b/src/main/java/thaumicenergistics/client/gui/GuiCraftAmountBridge.java @@ -51,17 +51,8 @@ public class GuiCraftAmountBridge extends GuiCraftAmount { if (btn == this.buttonReturnToTerminalHost) { // Change back to host GUI this.host.launchGUI(this.player); - } else if (btn == this.nextBtn) { - try { - // Parse the amount - long amount = Long.parseLong(this.amountTextField.getText()); - - // Ask server to show confirm gui - Packet_S_ConfirmCraftingJob.sendConfirmAutoCraft(this.player, amount, isShiftKeyDown()); - } catch (final NumberFormatException e) { - // Reset amount to 1 - this.amountTextField.setText("1"); - } + } else if (btn == this.nextBtn && btn.enabled) { + Packet_S_ConfirmCraftingJob.sendConfirmAutoCraft(this.player, this.getAmountLong(), isShiftKeyDown()); } else { // Call super super.actionPerformed(btn); diff --git a/src/main/java/thaumicenergistics/common/inventory/HandlerWirelessEssentiaTerminal.java b/src/main/java/thaumicenergistics/common/inventory/HandlerWirelessEssentiaTerminal.java index d9073961..a0205510 100644 --- a/src/main/java/thaumicenergistics/common/inventory/HandlerWirelessEssentiaTerminal.java +++ b/src/main/java/thaumicenergistics/common/inventory/HandlerWirelessEssentiaTerminal.java @@ -90,6 +90,12 @@ public class HandlerWirelessEssentiaTerminal extends WirelessAELink @Override public void setHasInfiniteStore(boolean b) {} + @Override + public boolean getHasInfiniteStore() { + // Ignored + return false; + } + @Override public double getEnergyDemand(final double d, final Set seen) { // Ignored