diff --git a/src/main/java/forestry/core/utils/BlockUtil.java b/src/main/java/forestry/core/utils/BlockUtil.java index d743b32f8..e0024a067 100644 --- a/src/main/java/forestry/core/utils/BlockUtil.java +++ b/src/main/java/forestry/core/utils/BlockUtil.java @@ -231,10 +231,14 @@ public abstract class BlockUtil { private static Class BW_MetaGenerated_WerkstoffBlocksClass; private static Block BWBlocks; - private static boolean bw = Loader.isModLoaded("bartworks"); + private static Class GTBlockMachines_Class; + private static Block GTBlockMachines; + private static final boolean bw = Loader.isModLoaded("bartworks"); + private static final boolean gt = Loader.isModLoaded("gregtech"); static { if (bw) try { + // noinspection unchecked BW_MetaGenerated_WerkstoffBlocksClass = (Class) Class .forName("com.github.bartimaeusnek.bartworks.system.material.BW_MetaGenerated_WerkstoffBlocks"); BWBlocks = (Block) Class.forName("com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader") @@ -242,6 +246,13 @@ public abstract class BlockUtil { } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) { e.printStackTrace(); } + if (gt) try { + // noinspection unchecked + GTBlockMachines_Class = (Class) Class.forName("gregtech.common.blocks.GT_Block_Machines"); + GTBlockMachines = (Block) Class.forName("gregtech.api.GregTech_API").getField("sBlockMachines").get(null); + } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) { + e.printStackTrace(); + } } public static ItemStack getItemStackFromBlockBelow(World world, int x, int y, int z, @@ -260,6 +271,10 @@ public abstract class BlockUtil { return new ItemStack(BWBlocks, 1, block.getDamageValue(world, x, y - depth, z)); } + if (gt && GTBlockMachines_Class.isInstance(block)) { + return new ItemStack(GTBlockMachines, 1, block.getDamageValue(world, x, y - depth, z)); + } + return new ItemStack(block, 1, world.getBlockMetadata(x, y - depth, z)); } }