diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index c26e9445e..db0180296 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -4,24 +4,25 @@ import java.util.List; import mekanism.api.gas.GasStack; import mekanism.api.util.ListUtils; -import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiRecipeType; +import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSortingTab; import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.gui.element.GuiUpgradeTab; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.render.MekanismRenderer; import mekanism.common.Tier.FactoryTier; import mekanism.common.inventory.container.ContainerFactory; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiFactory extends GuiMekanism { @@ -58,7 +59,6 @@ public class GuiFactory extends GuiMekanism fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 4, 0x404040); fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 93) + 2, 0x404040); - fontRendererObj.drawString(tileEntity.recipeType.getName(), 104, (ySize - 93) + 2, 0x404040); if(xAxis >= 165 && xAxis <= 169 && yAxis >= 17 && yAxis <= 69) { diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index b6f5e881e..e0ead22a7 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -152,11 +152,11 @@ public class MekanismRenderer } } - public static void loadDynamicTextures(IIconRegister register, MachineType type, IIcon def, IIcon[] textures) + public static void loadDynamicTextures(IIconRegister register, String name, IIcon def, IIcon[] textures) { for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - String tex = "mekanism:" + type.name + simpleSides[side.ordinal()]; + String tex = "mekanism:" + name + simpleSides[side.ordinal()]; String texOn = tex + "On"; if(blockIconExists(tex)) diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index 1bd8a63c4..b407046ad 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -2,6 +2,7 @@ package mekanism.common; import mekanism.api.EnumColor; import mekanism.common.multipart.TransmitterType; +import mekanism.common.util.MekanismUtils; import net.minecraft.util.ResourceLocation; /** @@ -27,6 +28,11 @@ public final class Tier return name; } + public String getLocalizedName() + { + return MekanismUtils.localize("tier." + getName()); + } + public EnumColor getColor() { return color; diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 6faf3afb5..c679aad62 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -18,6 +18,7 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; +import mekanism.common.Tier.BaseTier; import mekanism.common.base.IActiveState; import mekanism.common.base.IBoundingBlock; import mekanism.common.base.IElectricChest; @@ -179,25 +180,25 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer switch(blockType) { case MACHINE_BLOCK_1: - MekanismRenderer.loadDynamicTextures(register, MachineType.ENRICHMENT_CHAMBER, BASE_ICON, icons[0]); - MekanismRenderer.loadDynamicTextures(register, MachineType.OSMIUM_COMPRESSOR, BASE_ICON, icons[1]); - MekanismRenderer.loadDynamicTextures(register, MachineType.COMBINER, BASE_ICON, icons[2]); - MekanismRenderer.loadDynamicTextures(register, MachineType.CRUSHER, BASE_ICON, icons[3]); - MekanismRenderer.loadDynamicTextures(register, MachineType.BASIC_FACTORY, register.registerIcon("mekanism:BasicFactorySide"), icons[5]); - MekanismRenderer.loadDynamicTextures(register, MachineType.ADVANCED_FACTORY, register.registerIcon("mekanism:AdvancedFactorySide"), icons[6]); - MekanismRenderer.loadDynamicTextures(register, MachineType.ELITE_FACTORY, register.registerIcon("mekanism:EliteFactorySide"), icons[7]); - MekanismRenderer.loadDynamicTextures(register, MachineType.PURIFICATION_CHAMBER, BASE_ICON, icons[9]); - MekanismRenderer.loadDynamicTextures(register, MachineType.ENERGIZED_SMELTER, BASE_ICON, icons[10]); + MekanismRenderer.loadDynamicTextures(register, MachineType.ENRICHMENT_CHAMBER.name, BASE_ICON, icons[0]); + MekanismRenderer.loadDynamicTextures(register, MachineType.OSMIUM_COMPRESSOR.name, BASE_ICON, icons[1]); + MekanismRenderer.loadDynamicTextures(register, MachineType.COMBINER.name, BASE_ICON, icons[2]); + MekanismRenderer.loadDynamicTextures(register, MachineType.CRUSHER.name, BASE_ICON, icons[3]); + MekanismRenderer.loadDynamicTextures(register, BaseTier.BASIC.getName() + MachineType.BASIC_FACTORY.name, register.registerIcon("mekanism:BasicFactorySide"), icons[5]); + MekanismRenderer.loadDynamicTextures(register, BaseTier.ADVANCED.getName() + MachineType.ADVANCED_FACTORY.name, register.registerIcon("mekanism:AdvancedFactorySide"), icons[6]); + MekanismRenderer.loadDynamicTextures(register, BaseTier.ELITE.getName() + MachineType.ELITE_FACTORY.name, register.registerIcon("mekanism:EliteFactorySide"), icons[7]); + MekanismRenderer.loadDynamicTextures(register, MachineType.PURIFICATION_CHAMBER.name, BASE_ICON, icons[9]); + MekanismRenderer.loadDynamicTextures(register, MachineType.ENERGIZED_SMELTER.name, BASE_ICON, icons[10]); icons[11][0] = register.registerIcon("mekanism:Teleporter"); break; case MACHINE_BLOCK_2: - MekanismRenderer.loadDynamicTextures(register, MachineType.CHEMICAL_INJECTION_CHAMBER, BASE_ICON, icons[3]); - MekanismRenderer.loadDynamicTextures(register, MachineType.PRECISION_SAWMILL, BASE_ICON, icons[5]); + MekanismRenderer.loadDynamicTextures(register, MachineType.CHEMICAL_INJECTION_CHAMBER.name, BASE_ICON, icons[3]); + MekanismRenderer.loadDynamicTextures(register, MachineType.PRECISION_SAWMILL.name, BASE_ICON, icons[5]); break; case MACHINE_BLOCK_3: icons[0][0] = register.registerIcon("mekanism:AmbientAccumulator"); icons[2][0] = BASE_ICON; - MekanismRenderer.loadDynamicTextures(register, MachineType.OREDICTIONIFICATOR, register.registerIcon("mekanism:OredictionificatorSide"), icons[3]); + MekanismRenderer.loadDynamicTextures(register, MachineType.OREDICTIONIFICATOR.name, register.registerIcon("mekanism:OredictionificatorSide"), icons[3]); break; } } @@ -1040,9 +1041,9 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer COMBINER(MachineBlock.MACHINE_BLOCK_1, 2, "Combiner", 5, TileEntityCombiner.class, true, false, true), CRUSHER(MachineBlock.MACHINE_BLOCK_1, 3, "Crusher", 6, TileEntityCrusher.class, true, false, true), DIGITAL_MINER(MachineBlock.MACHINE_BLOCK_1, 4, "DigitalMiner", 2, TileEntityDigitalMiner.class, true, true, true), - BASIC_FACTORY(MachineBlock.MACHINE_BLOCK_1, 5, "BasicFactory", 11, TileEntityFactory.class, true, false, true), - ADVANCED_FACTORY(MachineBlock.MACHINE_BLOCK_1, 6, "AdvancedFactory", 11, TileEntityAdvancedFactory.class, true, false, true), - ELITE_FACTORY(MachineBlock.MACHINE_BLOCK_1, 7, "EliteFactory", 11, TileEntityEliteFactory.class, true, false, true), + BASIC_FACTORY(MachineBlock.MACHINE_BLOCK_1, 5, "Factory", 11, TileEntityFactory.class, true, false, true), + ADVANCED_FACTORY(MachineBlock.MACHINE_BLOCK_1, 6, "Factory", 11, TileEntityAdvancedFactory.class, true, false, true), + ELITE_FACTORY(MachineBlock.MACHINE_BLOCK_1, 7, "Factory", 11, TileEntityEliteFactory.class, true, false, true), METALLURGIC_INFUSER(MachineBlock.MACHINE_BLOCK_1, 8, "MetallurgicInfuser", 12, TileEntityMetallurgicInfuser.class, true, true, true), PURIFICATION_CHAMBER(MachineBlock.MACHINE_BLOCK_1, 9, "PurificationChamber", 15, TileEntityPurificationChamber.class, true, false, true), ENERGIZED_SMELTER(MachineBlock.MACHINE_BLOCK_1, 10, "EnergizedSmelter", 16, TileEntityEnergizedSmelter.class, true, false, true), diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 54b4b3368..61904120d 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -1,5 +1,8 @@ package mekanism.common.item; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; + import java.util.ArrayList; import java.util.List; @@ -19,7 +22,6 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.block.Block; import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.player.EntityPlayer; @@ -30,16 +32,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants.NBT; +import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import cofh.api.energy.IEnergyContainerItem; -import ic2.api.item.IElectricItemManager; -import ic2.api.item.ISpecialElectricItem; - @InterfaceList({ @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHCore"), @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") @@ -79,11 +78,11 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE stack.setItemDamage(100); return stack; } - + @Override - public String getUnlocalizedName(ItemStack itemstack) + public String getItemStackDisplayName(ItemStack itemstack) { - return getUnlocalizedName() + "." + getEnergyCubeTier(itemstack).getBaseTier().getName(); + return getEnergyCubeTier(itemstack).getBaseTier().getLocalizedName() + " " + metaBlock.getLocalizedName(); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 3bfa3a66a..e771f7c5c 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -1,5 +1,10 @@ package mekanism.common.item; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; + import java.util.List; import java.util.Map; @@ -11,12 +16,13 @@ import mekanism.api.energy.IEnergizedItem; import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; +import mekanism.common.Tier.BaseTier; import mekanism.common.Upgrade; import mekanism.common.base.IElectricChest; import mekanism.common.base.IFactory; -import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.IRedstoneControl.RedstoneControl; +import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedData; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; @@ -33,7 +39,6 @@ import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityPortableTank; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.settings.GameSettings; @@ -55,18 +60,13 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; +import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import cofh.api.energy.IEnergyContainerItem; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; -import ic2.api.item.IElectricItemManager; -import ic2.api.item.ISpecialElectricItem; - /** * Item class for handling multiple machine block IDs. * 0:0: Enrichment Chamber @@ -141,6 +141,22 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return "null"; } + + @Override + public String getItemStackDisplayName(ItemStack itemstack) + { + MachineType type = MachineType.get(itemstack); + + if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) + { + String tier = type == MachineType.BASIC_FACTORY ? BaseTier.BASIC.getLocalizedName() : (type == MachineType.ADVANCED_FACTORY ? + BaseTier.ADVANCED.getLocalizedName() : BaseTier.ELITE.getLocalizedName()); + + return tier + " " + RecipeType.values()[getRecipeType(itemstack)].getName() + " " + super.getItemStackDisplayName(itemstack); + } + + return super.getItemStackDisplayName(itemstack); + } @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 865117959..8e001c133 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -82,7 +82,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IPe @Override public String getInventoryName() { - return MekanismUtils.localize(getBlockType().getUnlocalizedName() + "." + tier.getBaseTier().getName() + ".name"); + return tier.getBaseTier().getLocalizedName() + " " + getBlockType().getLocalizedName(); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index c507b930b..f631f9f7c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -145,7 +145,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I public TileEntityFactory(FactoryTier type, MachineType machine) { - super("null", type.getBaseTier().getName() + "Factory", machine.baseEnergy); + super("null", machine.name, machine.baseEnergy); tier = type; inventory = new ItemStack[5+type.processes*2]; @@ -791,6 +791,12 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I { return 5+tier.processes+operation; } + + @Override + public String getInventoryName() + { + return tier.getBaseTier().getLocalizedName() + " " + recipeType.getName() + " " + super.getInventoryName(); + } @Override @Method(modid = "ComputerCraft") diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index e755aa3d4..a9ab62d4b 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -101,9 +101,7 @@ tile.MachineBlock.EnrichmentChamber.name=Enrichment Chamber tile.MachineBlock.OsmiumCompressor.name=Osmium Compressor tile.MachineBlock.Combiner.name=Combiner tile.MachineBlock.Crusher.name=Crusher -tile.MachineBlock.BasicFactory.name=Basic Factory -tile.MachineBlock.AdvancedFactory.name=Advanced Factory -tile.MachineBlock.EliteFactory.name=Elite Factory +tile.MachineBlock.Factory.name=Factory tile.MachineBlock.MetallurgicInfuser.name=Metallurgic Infuser tile.MachineBlock.PurificationChamber.name=Purification Chamber tile.MachineBlock.EnergizedSmelter.name=Energized Smelter @@ -179,11 +177,7 @@ item.MultipartTransmitter.DiversionTransporter.name=Diversion Transporter item.GlowPanel.name=Glow Panel //Energy Cubes -tile.EnergyCube.Basic.name=Basic Energy Cube -tile.EnergyCube.Advanced.name=Advanced Energy Cube -tile.EnergyCube.Elite.name=Elite Energy Cube -tile.EnergyCube.Ultimate.name=Ultimate Energy Cube -tile.EnergyCube.Creative.name=Creative Energy Cube +tile.EnergyCube.name=Energy Cube //Factory Installers item.basicFactoryInstaller.name=Basic Factory Installer @@ -318,6 +312,13 @@ oregas.silver=Silver Ore oregas.obsidian=Obsidian Ore oregas.lead=Lead Ore +//Tier names +tier.Basic=Basic +tier.Advanced=Advanced +tier.Elite=Elite +tier.Ultimate=Ultimate +tier.Creative=Creative + //Transmission types transmission.Energy=Energy transmission.Fluids=Fluids