diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core')
3 files changed, 8 insertions, 11 deletions
diff --git a/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java b/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java index 65d89c0577..b84c96be99 100644 --- a/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java +++ b/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java @@ -86,7 +86,7 @@ public abstract class BlockGenericRedstone extends BlockContainer { try { final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(world, player.getDisplayName()); final Item mHandItem = mHandStack.getItem(); - if (mHandItem instanceof GT_MetaGenerated_Tool_01) { + if (ItemUtils.isItemGregtechTool(mHandStack)) { Logger.INFO("Found Tool in players hand!"); @@ -250,7 +250,7 @@ public abstract class BlockGenericRedstone extends BlockContainer { if (aThis != null) { return aThis.shouldCheckWeakPower(world, x, y, z, side); } - return false; + return isNormalCube(); } @Override diff --git a/src/Java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java b/src/Java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java index 43f2c15251..fa2597eae9 100644 --- a/src/Java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java +++ b/src/Java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java @@ -1,16 +1,11 @@ package gtPlusPlus.core.tileentities.general.redstone; -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.Map; - import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.api.interfaces.IToolable; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.EntityUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; @@ -233,7 +228,7 @@ public abstract class TileEntityRedstoneHandler extends TileEntity implements IT if (mTilePos == null) { return false; } - return getBlock().canConnectRedstone(world, xCoord, yCoord, zCoord, side); + return canAcceptRedstoneSignal() || canSupplyRedstoneSignal(); } /** @@ -249,7 +244,7 @@ public abstract class TileEntityRedstoneHandler extends TileEntity implements IT if (mTilePos == null) { return false; } - return getBlock().shouldCheckWeakPower(world, xCoord, yCoord, zCoord, side); + return getBlock().isNormalCube(); } /** @@ -268,7 +263,7 @@ public abstract class TileEntityRedstoneHandler extends TileEntity implements IT if (mTilePos == null) { return false; } - return getBlock().getWeakChanges(world, xCoord, yCoord, zCoord); + return false; } diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java index 9617d12b66..ae799baa2b 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -1122,7 +1122,9 @@ public class ItemUtils { return false; } final Item mItem = aStack.getItem(); - if (mItem instanceof GT_MetaGenerated_Tool_01 || mItem instanceof MetaGeneratedGregtechTools || mItem instanceof Gregtech_MetaTool) { + final Item aSkookum = ItemUtils.getItemFromFQRN("miscutils:gt.plusplus.metatool.01"); + final Class aSkookClass = aSkookum.getClass(); + if (aSkookClass.isInstance(mItem) || mItem instanceof GT_MetaGenerated_Tool_01 || mItem instanceof MetaGeneratedGregtechTools || mItem instanceof Gregtech_MetaTool || mItem == aSkookum) { return true; } return false; |