Merge branch 'master' into null-fluid-container

GTNewHorizons · Feb 23, 2025 · 28f65fb · 28f65fb
2 parents 392a99c + 8b61980
commit 28f65fb
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -35,10 +35,10 @@
  */
 dependencies {
     api('com.github.GTNewHorizons:NotEnoughItems:2.7.29-GTNH:dev')
-    api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-544-GTNH:dev')
+    api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-547-GTNH:dev')
     api('curse.maven:cofh-core-69162:2388751')
     api('com.github.GTNewHorizons:waila:1.8.2:dev')
-    api("com.github.GTNewHorizons:GTNHLib:0.6.10:dev")
+    api("com.github.GTNewHorizons:GTNHLib:0.6.11:dev")
 
     implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.0:dev") {
         exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial'
@@ -47,8 +47,8 @@ dependencies {
     compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.0.3:dev')
     compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false }
     compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.2:dev')
-    compileOnly('com.github.GTNewHorizons:EnderIO:2.9.3:dev')
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.128:dev') {
+    compileOnly('com.github.GTNewHorizons:EnderIO:2.9.4:dev')
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.150:dev') {
         exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework'
         exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial'
     }

diff --git 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.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/settings.gradle b/settings.gradle
@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.32'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.33'
 }
 
 
diff --git a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java
@@ -271,6 +271,7 @@ protected void encodeFluidPattern() {
         pattern.setInputs(collectInventory(this.craftingSlots));
         pattern.setOutputs(collectInventory(this.outputSlots));
         pattern.setCanBeSubstitute(this.beSubstitute ? 1 : 0);
+        pattern.setCombine(this.combine ? 1 : 0);
         patternSlotOUT.putStack(stampAuthor(pattern.writeToStack()));
     }
 

diff --git a/src/main/java/com/glodblock/github/util/FluidPatternDetails.java b/src/main/java/com/glodblock/github/util/FluidPatternDetails.java
@@ -187,6 +187,9 @@ public boolean readFromStack() {
             return false;
         }
         NBTTagCompound tag = Objects.requireNonNull(patternStack.getTagCompound());
+        setCanBeSubstitute(tag.getBoolean("beSubstitute") ? 1 : 0);
+        setCombine(tag.getInteger("combine"));
+
         // may be possible to enter a partially-correct state if setInputs succeeds but setOutputs failed
         // but outside code should treat it as completely incorrect and not attempt to make calls
         return setInputs(readStackArray(tag.getTagList("in", Constants.NBT.TAG_COMPOUND)))