From 345feedf70940482511fb44864f9d5a098d88d22 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 30 Jan 2016 08:19:58 -0700 Subject: [PATCH] Remove ItemAttacher --- .../java/mekanism/common/ItemAttacher.java | 41 ------------------- .../mekanism/common/block/BlockBasic.java | 9 ---- .../common/block/BlockEnergyCube.java | 18 +++----- .../mekanism/common/block/BlockGasTank.java | 11 +---- .../mekanism/common/block/BlockMachine.java | 6 --- .../common/block/BlockGenerator.java | 6 --- .../generators/common/block/BlockReactor.java | 6 --- 7 files changed, 7 insertions(+), 90 deletions(-) delete mode 100644 src/main/java/mekanism/common/ItemAttacher.java diff --git a/src/main/java/mekanism/common/ItemAttacher.java b/src/main/java/mekanism/common/ItemAttacher.java deleted file mode 100644 index 651348d0f..000000000 --- a/src/main/java/mekanism/common/ItemAttacher.java +++ /dev/null @@ -1,41 +0,0 @@ -package mekanism.common; - -import java.util.ArrayList; -import java.util.List; - -import mekanism.common.multipart.TransmitterType; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; - -public final class ItemAttacher -{ - private static final List attachable = new ArrayList(); - - static - { - attachable.add(new ItemStack(Blocks.lever)); - - for(TransmitterType type : TransmitterType.values()) - { - attachable.add(new ItemStack(MekanismItems.PartTransmitter, 1, type.ordinal())); - } - } - - public static boolean canAttach(ItemStack itemStack) - { - if(itemStack == null) - { - return false; - } - - for(ItemStack stack : attachable) - { - if(stack.isItemEqual(itemStack)) - { - return true; - } - } - - return false; - } -} diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 9ef140c17..2060e8dd7 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -11,7 +11,6 @@ import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DefIcon; import mekanism.client.render.MekanismRenderer.ICustomBlockIcon; import mekanism.common.CTMData; -import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.Tier.BaseTier; @@ -449,14 +448,6 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon if(blockType == BasicBlock.BASIC_BLOCK_1) { - if(metadata != 6) - { - if(ItemAttacher.canAttach(entityplayer.getCurrentEquippedItem())) - { - return false; - } - } - if(metadata == 2) { if(entityplayer.isSneaking()) diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index 75ff04913..a5c461df1 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -1,10 +1,9 @@ package mekanism.common.block; -import buildcraft.api.tools.IToolWrench; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; +import java.util.Random; + import mekanism.api.energy.IEnergizedItem; -import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.Tier.EnergyCubeTier; @@ -30,9 +29,9 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import java.util.List; -import java.util.Random; +import buildcraft.api.tools.IToolWrench; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * Block class for handling multiple energy cube block IDs. @@ -137,11 +136,6 @@ public class BlockEnergyCube extends BlockContainer @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int side, float f1, float f2, float f3) { - if(ItemAttacher.canAttach(entityplayer.getCurrentEquippedItem())) - { - return false; - } - if(world.isRemote) { return true; diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index af2e6f2d5..e4e4b34d4 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -3,14 +3,12 @@ package mekanism.common.block; import java.util.Random; import mekanism.api.gas.IGasItem; -import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.base.ISustainedInventory; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.MekanismUtils; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -25,12 +23,10 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.ModAPIManager; +import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.api.tools.IToolWrench; - public class BlockGasTank extends BlockContainer { public BlockGasTank() @@ -86,11 +82,6 @@ public class BlockGasTank extends BlockContainer @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int side, float playerX, float playerY, float playerZ) { - if(ItemAttacher.canAttach(entityplayer.getCurrentEquippedItem())) - { - return false; - } - if(world.isRemote) { return true; diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 04bfd5610..f0f87191f 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -19,7 +19,6 @@ import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DefIcon; import mekanism.client.render.MekanismRenderer.ICustomBlockIcon; import mekanism.common.CTMData; -import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.Tier.BaseTier; @@ -545,11 +544,6 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int side, float posX, float posY, float posZ) { - if(ItemAttacher.canAttach(entityplayer.getCurrentEquippedItem())) - { - return false; - } - if(world.isRemote) { return true; diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 6bdfbcd92..f2725b45f 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -7,7 +7,6 @@ import java.util.Random; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.common.CTMData; -import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.base.IBlockCTM; @@ -415,11 +414,6 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int side, float playerX, float playerY, float playerZ) { - if(ItemAttacher.canAttach(entityplayer.getCurrentEquippedItem())) - { - return false; - } - if(world.isRemote) { return true; diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index 0f351b75c..eec2b1cff 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -5,7 +5,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.common.CTMData; -import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.base.IBlockCTM; import mekanism.common.tile.TileEntityBasicBlock; @@ -159,11 +158,6 @@ public class BlockReactor extends BlockContainer implements IBlockCTM @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int facing, float playerX, float playerY, float playerZ) { - if(ItemAttacher.canAttach(entityplayer.getCurrentEquippedItem())) - { - return false; - } - if(world.isRemote) { return true;