tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove ItemAttacher

Browse source
This commit is contained in:
aidancbrady 2016-01-30 08:19:58 -07:00
parent de7bff08d5
commit 345feedf70
7 changed files with 7 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/main/java/mekanism/common/ItemAttacher.java
View file

@ -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<ItemStack> attachable = new ArrayList<ItemStack>();
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;
}
}

9
src/main/java/mekanism/common/block/BlockBasic.java
View file

@ -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())

18
src/main/java/mekanism/common/block/BlockEnergyCube.java
View file

@ -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;

11
src/main/java/mekanism/common/block/BlockGasTank.java
View file

@ -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;

6
src/main/java/mekanism/common/block/BlockMachine.java
View file

@ -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;

6
src/main/java/mekanism/generators/common/block/BlockGenerator.java
View file

@ -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;

6
src/main/java/mekanism/generators/common/block/BlockReactor.java
View file

@ -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;