From 9ee8181086d84200f6982b6920f33adf5e868e8e Mon Sep 17 00:00:00 2001 From: Ruling-0 <47913168+Ruling-0@users.noreply.github.com> Date: Wed, 12 Feb 2025 22:20:13 -0600 Subject: [PATCH 1/2] Fix Ztones Having craftingTank OreDict (#3940) Co-authored-by: Martin Robertz --- src/main/java/gregtech/loaders/load/GTItemIterator.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/gregtech/loaders/load/GTItemIterator.java b/src/main/java/gregtech/loaders/load/GTItemIterator.java index dc0f951ebcc..0883cd145ea 100644 --- 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) { From b51e8532f34a0106bfd30e2124820ea6a25f4017 Mon Sep 17 00:00:00 2001 From: Ruling-0 <47913168+Ruling-0@users.noreply.github.com> Date: Thu, 13 Feb 2025 00:04:36 -0600 Subject: [PATCH 2/2] Fix Alchemical Furnace Polluting Without Burning (#3938) Co-authored-by: Martin Robertz Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../late/thaumcraft/MixinThaumcraftAlchemyFurnacePollution.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mixin/java/gregtech/mixin/mixins/late/thaumcraft/MixinThaumcraftAlchemyFurnacePollution.java b/src/mixin/java/gregtech/mixin/mixins/late/thaumcraft/MixinThaumcraftAlchemyFurnacePollution.java index a842f42d579..d96c55cfd6e 100644 --- a/src/mixin/java/gregtech/mixin/mixins/late/thaumcraft/MixinThaumcraftAlchemyFurnacePollution.java +++ b/src/mixin/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) {