Merge branch 'master' into copy-paste-tool

GTNewHorizons · Feb 13, 2025 · c2590e8 · c2590e8
2 parents 2876404 + b51e853
commit c2590e8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/gregtech/loaders/load/GTItemIterator.java b/src/main/java/gregtech/loaders/load/GTItemIterator.java
@@ -176,6 +176,9 @@ public void run() {
                             tItem.setMaxStackSize(OrePrefixes.stone.mDefaultStackSize);
                         }
                     }
+                    if (tName.equals("tile.tankBlock") && tBlock instanceof buildcraft.factory.BlockTank) {
+                        GTOreDictUnificator.registerOre(OreDictNames.craftingTank, new ItemStack(tItem, 1, 0));
+                    }
                 }
                 if (((tItem instanceof ItemFood)) && (tItem != ItemList.IC2_Food_Can_Filled.getItem())
                     && (tItem != ItemList.IC2_Food_Can_Spoiled.getItem())) {
@@ -269,10 +272,6 @@ public void run() {
                     case "tile.pumpBlock" -> GTOreDictUnificator
                         .registerOre(OreDictNames.craftingPump, new ItemStack(tItem, 1, 0));
 
-                    // buildcraft
-                    case "tile.tankBlock" -> GTOreDictUnificator
-                        .registerOre(OreDictNames.craftingTank, new ItemStack(tItem, 1, 0));
-
                 }
             }
         } catch (Throwable e) {

diff --git a/...in/java/gregtech/mixin/mixins/late/thaumcraft/MixinThaumcraftAlchemyFurnacePollution.java b/...in/java/gregtech/mixin/mixins/late/thaumcraft/MixinThaumcraftAlchemyFurnacePollution.java
@@ -22,6 +22,7 @@ public abstract class MixinThaumcraftAlchemyFurnacePollution extends TileEntity
             value = "FIELD",
             target = "thaumcraft/common/tiles/TileAlchemyFurnace.furnaceBurnTime:I",
             opcode = Opcodes.PUTFIELD,
+            ordinal = 0,
             remap = false))
     private void gt5u$addPollution(CallbackInfo ci) {
         if (!this.worldObj.isRemote && (this.worldObj.getTotalWorldTime() % 20) == 0) {