From 766f0d530220ea32b234fc139b8df2e0f24fdde4 Mon Sep 17 00:00:00 2001 From: Yip Rui Fung Date: Sat, 25 Jul 2015 08:59:25 +0800 Subject: [PATCH 1/2] Fix bin crash when interacting with empty hand. --- src/main/java/mekanism/common/block/BlockBasic.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 8f1f30328..848c9b9fb 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -469,10 +469,9 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon { TileEntityBin bin = (TileEntityBin)world.getTileEntity(x, y, z); - Item tool = entityplayer.getCurrentEquippedItem().getItem(); - - if(MekanismUtils.hasUsableWrench(entityplayer, x, y, z)) + if(entityplayer.getCurrentEquippedItem() != null && MekanismUtils.hasUsableWrench(entityplayer, x, y, z)) { + Item tool = entityplayer.getCurrentEquippedItem().getItem(); if(entityplayer.isSneaking()) { dismantleBlock(world, x, y, z, false); From 4bf799e37db6a2d018a59077df840dd4a422ae64 Mon Sep 17 00:00:00 2001 From: Yip Rui Fung Date: Sat, 25 Jul 2015 10:20:06 +0800 Subject: [PATCH 2/2] Fix AE2 P2P registration. --- src/main/java/mekanism/common/Mekanism.java | 5 +++++ .../java/mekanism/common/integration/MekanismHooks.java | 8 ++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 7ac37a731..2330295d5 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1212,6 +1212,11 @@ public class Mekanism hooks.loadOCDrivers(); } + if(Loader.isModLoaded("appliedenergistics2")) + { + hooks.registerAE2P2P(); + } + //Packet registrations packetHandler.initialize(); diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index f090db56d..9a75a7485 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -67,11 +67,7 @@ public final class MekanismHooks { loadCCPeripheralProviders(); } - - if(AE2Loaded) - { - hookAE2(); - } + } @@ -155,7 +151,7 @@ public final class MekanismHooks } @Method(modid = "appliedenergistics2") - public void hookAE2() { + public void registerAE2P2P() { String energyP2P = "add-p2p-attunement-rf-power"; if(IC2Loaded) {