diff --git a/src/main/java/magicbees/block/BlockApimancersDrainer.java b/src/main/java/magicbees/block/BlockApimancersDrainer.java index 742541e..c14d95c 100644 --- a/src/main/java/magicbees/block/BlockApimancersDrainer.java +++ b/src/main/java/magicbees/block/BlockApimancersDrainer.java @@ -45,13 +45,13 @@ public class BlockApimancersDrainer extends BlockContainer { } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float par7, float par8, float par9) { if (world.isRemote) { return false; } else { TileEntity tile = world.getTileEntity(x, y, z); - if (tile instanceof TileEntityApimancersDrainerCommon) { + if (tile instanceof TileEntityApimancersDrainerCommon && side != 0) { ItemStack tItemStack = player.getHeldItem(); if (tItemStack != null) { Item tItem = tItemStack.getItem(); @@ -71,7 +71,9 @@ public class BlockApimancersDrainer extends BlockContainer { } world.markBlockForUpdate(x, y, z); return true; - } else return false; + } else { + return false; + } } } diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index ad97dde..32fd247 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -165,6 +165,7 @@ public class Config { // ---- Loaded mods ----------------------------------------- public static boolean isGTLoaded = Loader.isModLoaded("gregtech"); + public static boolean isGTNHCoreModLoaded = Loader.isModLoaded("gregtech") && Loader.isModLoaded("dreamcraft"); public Config(File configFile) { configuration = new Configuration(configFile); @@ -507,7 +508,7 @@ public class Config { GameRegistry.registerBlock(visAuraProvider, "visAuraProvider"); GameRegistry.registerTileEntity(TileEntityVisAuraProvider.class, "visAuraProvider"); - if (isGTLoaded) BlockApimancersDrainer.drainer = TileEntityApimancersDrainerGT.class; + if (isGTNHCoreModLoaded) BlockApimancersDrainer.drainer = TileEntityApimancersDrainerGT.class; apimancersDrainer = new BlockApimancersDrainer(); GameRegistry.registerBlock(apimancersDrainer, "apimancersDrainer"); GameRegistry.registerTileEntity(BlockApimancersDrainer.drainer, "apimancersDrainer");