Merge remote-tracking branch 'gtnh/master' into feature/level-maintai…

…ner-terminal # Conflicts: # dependencies.gradle
GTNewHorizons · Oct 13, 2023 · f7fb0cf · f7fb0cf
2 parents 88492c4 + c6d1130
commit f7fb0cf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1696265388
+//version: 1696952014
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -793,7 +793,7 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
 }
 
 dependencies {
-    def lwjgl3ifyVersion = '1.5.0'
+    def lwjgl3ifyVersion = '1.5.1'
     if (modId != 'lwjgl3ify') {
         java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
     }

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -13,13 +13,13 @@ dependencies {
 
     compileOnly('com.github.GTNewHorizons:ForestryMC:4.6.14:dev')
     compileOnly('com.github.GTNewHorizons:EnderIO:2.5.2:dev')
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.35:dev') {
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.36:dev') {
         exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework'
     }
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
     compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') { transitive = false }
     compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.17-GTNH:dev') { transitive = false }
     compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.4.13-GTNH:dev') { transitive = false }
-    compileOnly('com.github.GTNewHorizons:GTplusplus:1.10.13:dev') { transitive = false }
+    compileOnly('com.github.GTNewHorizons:GTplusplus:1.10.17:dev') { transitive = false }
     compileOnly("com.github.GTNewHorizons:Hodgepodge:2.3.9:dev") { transitive = false }
 }
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
@@ -258,6 +258,9 @@ protected boolean checkHasFluidPattern() {
     }
 
     protected ItemStack stampAuthor(ItemStack patternStack) {
+        if (patternStack.stackTagCompound == null) {
+            patternStack.stackTagCompound = new NBTTagCompound();
+        }
         patternStack.stackTagCompound.setString("author", getPlayerInv().player.getCommandSenderName());
         return patternStack;
     }

diff --git a/src/main/java/com/glodblock/github/util/FluidPatternDetails.java b/src/main/java/com/glodblock/github/util/FluidPatternDetails.java
@@ -28,7 +28,7 @@ public class FluidPatternDetails implements ICraftingPatternDetails, Comparable<
 
     public FluidPatternDetails(ItemStack stack) {
         this.patternStack = stack;
-        if (stack.stackTagCompound.hasKey("author")) {
+        if (stack.stackTagCompound != null && stack.stackTagCompound.hasKey("author")) {
             final ItemStack forComparison = this.patternStack.copy();
             forComparison.stackTagCompound.removeTag("author");
             this.patternStackAe = Objects.requireNonNull(AEItemStack.create(forComparison)); // s2g