Merge branch 'master' into feature/wct

GTNewHorizons · May 5, 2024 · 8370312 · 8370312
2 parents ef9f590 + 8bf8be8
commit 8370312
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -3,17 +3,16 @@
 dependencies {
     api("com.github.GTNewHorizons:StructureLib:1.3.1:dev")
 
-    implementation("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-356-GTNH:dev") {
-
+    implementation("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-400-GTNH:dev") {
         transitive = false
     }
-    implementation("com.github.GTNewHorizons:AdventureBackpack2:1.1.3-GTNH:dev") {
+    implementation("com.github.GTNewHorizons:AdventureBackpack2:1.2.0-GTNH:dev") {
         transitive = false
     }
     implementation("com.github.GTNewHorizons:Minecraft-Backpack-Mod:2.3.0-GTNH:dev") {
         transitive = false
     }
-    implementation("com.github.GTNewHorizons:ForestryMC:4.8.9:dev") {
+    implementation("com.github.GTNewHorizons:ForestryMC:4.9.0:dev") {
         transitive = false
     }
     implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.11.2:dev")
@@ -22,13 +21,13 @@ dependencies {
     implementation("curse.maven:cofh-core-69162:2388751") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.4.43:dev") {
+    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.0:dev") {
         transitive = false
     }
     implementation("com.github.GTNewHorizons:Railcraft:9.15.8:dev")
 
-    implementation("com.github.GTNewHorizons:BloodMagic:1.5.2:dev")
+    implementation("com.github.GTNewHorizons:BloodMagic:1.6.0:dev")
     // for convenience of debug
-    runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.5.27-GTNH:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.6.0-GTNH:dev")
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:waila:1.7.3:dev")
 }
diff --git a/src/main/java/net/glease/structurecompat/CompatRailcraft.java b/src/main/java/net/glease/structurecompat/CompatRailcraft.java
@@ -4,6 +4,8 @@
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.partitionBy;
 import static net.glease.structurecompat.StructureUtilityExt.notBlock;
 
+import java.util.Arrays;
+
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -160,13 +162,13 @@ private static void registerBoilerStructureInfo() {
         for (int i = 0, intsLength = ints.length; i < intsLength; i++) {
             int[] dimension = ints[i];
             String[][] shape1 = new String[dimension[1]][];
-            String[][] shape2 = null;
+            String[][] shape2 = new String[dimension[1]][];
             for (int i1 = 0; i1 < dimension[1]; i1++) {
                 shape1[i1] = new String[dimension[0] + 1];
                 for (int i2 = 0; i2 < dimension[0]; i2++) {
                     shape1[i1][i2] = Strings.repeat("b", dimension[1]);
                 }
-                shape2 = shape1.clone();
+                shape2[i1] = Arrays.copyOf(shape1[i1], shape1[i1].length);
                 shape1[i1][dimension[0]] = Strings.repeat("f", dimension[1]);
                 shape2[i1][dimension[0]] = Strings.repeat("F", dimension[1]);
             }