diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index c5ebddff9..04d9669ba 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -12,7 +12,6 @@ import mekanism.common.base.IBoundingBlock; import mekanism.common.block.states.BlockStateBasic; import mekanism.common.block.states.BlockStateBasic.BasicBlock; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; -import mekanism.common.block.states.BlockStateMachine.MachineBlock; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.inventory.InventoryBin; import mekanism.common.item.ItemBlockBasic; @@ -21,19 +20,12 @@ import mekanism.common.multiblock.IStructuralMultiblock; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityDynamicTank; -import mekanism.common.tile.TileEntityDynamicValve; import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityInductionCell; -import mekanism.common.tile.TileEntityInductionPort; import mekanism.common.tile.TileEntityInductionProvider; -import mekanism.common.tile.TileEntitySolarEvaporationBlock; -import mekanism.common.tile.TileEntitySolarEvaporationController; -import mekanism.common.tile.TileEntitySolarEvaporationValve; -import mekanism.common.tile.TileEntityStructuralGlass; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; @@ -83,6 +75,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; * 1:2: Induction Port * 1:3: Induction Cell * 1:4: Induction Provider + * 1:5: Superheating Element + * 1:6: Boiler Casing + * 1:7: Boiler Valve * @author AidanBrady * */ @@ -118,7 +113,7 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus return new BlockStateBasic(this, getProperty()); } - public PropertyEnum getProperty() + public PropertyEnum getProperty() { return getBasicBlock().getProperty(); } @@ -126,7 +121,7 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus @Override public IBlockState getStateFromMeta(int meta) { - BasicBlockType type = BasicBlockType.getBlockType(getBasicBlock(), meta&0xF); + BlockStateBasic.BasicBlockType type = BlockStateBasic.BasicBlockType.get(getBasicBlock(), meta&0xF); return this.getDefaultState().withProperty(getProperty(), type); } @@ -134,7 +129,7 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus @Override public int getMetaFromState(IBlockState state) { - BasicBlockType type = state.getValue(getProperty()); + BlockStateBasic.BasicBlockType type = state.getValue(getProperty()); return type.meta; } /* @@ -230,6 +225,7 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus ctms[4][1] = new CTMData("ctm/InductionProviderAdvanced", this, Arrays.asList(3, 4)).registerIcons(register).setRenderConvexConnections(); ctms[4][2] = new CTMData("ctm/InductionProviderElite", this, Arrays.asList(3, 4)).registerIcons(register).setRenderConvexConnections(); ctms[4][3] = new CTMData("ctm/InductionProviderUltimate", this, Arrays.asList(3, 4)).registerIcons(register).setRenderConvexConnections(); + ctms[5][0] = new CTMData("ctm/SuperheatingElement", this, Arrays.asList(5)).registerIcons(register).setRenderConvexConnections(); icons[0][0] = ctms[0][0].mainTextureData.icon; icons[1][0] = ctms[1][0].mainTextureData.icon; @@ -243,6 +239,7 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus icons[4][1] = ctms[4][1].mainTextureData.icon; icons[4][2] = ctms[4][2].mainTextureData.icon; icons[4][3] = ctms[4][3].mainTextureData.icon; + icons[5][0] = ctms[5][0].mainTextureData.icon; break; } @@ -289,6 +286,8 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus case 4: TileEntityInductionProvider tileEntity2 = (TileEntityInductionProvider)world.getTileEntity(pos); return icons[meta][tileEntity2.tier.ordinal()]; + case 5: + return icons[meta][0]; default: return getIcon(side, meta); } @@ -347,7 +346,7 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus break; case BASIC_BLOCK_2: - for(int i = 0; i < 5; i++) + for(int i = 0; i < 6; i++) { if(i == 3) { @@ -767,38 +766,9 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus @Override public boolean hasTileEntity(IBlockState state) { - int metadata = state.getBlock().getMetaFromState(state); - switch(getBasicBlock()) - { - case BASIC_BLOCK_1: - switch(metadata) - { - case 6: - case 9: - case 10: - case 11: - case 12: - case 14: - case 15: - return true; - default: - return false; - } - case BASIC_BLOCK_2: - switch(metadata) - { - case 0: - case 1: - case 2: - case 3: - case 4: - return true; - default: - return false; - } - default: - return false; - } + BasicBlockType type = BasicBlockType.get(state); + + return type != null && type.tileEntityClass != null; } @Override @@ -818,46 +788,12 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus @Override public TileEntity createTileEntity(World world, IBlockState state) { - int metadata = state.getBlock().getMetaFromState(state); - switch(getBasicBlock()) + if(BasicBlockType.get(state) == null) { - case BASIC_BLOCK_1: - switch(metadata) - { - case 6: - return new TileEntityBin(); - case 9: - return new TileEntityDynamicTank(); - case 10: - return new TileEntityStructuralGlass(); - case 11: - return new TileEntityDynamicValve(); - case 14: - return new TileEntitySolarEvaporationController(); - case 15: - return new TileEntitySolarEvaporationValve(); - default: - return null; - } - case BASIC_BLOCK_2: - switch(metadata) - { - case 0: - return new TileEntitySolarEvaporationBlock(); - case 1: - return new TileEntityInductionCasing(); - case 2: - return new TileEntityInductionPort(); - case 3: - return new TileEntityInductionCell(); - case 4: - return new TileEntityInductionProvider(); - default: - return null; - } - default: - return null; + return null; } + + return BasicBlockType.get(state).create(); } @Override diff --git a/src/main/java/mekanism/common/block/states/BlockStateBasic.java b/src/main/java/mekanism/common/block/states/BlockStateBasic.java index 8500d3ea6..9c83921e7 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateBasic.java +++ b/src/main/java/mekanism/common/block/states/BlockStateBasic.java @@ -1,8 +1,9 @@ package mekanism.common.block.states; +import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.block.BlockBasic; -import mekanism.common.block.BlockMachine; +import mekanism.common.util.LangUtils; import net.minecraft.block.Block; import net.minecraft.block.properties.PropertyBool; @@ -11,6 +12,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Plane; import net.minecraft.util.IStringSerializable; @@ -33,7 +35,6 @@ public class BlockStateBasic extends BlockStateFacing BASIC_BLOCK_1, BASIC_BLOCK_2; - public BlockBasic implBlock; private PropertyEnum predicatedProperty; public PropertyEnum getProperty() @@ -61,63 +62,111 @@ public class BlockStateBasic extends BlockStateFacing public static enum BasicBlockType implements IStringSerializable { - OSMIUM_BLOCK(BasicBlock.BASIC_BLOCK_1, 0, Predicates.alwaysFalse(), false), - BRONZE_BLOCK(BasicBlock.BASIC_BLOCK_1, 1, Predicates.alwaysFalse(), false), - REFINED_OBSIDIAN(BasicBlock.BASIC_BLOCK_1, 2, Predicates.alwaysFalse(), false), - COAL_BLOCK(BasicBlock.BASIC_BLOCK_1, 3, Predicates.alwaysFalse(), false), - REFINED_GLOWSTONE(BasicBlock.BASIC_BLOCK_1, 4, Predicates.alwaysFalse(), false), - STEEL_BLOCK(BasicBlock.BASIC_BLOCK_1, 5, Predicates.alwaysFalse(), false), - BIN(BasicBlock.BASIC_BLOCK_1, 6, Plane.HORIZONTAL, false), - TELEPORTER_FRAME(BasicBlock.BASIC_BLOCK_1, 7, Predicates.alwaysFalse(), false), - STEEL_CASING(BasicBlock.BASIC_BLOCK_1, 8, Predicates.alwaysFalse(), false), - DYNAMIC_TANK(BasicBlock.BASIC_BLOCK_1, 9, Predicates.alwaysFalse(), false), - STRUCTURAL_GLASS(BasicBlock.BASIC_BLOCK_1, 10, Predicates.alwaysFalse(), false), - DYNAMIC_VALVE(BasicBlock.BASIC_BLOCK_1, 11, Predicates.alwaysFalse(), false), - COPPER_BLOCK(BasicBlock.BASIC_BLOCK_1, 12, Predicates.alwaysFalse(), false), - TIN_BLOCK(BasicBlock.BASIC_BLOCK_1, 13, Predicates.alwaysFalse(), false), - SOLAR_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, Plane.HORIZONTAL, false), - SOLAR_EVAPORATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, Predicates.alwaysFalse(), false), - SOLAR_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, Predicates.alwaysFalse(), false), - INDUCTION_CASING(BasicBlock.BASIC_BLOCK_2, 1, Predicates.alwaysFalse(), false), - INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, Predicates.alwaysFalse(), false), - INDUCTION_CELL(BasicBlock.BASIC_BLOCK_2, 3, Predicates.alwaysFalse(), false), - INDUCTION_PROVIDER(BasicBlock.BASIC_BLOCK_2, 4, Predicates.alwaysFalse(), false); + OSMIUM_BLOCK(BasicBlock.BASIC_BLOCK_1, 0, "OsmiumBlock", null, false, Predicates.alwaysFalse(), false), + BRONZE_BLOCK(BasicBlock.BASIC_BLOCK_1, 1, "BronzeBlock", null, false, Predicates.alwaysFalse(), false), + REFINED_OBSIDIAN(BasicBlock.BASIC_BLOCK_1, 2, "RefinedObsidian", null, false, Predicates.alwaysFalse(), false), + COAL_BLOCK(BasicBlock.BASIC_BLOCK_1, 3, "CharcoalBlock", null, false, Predicates.alwaysFalse(), false), + REFINED_GLOWSTONE(BasicBlock.BASIC_BLOCK_1, 4, "RefinedGlowstone", null, false, Predicates.alwaysFalse(), false), + STEEL_BLOCK(BasicBlock.BASIC_BLOCK_1, 5, "SteelBlock", null, false, Predicates.alwaysFalse(), false), + BIN(BasicBlock.BASIC_BLOCK_1, 6, "Bin", null, false, Plane.HORIZONTAL, false), + TELEPORTER_FRAME(BasicBlock.BASIC_BLOCK_1, 7, "TeleporterFrame", null, false, Predicates.alwaysFalse(), false), + STEEL_CASING(BasicBlock.BASIC_BLOCK_1, 8, "SteelCasing", null, false, Predicates.alwaysFalse(), false), + DYNAMIC_TANK(BasicBlock.BASIC_BLOCK_1, 9, "DynamicTank", null, false, Predicates.alwaysFalse(), false), + STRUCTURAL_GLASS(BasicBlock.BASIC_BLOCK_1, 10, "StructuralGlass", null, false, Predicates.alwaysFalse(), false), + DYNAMIC_VALVE(BasicBlock.BASIC_BLOCK_1, 11, "DynamicValve", null, false, Predicates.alwaysFalse(), false), + COPPER_BLOCK(BasicBlock.BASIC_BLOCK_1, 12, "CopperBlock", null, false, Predicates.alwaysFalse(), false), + TIN_BLOCK(BasicBlock.BASIC_BLOCK_1, 13, "TinBlock", null, false, Predicates.alwaysFalse(), false), + SOLAR_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, "SolarEvaporationController", null, false, Plane.HORIZONTAL, false), + SOLAR_EVAPORATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, "SolarEvaporationValve", null, false, Predicates.alwaysFalse(), false), + SOLAR_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, "SolarEvaporationBlock", null, false, Predicates.alwaysFalse(), false), + INDUCTION_CASING(BasicBlock.BASIC_BLOCK_2, 1, "InductionCasing", null, false, Predicates.alwaysFalse(), false), + INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, "InductionPort", null, false, Predicates.alwaysFalse(), false), + INDUCTION_CELL(BasicBlock.BASIC_BLOCK_2, 3, "InductionCell", null, false, Predicates.alwaysFalse(), false), + INDUCTION_PROVIDER(BasicBlock.BASIC_BLOCK_2, 4, "InductionProvider", null, false, Predicates.alwaysFalse(), false), + SUPERHEATING_ELEMENT(BasicBlock.BASIC_BLOCK_2, 5, "SuperheatingElement", null, true, Predicates.alwaysFalse(), false); + //BOILER_CASING(BasicBlock.BASIC_BLOCK_2, 6, "BoilerCasing", TileEntityBoilerCasing.class, true, Predicates.alwaysFalse(), false), + //BOILER_VALVE(BasicBlock.BASIC_BLOCK_2, 7, "BoilerValve", TileEntityBoilerValve.class, true, Predicates.alwaysFalse(), false); public BasicBlock blockType; public int meta; + public String name; + public Class tileEntityClass; + public boolean isElectric; + public boolean hasDescription; public Predicate facingPredicate; public boolean activable; - private BasicBlockType(BasicBlock block, int metadata, Predicate facingAllowed, boolean activeState) + private BasicBlockType(BasicBlock block, int metadata, String s, Class tileClass, boolean hasDesc, Predicate facingAllowed, boolean activeState) { blockType = block; meta = metadata; + name = s; + tileEntityClass = tileClass; + hasDescription = hasDesc; facingPredicate = facingAllowed; activable = activeState; } - public static BasicBlockType getBlockType(BasicBlock blockID, int metadata) + public static BasicBlockType get(IBlockState state) { - BasicBlockType firstTry = values()[blockID.ordinal() << 4 | metadata]; - if(firstTry.blockType == blockID && firstTry.meta == metadata) + Block b = state.getBlock(); + int m = b.getMetaFromState(state); + return get(b, m); + } + + public static BasicBlockType get(ItemStack stack) + { + return get(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage()); + } + + public static BasicBlockType get(Block block, int meta) + { + if(block instanceof BlockBasic) + { + return get(((BlockBasic)block).getBasicBlock(), meta); + } + + return null; + } + + public static BasicBlockType get(BasicBlock blockType, int metadata) + { + BasicBlockType firstTry = values()[blockType.ordinal() << 4 | metadata]; + if(firstTry.blockType == blockType && firstTry.meta == metadata) return firstTry; for(BasicBlockType type : values()) { - if(type.blockType == blockID && type.meta == metadata) + if(type.blockType == blockType && type.meta == metadata) return type; } return null; } + public TileEntity create() + { + try { + return tileEntityClass.newInstance(); + } catch(Exception e) { + Mekanism.logger.error("Unable to indirectly create tile entity."); + e.printStackTrace(); + return null; + } + } + @Override public String getName() { return name().toLowerCase(); } + public String getDescription() + { + return LangUtils.localize("tooltip." + name); + } + public ItemStack getStack(int amount) { - return new ItemStack(blockType.implBlock, amount, meta); + return new ItemStack(blockType.getBlock(), amount, meta); } public boolean canRotateTo(EnumFacing side) diff --git a/src/main/java/mekanism/common/content/boiler/BoilerCache.java b/src/main/java/mekanism/common/content/boiler/BoilerCache.java index 176bc9ab4..ced5d0b7c 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerCache.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerCache.java @@ -1,19 +1,13 @@ package mekanism.common.content.boiler; -import mekanism.api.Coord4D; -import mekanism.common.content.tank.SynchronizedTankData; import mekanism.common.multiblock.MultiblockCache; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fluids.FluidStack; -import java.util.HashMap; - public class BoilerCache extends MultiblockCache { public ItemStack[] inventory = new ItemStack[2]; diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 7567477ce..5bd778d6e 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -8,11 +8,14 @@ import mekanism.api.EnumColor; import mekanism.api.Range4D; import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; +import mekanism.client.MekKeyHandler; +import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.InductionCellTier; import mekanism.common.Tier.InductionProviderTier; +import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.inventory.InventoryBin; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBin; @@ -24,6 +27,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -58,6 +62,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; * 1:2: Induction Port * 1:3: Induction Cell * 1:4: Induction Provider + * 1:5: Superheating Element + * 1:6: Boiler Casing + * 1:7: Boiler Valve * @author AidanBrady * */ @@ -131,59 +138,66 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock && itemstack.getItemDamage() == 6) + BasicBlockType type = BasicBlockType.get(itemstack); + + if(type.hasDescription) { - InventoryBin inv = new InventoryBin(itemstack); - - if(inv.getItemCount() > 0) + if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { - list.add(EnumColor.BRIGHT_GREEN + inv.getItemType().getDisplayName()); - list.add(EnumColor.INDIGO + "Item amount: " + EnumColor.GREY + inv.getItemCount()); + if(type == BasicBlockType.BIN) + { + InventoryBin inv = new InventoryBin(itemstack); + + if(inv.getItemCount() > 0) + { + list.add(EnumColor.BRIGHT_GREEN + inv.getItemType().getDisplayName()); + list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.itemAmount") + ": " + EnumColor.GREY + inv.getItemCount()); + } + else { + list.add(EnumColor.DARK_RED + LangUtils.localize("gui.empty")); + } + } + else if(type == BasicBlockType.INDUCTION_CELL) + { + InductionCellTier tier = InductionCellTier.values()[getTier(itemstack).ordinal()]; + + list.add(tier.getBaseTier().getColor() + LangUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(tier.maxEnergy)); + } + else if(type == BasicBlockType.INDUCTION_PROVIDER) + { + InductionProviderTier tier = InductionProviderTier.values()[getTier(itemstack).ordinal()]; + + list.add(tier.getBaseTier().getColor() + LangUtils.localize("tooltip.outputRate") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(tier.output)); + } + + if(getMaxEnergy(itemstack) > 0) + { + list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); + } + + list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + "."); } else { - list.add(EnumColor.DARK_RED + "Empty"); + list.addAll(MekanismUtils.splitTooltip(type.getDescription(), itemstack)); } } - else if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock2) - { - if(itemstack.getItemDamage() == 3) - { - InductionCellTier tier = InductionCellTier.values()[getTier(itemstack).ordinal()]; - - list.add(tier.getBaseTier().getColor() + LangUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(tier.maxEnergy)); - } - else if(itemstack.getItemDamage() == 4) - { - InductionProviderTier tier = InductionProviderTier.values()[getTier(itemstack).ordinal()]; - - list.add(tier.getBaseTier().getColor() + LangUtils.localize("tooltip.outputRate") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(tier.output)); - } - } - - if(getMaxEnergy(itemstack) > 0) - { - list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); - } } @Override public boolean hasContainerItem(ItemStack stack) { - return stack.getItemDamage() == 6 && stack.getTagCompound() != null && stack.getTagCompound().hasKey("newCount"); + return BasicBlockType.get(stack) == BasicBlockType.BIN && stack.getTagCompound() != null && stack.getTagCompound().hasKey("newCount"); } /* @Override public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) { - if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock) + if(BasicType.get(stack) != BasicType.BIN) { - if(stack.getItemDamage() != 6) - { - return true; - } + return true; } if(stack.getTagCompound() == null || !stack.getTagCompound().hasKey("newCount")) @@ -198,9 +212,9 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem @Override public ItemStack getContainerItem(ItemStack stack) { - if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock) + if(BasicBlockType.get(stack) == BasicBlockType.BIN) { - if(stack.getItemDamage() != 6 || stack.getTagCompound() == null || !stack.getTagCompound().hasKey("newCount")) + if(stack.getTagCompound() == null || !stack.getTagCompound().hasKey("newCount")) { return null; } @@ -221,47 +235,43 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem if(place) { - if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock) + BasicBlockType type = BasicBlockType.get(stack); + + if(type == BasicBlockType.BIN && stack.getTagCompound() != null) { - if(stack.getItemDamage() == 6 && stack.getTagCompound() != null) + TileEntityBin tileEntity = (TileEntityBin)world.getTileEntity(pos); + InventoryBin inv = new InventoryBin(stack); + + if(inv.getItemType() != null) { - TileEntityBin tileEntity = (TileEntityBin)world.getTileEntity(pos); - InventoryBin inv = new InventoryBin(stack); + tileEntity.setItemType(inv.getItemType()); + } - if(inv.getItemType() != null) - { - tileEntity.setItemType(inv.getItemType()); - } + tileEntity.setItemCount(inv.getItemCount()); + } + else if(type == BasicBlockType.INDUCTION_CELL) + { + TileEntityInductionCell tileEntity = (TileEntityInductionCell)world.getTileEntity(pos); + tileEntity.tier = InductionCellTier.values()[getTier(stack).ordinal()]; - tileEntity.setItemCount(inv.getItemCount()); + if(!world.isRemote) + { + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); } } - else if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock2) + else if(type == BasicBlockType.INDUCTION_PROVIDER) { - if(stack.getItemDamage() == 3) + TileEntityInductionProvider tileEntity = (TileEntityInductionProvider)world.getTileEntity(pos); + tileEntity.tier = InductionProviderTier.values()[getTier(stack).ordinal()]; + + if(!world.isRemote) { - TileEntityInductionCell tileEntity = (TileEntityInductionCell)world.getTileEntity(pos); - tileEntity.tier = InductionCellTier.values()[getTier(stack).ordinal()]; - - if(!world.isRemote) - { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); - } - } - else if(stack.getItemDamage() == 4) - { - TileEntityInductionProvider tileEntity = (TileEntityInductionProvider)world.getTileEntity(pos); - tileEntity.tier = InductionProviderTier.values()[getTier(stack).ordinal()]; - - if(!world.isRemote) - { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); - } + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); } } - + TileEntity tileEntity = world.getTileEntity(pos); - + if(tileEntity instanceof IStrictEnergyStorage && !(tileEntity instanceof TileEntityMultiblock)) { ((IStrictEnergyStorage)tileEntity).setEnergy(getEnergy(stack)); @@ -270,98 +280,35 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem return place; } - + @Override public String getUnlocalizedName(ItemStack itemstack) { - String name = ""; - - if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock) + if(BasicBlockType.get(itemstack) != null) { - switch(itemstack.getItemDamage()) - { - case 0: - name = "OsmiumBlock"; - break; - case 1: - name = "BronzeBlock"; - break; - case 2: - name = "RefinedObsidian"; - break; - case 3: - name = "CharcoalBlock"; - break; - case 4: - name = "RefinedGlowstone"; - break; - case 5: - name = "SteelBlock"; - break; - case 6: - name = "Bin"; - break; - case 7: - name = "TeleporterFrame"; - break; - case 8: - name = "SteelCasing"; - break; - case 9: - name = "DynamicTank"; - break; - case 10: - name = "StructuralGlass"; - break; - case 11: - name = "DynamicValve"; - break; - case 12: - name = "CopperBlock"; - break; - case 13: - name = "TinBlock"; - break; - case 14: - name = "SolarEvaporationController"; - break; - case 15: - name = "SolarEvaporationValve"; - break; - default: - name = "Unknown"; - break; - } - } - else if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock2) - { - switch(itemstack.getItemDamage()) - { - case 0: - name = "SolarEvaporationBlock"; - break; - case 1: - name = "InductionCasing"; - break; - case 2: - name = "InductionPort"; - break; - case 3: - name = "InductionCell" + getTier(itemstack).getName(); - break; - case 4: - name = "InductionProvider" + getTier(itemstack).getName(); - break; - } + return getUnlocalizedName() + "." + BasicBlockType.get(itemstack).name; } - return getUnlocalizedName() + "." + name; + return "null"; + } + + @Override + public String getItemStackDisplayName(ItemStack itemstack) + { + BasicBlockType type = BasicBlockType.get(itemstack); + + if(type == BasicBlockType.INDUCTION_CELL || type == BasicBlockType.INDUCTION_PROVIDER) + { + return getTier(itemstack).getLocalizedName() + " " + super.getItemStackDisplayName(itemstack); + } + + return super.getItemStackDisplayName(itemstack); } @Override public double getEnergy(ItemStack itemStack) { - if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock2 && itemStack.getItemDamage() == 3) + if(BasicBlockType.get(itemStack) == BasicBlockType.INDUCTION_CELL) { if(itemStack.getTagCompound() == null) { @@ -377,7 +324,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem @Override public void setEnergy(ItemStack itemStack, double amount) { - if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock2 && itemStack.getItemDamage() == 3) + if(BasicBlockType.get(itemStack) == BasicBlockType.INDUCTION_CELL) { if(itemStack.getTagCompound() == null) { @@ -391,7 +338,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem @Override public double getMaxEnergy(ItemStack itemStack) { - if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock2 && itemStack.getItemDamage() == 3) + if(BasicBlockType.get(itemStack) == BasicBlockType.INDUCTION_CELL) { return InductionCellTier.values()[getTier(itemStack).ordinal()].maxEnergy; } diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java index 4af19dc52..327acafd4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java @@ -160,7 +160,7 @@ public class TileEntityInductionCasing extends TileEntityMultiblock