diff --git a/common/mekanism/api/EnumColor.java b/common/mekanism/api/EnumColor.java deleted file mode 100644 index e5f614bc3..000000000 --- a/common/mekanism/api/EnumColor.java +++ /dev/null @@ -1,57 +0,0 @@ -package mekanism.api; - -/** - * Simple color enum for adding colors to in-game GUI strings of text. - * @author AidanBrady - * - */ -public enum EnumColor -{ - BLACK("\u00a70", "Black", new int[] {0, 0, 0}), - DARK_BLUE("\u00a71", "Dark Blue", new int[] {0, 0, 170}), - DARK_GREEN("\u00a72", "Dark Green", new int[] {0, 170, 0}), - DARK_AQUA("\u00a73", "Dark Aqua", new int[] {0, 170, 170}), - DARK_RED("\u00a74", "Dark Red", new int[] {170, 0, 0}), - PURPLE("\u00a75", "Purple", new int[] {170, 0, 170}), - ORANGE("\u00a76", "Orange", new int[] {255, 170, 0}), - GREY("\u00a77", "Grey", new int[] {170, 170, 170}), - DARK_GREY("\u00a78", "Dark Grey", new int[] {85, 85, 85}), - INDIGO("\u00a79", "Indigo", new int[] {85, 85, 255}), - BRIGHT_GREEN("\u00a7a", "Bright Green", new int[] {85, 255, 85}), - AQUA("\u00a7b", "Aqua", new int[] {85, 255, 255}), - RED("\u00a7c", "Red", new int[] {255, 85, 85}), - PINK("\u00a7d", "Pink", new int[] {255, 85, 255}), - YELLOW("\u00a7e", "Yellow", new int[] {255, 255, 85}), - WHITE("\u00a7f", "White", new int[] {255, 255, 255}); - - /** The color code that will be displayed */ - public final String code; - - public final int[] rgbCode; - - /** A friendly name of the color. */ - public String friendlyName; - - private EnumColor(String s, String n, int[] rgb) - { - code = s; - friendlyName = n; - rgbCode = rgb; - } - - public String getName() - { - return code + friendlyName; - } - - public float getColor(int index) - { - return (float)rgbCode[index]/255F; - } - - @Override - public String toString() - { - return code; - } -} diff --git a/common/mekanism/api/gas/Gas.java b/common/mekanism/api/gas/Gas.java index a21c20047..701c43f26 100644 --- a/common/mekanism/api/gas/Gas.java +++ b/common/mekanism/api/gas/Gas.java @@ -1,8 +1,8 @@ package mekanism.api.gas; -import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Icon; +import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -33,7 +33,7 @@ public class Gas public String getLocalizedName() { - return MekanismUtils.localize(getUnlocalizedName()); + return StatCollector.translateToLocal(getUnlocalizedName()); } public Gas setUnlocalizedName(String s) diff --git a/common/mekanism/api/gas/GasTransmission.java b/common/mekanism/api/gas/GasTransmission.java index 6ea720ba5..e1d3aefbd 100644 --- a/common/mekanism/api/gas/GasTransmission.java +++ b/common/mekanism/api/gas/GasTransmission.java @@ -3,9 +3,9 @@ package mekanism.api.gas; import java.util.HashSet; import java.util.Set; -import mekanism.api.Object3D; import mekanism.api.transmitters.ITransmitter; import mekanism.api.transmitters.TransmissionType; +import mekanism.common.Object3D; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; diff --git a/common/mekanism/api/transmitters/DynamicNetwork.java b/common/mekanism/api/transmitters/DynamicNetwork.java index 35db6d408..fd28b94b4 100644 --- a/common/mekanism/api/transmitters/DynamicNetwork.java +++ b/common/mekanism/api/transmitters/DynamicNetwork.java @@ -11,15 +11,14 @@ import java.util.NoSuchElementException; import java.util.Set; import mekanism.api.IClientTicker; -import mekanism.api.Object3D; import mekanism.client.ClientTickHandler; -import mekanism.common.PacketHandler; -import mekanism.common.PacketHandler.Transmission; -import mekanism.common.network.PacketDataRequest; +import mekanism.common.Object3D; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.Event; import cpw.mods.fml.common.FMLCommonHandler; public abstract class DynamicNetwork implements ITransmitterNetwork, IClientTicker @@ -251,7 +250,17 @@ public abstract class DynamicNetwork implements ITransmitterNetwork, if(ticksSinceCreate == 5 && getSize() > 0) { TileEntity tile = (TileEntity)transmitters.iterator().next(); - PacketHandler.sendPacket(Transmission.SERVER, new PacketDataRequest().setParams(Object3D.get(tile))); + MinecraftForge.EVENT_BUS.post(new NetworkClientRequest(tile)); + } + } + + public static class NetworkClientRequest extends Event + { + public TileEntity tileEntity; + + public NetworkClientRequest(TileEntity tile) + { + tileEntity = tile; } } diff --git a/common/mekanism/client/ClientPlayerTickHandler.java b/common/mekanism/client/ClientPlayerTickHandler.java index 42a3ca89f..6f70afb8c 100644 --- a/common/mekanism/client/ClientPlayerTickHandler.java +++ b/common/mekanism/client/ClientPlayerTickHandler.java @@ -4,8 +4,8 @@ import java.util.EnumSet; import java.util.HashSet; import java.util.Set; -import mekanism.api.EnumColor; -import mekanism.api.Object3D; +import mekanism.common.EnumColor; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.item.ItemConfigurator; diff --git a/common/mekanism/client/ClientProxy.java b/common/mekanism/client/ClientProxy.java index 300a04850..6195ddf67 100644 --- a/common/mekanism/client/ClientProxy.java +++ b/common/mekanism/client/ClientProxy.java @@ -4,7 +4,6 @@ package mekanism.client; import java.io.File; import java.util.HashMap; -import mekanism.api.IConfigurable; import mekanism.client.gui.GuiCombiner; import mekanism.client.gui.GuiConfiguration; import mekanism.client.gui.GuiCredits; @@ -61,6 +60,7 @@ import mekanism.client.sound.SoundHandler; import mekanism.common.CommonProxy; import mekanism.common.EntityObsidianTNT; import mekanism.common.EntityRobit; +import mekanism.common.IConfigurable; import mekanism.common.IElectricChest; import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; diff --git a/common/mekanism/client/ThreadTankSparkle.java b/common/mekanism/client/ThreadTankSparkle.java index e3b949660..2cd051a5f 100644 --- a/common/mekanism/client/ThreadTankSparkle.java +++ b/common/mekanism/client/ThreadTankSparkle.java @@ -4,8 +4,8 @@ import java.util.HashSet; import java.util.Random; import java.util.Set; -import mekanism.api.Object3D; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.tileentity.TileEntityDynamicTank; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/common/mekanism/client/gui/GuiAdvancedElectricMachine.java b/common/mekanism/client/gui/GuiAdvancedElectricMachine.java index 940c32663..61e419c4c 100644 --- a/common/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/common/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -31,7 +31,7 @@ public class GuiAdvancedElectricMachine extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString(tileEntity.fullName, 45, 6, 0x404040); + fontRenderer.drawString(tileEntity.getInvName(), 45, 6, 0x404040); fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040); if(xAxis >= 165 && xAxis <= 169 && yAxis >= 17 && yAxis <= 69) diff --git a/common/mekanism/client/gui/GuiConfiguration.java b/common/mekanism/client/gui/GuiConfiguration.java index 5c28a91a5..78977e458 100644 --- a/common/mekanism/client/gui/GuiConfiguration.java +++ b/common/mekanism/client/gui/GuiConfiguration.java @@ -3,12 +3,12 @@ package mekanism.client.gui; import java.util.HashMap; import java.util.Map; -import mekanism.api.EnumColor; -import mekanism.api.IConfigurable; -import mekanism.api.Object3D; -import mekanism.api.SideData; import mekanism.client.render.MekanismRenderer; +import mekanism.common.EnumColor; +import mekanism.common.IConfigurable; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; +import mekanism.common.SideData; import mekanism.common.PacketHandler.Transmission; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.container.ContainerNull; @@ -152,7 +152,7 @@ public class GuiConfiguration extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString("Configuration", 60, 5, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("gui.configuration"), 60, 5, 0x404040); fontRenderer.drawString("Eject: " + (configurable.getEjector().isEjecting() ? "On" : "Off"), 53, 17, 0x00CD00); fontRenderer.drawString("Input (" + (configurable.getEjector().hasStrictInput() ? "On" : "Off") + ")", 18, 81, 0x787878); diff --git a/common/mekanism/client/gui/GuiConfigurationTab.java b/common/mekanism/client/gui/GuiConfigurationTab.java index 437000090..0fafd7144 100644 --- a/common/mekanism/client/gui/GuiConfigurationTab.java +++ b/common/mekanism/client/gui/GuiConfigurationTab.java @@ -1,8 +1,8 @@ package mekanism.client.gui; -import mekanism.api.Object3D; import mekanism.common.IRedstoneControl; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketSimpleGui; @@ -48,7 +48,7 @@ public class GuiConfigurationTab extends GuiElement if(xAxis >= -21 && xAxis <= -3 && yAxis >= 10 && yAxis <= 28) { - displayTooltip("Configuration", xAxis, yAxis); + displayTooltip(MekanismUtils.localize("gui.configuration"), xAxis, yAxis); } mc.renderEngine.bindTexture(defaultLocation); diff --git a/common/mekanism/client/gui/GuiCredits.java b/common/mekanism/client/gui/GuiCredits.java index 3a0bbdc14..207cc9d8a 100644 --- a/common/mekanism/client/gui/GuiCredits.java +++ b/common/mekanism/client/gui/GuiCredits.java @@ -1,7 +1,7 @@ package mekanism.client.gui; -import mekanism.api.EnumColor; import mekanism.client.ThreadClientUpdate; +import mekanism.common.EnumColor; import mekanism.common.IModule; import mekanism.common.Mekanism; import mekanism.common.Version; diff --git a/common/mekanism/client/gui/GuiDigitalMiner.java b/common/mekanism/client/gui/GuiDigitalMiner.java index 8879b208a..0c55d3e91 100644 --- a/common/mekanism/client/gui/GuiDigitalMiner.java +++ b/common/mekanism/client/gui/GuiDigitalMiner.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import java.util.ArrayList; -import mekanism.api.Object3D; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerDigitalMiner; @@ -54,21 +54,21 @@ public class GuiDigitalMiner extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - startButton = new GuiButton(0, guiWidth + 69, guiHeight + 17, 60, 20, "Start"); + startButton = new GuiButton(0, guiWidth + 69, guiHeight + 17, 60, 20, MekanismUtils.localize("gui.start")); if(tileEntity.searcher.state != State.IDLE && tileEntity.running) { startButton.enabled = false; } - stopButton = new GuiButton(1, guiWidth + 69, guiHeight + 37, 60, 20, "Stop"); + stopButton = new GuiButton(1, guiWidth + 69, guiHeight + 37, 60, 20, MekanismUtils.localize("gui.stop")); if(tileEntity.searcher.state == State.IDLE || !tileEntity.running) { stopButton.enabled = false; } - configButton = new GuiButton(2, guiWidth + 69, guiHeight + 57, 60, 20, "Config"); + configButton = new GuiButton(2, guiWidth + 69, guiHeight + 57, 60, 20, MekanismUtils.localize("gui.config")); if(tileEntity.searcher.state != State.IDLE) { @@ -141,17 +141,17 @@ public class GuiDigitalMiner extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString(tileEntity.fullName, 69, 6, 0x404040); - fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040); + fontRenderer.drawString(tileEntity.getInvName(), 69, 6, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); - fontRenderer.drawString(tileEntity.running ? "Running" : "Idle", 9, 10, 0x00CD00); + fontRenderer.drawString(tileEntity.running ? MekanismUtils.localize("gui.digitalMiner.running") : MekanismUtils.localize("gui.digitalMiner.idle"), 9, 10, 0x00CD00); fontRenderer.drawString(tileEntity.searcher.state.desc, 9, 19, 0x00CD00); - fontRenderer.drawString("Eject: " + (tileEntity.doEject ? "On" : "Off"), 9, 30, 0x00CD00); - fontRenderer.drawString("Pull: " + (tileEntity.doPull ? "On" : "Off"), 9, 39, 0x00CD00); - fontRenderer.drawString("Silk: " + (tileEntity.silkTouch ? "On" : "Off"), 9, 48, 0x00CD00); + fontRenderer.drawString(MekanismUtils.localize("gui.digitalMiner.eject") + ": " + (tileEntity.doEject ? "On" : "Off"), 9, 30, 0x00CD00); + fontRenderer.drawString(MekanismUtils.localize("gui.digitalMiner.pull") + ": " + (tileEntity.doPull ? "On" : "Off"), 9, 39, 0x00CD00); + fontRenderer.drawString(MekanismUtils.localize("gui.digitalMiner.silk") + ": " + (tileEntity.silkTouch ? "On" : "Off"), 9, 48, 0x00CD00); - fontRenderer.drawString("To mine:", 9, 59, 0x00CD00); + fontRenderer.drawString(MekanismUtils.localize("gui.digitalMiner.toMine") + ":", 9, 59, 0x00CD00); fontRenderer.drawString("" + tileEntity.clientToMine, 9, 68, 0x00CD00); if(tileEntity.replaceStack != null) @@ -170,27 +170,27 @@ public class GuiDigitalMiner extends GuiMekanism if(xAxis >= 147 && xAxis <= 161 && yAxis >= 47 && yAxis <= 61) { - drawCreativeTabHoveringText("Auto-eject", xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.localize("gui.autoEject"), xAxis, yAxis); } if(xAxis >= 147 && xAxis <= 161 && yAxis >= 63 && yAxis <= 77) { - drawCreativeTabHoveringText("Auto-pull", xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.localize("gui.digitalMiner.autoPull"), xAxis, yAxis); } if(xAxis >= 144 && xAxis <= 160 && yAxis >= 27 && yAxis <= 43) { - drawCreativeTabHoveringText("Replace block", xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.localize("gui.digitalMiner.replaceBlock"), xAxis, yAxis); } if(xAxis >= 131 && xAxis <= 145 && yAxis >= 47 && yAxis <= 61) { - drawCreativeTabHoveringText("Reset", xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.localize("gui.digitalMiner.reset"), xAxis, yAxis); } if(xAxis >= 131 && xAxis <= 145 && yAxis >= 63 && yAxis <= 77) { - drawCreativeTabHoveringText("Silk touch", xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.localize("gui.digitalMiner.silkTouch"), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/common/mekanism/client/gui/GuiDigitalMinerConfig.java b/common/mekanism/client/gui/GuiDigitalMinerConfig.java index 5a58be218..2afb6ae6a 100644 --- a/common/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/common/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import mekanism.api.Object3D; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerNull; @@ -282,7 +282,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString("Digital Miner Config", 43, 6, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("gui.digitalMinerConfig"), 43, 6, 0x404040); fontRenderer.drawString("Filters:", 11, 19, 0x00CD00); fontRenderer.drawString("T: " + tileEntity.filters.size(), 11, 28, 0x00CD00); diff --git a/common/mekanism/client/gui/GuiDynamicTank.java b/common/mekanism/client/gui/GuiDynamicTank.java index 375a933ba..b38058774 100644 --- a/common/mekanism/client/gui/GuiDynamicTank.java +++ b/common/mekanism/client/gui/GuiDynamicTank.java @@ -34,10 +34,10 @@ public class GuiDynamicTank extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString(tileEntity.fullName, 45, 6, 0x404040); - fontRenderer.drawString("Inventory", 8, (ySize - 94) + 2, 0x404040); - fontRenderer.drawString("Volume: " + tileEntity.clientCapacity/TankUpdateProtocol.FLUID_PER_TANK, 53, 26, 0x00CD00); - fontRenderer.drawString(tileEntity.structure.fluidStored != null ? tileEntity.structure.fluidStored.getFluid().getName() + ":" : "No fluid.", 53, 44, 0x00CD00); + fontRenderer.drawString(tileEntity.getInvName(), 45, 6, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("gui.volume") + ": " + tileEntity.clientCapacity/TankUpdateProtocol.FLUID_PER_TANK, 53, 26, 0x00CD00); + fontRenderer.drawString(tileEntity.structure.fluidStored != null ? tileEntity.structure.fluidStored.getFluid().getName() + ":" : MekanismUtils.localize("gui.noFluid"), 53, 44, 0x00CD00); if(tileEntity.structure.fluidStored != null) { @@ -46,7 +46,7 @@ public class GuiDynamicTank extends GuiMekanism if(xAxis >= 7 && xAxis <= 39 && yAxis >= 14 && yAxis <= 72) { - drawCreativeTabHoveringText(tileEntity.structure.fluidStored != null ? tileEntity.structure.fluidStored.getFluid().getLocalizedName() + ": " + tileEntity.structure.fluidStored.amount + "mB" : "Empty", xAxis, yAxis); + drawCreativeTabHoveringText(tileEntity.structure.fluidStored != null ? tileEntity.structure.fluidStored.getFluid().getLocalizedName() + ": " + tileEntity.structure.fluidStored.amount + "mB" : MekanismUtils.localize("gui.empty"), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/common/mekanism/client/gui/GuiElectricChest.java b/common/mekanism/client/gui/GuiElectricChest.java index 16b6d8d3f..d3c0ba408 100644 --- a/common/mekanism/client/gui/GuiElectricChest.java +++ b/common/mekanism/client/gui/GuiElectricChest.java @@ -1,10 +1,10 @@ package mekanism.client.gui; -import mekanism.api.EnumColor; -import mekanism.api.Object3D; import mekanism.api.energy.IEnergizedItem; +import mekanism.common.EnumColor; import mekanism.common.IElectricChest; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerElectricChest; @@ -72,7 +72,7 @@ public class GuiElectricChest extends GuiContainer int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 93, guiHeight + 4, 76, 20, "Edit Password")); + buttonList.add(new GuiButton(0, guiWidth + 93, guiHeight + 4, 76, 20, MekanismUtils.localize("gui.electricChest.editPassword"))); } @Override @@ -96,9 +96,9 @@ public class GuiElectricChest extends GuiContainer int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString("Electric Chest", 8, 6, 0x404040); + fontRenderer.drawString(tileEntity.getInvName(), 8, 6, 0x404040); fontRenderer.drawString(getLocked() ? EnumColor.DARK_RED + "Locked" : EnumColor.BRIGHT_GREEN + "Unlocked", 97, 137, 0x404040); - fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); if(xAxis >= 180 && xAxis <= 184 && yAxis >= 32 && yAxis <= 84) { diff --git a/common/mekanism/client/gui/GuiElectricPump.java b/common/mekanism/client/gui/GuiElectricPump.java index 6b37b0f43..1a1b6eedf 100644 --- a/common/mekanism/client/gui/GuiElectricPump.java +++ b/common/mekanism/client/gui/GuiElectricPump.java @@ -34,14 +34,14 @@ public class GuiElectricPump extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString(tileEntity.fullName, 45, 6, 0x404040); - fontRenderer.drawString("Inventory", 8, (ySize - 94) + 2, 0x404040); + fontRenderer.drawString(tileEntity.getInvName(), 45, 6, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); fontRenderer.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); - fontRenderer.drawString(tileEntity.fluidTank.getFluid() != null ? tileEntity.fluidTank.getFluid().getFluid().getName() + ": " + tileEntity.fluidTank.getFluid().amount : "No fluid.", 51, 35, 0x00CD00); + fontRenderer.drawString(tileEntity.fluidTank.getFluid() != null ? tileEntity.fluidTank.getFluid().getFluid().getName() + ": " + tileEntity.fluidTank.getFluid().amount : MekanismUtils.localize("gui.noFluid"), 51, 35, 0x00CD00); if(xAxis >= 7 && xAxis <= 23 && yAxis >= 14 && yAxis <= 72) { - drawCreativeTabHoveringText(tileEntity.fluidTank.getFluid() != null ? tileEntity.fluidTank.getFluid().getFluid().getLocalizedName() + ": " + tileEntity.fluidTank.getFluid().amount + "mB" : "Empty", xAxis, yAxis); + drawCreativeTabHoveringText(tileEntity.fluidTank.getFluid() != null ? tileEntity.fluidTank.getFluid().getFluid().getLocalizedName() + ": " + tileEntity.fluidTank.getFluid().amount + "mB" : MekanismUtils.localize("gui.empty"), xAxis, yAxis); } if(xAxis >= 165 && xAxis <= 169 && yAxis >= 17 && yAxis <= 69) diff --git a/common/mekanism/client/gui/GuiEnergyCube.java b/common/mekanism/client/gui/GuiEnergyCube.java index 39c7763d7..661d16bc5 100644 --- a/common/mekanism/client/gui/GuiEnergyCube.java +++ b/common/mekanism/client/gui/GuiEnergyCube.java @@ -33,12 +33,12 @@ public class GuiEnergyCube extends GuiMekanism int yAxis = (mouseY - (height - ySize) / 2); String capacityInfo = MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()) + "/" + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()); - String outputInfo = "Out: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"; + String outputInfo = MekanismUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"; - fontRenderer.drawString(tileEntity.tier.name + " Energy Cube", 43, 6, 0x404040); + fontRenderer.drawString(tileEntity.getInvName(), 43, 6, 0x404040); fontRenderer.drawString(capacityInfo, 45, 40, 0x00CD00); fontRenderer.drawString(outputInfo, 45, 49, 0x00CD00); - fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/common/mekanism/client/gui/GuiFactory.java b/common/mekanism/client/gui/GuiFactory.java index 70bdd240e..a095c551c 100644 --- a/common/mekanism/client/gui/GuiFactory.java +++ b/common/mekanism/client/gui/GuiFactory.java @@ -36,8 +36,8 @@ public class GuiFactory extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString(tileEntity.fullName, 48, 4, 0x404040); - fontRenderer.drawString("Inventory", 8, (ySize - 93) + 2, 0x404040); + fontRenderer.drawString(tileEntity.getInvName(), 48, 4, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 93) + 2, 0x404040); fontRenderer.drawString(RecipeType.values()[tileEntity.recipeType].getName(), 104, (ySize - 93) + 2, 0x404040); if(xAxis >= 165 && xAxis <= 169 && yAxis >= 17 && yAxis <= 69) @@ -47,7 +47,7 @@ public class GuiFactory extends GuiMekanism if(xAxis >= 8 && xAxis <= 168 && yAxis >= 78 && yAxis <= 83) { - drawCreativeTabHoveringText("Secondary energy: " + tileEntity.secondaryEnergyStored, xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.localize("gui.factory.secondaryEnergy") + ": " + tileEntity.secondaryEnergyStored, xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/common/mekanism/client/gui/GuiGasTank.java b/common/mekanism/client/gui/GuiGasTank.java index acfd6e356..b8c05fc69 100644 --- a/common/mekanism/client/gui/GuiGasTank.java +++ b/common/mekanism/client/gui/GuiGasTank.java @@ -32,10 +32,10 @@ public class GuiGasTank extends GuiMekanism String capacityInfo = (tileEntity.getGas() != null ? tileEntity.getGas().amount : 0) + "/" + tileEntity.MAX_GAS; - fontRenderer.drawString("Gas Tank", 43, 6, 0x404040); + fontRenderer.drawString(tileEntity.getInvName(), 43, 6, 0x404040); fontRenderer.drawString(capacityInfo, 45, 40, 0x404040); fontRenderer.drawString("Gas: " + (tileEntity.getGas() != null ? tileEntity.getGas().getGas().getLocalizedName() : "None"), 45, 49, 0x404040); - fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/common/mekanism/client/gui/GuiLogisticalSorter.java b/common/mekanism/client/gui/GuiLogisticalSorter.java index 5079a5d43..98cf27b79 100644 --- a/common/mekanism/client/gui/GuiLogisticalSorter.java +++ b/common/mekanism/client/gui/GuiLogisticalSorter.java @@ -7,8 +7,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import mekanism.api.Object3D; import mekanism.client.render.MekanismRenderer; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerNull; @@ -243,8 +243,8 @@ public class GuiLogisticalSorter extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 56, guiHeight + 136, 54, 20, "ItemStack")); - buttonList.add(new GuiButton(1, guiWidth + 110, guiHeight + 136, 43, 20, "OreDict")); + buttonList.add(new GuiButton(0, guiWidth + 56, guiHeight + 136, 54, 20, MekanismUtils.localize("gui.itemstack"))); + buttonList.add(new GuiButton(1, guiWidth + 110, guiHeight + 136, 43, 20, MekanismUtils.localize("gui.oredict"))); } @Override @@ -268,9 +268,9 @@ public class GuiLogisticalSorter extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString("Logistical Sorter", 43, 6, 0x404040); + fontRenderer.drawString(tileEntity.getInvName(), 43, 6, 0x404040); - fontRenderer.drawString("Filters:", 11, 19, 0x00CD00); + fontRenderer.drawString(MekanismUtils.localize("gui.logisticalSorter.filters") + ":", 11, 19, 0x00CD00); fontRenderer.drawString("T: " + tileEntity.filters.size(), 11, 28, 0x00CD00); fontRenderer.drawString("IS: " + getItemStackFilters().size(), 11, 37, 0x00CD00); fontRenderer.drawString("OD: " + getOreDictFilters().size(), 11, 46, 0x00CD00); @@ -278,10 +278,10 @@ public class GuiLogisticalSorter extends GuiMekanism fontRenderer.drawString("RR:", 12, 74, 0x00CD00); fontRenderer.drawString(tileEntity.roundRobin ? "On" : "Off", 27, 86, 0x00CD00); - fontRenderer.drawString("Auto:", 12, 100, 0x00CD00); + fontRenderer.drawString(MekanismUtils.localize("gui.logisticalSorter.auto") + ":", 12, 100, 0x00CD00); fontRenderer.drawString(tileEntity.autoEject ? "On" : "Off", 27, 112, 0x00CD00); - fontRenderer.drawString("Default:", 12, 126, 0x00CD00); + fontRenderer.drawString(MekanismUtils.localize("gui.logisticalSorter.default") + ":", 12, 126, 0x00CD00); for(int i = 0; i < 4; i++) { @@ -303,8 +303,8 @@ public class GuiLogisticalSorter extends GuiMekanism GL11.glPopMatrix(); } - fontRenderer.drawString("Item Filter", 78, yStart + 2, 0x404040); - fontRenderer.drawString(filter.color != null ? filter.color.getName() : "None", 78, yStart + 11, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("gui.itemFilter"), 78, yStart + 2, 0x404040); + fontRenderer.drawString(filter.color != null ? filter.color.getName() : MekanismUtils.localize("gui.none"), 78, yStart + 11, 0x404040); } else if(filter instanceof TOreDictFilter) { @@ -325,7 +325,7 @@ public class GuiLogisticalSorter extends GuiMekanism } fontRenderer.drawString("OreDict Filter", 78, yStart + 2, 0x404040); - fontRenderer.drawString(filter.color != null ? filter.color.getName() : "None", 78, yStart + 11, 0x404040); + fontRenderer.drawString(filter.color != null ? filter.color.getName() : MekanismUtils.localize("gui.none"), 78, yStart + 11, 0x404040); } } } @@ -351,18 +351,18 @@ public class GuiLogisticalSorter extends GuiMekanism drawCreativeTabHoveringText(tileEntity.color.getName(), xAxis, yAxis); } else { - drawCreativeTabHoveringText("None", xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.localize("gui.none"), xAxis, yAxis); } } if(xAxis >= 12 && xAxis <= 26 && yAxis >= 110 && yAxis <= 124) { - drawCreativeTabHoveringText("Auto-eject", xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.localize("gui.autoEject"), xAxis, yAxis); } if(xAxis >= 12 && xAxis <= 26 && yAxis >= 84 && yAxis <= 98) { - drawCreativeTabHoveringText("Round robin", xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.localize("gui.logisticalSorter.roundRobin"), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/common/mekanism/client/gui/GuiMItemStackFilter.java b/common/mekanism/client/gui/GuiMItemStackFilter.java index 11f103125..ec1182c11 100644 --- a/common/mekanism/client/gui/GuiMItemStackFilter.java +++ b/common/mekanism/client/gui/GuiMItemStackFilter.java @@ -1,7 +1,7 @@ package mekanism.client.gui; -import mekanism.api.EnumColor; -import mekanism.api.Object3D; +import mekanism.common.EnumColor; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerFilter; diff --git a/common/mekanism/client/gui/GuiMOreDictFilter.java b/common/mekanism/client/gui/GuiMOreDictFilter.java index 10fb2d859..3607ca564 100644 --- a/common/mekanism/client/gui/GuiMOreDictFilter.java +++ b/common/mekanism/client/gui/GuiMOreDictFilter.java @@ -3,8 +3,8 @@ package mekanism.client.gui; import java.util.ArrayList; import java.util.List; -import mekanism.api.EnumColor; -import mekanism.api.Object3D; +import mekanism.common.EnumColor; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerFilter; diff --git a/common/mekanism/client/gui/GuiMekanism.java b/common/mekanism/client/gui/GuiMekanism.java index 0d143bc3b..c7614c87d 100644 --- a/common/mekanism/client/gui/GuiMekanism.java +++ b/common/mekanism/client/gui/GuiMekanism.java @@ -3,8 +3,8 @@ package mekanism.client.gui; import java.util.HashSet; import java.util.Set; -import mekanism.api.IConfigurable; -import mekanism.api.SideData; +import mekanism.common.IConfigurable; +import mekanism.common.SideData; import mekanism.common.item.ItemConfigurator; import mekanism.common.tileentity.TileEntityContainerBlock; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/common/mekanism/client/gui/GuiMetallurgicInfuser.java b/common/mekanism/client/gui/GuiMetallurgicInfuser.java index 077d8299d..1a07a82af 100644 --- a/common/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/common/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import java.util.ArrayList; -import mekanism.api.Object3D; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerMetallurgicInfuser; @@ -38,8 +38,8 @@ public class GuiMetallurgicInfuser extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString(tileEntity.fullName, 45, 6, 0x404040); - fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040); + fontRenderer.drawString(tileEntity.getInvName(), 45, 6, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); if(xAxis >= 165 && xAxis <= 169 && yAxis >= 17 && yAxis <= 69) { diff --git a/common/mekanism/client/gui/GuiPasswordEnter.java b/common/mekanism/client/gui/GuiPasswordEnter.java index 28df070bd..9c49b3942 100644 --- a/common/mekanism/client/gui/GuiPasswordEnter.java +++ b/common/mekanism/client/gui/GuiPasswordEnter.java @@ -1,9 +1,9 @@ package mekanism.client.gui; -import mekanism.api.EnumColor; -import mekanism.api.Object3D; import mekanism.api.energy.IEnergizedItem; +import mekanism.common.EnumColor; import mekanism.common.IElectricChest; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketElectricChest; @@ -36,7 +36,7 @@ public class GuiPasswordEnter extends GuiScreen public GuiTextField passwordField; - public String displayText = EnumColor.BRIGHT_GREEN + "Enter password"; + public String displayText = EnumColor.BRIGHT_GREEN + MekanismUtils.localize("gui.password.enterPassword"); public int ticker = 0; @@ -68,7 +68,7 @@ public class GuiPasswordEnter extends GuiScreen int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 55, guiHeight + 68, 60, 20, "Open")); + buttonList.add(new GuiButton(0, guiWidth + 55, guiHeight + 68, 60, 20, MekanismUtils.localize("gui.open"))); passwordField = new GuiTextField(fontRenderer, guiWidth + 45, guiHeight + 50, 80, 12); passwordField.setMaxStringLength(12); @@ -104,7 +104,7 @@ public class GuiPasswordEnter extends GuiScreen ticker--; } else { - displayText = EnumColor.BRIGHT_GREEN + "Enter password"; + displayText = EnumColor.BRIGHT_GREEN + MekanismUtils.localize("gui.password.enterPassword"); } } @@ -121,13 +121,13 @@ public class GuiPasswordEnter extends GuiScreen { if(passwordField.getText() == null || passwordField.getText() == "") { - displayText = EnumColor.DARK_RED + "Field empty"; + displayText = EnumColor.DARK_RED + MekanismUtils.localize("gui.password.fieldsEmpty"); mc.sndManager.playSoundFX("mekanism:etc.Error", 1.0F, 1.0F); ticker = 30; } else if(!getPassword().equals(passwordField.getText())) { - displayText = EnumColor.DARK_RED + "Invalid"; + displayText = EnumColor.DARK_RED + MekanismUtils.localize("gui.password.invalid"); passwordField.setText(""); mc.sndManager.playSoundFX("mekanism:etc.Error", 1.0F, 1.0F); ticker = 30; @@ -172,7 +172,7 @@ public class GuiPasswordEnter extends GuiScreen super.drawScreen(mouseX, mouseY, partialTick); - fontRenderer.drawString("Password", guiWidth + 64, guiHeight + 5, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("gui.password"), guiWidth + 64, guiHeight + 5, 0x404040); fontRenderer.drawString("Enter:", guiWidth + 45, guiHeight + 40, 0x404040); fontRenderer.drawString(displayText, guiWidth + 37, guiHeight + 19, 0x404040); diff --git a/common/mekanism/client/gui/GuiPasswordModify.java b/common/mekanism/client/gui/GuiPasswordModify.java index b986769ed..7390ed445 100644 --- a/common/mekanism/client/gui/GuiPasswordModify.java +++ b/common/mekanism/client/gui/GuiPasswordModify.java @@ -1,8 +1,8 @@ package mekanism.client.gui; -import mekanism.api.EnumColor; -import mekanism.api.Object3D; +import mekanism.common.EnumColor; import mekanism.common.IElectricChest; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketElectricChest; @@ -37,7 +37,7 @@ public class GuiPasswordModify extends GuiScreen public GuiTextField confirmPasswordField; - public String displayText = EnumColor.BRIGHT_GREEN + "Set password"; + public String displayText = EnumColor.BRIGHT_GREEN + MekanismUtils.localize("gui.password.setPassword"); public int ticker = 0; @@ -62,7 +62,7 @@ public class GuiPasswordModify extends GuiScreen int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 55, guiHeight + 68, 60, 20, "Confirm")); + buttonList.add(new GuiButton(0, guiWidth + 55, guiHeight + 68, 60, 20, MekanismUtils.localize("gui.confirm"))); newPasswordField = new GuiTextField(fontRenderer, guiWidth + 60, guiHeight + 34, 80, 12); newPasswordField.setMaxStringLength(12); @@ -130,7 +130,7 @@ public class GuiPasswordModify extends GuiScreen ticker--; } else { - displayText = EnumColor.BRIGHT_GREEN + "Set password"; + displayText = EnumColor.BRIGHT_GREEN + MekanismUtils.localize("gui.password.setPassword"); } } @@ -147,17 +147,17 @@ public class GuiPasswordModify extends GuiScreen { if(newPasswordField.getText() == null || newPasswordField.getText().equals("") || confirmPasswordField.getText() == null || confirmPasswordField.getText().equals("")) { - displayText = EnumColor.DARK_RED + "Field(s) empty"; + displayText = EnumColor.DARK_RED + MekanismUtils.localize("gui.password.fieldsEmpty"); ticker = 30; } else if(!newPasswordField.getText().equals(confirmPasswordField.getText())) { - displayText = EnumColor.DARK_RED + "Not matching"; + displayText = EnumColor.DARK_RED + MekanismUtils.localize("gui.password.notMatching"); ticker = 30; } else if(confirmPasswordField.getText().equals(getPassword())) { - displayText = EnumColor.DARK_RED + "Identical"; + displayText = EnumColor.DARK_RED + MekanismUtils.localize("gui.password.identical"); ticker = 30; } else { @@ -198,7 +198,7 @@ public class GuiPasswordModify extends GuiScreen super.drawScreen(mouseX, mouseY, partialTick); - fontRenderer.drawString("Password", guiWidth + 64, guiHeight + 5, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("gui.password"), guiWidth + 64, guiHeight + 5, 0x404040); fontRenderer.drawString(displayText, guiWidth + 37, guiHeight + 19, 0x404040); fontRenderer.drawString("Enter:", guiWidth + 27, guiHeight + 37, 0x404040); fontRenderer.drawString("Repeat:", guiWidth + 21, guiHeight + 54, 0x404040); diff --git a/common/mekanism/client/gui/GuiPortableTeleporter.java b/common/mekanism/client/gui/GuiPortableTeleporter.java index f57c2f144..18938a416 100644 --- a/common/mekanism/client/gui/GuiPortableTeleporter.java +++ b/common/mekanism/client/gui/GuiPortableTeleporter.java @@ -36,7 +36,7 @@ public class GuiPortableTeleporter extends GuiScreen public void initGui() { buttonList.clear(); - buttonList.add(new GuiButton(0, 173, 105, 80, 20, "Teleport")); + buttonList.add(new GuiButton(0, 173, 105, 80, 20, MekanismUtils.localize("gui.teleport"))); } @Override @@ -72,7 +72,7 @@ public class GuiPortableTeleporter extends GuiScreen ((GuiButton)buttonList.get(0)).xPosition = guiWidth+48; ((GuiButton)buttonList.get(0)).yPosition = guiHeight+68; - fontRenderer.drawString("Portable Teleporter", guiWidth+39, guiHeight+6, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("gui.portableTeleporter"), guiWidth+39, guiHeight+6, 0x404040); fontRenderer.drawString(item.getStatusAsString(item.getStatus(itemStack)), guiWidth+53, guiHeight+19, 0x00CD00); super.drawScreen(mouseX, mouseY, partialTick); diff --git a/common/mekanism/client/gui/GuiRedstoneControl.java b/common/mekanism/client/gui/GuiRedstoneControl.java index 5a2807b23..1757636f3 100644 --- a/common/mekanism/client/gui/GuiRedstoneControl.java +++ b/common/mekanism/client/gui/GuiRedstoneControl.java @@ -1,7 +1,7 @@ package mekanism.client.gui; -import mekanism.api.Object3D; import mekanism.common.IRedstoneControl; +import mekanism.common.Object3D; import mekanism.common.IRedstoneControl.RedstoneControl; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; diff --git a/common/mekanism/client/gui/GuiRobitCrafting.java b/common/mekanism/client/gui/GuiRobitCrafting.java index f17f08a13..d532f2c4c 100644 --- a/common/mekanism/client/gui/GuiRobitCrafting.java +++ b/common/mekanism/client/gui/GuiRobitCrafting.java @@ -31,8 +31,8 @@ public class GuiRobitCrafting extends GuiMekanism @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - fontRenderer.drawString("Robit Crafting", 8, 6, 0x404040); - fontRenderer.drawString("Inventory", 8, ySize - 96 + 3, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("gui.robit.crafting"), 8, 6, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, ySize - 96 + 3, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/common/mekanism/client/gui/GuiRobitInventory.java b/common/mekanism/client/gui/GuiRobitInventory.java index 9907e462e..7cac4b3f6 100644 --- a/common/mekanism/client/gui/GuiRobitInventory.java +++ b/common/mekanism/client/gui/GuiRobitInventory.java @@ -31,8 +31,8 @@ public class GuiRobitInventory extends GuiMekanism @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - fontRenderer.drawString("Robit Inventory", 8, 6, 0x404040); - fontRenderer.drawString("Inventory", 8, ySize - 96 + 3, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("gui.robit.inventory"), 8, 6, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, ySize - 96 + 3, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/common/mekanism/client/gui/GuiRobitMain.java b/common/mekanism/client/gui/GuiRobitMain.java index 99e18a35d..8fa931d75 100644 --- a/common/mekanism/client/gui/GuiRobitMain.java +++ b/common/mekanism/client/gui/GuiRobitMain.java @@ -71,7 +71,7 @@ public class GuiRobitMain extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(confirmName = new GuiButton(0, guiWidth + 58, guiHeight + 47, 60, 20, "Confirm")); + buttonList.add(confirmName = new GuiButton(0, guiWidth + 58, guiHeight + 47, 60, 20, MekanismUtils.localize("gui.confirm"))); confirmName.drawButton = displayNameChange; nameChangeField = new GuiTextField(fontRenderer, guiWidth + 48, guiHeight + 21, 80, 12); @@ -103,11 +103,11 @@ public class GuiRobitMain extends GuiMekanism @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - fontRenderer.drawString("Robit", 76, 6, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("gui.robit"), 76, 6, 0x404040); if(!displayNameChange) { - fontRenderer.drawString("Hi, I'm " + robit.getTranslatedEntityName() + "!", 29, 18, 0x00CD00); + fontRenderer.drawString(MekanismUtils.localize("gui.robit.greeting") + " " + robit.getTranslatedEntityName() + "!", 29, 18, 0x00CD00); fontRenderer.drawString("Energy: " + MekanismUtils.getEnergyDisplay(robit.getEnergy()), 29, 36-4, 0x00CD00); fontRenderer.drawString("Following: " + robit.getFollowing(), 29, 45-4, 0x00CD00); fontRenderer.drawString("Drop pickup: " + robit.getDropPickup(), 29, 54-4, 0x00CD00); @@ -123,19 +123,19 @@ public class GuiRobitMain extends GuiMekanism } else if(xAxis >= 152 && xAxis <= 170 && yAxis >= 54 && yAxis <= 72) { - drawCreativeTabHoveringText("Toggle 'follow' mode", xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.localize("gui.robit.toggleFollow"), xAxis, yAxis); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 54 && yAxis <= 72) { - drawCreativeTabHoveringText("Rename this Robit", xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.localize("gui.robit.rename"), xAxis, yAxis); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 16 && yAxis <= 34) { - drawCreativeTabHoveringText("Teleport back home", xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.localize("gui.robit.teleport"), xAxis, yAxis); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 35 && yAxis <= 53) { - drawCreativeTabHoveringText("Toggle 'drop pickup' mode", xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.localize("gui.robit.togglePickup"), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/common/mekanism/client/gui/GuiRobitRepair.java b/common/mekanism/client/gui/GuiRobitRepair.java index 6806e2842..60cc7b153 100644 --- a/common/mekanism/client/gui/GuiRobitRepair.java +++ b/common/mekanism/client/gui/GuiRobitRepair.java @@ -73,7 +73,7 @@ public class GuiRobitRepair extends GuiMekanism implements ICrafting protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { GL11.glDisable(GL11.GL_LIGHTING); - fontRenderer.drawString(StatCollector.translateToLocal("container.repair"), 60, 6, 4210752); + fontRenderer.drawString(MekanismUtils.localize("container.repair"), 60, 6, 4210752); if(repairContainer.maximumCost > 0) { @@ -83,7 +83,7 @@ public class GuiRobitRepair extends GuiMekanism implements ICrafting if(repairContainer.maximumCost >= 40 && !mc.thePlayer.capabilities.isCreativeMode) { - s = StatCollector.translateToLocal("container.repair.expensive"); + s = MekanismUtils.localize("container.repair.expensive"); k = 16736352; } else if(!repairContainer.getSlot(2).getHasStack()) diff --git a/common/mekanism/client/gui/GuiRobitSmelting.java b/common/mekanism/client/gui/GuiRobitSmelting.java index 681e96684..741b9b64f 100644 --- a/common/mekanism/client/gui/GuiRobitSmelting.java +++ b/common/mekanism/client/gui/GuiRobitSmelting.java @@ -27,8 +27,8 @@ public class GuiRobitSmelting extends GuiMekanism @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - fontRenderer.drawString("Robit Smelting", 8, 6, 0x404040); - fontRenderer.drawString("Inventory", 8, ySize - 96 + 3, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("gui.robit.smelting"), 8, 6, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, ySize - 96 + 3, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/common/mekanism/client/gui/GuiRotaryCondensentrator.java b/common/mekanism/client/gui/GuiRotaryCondensentrator.java index cccde3499..7cad46e90 100644 --- a/common/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/common/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -2,9 +2,9 @@ package mekanism.client.gui; import java.util.ArrayList; -import mekanism.api.Object3D; import mekanism.api.gas.GasStack; import mekanism.client.render.MekanismRenderer; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; @@ -43,8 +43,8 @@ public class GuiRotaryCondensentrator extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString("Rotary Condensentrator", 26, 4, 0x404040); - fontRenderer.drawString(tileEntity.mode == 0 ? "Condensentrating" : "Decondensentrating", 6, (ySize - 94) + 2, 0x404040); + fontRenderer.drawString(tileEntity.getInvName(), 26, 4, 0x404040); + fontRenderer.drawString(tileEntity.mode == 0 ? MekanismUtils.localize("gui.condensentrating") : MekanismUtils.localize("gui.decondensentrating"), 6, (ySize - 94) + 2, 0x404040); if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14 && yAxis <= 72) { diff --git a/common/mekanism/client/gui/GuiTItemStackFilter.java b/common/mekanism/client/gui/GuiTItemStackFilter.java index ff2f1f5d1..500a1f897 100644 --- a/common/mekanism/client/gui/GuiTItemStackFilter.java +++ b/common/mekanism/client/gui/GuiTItemStackFilter.java @@ -1,8 +1,8 @@ package mekanism.client.gui; -import mekanism.api.EnumColor; -import mekanism.api.Object3D; import mekanism.client.render.MekanismRenderer; +import mekanism.common.EnumColor; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerFilter; @@ -67,8 +67,8 @@ public class GuiTItemStackFilter extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, "Save")); - buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, "Delete")); + buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.save"))); + buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.delete"))); if(isNew) { @@ -161,17 +161,17 @@ public class GuiTItemStackFilter extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString((isNew ? "New" : "Edit") + " Item Filter", 43, 6, 0x404040); - fontRenderer.drawString("Status: " + status, 35, 20, 0x00CD00); - fontRenderer.drawString("ItemStack Details:", 35, 32, 0x00CD00); + fontRenderer.drawString((isNew ? MekanismUtils.localize("gui.new") : MekanismUtils.localize("gui.edit")) + " " + MekanismUtils.localize("gui.itemFilter"), 43, 6, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); + fontRenderer.drawString(MekanismUtils.localize("gui.itemFilter.details") + ":", 35, 32, 0x00CD00); - fontRenderer.drawString("Min:", 128, 20, 0x404040); - fontRenderer.drawString("Max:", 128, 32, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("gui.itemFilter.min") + ":", 128, 20, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("gui.itemFilter.max") + ":", 128, 32, 0x404040); fontRenderer.drawString(filter.sizeMode ? "On" : "Off", 141, 46, 0x404040); if(filter.itemType != null) { - fontRenderer.drawString("Item: " + filter.itemType.getDisplayName(), 35, 41, 0x00CD00); + fontRenderer.drawString(filter.itemType.getDisplayName(), 35, 41, 0x00CD00); } if(filter.itemType != null) @@ -204,7 +204,7 @@ public class GuiTItemStackFilter extends GuiMekanism drawCreativeTabHoveringText(filter.color.getName(), xAxis, yAxis); } else { - drawCreativeTabHoveringText("None", xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.localize("gui.none"), xAxis, yAxis); } } @@ -224,7 +224,7 @@ public class GuiTItemStackFilter extends GuiMekanism ticker--; } else { - status = EnumColor.DARK_GREEN + "All OK"; + status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK"); } } diff --git a/common/mekanism/client/gui/GuiTOreDictFilter.java b/common/mekanism/client/gui/GuiTOreDictFilter.java index 0cd74eb23..ca534a032 100644 --- a/common/mekanism/client/gui/GuiTOreDictFilter.java +++ b/common/mekanism/client/gui/GuiTOreDictFilter.java @@ -3,10 +3,10 @@ package mekanism.client.gui; import java.util.ArrayList; import java.util.List; -import mekanism.api.EnumColor; -import mekanism.api.Object3D; import mekanism.client.render.MekanismRenderer; +import mekanism.common.EnumColor; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerFilter; @@ -52,7 +52,7 @@ public class GuiTOreDictFilter extends GuiMekanism public List iterStacks; - public String status = EnumColor.DARK_GREEN + "All OK"; + public String status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK"); public GuiTOreDictFilter(EntityPlayer player, TileEntityLogisticalSorter tentity, int index) { @@ -82,8 +82,8 @@ public class GuiTOreDictFilter extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, "Save")); - buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, "Delete")); + buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.save"))); + buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.delete"))); if(isNew) { @@ -140,7 +140,7 @@ public class GuiTOreDictFilter extends GuiMekanism PacketHandler.sendPacket(Transmission.SERVER, new PacketLogisticalSorterGui().setParams(SorterGuiPacket.SERVER, Object3D.get(tileEntity), 0)); } else { - status = EnumColor.DARK_RED + "No key"; + status = EnumColor.DARK_RED + MekanismUtils.localize("gui.oredictFilter.noKey"); ticker = 20; } } @@ -157,8 +157,8 @@ public class GuiTOreDictFilter extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString((isNew ? "New" : "Edit") + " OreDict Filter", 43, 6, 0x404040); - fontRenderer.drawString("Status: " + status, 35, 20, 0x00CD00); + fontRenderer.drawString((isNew ? MekanismUtils.localize("gui.new") : MekanismUtils.localize("gui.edit")) + " " + MekanismUtils.localize("gui.oredictFilter"), 43, 6, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); fontRenderer.drawString("Key: " + filter.oreDictName, 35, 32, 0x00CD00); if(renderStack != null) @@ -191,7 +191,7 @@ public class GuiTOreDictFilter extends GuiMekanism drawCreativeTabHoveringText(filter.color.getName(), xAxis, yAxis); } else { - drawCreativeTabHoveringText("None", xAxis, yAxis); + drawCreativeTabHoveringText(MekanismUtils.localize("gui.none"), xAxis, yAxis); } } @@ -243,7 +243,7 @@ public class GuiTOreDictFilter extends GuiMekanism ticker--; } else { - status = EnumColor.DARK_GREEN + "All OK"; + status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK"); } if(stackSwitch > 0) @@ -385,12 +385,12 @@ public class GuiTOreDictFilter extends GuiMekanism if(oreName == null || oreName.isEmpty()) { - status = EnumColor.DARK_RED + "No key entered"; + status = EnumColor.DARK_RED + MekanismUtils.localize("gui.oredictFilter.noKey"); return; } else if(oreName.equals(filter.oreDictName)) { - status = EnumColor.DARK_RED + "Same key"; + status = EnumColor.DARK_RED + MekanismUtils.localize("gui.oredictFilter.sameKey"); return; } diff --git a/common/mekanism/client/gui/GuiTeleporter.java b/common/mekanism/client/gui/GuiTeleporter.java index 05dd2bb6f..e00155112 100644 --- a/common/mekanism/client/gui/GuiTeleporter.java +++ b/common/mekanism/client/gui/GuiTeleporter.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import java.util.ArrayList; -import mekanism.api.Object3D; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerTeleporter; @@ -34,8 +34,8 @@ public class GuiTeleporter extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString(tileEntity.fullName, 45, 6, 0x404040); - fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040); + fontRenderer.drawString(tileEntity.getInvName(), 45, 6, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); fontRenderer.drawString(tileEntity.status, 66, 19, 0x00CD00); if(xAxis >= 165 && xAxis <= 169 && yAxis >= 17 && yAxis <= 69) diff --git a/common/mekanism/client/gui/GuiUpgradeManagement.java b/common/mekanism/client/gui/GuiUpgradeManagement.java index 5909ca9dc..12edf08a3 100644 --- a/common/mekanism/client/gui/GuiUpgradeManagement.java +++ b/common/mekanism/client/gui/GuiUpgradeManagement.java @@ -1,7 +1,7 @@ package mekanism.client.gui; -import mekanism.api.Object3D; import mekanism.common.IUpgradeTile; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketRemoveUpgrade; @@ -48,12 +48,12 @@ public class GuiUpgradeManagement extends GuiElement if(xAxis >= 179 && xAxis <= 198 && yAxis >= 47 && yAxis <= 54) { - displayTooltip("Remove speed upgrade", xAxis, yAxis); + displayTooltip(MekanismUtils.localize("gui.removeEnergyUpgrade"), xAxis, yAxis); } if(xAxis >= 179 && xAxis <= 198 && yAxis >= 57 && yAxis <= 64) { - displayTooltip("Remove energy upgrade", xAxis, yAxis); + displayTooltip(MekanismUtils.localize("gui.removeSpeedUpgrade"), xAxis, yAxis); } mc.renderEngine.bindTexture(defaultLocation); diff --git a/common/mekanism/client/render/MekanismRenderer.java b/common/mekanism/client/render/MekanismRenderer.java index 57cefa699..d25b48715 100644 --- a/common/mekanism/client/render/MekanismRenderer.java +++ b/common/mekanism/client/render/MekanismRenderer.java @@ -3,8 +3,8 @@ package mekanism.client.render; import java.util.Arrays; import java.util.List; -import mekanism.api.EnumColor; import mekanism.api.gas.GasRegistry; +import mekanism.common.EnumColor; import mekanism.common.ISpecialBounds; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; @@ -61,7 +61,7 @@ public class MekanismRenderer { for(EnumColor color : EnumColor.values()) { - colors[color.ordinal()] = event.map.registerIcon("mekanism:Overlay" + color.friendlyName.replace(" ", "")); + colors[color.ordinal()] = event.map.registerIcon("mekanism:Overlay" + color.getLocalizedName().replace(" ", "")); } energyIcon = event.map.registerIcon("mekanism:LiquidEnergy"); diff --git a/common/mekanism/client/render/RenderTickHandler.java b/common/mekanism/client/render/RenderTickHandler.java index 604b88025..e5a11092c 100644 --- a/common/mekanism/client/render/RenderTickHandler.java +++ b/common/mekanism/client/render/RenderTickHandler.java @@ -2,8 +2,8 @@ package mekanism.client.render; import java.util.EnumSet; -import mekanism.api.Object3D; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.EntityPlayer; diff --git a/common/mekanism/client/render/item/ItemRenderingHandler.java b/common/mekanism/client/render/item/ItemRenderingHandler.java index 319e1f39e..d5a74749b 100644 --- a/common/mekanism/client/render/item/ItemRenderingHandler.java +++ b/common/mekanism/client/render/item/ItemRenderingHandler.java @@ -1,6 +1,5 @@ package mekanism.client.render.item; -import mekanism.api.EnumColor; import mekanism.api.energy.IEnergizedItem; import mekanism.client.ClientProxy; import mekanism.client.MekanismClient; @@ -11,6 +10,7 @@ import mekanism.client.model.ModelObsidianTNT; import mekanism.client.model.ModelRobit; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.tileentity.RenderBin; +import mekanism.common.EnumColor; import mekanism.common.IElectricChest; import mekanism.common.IEnergyCube; import mekanism.common.Mekanism; diff --git a/common/mekanism/client/render/tileentity/RenderBin.java b/common/mekanism/client/render/tileentity/RenderBin.java index 99bf3192b..c7d03c61f 100644 --- a/common/mekanism/client/render/tileentity/RenderBin.java +++ b/common/mekanism/client/render/tileentity/RenderBin.java @@ -1,6 +1,6 @@ package mekanism.client.render.tileentity; -import mekanism.api.Object3D; +import mekanism.common.Object3D; import mekanism.common.tileentity.TileEntityBin; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; diff --git a/common/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/common/mekanism/client/render/tileentity/RenderConfigurableMachine.java index b2fd52cd5..a574acb5c 100644 --- a/common/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/common/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -2,12 +2,12 @@ package mekanism.client.render.tileentity; import java.util.HashMap; -import mekanism.api.EnumColor; -import mekanism.api.IConfigurable; -import mekanism.api.Object3D; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; +import mekanism.common.EnumColor; +import mekanism.common.IConfigurable; +import mekanism.common.Object3D; import mekanism.common.item.ItemConfigurator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; diff --git a/common/mekanism/client/render/tileentity/RenderDynamicTank.java b/common/mekanism/client/render/tileentity/RenderDynamicTank.java index 6f2edf07a..d9636e1c5 100644 --- a/common/mekanism/client/render/tileentity/RenderDynamicTank.java +++ b/common/mekanism/client/render/tileentity/RenderDynamicTank.java @@ -3,11 +3,11 @@ package mekanism.client.render.tileentity; import java.util.HashMap; import java.util.Map; -import mekanism.api.Object3D; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.SynchronizedTankData.ValveData; +import mekanism.common.Object3D; import mekanism.common.TankUpdateProtocol; import mekanism.common.tileentity.TileEntityDynamicTank; import net.minecraft.block.Block; diff --git a/common/mekanism/client/render/tileentity/RenderEnergyCube.java b/common/mekanism/client/render/tileentity/RenderEnergyCube.java index 86cbcaab4..1304fe9f9 100644 --- a/common/mekanism/client/render/tileentity/RenderEnergyCube.java +++ b/common/mekanism/client/render/tileentity/RenderEnergyCube.java @@ -1,10 +1,10 @@ package mekanism.client.render.tileentity; -import mekanism.api.EnumColor; import mekanism.client.MekanismClient; import mekanism.client.model.ModelEnergyCube; import mekanism.client.model.ModelEnergyCube.ModelEnergyCore; import mekanism.client.render.MekanismRenderer; +import mekanism.common.EnumColor; import mekanism.common.tileentity.TileEntityEnergyCube; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; diff --git a/common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java b/common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java index e623c4a7a..d859cd6dc 100644 --- a/common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java +++ b/common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java @@ -2,13 +2,13 @@ package mekanism.client.render.tileentity; import java.util.HashMap; -import mekanism.api.Object3D; import mekanism.client.model.ModelTransmitter; import mekanism.client.model.ModelTransmitter.Size; import mekanism.client.model.ModelTransporterBox; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; +import mekanism.common.Object3D; import mekanism.common.item.ItemConfigurator; import mekanism.common.tileentity.TileEntityDiversionTransporter; import mekanism.common.tileentity.TileEntityLogisticalTransporter; diff --git a/common/mekanism/client/render/tileentity/RenderPressurizedTube.java b/common/mekanism/client/render/tileentity/RenderPressurizedTube.java index 1d06910b4..be26e90d1 100644 --- a/common/mekanism/client/render/tileentity/RenderPressurizedTube.java +++ b/common/mekanism/client/render/tileentity/RenderPressurizedTube.java @@ -3,7 +3,6 @@ package mekanism.client.render.tileentity; import java.util.Arrays; import java.util.HashMap; -import mekanism.api.Object3D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasTransmission; import mekanism.api.gas.ITubeConnection; @@ -13,6 +12,7 @@ import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.BooleanArray; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; +import mekanism.common.Object3D; import mekanism.common.tileentity.TileEntityGasTank; import mekanism.common.tileentity.TileEntityPressurizedTube; import mekanism.common.util.MekanismUtils; diff --git a/common/mekanism/client/sound/SoundHandler.java b/common/mekanism/client/sound/SoundHandler.java index 364dcc7fb..2906b7e13 100644 --- a/common/mekanism/client/sound/SoundHandler.java +++ b/common/mekanism/client/sound/SoundHandler.java @@ -13,9 +13,9 @@ import java.util.Random; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import mekanism.api.Object3D; import mekanism.common.IActiveState; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import net.minecraft.client.Minecraft; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/common/mekanism/common/CommandMekanism.java b/common/mekanism/common/CommandMekanism.java index f5fafca4c..574685dea 100644 --- a/common/mekanism/common/CommandMekanism.java +++ b/common/mekanism/common/CommandMekanism.java @@ -3,7 +3,6 @@ package mekanism.common; import java.util.Arrays; import java.util.List; -import mekanism.api.EnumColor; import mekanism.common.util.MekanismUtils; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; diff --git a/common/mekanism/common/CommonWorldTickHandler.java b/common/mekanism/common/CommonWorldTickHandler.java index e90b9f6fd..c63dcf5ea 100644 --- a/common/mekanism/common/CommonWorldTickHandler.java +++ b/common/mekanism/common/CommonWorldTickHandler.java @@ -6,7 +6,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import mekanism.api.Object3D; import mekanism.common.tileentity.TileEntityDynamicTank; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/common/mekanism/common/ConnectedTextureRenderer.java b/common/mekanism/common/ConnectedTextureRenderer.java index a0736b6c3..230adec3a 100644 --- a/common/mekanism/common/ConnectedTextureRenderer.java +++ b/common/mekanism/common/ConnectedTextureRenderer.java @@ -3,7 +3,6 @@ package mekanism.common; import java.util.HashMap; import java.util.Map; -import mekanism.api.Object3D; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; diff --git a/common/mekanism/common/DynamicFluidTank.java b/common/mekanism/common/DynamicFluidTank.java index a9c20f175..6bf4c5b28 100644 --- a/common/mekanism/common/DynamicFluidTank.java +++ b/common/mekanism/common/DynamicFluidTank.java @@ -1,6 +1,5 @@ package mekanism.common; -import mekanism.api.Object3D; import mekanism.common.SynchronizedTankData.ValveData; import mekanism.common.tileentity.TileEntityDynamicTank; import mekanism.common.util.MekanismUtils; diff --git a/common/mekanism/common/DynamicTankCache.java b/common/mekanism/common/DynamicTankCache.java index 4df194a30..0f338b90e 100644 --- a/common/mekanism/common/DynamicTankCache.java +++ b/common/mekanism/common/DynamicTankCache.java @@ -2,7 +2,6 @@ package mekanism.common; import java.util.HashSet; -import mekanism.api.Object3D; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/common/mekanism/common/EnergyNetwork.java b/common/mekanism/common/EnergyNetwork.java index 840e3420e..93a7672c3 100644 --- a/common/mekanism/common/EnergyNetwork.java +++ b/common/mekanism/common/EnergyNetwork.java @@ -11,7 +11,6 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import mekanism.api.Object3D; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.ITransmitter; diff --git a/common/mekanism/common/EntityRobit.java b/common/mekanism/common/EntityRobit.java index 27afb98fd..b0dd5d756 100644 --- a/common/mekanism/common/EntityRobit.java +++ b/common/mekanism/common/EntityRobit.java @@ -7,7 +7,6 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.util.List; -import mekanism.api.Object3D; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; import mekanism.common.item.ItemConfigurator; diff --git a/common/mekanism/common/EnumColor.java b/common/mekanism/common/EnumColor.java new file mode 100644 index 000000000..92c0dd2f1 --- /dev/null +++ b/common/mekanism/common/EnumColor.java @@ -0,0 +1,64 @@ +package mekanism.common; + +import mekanism.common.util.MekanismUtils; + +/** + * Simple color enum for adding colors to in-game GUI strings of text. + * @author AidanBrady + * + */ +public enum EnumColor +{ + BLACK("\u00a70", "black", new int[] {0, 0, 0}), + DARK_BLUE("\u00a71", "darkBlue", new int[] {0, 0, 170}), + DARK_GREEN("\u00a72", "darkGreen", new int[] {0, 170, 0}), + DARK_AQUA("\u00a73", "darkAqua", new int[] {0, 170, 170}), + DARK_RED("\u00a74", "darkRed", new int[] {170, 0, 0}), + PURPLE("\u00a75", "purple", new int[] {170, 0, 170}), + ORANGE("\u00a76", "orange", new int[] {255, 170, 0}), + GREY("\u00a77", "grey", new int[] {170, 170, 170}), + DARK_GREY("\u00a78", "darkGrey", new int[] {85, 85, 85}), + INDIGO("\u00a79", "indigo", new int[] {85, 85, 255}), + BRIGHT_GREEN("\u00a7a", "brightGreen", new int[] {85, 255, 85}), + AQUA("\u00a7b", "aqua", new int[] {85, 255, 255}), + RED("\u00a7c", "red", new int[] {255, 85, 85}), + PINK("\u00a7d", "pink", new int[] {255, 85, 255}), + YELLOW("\u00a7e", "yellow", new int[] {255, 255, 85}), + WHITE("\u00a7f", "white", new int[] {255, 255, 255}); + + /** The color code that will be displayed */ + public final String code; + + public final int[] rgbCode; + + /** A friendly name of the color. */ + public String unlocalizedName; + + private EnumColor(String s, String n, int[] rgb) + { + code = s; + unlocalizedName = n; + rgbCode = rgb; + } + + public String getLocalizedName() + { + return MekanismUtils.localize("color." + unlocalizedName); + } + + public String getName() + { + return code + getLocalizedName(); + } + + public float getColor(int index) + { + return (float)rgbCode[index]/255F; + } + + @Override + public String toString() + { + return code; + } +} diff --git a/common/mekanism/common/IAdvancedBoundingBlock.java b/common/mekanism/common/IAdvancedBoundingBlock.java index f642084bf..8b98ad515 100644 --- a/common/mekanism/common/IAdvancedBoundingBlock.java +++ b/common/mekanism/common/IAdvancedBoundingBlock.java @@ -7,7 +7,6 @@ import universalelectricity.core.block.IElectrical; import universalelectricity.core.block.IElectricalStorage; import buildcraft.api.power.IPowerReceptor; import cofh.api.energy.IEnergyHandler; -import mekanism.api.Object3D; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; import net.minecraft.inventory.ISidedInventory; diff --git a/common/mekanism/api/IConfigurable.java b/common/mekanism/common/IConfigurable.java similarity index 96% rename from common/mekanism/api/IConfigurable.java rename to common/mekanism/common/IConfigurable.java index fc2848378..a747c221f 100644 --- a/common/mekanism/api/IConfigurable.java +++ b/common/mekanism/common/IConfigurable.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.common; import java.util.ArrayList; diff --git a/common/mekanism/api/IEjector.java b/common/mekanism/common/IEjector.java similarity index 95% rename from common/mekanism/api/IEjector.java rename to common/mekanism/common/IEjector.java index 9a95e34af..87fb4c15d 100644 --- a/common/mekanism/api/IEjector.java +++ b/common/mekanism/common/IEjector.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.common; import net.minecraftforge.common.ForgeDirection; diff --git a/common/mekanism/common/IFactory.java b/common/mekanism/common/IFactory.java index 1509dca17..154f2c0a4 100644 --- a/common/mekanism/common/IFactory.java +++ b/common/mekanism/common/IFactory.java @@ -3,6 +3,7 @@ package mekanism.common; import mekanism.common.RecipeHandler.Recipe; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; +import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; @@ -29,12 +30,12 @@ public interface IFactory public static enum RecipeType { - SMELTING("Smelting", "Smelter.ogg", MachineType.ENERGIZED_SMELTER.getStack(), false), - ENRICHING("Enriching", "Chamber.ogg", MachineType.ENRICHMENT_CHAMBER.getStack(), false), - CRUSHING("Crushing", "Crusher.ogg", MachineType.CRUSHER.getStack(), false), - COMPRESSING("Compressing", "Compressor.ogg", MachineType.OSMIUM_COMPRESSOR.getStack(), true), - COMBINING("Combining", "Combiner.ogg", MachineType.COMBINER.getStack(), true), - PURIFYING("Purifying", "PurificationChamber.ogg", MachineType.PURIFICATION_CHAMBER.getStack(), true); + SMELTING("smelting", "Smelter.ogg", MachineType.ENERGIZED_SMELTER.getStack(), false), + ENRICHING("enriching", "Chamber.ogg", MachineType.ENRICHMENT_CHAMBER.getStack(), false), + CRUSHING("crushing", "Crusher.ogg", MachineType.CRUSHER.getStack(), false), + COMPRESSING("compressing", "Compressor.ogg", MachineType.OSMIUM_COMPRESSOR.getStack(), true), + COMBINING("combining", "Combiner.ogg", MachineType.COMBINER.getStack(), true), + PURIFYING("purifying", "PurificationChamber.ogg", MachineType.PURIFICATION_CHAMBER.getStack(), true); private String name; private String sound; @@ -132,7 +133,7 @@ public interface IFactory public String getName() { - return name; + return MekanismUtils.localize("gui.factory." + name); } public String getSound() diff --git a/common/mekanism/common/IRedstoneControl.java b/common/mekanism/common/IRedstoneControl.java index 4f551d062..0d64a5f62 100644 --- a/common/mekanism/common/IRedstoneControl.java +++ b/common/mekanism/common/IRedstoneControl.java @@ -1,18 +1,20 @@ package mekanism.common; +import mekanism.common.util.MekanismUtils; + public interface IRedstoneControl { public static enum RedstoneControl { - DISABLED("Disabled"), - HIGH("High"), - LOW("Low"); + DISABLED("control.disabled"), + HIGH("control.high"), + LOW("control.low"); private String display; public String getDisplay() { - return display; + return MekanismUtils.localize(display); } private RedstoneControl(String s) diff --git a/common/mekanism/api/IUpgradeManagement.java b/common/mekanism/common/IUpgradeManagement.java similarity index 98% rename from common/mekanism/api/IUpgradeManagement.java rename to common/mekanism/common/IUpgradeManagement.java index 02c09ae2e..d0edf2e36 100644 --- a/common/mekanism/api/IUpgradeManagement.java +++ b/common/mekanism/common/IUpgradeManagement.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.common; /** * Implement this if your block or item can store Mekanism-based upgrades. diff --git a/common/mekanism/common/IUpgradeTile.java b/common/mekanism/common/IUpgradeTile.java index 3dabadd36..aba6fe6d1 100644 --- a/common/mekanism/common/IUpgradeTile.java +++ b/common/mekanism/common/IUpgradeTile.java @@ -1,6 +1,5 @@ package mekanism.common; -import mekanism.api.IUpgradeManagement; public interface IUpgradeTile extends IUpgradeManagement { diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index fd28c2202..a7461f6f7 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -13,7 +13,6 @@ import java.util.Map; import java.util.Set; import java.util.logging.Logger; -import mekanism.api.Object3D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasNetwork.GasTransferEvent; import mekanism.api.gas.GasRegistry; @@ -21,6 +20,7 @@ import mekanism.api.infuse.InfuseObject; import mekanism.api.infuse.InfuseRegistry; import mekanism.api.infuse.InfuseType; import mekanism.api.infuse.InfusionInput; +import mekanism.api.transmitters.DynamicNetwork.NetworkClientRequest; import mekanism.api.transmitters.TransmitterNetworkRegistry; import mekanism.common.EnergyNetwork.EnergyTransferEvent; import mekanism.common.FluidNetwork.FluidTransferEvent; @@ -1197,6 +1197,14 @@ public class Mekanism } catch(Exception e) {} } + @ForgeSubscribe + public void onNetworkClientRequest(NetworkClientRequest event) + { + try { + PacketHandler.sendPacket(Transmission.SERVER, new PacketDataRequest().setParams(Object3D.get(event.tileEntity))); + } catch(Exception e) {} + } + @ForgeSubscribe public void onChunkLoad(ChunkEvent.Load event) { diff --git a/common/mekanism/common/MekanismRecipe.java b/common/mekanism/common/MekanismRecipe.java index 876c55f1e..309e7b529 100644 --- a/common/mekanism/common/MekanismRecipe.java +++ b/common/mekanism/common/MekanismRecipe.java @@ -3,7 +3,6 @@ package mekanism.common; import java.util.ArrayList; import java.util.HashMap; -import mekanism.api.IUpgradeManagement; import mekanism.api.energy.IEnergizedItem; import mekanism.common.block.BlockMachine.MachineType; import net.minecraft.block.Block; diff --git a/common/mekanism/api/Object3D.java b/common/mekanism/common/Object3D.java similarity index 99% rename from common/mekanism/api/Object3D.java rename to common/mekanism/common/Object3D.java index f9ac1c147..00bc1aa7b 100644 --- a/common/mekanism/api/Object3D.java +++ b/common/mekanism/common/Object3D.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.common; import java.util.ArrayList; diff --git a/common/mekanism/common/PacketHandler.java b/common/mekanism/common/PacketHandler.java index 487ef34b7..dc264a5f4 100644 --- a/common/mekanism/common/PacketHandler.java +++ b/common/mekanism/common/PacketHandler.java @@ -5,7 +5,6 @@ import java.io.DataOutputStream; import java.util.ArrayList; import java.util.List; -import mekanism.api.Object3D; import mekanism.common.network.IMekanismPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/common/mekanism/common/PipeUtils.java b/common/mekanism/common/PipeUtils.java index 9a87697d4..c1dabf685 100644 --- a/common/mekanism/common/PipeUtils.java +++ b/common/mekanism/common/PipeUtils.java @@ -2,7 +2,6 @@ package mekanism.common; import java.util.Arrays; -import mekanism.api.Object3D; import mekanism.api.transmitters.ITransmitter; import mekanism.api.transmitters.TransmissionType; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/api/SideData.java b/common/mekanism/common/SideData.java similarity index 91% rename from common/mekanism/api/SideData.java rename to common/mekanism/common/SideData.java index 700fd684b..d0a6b66b7 100644 --- a/common/mekanism/api/SideData.java +++ b/common/mekanism/common/SideData.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.common; public class SideData { diff --git a/common/mekanism/common/SynchronizedTankData.java b/common/mekanism/common/SynchronizedTankData.java index 02fe2ac5e..401fca1f8 100644 --- a/common/mekanism/common/SynchronizedTankData.java +++ b/common/mekanism/common/SynchronizedTankData.java @@ -3,7 +3,6 @@ package mekanism.common; import java.util.HashSet; import java.util.Set; -import mekanism.api.Object3D; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidStack; diff --git a/common/mekanism/common/TankUpdateProtocol.java b/common/mekanism/common/TankUpdateProtocol.java index b378cd27d..ad07d6eb7 100644 --- a/common/mekanism/common/TankUpdateProtocol.java +++ b/common/mekanism/common/TankUpdateProtocol.java @@ -3,7 +3,6 @@ package mekanism.common; import java.util.HashSet; import java.util.Set; -import mekanism.api.Object3D; import mekanism.common.SynchronizedTankData.ValveData; import mekanism.common.tileentity.TileEntityDynamicTank; import mekanism.common.tileentity.TileEntityDynamicValve; diff --git a/common/mekanism/common/Tier.java b/common/mekanism/common/Tier.java index 7eeb65916..76498413c 100644 --- a/common/mekanism/common/Tier.java +++ b/common/mekanism/common/Tier.java @@ -1,6 +1,5 @@ package mekanism.common; -import mekanism.api.EnumColor; import net.minecraft.util.ResourceLocation; /** diff --git a/common/mekanism/common/TileComponentEjector.java b/common/mekanism/common/TileComponentEjector.java index b03e2cfb6..d0cbf5557 100644 --- a/common/mekanism/common/TileComponentEjector.java +++ b/common/mekanism/common/TileComponentEjector.java @@ -3,11 +3,6 @@ package mekanism.common; import java.util.ArrayList; import java.util.List; -import mekanism.api.EnumColor; -import mekanism.api.IConfigurable; -import mekanism.api.IEjector; -import mekanism.api.Object3D; -import mekanism.api.SideData; import mekanism.common.tileentity.TileEntityContainerBlock; import mekanism.common.tileentity.TileEntityLogisticalTransporter; import mekanism.common.transporter.TransporterManager; diff --git a/common/mekanism/common/block/BlockBasic.java b/common/mekanism/common/block/BlockBasic.java index 7d7d5b11d..a05e8ad29 100644 --- a/common/mekanism/common/block/BlockBasic.java +++ b/common/mekanism/common/block/BlockBasic.java @@ -4,13 +4,13 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import mekanism.api.Object3D; import mekanism.client.ClientProxy; import mekanism.common.ConnectedTextureRenderer; import mekanism.common.IActiveState; import mekanism.common.IBoundingBlock; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.TankUpdateProtocol; diff --git a/common/mekanism/common/block/BlockMachine.java b/common/mekanism/common/block/BlockMachine.java index 047fee014..f7dfda1c4 100644 --- a/common/mekanism/common/block/BlockMachine.java +++ b/common/mekanism/common/block/BlockMachine.java @@ -3,9 +3,6 @@ package mekanism.common.block; import java.util.List; import java.util.Random; -import mekanism.api.IConfigurable; -import mekanism.api.IUpgradeManagement; -import mekanism.api.Object3D; import mekanism.api.energy.IEnergizedItem; import mekanism.api.gas.IGasItem; import mekanism.client.ClientProxy; @@ -14,12 +11,15 @@ import mekanism.common.IBoundingBlock; import mekanism.common.IElectricChest; import mekanism.common.IFactory; import mekanism.common.IFactory.RecipeType; +import mekanism.common.IConfigurable; import mekanism.common.IRedstoneControl; import mekanism.common.ISpecialBounds; import mekanism.common.ISustainedInventory; import mekanism.common.ISustainedTank; +import mekanism.common.IUpgradeManagement; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.miner.MinerFilter; diff --git a/common/mekanism/common/item/ItemAtomicDisassembler.java b/common/mekanism/common/item/ItemAtomicDisassembler.java index 45c3f4e93..3c9a28c6f 100644 --- a/common/mekanism/common/item/ItemAtomicDisassembler.java +++ b/common/mekanism/common/item/ItemAtomicDisassembler.java @@ -2,7 +2,7 @@ package mekanism.common.item; import java.util.List; -import mekanism.api.EnumColor; +import mekanism.common.EnumColor; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/common/mekanism/common/item/ItemBlockBasic.java b/common/mekanism/common/item/ItemBlockBasic.java index 9d00fcd6c..926d8df02 100644 --- a/common/mekanism/common/item/ItemBlockBasic.java +++ b/common/mekanism/common/item/ItemBlockBasic.java @@ -2,7 +2,7 @@ package mekanism.common.item; import java.util.List; -import mekanism.api.EnumColor; +import mekanism.common.EnumColor; import mekanism.common.Mekanism; import mekanism.common.inventory.InventoryBin; import mekanism.common.tileentity.TileEntityBin; diff --git a/common/mekanism/common/item/ItemBlockEnergyCube.java b/common/mekanism/common/item/ItemBlockEnergyCube.java index 347a20533..f78a8b3c8 100644 --- a/common/mekanism/common/item/ItemBlockEnergyCube.java +++ b/common/mekanism/common/item/ItemBlockEnergyCube.java @@ -6,12 +6,12 @@ import ic2.api.item.ISpecialElectricItem; import java.util.ArrayList; import java.util.List; -import mekanism.api.EnumColor; -import mekanism.api.Object3D; import mekanism.api.energy.IEnergizedItem; +import mekanism.common.EnumColor; import mekanism.common.IEnergyCube; import mekanism.common.ISustainedInventory; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.Tier.EnergyCubeTier; diff --git a/common/mekanism/common/item/ItemBlockGasTank.java b/common/mekanism/common/item/ItemBlockGasTank.java index b87851374..724d986a6 100644 --- a/common/mekanism/common/item/ItemBlockGasTank.java +++ b/common/mekanism/common/item/ItemBlockGasTank.java @@ -2,11 +2,11 @@ package mekanism.common.item; import java.util.List; -import mekanism.api.EnumColor; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; +import mekanism.common.EnumColor; import mekanism.common.ISustainedInventory; import mekanism.common.Mekanism; import mekanism.common.tileentity.TileEntityGasTank; diff --git a/common/mekanism/common/item/ItemBlockMachine.java b/common/mekanism/common/item/ItemBlockMachine.java index 7499e7970..5b988e31f 100644 --- a/common/mekanism/common/item/ItemBlockMachine.java +++ b/common/mekanism/common/item/ItemBlockMachine.java @@ -7,9 +7,6 @@ import ic2.api.item.ISpecialElectricItem; import java.util.List; -import mekanism.api.EnumColor; -import mekanism.api.IConfigurable; -import mekanism.api.IUpgradeManagement; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; import mekanism.api.gas.Gas; @@ -19,8 +16,11 @@ import mekanism.common.IElectricChest; import mekanism.common.IFactory; import mekanism.common.IRedstoneControl; import mekanism.common.IRedstoneControl.RedstoneControl; +import mekanism.common.EnumColor; +import mekanism.common.IConfigurable; import mekanism.common.ISustainedInventory; import mekanism.common.ISustainedTank; +import mekanism.common.IUpgradeManagement; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; diff --git a/common/mekanism/common/item/ItemBlockOre.java b/common/mekanism/common/item/ItemBlockOre.java index 18174650f..d222bc72e 100644 --- a/common/mekanism/common/item/ItemBlockOre.java +++ b/common/mekanism/common/item/ItemBlockOre.java @@ -6,7 +6,7 @@ import org.lwjgl.input.Keyboard; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mekanism.api.EnumColor; +import mekanism.common.EnumColor; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; diff --git a/common/mekanism/common/item/ItemBlockTransmitter.java b/common/mekanism/common/item/ItemBlockTransmitter.java index d7c026a88..e967671a5 100644 --- a/common/mekanism/common/item/ItemBlockTransmitter.java +++ b/common/mekanism/common/item/ItemBlockTransmitter.java @@ -6,8 +6,7 @@ import org.lwjgl.input.Keyboard; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - -import mekanism.api.EnumColor; +import mekanism.common.EnumColor; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; diff --git a/common/mekanism/common/item/ItemConfigurator.java b/common/mekanism/common/item/ItemConfigurator.java index 6ab4fc13c..eb3b8093d 100644 --- a/common/mekanism/common/item/ItemConfigurator.java +++ b/common/mekanism/common/item/ItemConfigurator.java @@ -4,10 +4,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import mekanism.api.EnumColor; -import mekanism.api.IConfigurable; -import mekanism.api.Object3D; import mekanism.api.transmitters.ITransmitter; +import mekanism.common.EnumColor; +import mekanism.common.IConfigurable; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; diff --git a/common/mekanism/common/item/ItemElectricBow.java b/common/mekanism/common/item/ItemElectricBow.java index 6a1c0acb9..c620e542c 100644 --- a/common/mekanism/common/item/ItemElectricBow.java +++ b/common/mekanism/common/item/ItemElectricBow.java @@ -2,7 +2,7 @@ package mekanism.common.item; import java.util.List; -import mekanism.api.EnumColor; +import mekanism.common.EnumColor; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; diff --git a/common/mekanism/common/item/ItemEnergized.java b/common/mekanism/common/item/ItemEnergized.java index d5cf9a4ae..251730a90 100644 --- a/common/mekanism/common/item/ItemEnergized.java +++ b/common/mekanism/common/item/ItemEnergized.java @@ -5,8 +5,8 @@ import ic2.api.item.ISpecialElectricItem; import java.util.List; -import mekanism.api.EnumColor; import mekanism.api.energy.IEnergizedItem; +import mekanism.common.EnumColor; import mekanism.common.Mekanism; import mekanism.common.integration.IC2ItemManager; import mekanism.common.util.MekanismUtils; diff --git a/common/mekanism/common/item/ItemNetworkReader.java b/common/mekanism/common/item/ItemNetworkReader.java index a7abf0f29..489cc3c0c 100644 --- a/common/mekanism/common/item/ItemNetworkReader.java +++ b/common/mekanism/common/item/ItemNetworkReader.java @@ -1,8 +1,8 @@ package mekanism.common.item; -import mekanism.api.EnumColor; import mekanism.api.transmitters.ITransmitter; import mekanism.api.transmitters.TransmitterNetworkRegistry; +import mekanism.common.EnumColor; import mekanism.common.Mekanism; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/item/ItemPortableTeleporter.java b/common/mekanism/common/item/ItemPortableTeleporter.java index fe28353e0..c215cbd48 100644 --- a/common/mekanism/common/item/ItemPortableTeleporter.java +++ b/common/mekanism/common/item/ItemPortableTeleporter.java @@ -1,8 +1,9 @@ package mekanism.common.item; -import mekanism.api.EnumColor; -import mekanism.api.Object3D; +import mekanism.common.EnumColor; import mekanism.common.Mekanism; +import mekanism.common.Object3D; +import mekanism.common.util.MekanismUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -49,17 +50,17 @@ public class ItemPortableTeleporter extends ItemEnergized switch(i) { case 0: - return EnumColor.DARK_RED + "Not ready."; + return EnumColor.DARK_RED + MekanismUtils.localize("gui.teleporter.notReady"); case 1: - return EnumColor.DARK_GREEN + "Ready."; + return EnumColor.DARK_GREEN + MekanismUtils.localize("gui.teleporter.ready"); case 2: - return EnumColor.DARK_RED + "Needs energy."; + return EnumColor.DARK_RED + MekanismUtils.localize("gui.teleporter.needsEnergy"); case 3: - return EnumColor.DARK_RED + "Links > 2."; + return EnumColor.DARK_RED + MekanismUtils.localize("gui.teleporter.linksCapacity"); case 4: - return EnumColor.DARK_RED + "No link found."; + return EnumColor.DARK_RED + MekanismUtils.localize("gui.teleporter.noLink"); default: - return EnumColor.DARK_RED + "Not ready."; + return EnumColor.DARK_RED + MekanismUtils.localize("gui.teleporter.notReady"); } } diff --git a/common/mekanism/common/item/ItemRobit.java b/common/mekanism/common/item/ItemRobit.java index 30538da5a..f602ac4de 100644 --- a/common/mekanism/common/item/ItemRobit.java +++ b/common/mekanism/common/item/ItemRobit.java @@ -2,10 +2,10 @@ package mekanism.common.item; import java.util.List; -import mekanism.api.EnumColor; -import mekanism.api.Object3D; import mekanism.common.EntityRobit; +import mekanism.common.EnumColor; import mekanism.common.ISustainedInventory; +import mekanism.common.Object3D; import mekanism.common.tileentity.TileEntityChargepad; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; diff --git a/common/mekanism/common/item/ItemWalkieTalkie.java b/common/mekanism/common/item/ItemWalkieTalkie.java index 37e27228d..88aad4386 100644 --- a/common/mekanism/common/item/ItemWalkieTalkie.java +++ b/common/mekanism/common/item/ItemWalkieTalkie.java @@ -2,7 +2,7 @@ package mekanism.common.item; import java.util.List; -import mekanism.api.EnumColor; +import mekanism.common.EnumColor; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/miner/ThreadMinerSearch.java b/common/mekanism/common/miner/ThreadMinerSearch.java index c1fd16a6b..07b7c642c 100644 --- a/common/mekanism/common/miner/ThreadMinerSearch.java +++ b/common/mekanism/common/miner/ThreadMinerSearch.java @@ -2,8 +2,8 @@ package mekanism.common.miner; import java.util.Collections; -import mekanism.api.Object3D; import mekanism.common.IBoundingBlock; +import mekanism.common.Object3D; import mekanism.common.tileentity.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/network/PacketConfigurationUpdate.java b/common/mekanism/common/network/PacketConfigurationUpdate.java index f1dc18fdb..0699e6198 100644 --- a/common/mekanism/common/network/PacketConfigurationUpdate.java +++ b/common/mekanism/common/network/PacketConfigurationUpdate.java @@ -3,9 +3,9 @@ package mekanism.common.network; import java.io.DataOutputStream; import java.util.ArrayList; -import mekanism.api.IConfigurable; -import mekanism.api.Object3D; +import mekanism.common.IConfigurable; import mekanism.common.ITileNetwork; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.tileentity.TileEntityBasicBlock; diff --git a/common/mekanism/common/network/PacketDataRequest.java b/common/mekanism/common/network/PacketDataRequest.java index 87b70d71c..f7e9f1283 100644 --- a/common/mekanism/common/network/PacketDataRequest.java +++ b/common/mekanism/common/network/PacketDataRequest.java @@ -3,10 +3,10 @@ package mekanism.common.network; import java.io.DataOutputStream; import java.util.ArrayList; -import mekanism.api.Object3D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.ITransmitter; import mekanism.common.ITileNetwork; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.tileentity.TileEntityDynamicTank; diff --git a/common/mekanism/common/network/PacketDigitalMinerGui.java b/common/mekanism/common/network/PacketDigitalMinerGui.java index 4c0c741c4..a2291d146 100644 --- a/common/mekanism/common/network/PacketDigitalMinerGui.java +++ b/common/mekanism/common/network/PacketDigitalMinerGui.java @@ -3,11 +3,11 @@ package mekanism.common.network; import java.io.DataOutputStream; import java.util.ArrayList; -import mekanism.api.Object3D; import mekanism.client.gui.GuiDigitalMiner; import mekanism.client.gui.GuiDigitalMinerConfig; import mekanism.client.gui.GuiMItemStackFilter; import mekanism.client.gui.GuiMOreDictFilter; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerDigitalMiner; diff --git a/common/mekanism/common/network/PacketEditFilter.java b/common/mekanism/common/network/PacketEditFilter.java index 6ae6dd2dd..f7119d969 100644 --- a/common/mekanism/common/network/PacketEditFilter.java +++ b/common/mekanism/common/network/PacketEditFilter.java @@ -3,7 +3,7 @@ package mekanism.common.network; import java.io.DataOutputStream; import java.util.ArrayList; -import mekanism.api.Object3D; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.miner.MinerFilter; diff --git a/common/mekanism/common/network/PacketElectricChest.java b/common/mekanism/common/network/PacketElectricChest.java index 27bbc1576..f8967c990 100644 --- a/common/mekanism/common/network/PacketElectricChest.java +++ b/common/mekanism/common/network/PacketElectricChest.java @@ -2,10 +2,10 @@ package mekanism.common.network; import java.io.DataOutputStream; -import mekanism.api.Object3D; import mekanism.api.energy.IEnergizedItem; import mekanism.common.IElectricChest; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.InventoryElectricChest; import mekanism.common.tileentity.TileEntityElectricChest; diff --git a/common/mekanism/common/network/PacketLogisticalSorterGui.java b/common/mekanism/common/network/PacketLogisticalSorterGui.java index 59f05b437..3adff6e3e 100644 --- a/common/mekanism/common/network/PacketLogisticalSorterGui.java +++ b/common/mekanism/common/network/PacketLogisticalSorterGui.java @@ -2,11 +2,11 @@ package mekanism.common.network; import java.io.DataOutputStream; -import mekanism.api.Object3D; import mekanism.client.gui.GuiTItemStackFilter; import mekanism.client.gui.GuiLogisticalSorter; import mekanism.client.gui.GuiTOreDictFilter; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerFilter; diff --git a/common/mekanism/common/network/PacketNewFilter.java b/common/mekanism/common/network/PacketNewFilter.java index c28adc76c..6c55a0761 100644 --- a/common/mekanism/common/network/PacketNewFilter.java +++ b/common/mekanism/common/network/PacketNewFilter.java @@ -3,7 +3,7 @@ package mekanism.common.network; import java.io.DataOutputStream; import java.util.ArrayList; -import mekanism.api.Object3D; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.miner.MinerFilter; diff --git a/common/mekanism/common/network/PacketPortableTeleport.java b/common/mekanism/common/network/PacketPortableTeleport.java index 90adea549..84c3bf6e4 100644 --- a/common/mekanism/common/network/PacketPortableTeleport.java +++ b/common/mekanism/common/network/PacketPortableTeleport.java @@ -2,7 +2,7 @@ package mekanism.common.network; import java.io.DataOutputStream; -import mekanism.api.Object3D; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.Teleporter; import mekanism.common.PacketHandler.Transmission; diff --git a/common/mekanism/common/network/PacketPortalFX.java b/common/mekanism/common/network/PacketPortalFX.java index eb124dee3..b08723ce9 100644 --- a/common/mekanism/common/network/PacketPortalFX.java +++ b/common/mekanism/common/network/PacketPortalFX.java @@ -3,7 +3,7 @@ package mekanism.common.network; import java.io.DataOutputStream; import java.util.Random; -import mekanism.api.Object3D; +import mekanism.common.Object3D; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/common/mekanism/common/network/PacketRedstoneControl.java b/common/mekanism/common/network/PacketRedstoneControl.java index 9bb0eb013..6caafca02 100644 --- a/common/mekanism/common/network/PacketRedstoneControl.java +++ b/common/mekanism/common/network/PacketRedstoneControl.java @@ -3,8 +3,8 @@ package mekanism.common.network; import java.io.DataOutputStream; import java.util.Random; -import mekanism.api.Object3D; import mekanism.common.IRedstoneControl; +import mekanism.common.Object3D; import mekanism.common.IRedstoneControl.RedstoneControl; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/common/network/PacketRemoveUpgrade.java b/common/mekanism/common/network/PacketRemoveUpgrade.java index 23382e33a..8f033d437 100644 --- a/common/mekanism/common/network/PacketRemoveUpgrade.java +++ b/common/mekanism/common/network/PacketRemoveUpgrade.java @@ -2,9 +2,9 @@ package mekanism.common.network; import java.io.DataOutputStream; -import mekanism.api.IUpgradeManagement; -import mekanism.api.Object3D; +import mekanism.common.IUpgradeManagement; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.tileentity.TileEntityBasicBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/network/PacketSimpleGui.java b/common/mekanism/common/network/PacketSimpleGui.java index 2403878cd..982fbb64d 100644 --- a/common/mekanism/common/network/PacketSimpleGui.java +++ b/common/mekanism/common/network/PacketSimpleGui.java @@ -2,8 +2,8 @@ package mekanism.common.network; import java.io.DataOutputStream; -import mekanism.api.Object3D; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.tileentity.TileEntityBasicBlock; diff --git a/common/mekanism/common/network/PacketTileEntity.java b/common/mekanism/common/network/PacketTileEntity.java index 9d89719d3..8c2e23c2c 100644 --- a/common/mekanism/common/network/PacketTileEntity.java +++ b/common/mekanism/common/network/PacketTileEntity.java @@ -3,8 +3,8 @@ package mekanism.common.network; import java.io.DataOutputStream; import java.util.ArrayList; -import mekanism.api.Object3D; import mekanism.common.ITileNetwork; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/common/tileentity/TileEntityAdvancedBoundingBlock.java b/common/mekanism/common/tileentity/TileEntityAdvancedBoundingBlock.java index dbb6d3ac5..da0cf948e 100644 --- a/common/mekanism/common/tileentity/TileEntityAdvancedBoundingBlock.java +++ b/common/mekanism/common/tileentity/TileEntityAdvancedBoundingBlock.java @@ -10,10 +10,10 @@ import buildcraft.api.power.PowerHandler.PowerReceiver; import cofh.api.energy.IEnergyHandler; import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergyTile; -import mekanism.api.Object3D; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.IAdvancedBoundingBlock; +import mekanism.common.Object3D; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/tileentity/TileEntityAdvancedElectricMachine.java b/common/mekanism/common/tileentity/TileEntityAdvancedElectricMachine.java index 09669377a..06b0d1721 100644 --- a/common/mekanism/common/tileentity/TileEntityAdvancedElectricMachine.java +++ b/common/mekanism/common/tileentity/TileEntityAdvancedElectricMachine.java @@ -2,10 +2,10 @@ package mekanism.common.tileentity; import java.util.ArrayList; -import mekanism.api.EnumColor; -import mekanism.api.SideData; +import mekanism.common.EnumColor; import mekanism.common.Mekanism; import mekanism.common.RecipeHandler; +import mekanism.common.SideData; import mekanism.common.TileComponentEjector; import mekanism.common.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; diff --git a/common/mekanism/common/tileentity/TileEntityAdvancedFactory.java b/common/mekanism/common/tileentity/TileEntityAdvancedFactory.java index aa47bbe94..01e5a5ecd 100644 --- a/common/mekanism/common/tileentity/TileEntityAdvancedFactory.java +++ b/common/mekanism/common/tileentity/TileEntityAdvancedFactory.java @@ -1,7 +1,7 @@ package mekanism.common.tileentity; -import mekanism.api.EnumColor; -import mekanism.api.SideData; +import mekanism.common.EnumColor; +import mekanism.common.SideData; import mekanism.common.TileComponentEjector; import mekanism.common.Tier.FactoryTier; import mekanism.common.block.BlockMachine.MachineType; diff --git a/common/mekanism/common/tileentity/TileEntityBasicBlock.java b/common/mekanism/common/tileentity/TileEntityBasicBlock.java index 38048673b..7afafc9bf 100644 --- a/common/mekanism/common/tileentity/TileEntityBasicBlock.java +++ b/common/mekanism/common/tileentity/TileEntityBasicBlock.java @@ -7,9 +7,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import mekanism.api.Object3D; import mekanism.common.ITileComponent; import mekanism.common.ITileNetwork; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketDataRequest; diff --git a/common/mekanism/common/tileentity/TileEntityBasicMachine.java b/common/mekanism/common/tileentity/TileEntityBasicMachine.java index b9989b4ab..f250d7823 100644 --- a/common/mekanism/common/tileentity/TileEntityBasicMachine.java +++ b/common/mekanism/common/tileentity/TileEntityBasicMachine.java @@ -2,17 +2,17 @@ package mekanism.common.tileentity; import java.util.ArrayList; -import mekanism.api.IConfigurable; -import mekanism.api.IEjector; -import mekanism.api.Object3D; -import mekanism.api.SideData; import mekanism.client.sound.IHasSound; import mekanism.common.IActiveState; +import mekanism.common.IConfigurable; +import mekanism.common.IEjector; import mekanism.common.IElectricMachine; import mekanism.common.IRedstoneControl; import mekanism.common.IUpgradeTile; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; +import mekanism.common.SideData; import mekanism.common.PacketHandler.Transmission; import mekanism.common.TileComponentEjector; import mekanism.common.TileComponentUpgrade; diff --git a/common/mekanism/common/tileentity/TileEntityBin.java b/common/mekanism/common/tileentity/TileEntityBin.java index c07b3c79c..0e1118580 100644 --- a/common/mekanism/common/tileentity/TileEntityBin.java +++ b/common/mekanism/common/tileentity/TileEntityBin.java @@ -2,8 +2,8 @@ package mekanism.common.tileentity; import java.util.ArrayList; -import mekanism.api.Object3D; import mekanism.common.IActiveState; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.item.ItemBlockBasic; @@ -364,7 +364,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento @Override public String getInvName() { - return "Bin"; + return MekanismUtils.localize("tile.BasicBlock.Bin.name"); } @Override diff --git a/common/mekanism/common/tileentity/TileEntityBoundingBlock.java b/common/mekanism/common/tileentity/TileEntityBoundingBlock.java index 953f1155f..2be2d1b6f 100644 --- a/common/mekanism/common/tileentity/TileEntityBoundingBlock.java +++ b/common/mekanism/common/tileentity/TileEntityBoundingBlock.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import com.google.common.io.ByteArrayDataInput; -import mekanism.api.Object3D; import mekanism.common.ITileNetwork; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketDataRequest; diff --git a/common/mekanism/common/tileentity/TileEntityChargepad.java b/common/mekanism/common/tileentity/TileEntityChargepad.java index 5d98962f6..ffaee6418 100644 --- a/common/mekanism/common/tileentity/TileEntityChargepad.java +++ b/common/mekanism/common/tileentity/TileEntityChargepad.java @@ -8,13 +8,13 @@ import java.util.EnumSet; import java.util.List; import java.util.Random; -import mekanism.api.Object3D; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; import mekanism.client.sound.IHasSound; import mekanism.common.EntityRobit; import mekanism.common.IActiveState; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.block.BlockMachine.MachineType; diff --git a/common/mekanism/common/tileentity/TileEntityContainerBlock.java b/common/mekanism/common/tileentity/TileEntityContainerBlock.java index 84a47cff5..999aba3ee 100644 --- a/common/mekanism/common/tileentity/TileEntityContainerBlock.java +++ b/common/mekanism/common/tileentity/TileEntityContainerBlock.java @@ -1,8 +1,8 @@ package mekanism.common.tileentity; import mekanism.common.ISustainedInventory; +import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -141,7 +141,7 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl @Override public String getInvName() { - return fullName; + return MekanismUtils.localize(getBlockType().getUnlocalizedName() + "." + fullName + ".name"); } @Override diff --git a/common/mekanism/common/tileentity/TileEntityDigitalMiner.java b/common/mekanism/common/tileentity/TileEntityDigitalMiner.java index bf06f9482..709621815 100644 --- a/common/mekanism/common/tileentity/TileEntityDigitalMiner.java +++ b/common/mekanism/common/tileentity/TileEntityDigitalMiner.java @@ -6,13 +6,13 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import mekanism.api.Object3D; import mekanism.common.HashList; import mekanism.common.IActiveState; import mekanism.common.IAdvancedBoundingBlock; import mekanism.common.IRedstoneControl; import mekanism.common.IUpgradeTile; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.TileComponentUpgrade; @@ -91,7 +91,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I public TileEntityDigitalMiner() { - super("Digital Miner", MachineType.DIGITAL_MINER.baseEnergy); + super("DigitalMiner", MachineType.DIGITAL_MINER.baseEnergy); inventory = new ItemStack[29]; radius = 10; } diff --git a/common/mekanism/common/tileentity/TileEntityDynamicTank.java b/common/mekanism/common/tileentity/TileEntityDynamicTank.java index be9b68dfe..59529b785 100644 --- a/common/mekanism/common/tileentity/TileEntityDynamicTank.java +++ b/common/mekanism/common/tileentity/TileEntityDynamicTank.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import mekanism.api.Object3D; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.SynchronizedTankData; import mekanism.common.TankUpdateProtocol; @@ -58,7 +58,7 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock public TileEntityDynamicTank() { - this("Dynamic Tank"); + this("DynamicTank"); } public TileEntityDynamicTank(String name) diff --git a/common/mekanism/common/tileentity/TileEntityElectricBlock.java b/common/mekanism/common/tileentity/TileEntityElectricBlock.java index 9a19ac6ce..d330b840b 100644 --- a/common/mekanism/common/tileentity/TileEntityElectricBlock.java +++ b/common/mekanism/common/tileentity/TileEntityElectricBlock.java @@ -9,12 +9,12 @@ import ic2.api.tile.IEnergyStorage; import java.util.ArrayList; import java.util.EnumSet; -import mekanism.api.Object3D; import mekanism.api.energy.ICableOutputter; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.ITileNetwork; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -79,7 +79,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i public EnumSet getOutputtingSides() { - return null; + return EnumSet.noneOf(ForgeDirection.class); } protected EnumSet getConsumingSides() diff --git a/common/mekanism/common/tileentity/TileEntityElectricChest.java b/common/mekanism/common/tileentity/TileEntityElectricChest.java index e0a2f15f0..8098c9f79 100644 --- a/common/mekanism/common/tileentity/TileEntityElectricChest.java +++ b/common/mekanism/common/tileentity/TileEntityElectricChest.java @@ -26,7 +26,7 @@ public class TileEntityElectricChest extends TileEntityElectricBlock public TileEntityElectricChest() { - super("Electric Chest", 12000); + super("ElectricChest", 12000); inventory = new ItemStack[55]; } diff --git a/common/mekanism/common/tileentity/TileEntityElectricMachine.java b/common/mekanism/common/tileentity/TileEntityElectricMachine.java index 66f50aeb8..b6da93154 100644 --- a/common/mekanism/common/tileentity/TileEntityElectricMachine.java +++ b/common/mekanism/common/tileentity/TileEntityElectricMachine.java @@ -1,9 +1,9 @@ package mekanism.common.tileentity; -import mekanism.api.EnumColor; -import mekanism.api.SideData; +import mekanism.common.EnumColor; import mekanism.common.Mekanism; import mekanism.common.RecipeHandler; +import mekanism.common.SideData; import mekanism.common.TileComponentEjector; import mekanism.common.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; diff --git a/common/mekanism/common/tileentity/TileEntityElectricPump.java b/common/mekanism/common/tileentity/TileEntityElectricPump.java index a9b7a7009..b70bc8412 100644 --- a/common/mekanism/common/tileentity/TileEntityElectricPump.java +++ b/common/mekanism/common/tileentity/TileEntityElectricPump.java @@ -8,9 +8,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import mekanism.api.Object3D; import mekanism.common.ISustainedTank; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; @@ -43,7 +43,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I public TileEntityElectricPump() { - super("Electric Pump", 10000); + super("ElectricPump", 10000); fluidTank = new FluidTank(10000); inventory = new ItemStack[3]; } diff --git a/common/mekanism/common/tileentity/TileEntityEliteFactory.java b/common/mekanism/common/tileentity/TileEntityEliteFactory.java index 2264e49e2..5b8623066 100644 --- a/common/mekanism/common/tileentity/TileEntityEliteFactory.java +++ b/common/mekanism/common/tileentity/TileEntityEliteFactory.java @@ -1,7 +1,7 @@ package mekanism.common.tileentity; -import mekanism.api.EnumColor; -import mekanism.api.SideData; +import mekanism.common.EnumColor; +import mekanism.common.SideData; import mekanism.common.TileComponentEjector; import mekanism.common.Tier.FactoryTier; import mekanism.common.block.BlockMachine.MachineType; diff --git a/common/mekanism/common/tileentity/TileEntityEnergizedSmelter.java b/common/mekanism/common/tileentity/TileEntityEnergizedSmelter.java index bfd241620..c67cad02d 100644 --- a/common/mekanism/common/tileentity/TileEntityEnergizedSmelter.java +++ b/common/mekanism/common/tileentity/TileEntityEnergizedSmelter.java @@ -14,7 +14,7 @@ public class TileEntityEnergizedSmelter extends TileEntityElectricMachine { public TileEntityEnergizedSmelter() { - super("Smelter.ogg", "Energized Smelter", new ResourceLocation("mekanism", "gui/GuiEnergizedSmelter.png"), Mekanism.energizedSmelterUsage, 200, MachineType.ENERGIZED_SMELTER.baseEnergy); + super("Smelter.ogg", "EnergizedSmelter", new ResourceLocation("mekanism", "gui/GuiEnergizedSmelter.png"), Mekanism.energizedSmelterUsage, 200, MachineType.ENERGIZED_SMELTER.baseEnergy); } @Override diff --git a/common/mekanism/common/tileentity/TileEntityEnergyCube.java b/common/mekanism/common/tileentity/TileEntityEnergyCube.java index 48f3f50b3..a32eda40f 100644 --- a/common/mekanism/common/tileentity/TileEntityEnergyCube.java +++ b/common/mekanism/common/tileentity/TileEntityEnergyCube.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.HashSet; -import mekanism.api.Object3D; import mekanism.common.IRedstoneControl; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.Tier.EnergyCubeTier; @@ -46,7 +46,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IPo */ public TileEntityEnergyCube() { - super("Energy Cube", 0); + super("EnergyCube", 0); inventory = new ItemStack[2]; controlType = RedstoneControl.DISABLED; @@ -66,6 +66,12 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IPo } } + @Override + public String getInvName() + { + return MekanismUtils.localize(getBlockType().getUnlocalizedName() + "." + tier.name + fullName + ".name"); + } + @Override public double getMaxOutput() { diff --git a/common/mekanism/common/tileentity/TileEntityEnrichmentChamber.java b/common/mekanism/common/tileentity/TileEntityEnrichmentChamber.java index 2e6e70eb2..2d7184c2f 100644 --- a/common/mekanism/common/tileentity/TileEntityEnrichmentChamber.java +++ b/common/mekanism/common/tileentity/TileEntityEnrichmentChamber.java @@ -11,7 +11,7 @@ public class TileEntityEnrichmentChamber extends TileEntityElectricMachine { public TileEntityEnrichmentChamber() { - super("Chamber.ogg", "Enrichment Chamber", new ResourceLocation("mekanism", "gui/GuiChamber.png"), Mekanism.enrichmentChamberUsage, 200, MachineType.ENRICHMENT_CHAMBER.baseEnergy); + super("Chamber.ogg", "EnrichmentChamber", new ResourceLocation("mekanism", "gui/GuiChamber.png"), Mekanism.enrichmentChamberUsage, 200, MachineType.ENRICHMENT_CHAMBER.baseEnergy); } @Override diff --git a/common/mekanism/common/tileentity/TileEntityFactory.java b/common/mekanism/common/tileentity/TileEntityFactory.java index ef7110ad7..954401f09 100644 --- a/common/mekanism/common/tileentity/TileEntityFactory.java +++ b/common/mekanism/common/tileentity/TileEntityFactory.java @@ -2,11 +2,6 @@ package mekanism.common.tileentity; import java.util.ArrayList; -import mekanism.api.EnumColor; -import mekanism.api.IConfigurable; -import mekanism.api.IEjector; -import mekanism.api.Object3D; -import mekanism.api.SideData; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -18,10 +13,15 @@ import mekanism.api.gas.ITubeConnection; import mekanism.client.sound.IHasSound; import mekanism.common.IActiveState; import mekanism.common.IFactory.RecipeType; +import mekanism.common.EnumColor; +import mekanism.common.IConfigurable; +import mekanism.common.IEjector; import mekanism.common.IRedstoneControl; import mekanism.common.IUpgradeTile; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; +import mekanism.common.SideData; import mekanism.common.PacketHandler.Transmission; import mekanism.common.Tier.FactoryTier; import mekanism.common.TileComponentEjector; @@ -105,7 +105,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip public TileEntityFactory(FactoryTier type, MachineType machine) { - super(type.name + " Factory", machine.baseEnergy); + super(type.name + "Factory", machine.baseEnergy); tier = type; inventory = new ItemStack[5+type.processes*2]; diff --git a/common/mekanism/common/tileentity/TileEntityGasTank.java b/common/mekanism/common/tileentity/TileEntityGasTank.java index c6a71bf58..748707e00 100644 --- a/common/mekanism/common/tileentity/TileEntityGasTank.java +++ b/common/mekanism/common/tileentity/TileEntityGasTank.java @@ -2,7 +2,6 @@ package mekanism.common.tileentity; import java.util.ArrayList; -import mekanism.api.Object3D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -13,6 +12,7 @@ import mekanism.api.gas.IGasItem; import mekanism.api.gas.IGasStorage; import mekanism.api.gas.ITubeConnection; import mekanism.common.IRedstoneControl; +import mekanism.common.Object3D; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -36,7 +36,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasS public TileEntityGasTank() { - super("Gas Tank"); + super("GasTank"); inventory = new ItemStack[2]; controlType = RedstoneControl.DISABLED; } diff --git a/common/mekanism/common/tileentity/TileEntityLogisticalSorter.java b/common/mekanism/common/tileentity/TileEntityLogisticalSorter.java index 55ef378eb..3e3c84ab4 100644 --- a/common/mekanism/common/tileentity/TileEntityLogisticalSorter.java +++ b/common/mekanism/common/tileentity/TileEntityLogisticalSorter.java @@ -3,11 +3,11 @@ package mekanism.common.tileentity; import java.util.ArrayList; import java.util.EnumSet; -import mekanism.api.EnumColor; -import mekanism.api.Object3D; +import mekanism.common.EnumColor; import mekanism.common.HashList; import mekanism.common.IActiveState; import mekanism.common.IRedstoneControl; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.block.BlockMachine.MachineType; diff --git a/common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java b/common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java index 1aa1bc0c5..dcac5778c 100644 --- a/common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java +++ b/common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java @@ -4,10 +4,10 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.Set; -import mekanism.api.EnumColor; -import mekanism.api.Object3D; +import mekanism.common.EnumColor; import mekanism.common.HashList; import mekanism.common.ITileNetwork; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketDataRequest; diff --git a/common/mekanism/common/tileentity/TileEntityMechanicalPipe.java b/common/mekanism/common/tileentity/TileEntityMechanicalPipe.java index c374a58c3..ffe3ef893 100644 --- a/common/mekanism/common/tileentity/TileEntityMechanicalPipe.java +++ b/common/mekanism/common/tileentity/TileEntityMechanicalPipe.java @@ -4,11 +4,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; -import mekanism.api.Object3D; import mekanism.api.transmitters.ITransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.api.transmitters.TransmitterNetworkRegistry; import mekanism.common.FluidNetwork; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.PipeUtils; diff --git a/common/mekanism/common/tileentity/TileEntityMetallurgicInfuser.java b/common/mekanism/common/tileentity/TileEntityMetallurgicInfuser.java index ea9e1a14e..97ee92c9e 100644 --- a/common/mekanism/common/tileentity/TileEntityMetallurgicInfuser.java +++ b/common/mekanism/common/tileentity/TileEntityMetallurgicInfuser.java @@ -2,22 +2,22 @@ package mekanism.common.tileentity; import java.util.ArrayList; -import mekanism.api.EnumColor; -import mekanism.api.IConfigurable; -import mekanism.api.IEjector; -import mekanism.api.Object3D; -import mekanism.api.SideData; import mekanism.api.infuse.InfuseObject; import mekanism.api.infuse.InfuseRegistry; import mekanism.api.infuse.InfuseType; import mekanism.api.infuse.InfusionInput; import mekanism.api.infuse.InfusionOutput; import mekanism.client.sound.IHasSound; +import mekanism.common.EnumColor; import mekanism.common.IActiveState; +import mekanism.common.IConfigurable; +import mekanism.common.IEjector; import mekanism.common.IRedstoneControl; import mekanism.common.IUpgradeTile; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; +import mekanism.common.SideData; import mekanism.common.PacketHandler.Transmission; import mekanism.common.RecipeHandler; import mekanism.common.RecipeHandler.Recipe; @@ -82,7 +82,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem public TileEntityMetallurgicInfuser() { - super("Metallurgic Infuser", MachineType.METALLURGIC_INFUSER.baseEnergy); + super("MetallurgicInfuser", MachineType.METALLURGIC_INFUSER.baseEnergy); sideOutputs.add(new SideData(EnumColor.GREY, new int[0])); sideOutputs.add(new SideData(EnumColor.ORANGE, new int[] {0})); diff --git a/common/mekanism/common/tileentity/TileEntityOsmiumCompressor.java b/common/mekanism/common/tileentity/TileEntityOsmiumCompressor.java index 70855d3b2..035cdc86d 100644 --- a/common/mekanism/common/tileentity/TileEntityOsmiumCompressor.java +++ b/common/mekanism/common/tileentity/TileEntityOsmiumCompressor.java @@ -13,7 +13,7 @@ public class TileEntityOsmiumCompressor extends TileEntityAdvancedElectricMachin { public TileEntityOsmiumCompressor() { - super("Compressor.ogg", "Osmium Compressor", new ResourceLocation("mekanism", "gui/GuiCompressor.png"), Mekanism.osmiumCompressorUsage, 1, 200, MachineType.OSMIUM_COMPRESSOR.baseEnergy, 200); + super("Compressor.ogg", "OsmiumCompressor", new ResourceLocation("mekanism", "gui/GuiCompressor.png"), Mekanism.osmiumCompressorUsage, 1, 200, MachineType.OSMIUM_COMPRESSOR.baseEnergy, 200); } @Override diff --git a/common/mekanism/common/tileentity/TileEntityPressurizedTube.java b/common/mekanism/common/tileentity/TileEntityPressurizedTube.java index bd10acd7b..6f5441a97 100644 --- a/common/mekanism/common/tileentity/TileEntityPressurizedTube.java +++ b/common/mekanism/common/tileentity/TileEntityPressurizedTube.java @@ -2,7 +2,6 @@ package mekanism.common.tileentity; import java.util.HashSet; -import mekanism.api.Object3D; import mekanism.api.gas.GasNetwork; import mekanism.api.gas.GasTransmission; import mekanism.api.gas.IGasTransmitter; @@ -10,6 +9,7 @@ import mekanism.api.gas.ITubeConnection; import mekanism.api.transmitters.ITransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.api.transmitters.TransmitterNetworkRegistry; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketDataRequest; diff --git a/common/mekanism/common/tileentity/TileEntityPurificationChamber.java b/common/mekanism/common/tileentity/TileEntityPurificationChamber.java index f41b2542b..75c51e90f 100644 --- a/common/mekanism/common/tileentity/TileEntityPurificationChamber.java +++ b/common/mekanism/common/tileentity/TileEntityPurificationChamber.java @@ -23,7 +23,7 @@ public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMac { public TileEntityPurificationChamber() { - super("PurificationChamber.ogg", "Purification Chamber", new ResourceLocation("mekanism", "gui/GuiPurificationChamber.png"), Mekanism.purificationChamberUsage, 1, 200, MachineType.PURIFICATION_CHAMBER.baseEnergy, 1200); + super("PurificationChamber.ogg", "PurificationChamber", new ResourceLocation("mekanism", "gui/GuiPurificationChamber.png"), Mekanism.purificationChamberUsage, 1, 200, MachineType.PURIFICATION_CHAMBER.baseEnergy, 1200); } @Override diff --git a/common/mekanism/common/tileentity/TileEntityRotaryCondensentrator.java b/common/mekanism/common/tileentity/TileEntityRotaryCondensentrator.java index 44a47b5e4..be3cc3521 100644 --- a/common/mekanism/common/tileentity/TileEntityRotaryCondensentrator.java +++ b/common/mekanism/common/tileentity/TileEntityRotaryCondensentrator.java @@ -2,7 +2,6 @@ package mekanism.common.tileentity; import java.util.ArrayList; -import mekanism.api.Object3D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -15,6 +14,7 @@ import mekanism.common.IActiveState; import mekanism.common.IRedstoneControl; import mekanism.common.ISustainedTank; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.block.BlockMachine.MachineType; diff --git a/common/mekanism/common/tileentity/TileEntityTeleporter.java b/common/mekanism/common/tileentity/TileEntityTeleporter.java index 6b9ebef0c..56f0ed3a6 100644 --- a/common/mekanism/common/tileentity/TileEntityTeleporter.java +++ b/common/mekanism/common/tileentity/TileEntityTeleporter.java @@ -3,9 +3,9 @@ package mekanism.common.tileentity; import java.util.ArrayList; import java.util.List; -import mekanism.api.EnumColor; -import mekanism.api.Object3D; +import mekanism.common.EnumColor; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.Teleporter; diff --git a/common/mekanism/common/tileentity/TileEntityUniversalCable.java b/common/mekanism/common/tileentity/TileEntityUniversalCable.java index d32de2bae..438142cad 100644 --- a/common/mekanism/common/tileentity/TileEntityUniversalCable.java +++ b/common/mekanism/common/tileentity/TileEntityUniversalCable.java @@ -9,12 +9,12 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import mekanism.api.Object3D; import mekanism.api.transmitters.ITransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.api.transmitters.TransmitterNetworkRegistry; import mekanism.common.EnergyNetwork; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketDataRequest; diff --git a/common/mekanism/common/transporter/TransporterFilter.java b/common/mekanism/common/transporter/TransporterFilter.java index b4295abde..4f62312b8 100644 --- a/common/mekanism/common/transporter/TransporterFilter.java +++ b/common/mekanism/common/transporter/TransporterFilter.java @@ -2,7 +2,7 @@ package mekanism.common.transporter; import java.util.ArrayList; -import mekanism.api.EnumColor; +import mekanism.common.EnumColor; import mekanism.common.util.TransporterUtils; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/transporter/TransporterManager.java b/common/mekanism/common/transporter/TransporterManager.java index 88ab5c822..faf27c908 100644 --- a/common/mekanism/common/transporter/TransporterManager.java +++ b/common/mekanism/common/transporter/TransporterManager.java @@ -5,9 +5,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import mekanism.api.EnumColor; -import mekanism.api.IConfigurable; -import mekanism.api.Object3D; +import mekanism.common.EnumColor; +import mekanism.common.IConfigurable; +import mekanism.common.Object3D; import mekanism.common.tileentity.TileEntityBin; import mekanism.common.transporter.TransporterStack.Path; import mekanism.common.util.InventoryUtils; diff --git a/common/mekanism/common/transporter/TransporterPathfinder.java b/common/mekanism/common/transporter/TransporterPathfinder.java index cf8d54b3a..2ea8b7bea 100644 --- a/common/mekanism/common/transporter/TransporterPathfinder.java +++ b/common/mekanism/common/transporter/TransporterPathfinder.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import mekanism.api.Object3D; +import mekanism.common.Object3D; import mekanism.common.tileentity.TileEntityLogisticalSorter; import mekanism.common.tileentity.TileEntityLogisticalTransporter; import mekanism.common.transporter.TransporterPathfinder.Pathfinder.DestChecker; diff --git a/common/mekanism/common/transporter/TransporterStack.java b/common/mekanism/common/transporter/TransporterStack.java index aeef7ffb1..74e834b2d 100644 --- a/common/mekanism/common/transporter/TransporterStack.java +++ b/common/mekanism/common/transporter/TransporterStack.java @@ -3,8 +3,8 @@ package mekanism.common.transporter; import java.util.ArrayList; import java.util.List; -import mekanism.api.EnumColor; -import mekanism.api.Object3D; +import mekanism.common.EnumColor; +import mekanism.common.Object3D; import mekanism.common.tileentity.TileEntityLogisticalSorter; import mekanism.common.tileentity.TileEntityLogisticalTransporter; import mekanism.common.transporter.TransporterPathfinder.Destination; diff --git a/common/mekanism/common/util/CableUtils.java b/common/mekanism/common/util/CableUtils.java index 22ac25b60..b06c89bd4 100644 --- a/common/mekanism/common/util/CableUtils.java +++ b/common/mekanism/common/util/CableUtils.java @@ -9,13 +9,13 @@ import java.util.Arrays; import java.util.EnumSet; import java.util.List; -import mekanism.api.Object3D; import mekanism.api.energy.ICableOutputter; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.transmitters.ITransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.common.EnergyNetwork; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.tileentity.TileEntityElectricBlock; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; diff --git a/common/mekanism/common/util/InventoryUtils.java b/common/mekanism/common/util/InventoryUtils.java index ebbc9bdb9..91ab9e6bd 100644 --- a/common/mekanism/common/util/InventoryUtils.java +++ b/common/mekanism/common/util/InventoryUtils.java @@ -1,7 +1,7 @@ package mekanism.common.util; -import mekanism.api.EnumColor; -import mekanism.api.IConfigurable; +import mekanism.common.EnumColor; +import mekanism.common.IConfigurable; import mekanism.common.tileentity.TileEntityBin; import mekanism.common.tileentity.TileEntityLogisticalSorter; import mekanism.common.transporter.InvStack; diff --git a/common/mekanism/common/util/MekanismUtils.java b/common/mekanism/common/util/MekanismUtils.java index 083667550..041469031 100644 --- a/common/mekanism/common/util/MekanismUtils.java +++ b/common/mekanism/common/util/MekanismUtils.java @@ -12,12 +12,12 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import mekanism.api.EnumColor; -import mekanism.api.IConfigurable; -import mekanism.api.Object3D; import mekanism.common.DynamicTankCache; +import mekanism.common.EnumColor; import mekanism.common.IActiveState; +import mekanism.common.IConfigurable; import mekanism.common.IFactory; +import mekanism.common.Object3D; import mekanism.common.IFactory.RecipeType; import mekanism.common.IModule; import mekanism.common.IRedstoneControl; diff --git a/common/mekanism/common/util/MinerUtils.java b/common/mekanism/common/util/MinerUtils.java index 6d828603b..9535aed60 100644 --- a/common/mekanism/common/util/MinerUtils.java +++ b/common/mekanism/common/util/MinerUtils.java @@ -3,7 +3,7 @@ package mekanism.common.util; import java.util.ArrayList; import java.util.List; -import mekanism.api.Object3D; +import mekanism.common.Object3D; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/common/mekanism/common/util/TransporterUtils.java b/common/mekanism/common/util/TransporterUtils.java index 089925a3f..ca99a8f59 100644 --- a/common/mekanism/common/util/TransporterUtils.java +++ b/common/mekanism/common/util/TransporterUtils.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mekanism.api.EnumColor; -import mekanism.api.Object3D; import mekanism.api.transmitters.ITransmitter; +import mekanism.common.EnumColor; +import mekanism.common.Object3D; import mekanism.common.tileentity.TileEntityDiversionTransporter; import mekanism.common.tileentity.TileEntityLogisticalSorter; import mekanism.common.tileentity.TileEntityLogisticalTransporter; diff --git a/common/mekanism/generators/client/gui/GuiBioGenerator.java b/common/mekanism/generators/client/gui/GuiBioGenerator.java index e4173498d..48fab3d12 100644 --- a/common/mekanism/generators/client/gui/GuiBioGenerator.java +++ b/common/mekanism/generators/client/gui/GuiBioGenerator.java @@ -33,11 +33,11 @@ public class GuiBioGenerator extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString(tileEntity.fullName, 45, 6, 0x404040); - fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040); + fontRenderer.drawString(tileEntity.getInvName(), 45, 6, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); fontRenderer.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); - fontRenderer.drawString("BioFuel: " + tileEntity.bioFuelSlot.fluidStored, 51, 35, 0x00CD00); - fontRenderer.drawString("Out: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00); + fontRenderer.drawString(MekanismUtils.localize("gui.bioGenerator.bioFuel") + ": " + tileEntity.bioFuelSlot.fluidStored, 51, 35, 0x00CD00); + fontRenderer.drawString(MekanismUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00); if(xAxis >= 165 && xAxis <= 169 && yAxis >= 17 && yAxis <= 69) { diff --git a/common/mekanism/generators/client/gui/GuiElectrolyticSeparator.java b/common/mekanism/generators/client/gui/GuiElectrolyticSeparator.java index c0348a0ac..2d1a44558 100644 --- a/common/mekanism/generators/client/gui/GuiElectrolyticSeparator.java +++ b/common/mekanism/generators/client/gui/GuiElectrolyticSeparator.java @@ -2,9 +2,9 @@ package mekanism.generators.client.gui; import java.util.ArrayList; -import mekanism.api.Object3D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; @@ -95,9 +95,9 @@ public class GuiElectrolyticSeparator extends GuiContainer int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString(tileEntity.fullName, 45, 6, 0x404040); - fontRenderer.drawString("Output", 124, 73, 0x404040); - fontRenderer.drawString("Dump", 21, 73, 0x404040); + fontRenderer.drawString(tileEntity.getInvName(), 45, 6, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("gui.output"), 124, 73, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("gui.electrolyticSeparator.dump"), 21, 73, 0x404040); if(xAxis >= 165 && xAxis <= 169 && yAxis >= 17 && yAxis <= 69) { diff --git a/common/mekanism/generators/client/gui/GuiHeatGenerator.java b/common/mekanism/generators/client/gui/GuiHeatGenerator.java index 327429696..8307da2ad 100644 --- a/common/mekanism/generators/client/gui/GuiHeatGenerator.java +++ b/common/mekanism/generators/client/gui/GuiHeatGenerator.java @@ -33,11 +33,11 @@ public class GuiHeatGenerator extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString(tileEntity.fullName, 45, 6, 0x404040); - fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040); + fontRenderer.drawString(tileEntity.getInvName(), 45, 6, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); fontRenderer.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); - fontRenderer.drawString("Fuel: " + (tileEntity.lavaTank.getFluid() != null ? tileEntity.lavaTank.getFluid().amount : 0), 51, 35, 0x00CD00); - fontRenderer.drawString("Out: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00); + fontRenderer.drawString(MekanismUtils.localize("gui.heatGenerator.fuel") + ": " + (tileEntity.lavaTank.getFluid() != null ? tileEntity.lavaTank.getFluid().amount : 0), 51, 35, 0x00CD00); + fontRenderer.drawString(MekanismUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00); if(xAxis >= 165 && xAxis <= 169 && yAxis >= 17 && yAxis <= 69) { diff --git a/common/mekanism/generators/client/gui/GuiHydrogenGenerator.java b/common/mekanism/generators/client/gui/GuiHydrogenGenerator.java index 46a8434ce..c54641449 100644 --- a/common/mekanism/generators/client/gui/GuiHydrogenGenerator.java +++ b/common/mekanism/generators/client/gui/GuiHydrogenGenerator.java @@ -33,11 +33,11 @@ public class GuiHydrogenGenerator extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString(tileEntity.fullName, 45, 6, 0x404040); - fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040); + fontRenderer.drawString(tileEntity.getInvName(), 45, 6, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); fontRenderer.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); fontRenderer.drawString("H: " + tileEntity.hydrogenStored, 51, 35, 0x00CD00); - fontRenderer.drawString("Out: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00); + fontRenderer.drawString(MekanismUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00); if(xAxis >= 165 && xAxis <= 169 && yAxis >= 17 && yAxis <= 69) { diff --git a/common/mekanism/generators/client/gui/GuiSolarGenerator.java b/common/mekanism/generators/client/gui/GuiSolarGenerator.java index 46f5ebc28..0a89ac217 100644 --- a/common/mekanism/generators/client/gui/GuiSolarGenerator.java +++ b/common/mekanism/generators/client/gui/GuiSolarGenerator.java @@ -33,11 +33,11 @@ public class GuiSolarGenerator extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString(tileEntity.fullName, tileEntity.fullName != "Advanced Solar Generator" ? 45 : 30, 6, 0x404040); - fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040); + fontRenderer.drawString(tileEntity.getInvName(), !tileEntity.fullName.contains("Advanced") ? 45 : 30, 6, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); fontRenderer.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); - fontRenderer.drawString("Sun: " + tileEntity.seesSun, 51, 35, 0x00CD00); - fontRenderer.drawString("Out: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00); + fontRenderer.drawString(MekanismUtils.localize("gui.solarGenerator.sun") + ": " + tileEntity.seesSun, 51, 35, 0x00CD00); + fontRenderer.drawString(MekanismUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00); if(xAxis >= 165 && xAxis <= 169 && yAxis >= 17 && yAxis <= 69) { diff --git a/common/mekanism/generators/client/gui/GuiWindTurbine.java b/common/mekanism/generators/client/gui/GuiWindTurbine.java index 03b28c6f7..e7f6ebdb9 100644 --- a/common/mekanism/generators/client/gui/GuiWindTurbine.java +++ b/common/mekanism/generators/client/gui/GuiWindTurbine.java @@ -1,8 +1,8 @@ package mekanism.generators.client.gui; -import mekanism.api.EnumColor; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.GuiRedstoneControl; +import mekanism.common.EnumColor; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.MekanismGenerators; @@ -35,11 +35,11 @@ public class GuiWindTurbine extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRenderer.drawString(tileEntity.fullName, 45, 6, 0x404040); - fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040); + fontRenderer.drawString(tileEntity.getInvName(), 45, 6, 0x404040); + fontRenderer.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); fontRenderer.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); - fontRenderer.drawString("Power: " + MekanismGenerators.windGeneration*tileEntity.getMultiplier(), 51, 35, 0x00CD00); - fontRenderer.drawString("Out: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00); + fontRenderer.drawString(MekanismUtils.localize("gui.power") + ": " + MekanismGenerators.windGeneration*tileEntity.getMultiplier(), 51, 35, 0x00CD00); + fontRenderer.drawString(MekanismUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00); int size = 44; diff --git a/common/mekanism/generators/common/MekanismGenerators.java b/common/mekanism/generators/common/MekanismGenerators.java index fd3550418..c8cfde232 100644 --- a/common/mekanism/generators/common/MekanismGenerators.java +++ b/common/mekanism/generators/common/MekanismGenerators.java @@ -106,7 +106,7 @@ public class MekanismGenerators implements IModule public void postInit(FMLPostInitializationEvent event) { try { - for(ItemStack ore : OreDictionary.getOres("treeSapling")) + /*for(ItemStack ore : OreDictionary.getOres("treeSapling")) //TODO later! { ArrayList list = new ArrayList(); ore.getItem().getSubItems(ore.itemID, CreativeTabs.tabDecorations, list); @@ -115,7 +115,7 @@ public class MekanismGenerators implements IModule { RecipeHandler.addCrusherRecipe(MekanismUtils.size(sapling, 1), new ItemStack(BioFuel, 2)); } - } + }*/ } catch(Exception e) {} } diff --git a/common/mekanism/generators/common/item/ItemBlockGenerator.java b/common/mekanism/generators/common/item/ItemBlockGenerator.java index e52e8f031..dfed1a84d 100644 --- a/common/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/common/mekanism/generators/common/item/ItemBlockGenerator.java @@ -5,8 +5,8 @@ import ic2.api.item.ISpecialElectricItem; import java.util.List; -import mekanism.api.EnumColor; import mekanism.api.energy.IEnergizedItem; +import mekanism.common.EnumColor; import mekanism.common.ISustainedInventory; import mekanism.common.ISustainedTank; import mekanism.common.Mekanism; diff --git a/common/mekanism/generators/common/tileentity/TileEntityAdvancedSolarGenerator.java b/common/mekanism/generators/common/tileentity/TileEntityAdvancedSolarGenerator.java index 230d4df6a..f79fd5a1b 100644 --- a/common/mekanism/generators/common/tileentity/TileEntityAdvancedSolarGenerator.java +++ b/common/mekanism/generators/common/tileentity/TileEntityAdvancedSolarGenerator.java @@ -2,8 +2,8 @@ package mekanism.generators.common.tileentity; import java.util.EnumSet; -import mekanism.api.Object3D; import mekanism.common.IBoundingBlock; +import mekanism.common.Object3D; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.MekanismGenerators; import net.minecraftforge.common.ForgeDirection; @@ -12,7 +12,7 @@ public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator i { public TileEntityAdvancedSolarGenerator() { - super("Advanced Solar Generator", 200000, 360, MekanismGenerators.advancedSolarGeneration); + super("AdvancedSolarGenerator", 200000, 360, MekanismGenerators.advancedSolarGeneration); } @Override diff --git a/common/mekanism/generators/common/tileentity/TileEntityBioGenerator.java b/common/mekanism/generators/common/tileentity/TileEntityBioGenerator.java index 215079c34..d4700d77a 100644 --- a/common/mekanism/generators/common/tileentity/TileEntityBioGenerator.java +++ b/common/mekanism/generators/common/tileentity/TileEntityBioGenerator.java @@ -36,7 +36,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui public TileEntityBioGenerator() { - super("Bio-Generator", 160000, MekanismGenerators.bioGeneration*2); + super("BioGenerator", 160000, MekanismGenerators.bioGeneration*2); inventory = new ItemStack[2]; } diff --git a/common/mekanism/generators/common/tileentity/TileEntityElectrolyticSeparator.java b/common/mekanism/generators/common/tileentity/TileEntityElectrolyticSeparator.java index a4af91ce7..2f2ca44b3 100644 --- a/common/mekanism/generators/common/tileentity/TileEntityElectrolyticSeparator.java +++ b/common/mekanism/generators/common/tileentity/TileEntityElectrolyticSeparator.java @@ -3,7 +3,6 @@ package mekanism.generators.common.tileentity; import java.util.ArrayList; import java.util.Random; -import mekanism.api.Object3D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -14,6 +13,7 @@ import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; import mekanism.common.ISustainedTank; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.tileentity.TileEntityElectricBlock; @@ -66,7 +66,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp public TileEntityElectrolyticSeparator() { - super("Electrolytic Separator", GeneratorType.ELECTROLYTIC_SEPARATOR.maxEnergy); + super("ElectrolyticSeparator", GeneratorType.ELECTROLYTIC_SEPARATOR.maxEnergy); inventory = new ItemStack[4]; outputType = GasRegistry.getGas("oxygen"); dumpType = null; diff --git a/common/mekanism/generators/common/tileentity/TileEntityGenerator.java b/common/mekanism/generators/common/tileentity/TileEntityGenerator.java index b3c21617d..44af8a2df 100644 --- a/common/mekanism/generators/common/tileentity/TileEntityGenerator.java +++ b/common/mekanism/generators/common/tileentity/TileEntityGenerator.java @@ -6,12 +6,12 @@ import ic2.api.tile.IEnergyStorage; import java.util.ArrayList; import java.util.EnumSet; -import mekanism.api.Object3D; import mekanism.api.energy.ICableOutputter; import mekanism.client.sound.IHasSound; import mekanism.common.IActiveState; import mekanism.common.IRedstoneControl; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; @@ -242,7 +242,7 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem @Override public String getSoundPath() { - return fullName.replace(" ", "").replace("-","").replace("Advanced", "") + ".ogg"; + return fullName.replace("Advanced", "") + ".ogg"; } @Override diff --git a/common/mekanism/generators/common/tileentity/TileEntityHeatGenerator.java b/common/mekanism/generators/common/tileentity/TileEntityHeatGenerator.java index d02051913..332c6ebf7 100644 --- a/common/mekanism/generators/common/tileentity/TileEntityHeatGenerator.java +++ b/common/mekanism/generators/common/tileentity/TileEntityHeatGenerator.java @@ -30,7 +30,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu public TileEntityHeatGenerator() { - super("Heat Generator", 160000, MekanismGenerators.heatGeneration*2); + super("HeatGenerator", 160000, MekanismGenerators.heatGeneration*2); inventory = new ItemStack[2]; } diff --git a/common/mekanism/generators/common/tileentity/TileEntityHydrogenGenerator.java b/common/mekanism/generators/common/tileentity/TileEntityHydrogenGenerator.java index 42c72f73d..cc0abb06f 100644 --- a/common/mekanism/generators/common/tileentity/TileEntityHydrogenGenerator.java +++ b/common/mekanism/generators/common/tileentity/TileEntityHydrogenGenerator.java @@ -32,7 +32,7 @@ public class TileEntityHydrogenGenerator extends TileEntityGenerator implements public TileEntityHydrogenGenerator() { - super("Hydrogen Generator", 40000, MekanismGenerators.hydrogenGeneration*2); + super("HydrogenGenerator", 40000, MekanismGenerators.hydrogenGeneration*2); inventory = new ItemStack[2]; } diff --git a/common/mekanism/generators/common/tileentity/TileEntitySolarGenerator.java b/common/mekanism/generators/common/tileentity/TileEntitySolarGenerator.java index 3590f12ff..b32797437 100644 --- a/common/mekanism/generators/common/tileentity/TileEntitySolarGenerator.java +++ b/common/mekanism/generators/common/tileentity/TileEntitySolarGenerator.java @@ -3,7 +3,7 @@ package mekanism.generators.common.tileentity; import java.util.ArrayList; import java.util.EnumSet; -import mekanism.api.Object3D; +import mekanism.common.Object3D; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.MekanismGenerators; @@ -29,7 +29,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator public TileEntitySolarGenerator() { - super("Solar Generator", 96000, MekanismGenerators.solarGeneration*2); + super("SolarGenerator", 96000, MekanismGenerators.solarGeneration*2); GENERATION_RATE = MekanismGenerators.solarGeneration; inventory = new ItemStack[1]; } diff --git a/common/mekanism/generators/common/tileentity/TileEntityWindTurbine.java b/common/mekanism/generators/common/tileentity/TileEntityWindTurbine.java index 152012f34..c816aa1eb 100644 --- a/common/mekanism/generators/common/tileentity/TileEntityWindTurbine.java +++ b/common/mekanism/generators/common/tileentity/TileEntityWindTurbine.java @@ -1,7 +1,7 @@ package mekanism.generators.common.tileentity; -import mekanism.api.Object3D; import mekanism.common.IBoundingBlock; +import mekanism.common.Object3D; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.MekanismGenerators; @@ -16,7 +16,7 @@ public class TileEntityWindTurbine extends TileEntityGenerator implements IBound public TileEntityWindTurbine() { - super("Wind Turbine", 200000, (MekanismGenerators.windGeneration*8)*2); + super("WindTurbine", 200000, (MekanismGenerators.windGeneration*8)*2); inventory = new ItemStack[1]; } diff --git a/common/mekanism/induction/client/gui/GuiMultimeter.java b/common/mekanism/induction/client/gui/GuiMultimeter.java index 593c5fb51..3412d16b9 100644 --- a/common/mekanism/induction/client/gui/GuiMultimeter.java +++ b/common/mekanism/induction/client/gui/GuiMultimeter.java @@ -5,7 +5,7 @@ package mekanism.induction.client.gui; import java.util.ArrayList; -import mekanism.api.Object3D; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; diff --git a/common/mekanism/induction/common/BatteryUpdateProtocol.java b/common/mekanism/induction/common/BatteryUpdateProtocol.java index 7c831b895..a5a75f4f4 100644 --- a/common/mekanism/induction/common/BatteryUpdateProtocol.java +++ b/common/mekanism/induction/common/BatteryUpdateProtocol.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import mekanism.api.Object3D; +import mekanism.common.Object3D; import mekanism.common.util.ListUtils; import mekanism.induction.common.tileentity.TileEntityBattery; import net.minecraft.entity.item.EntityItem; diff --git a/common/mekanism/induction/common/SynchronizedBatteryData.java b/common/mekanism/induction/common/SynchronizedBatteryData.java index fc6630426..52e7b8073 100644 --- a/common/mekanism/induction/common/SynchronizedBatteryData.java +++ b/common/mekanism/induction/common/SynchronizedBatteryData.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import mekanism.api.Object3D; +import mekanism.common.Object3D; import mekanism.common.util.ListUtils; import mekanism.induction.common.tileentity.TileEntityBattery; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/induction/common/block/BlockEMContractor.java b/common/mekanism/induction/common/block/BlockEMContractor.java index 28e490c3b..0a54e294a 100644 --- a/common/mekanism/induction/common/block/BlockEMContractor.java +++ b/common/mekanism/induction/common/block/BlockEMContractor.java @@ -1,7 +1,7 @@ package mekanism.induction.common.block; -import mekanism.api.Object3D; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.induction.client.render.BlockRenderingHandler; import mekanism.induction.common.item.ItemCoordLink; import mekanism.induction.common.tileentity.TileEntityEMContractor; diff --git a/common/mekanism/induction/common/block/BlockTesla.java b/common/mekanism/induction/common/block/BlockTesla.java index d05e2a05f..4b9456e02 100644 --- a/common/mekanism/induction/common/block/BlockTesla.java +++ b/common/mekanism/induction/common/block/BlockTesla.java @@ -3,8 +3,8 @@ */ package mekanism.induction.common.block; -import mekanism.api.Object3D; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.induction.client.render.BlockRenderingHandler; import mekanism.induction.common.item.ItemCoordLink; import mekanism.induction.common.tileentity.TileEntityTesla; diff --git a/common/mekanism/induction/common/item/ItemCoordLink.java b/common/mekanism/induction/common/item/ItemCoordLink.java index cceb9d168..7d1db78c6 100644 --- a/common/mekanism/induction/common/item/ItemCoordLink.java +++ b/common/mekanism/induction/common/item/ItemCoordLink.java @@ -5,7 +5,7 @@ package mekanism.induction.common.item; import java.util.List; -import mekanism.api.Object3D; +import mekanism.common.Object3D; import mekanism.common.item.ItemMekanism; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/induction/common/item/ItemLinker.java b/common/mekanism/induction/common/item/ItemLinker.java index 752704ad1..81c578024 100644 --- a/common/mekanism/induction/common/item/ItemLinker.java +++ b/common/mekanism/induction/common/item/ItemLinker.java @@ -3,7 +3,7 @@ */ package mekanism.induction.common.item; -import mekanism.api.Object3D; +import mekanism.common.Object3D; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/common/mekanism/induction/common/tileentity/TileEntityBattery.java b/common/mekanism/induction/common/tileentity/TileEntityBattery.java index 729bbbf2c..3a18229f0 100644 --- a/common/mekanism/induction/common/tileentity/TileEntityBattery.java +++ b/common/mekanism/induction/common/tileentity/TileEntityBattery.java @@ -10,9 +10,9 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import mekanism.api.Object3D; import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; diff --git a/common/mekanism/induction/common/tileentity/TileEntityEMContractor.java b/common/mekanism/induction/common/tileentity/TileEntityEMContractor.java index 2660b5ed6..31d6049c0 100644 --- a/common/mekanism/induction/common/tileentity/TileEntityEMContractor.java +++ b/common/mekanism/induction/common/tileentity/TileEntityEMContractor.java @@ -5,8 +5,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import mekanism.api.Object3D; import mekanism.common.ITileNetwork; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketDataRequest; diff --git a/common/mekanism/induction/common/tileentity/TileEntityMultimeter.java b/common/mekanism/induction/common/tileentity/TileEntityMultimeter.java index 4ac0ba7a1..8702cc643 100644 --- a/common/mekanism/induction/common/tileentity/TileEntityMultimeter.java +++ b/common/mekanism/induction/common/tileentity/TileEntityMultimeter.java @@ -9,8 +9,8 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.Set; -import mekanism.api.Object3D; import mekanism.common.ITileNetwork; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketDataRequest; diff --git a/common/mekanism/induction/common/tileentity/TileEntityTesla.java b/common/mekanism/induction/common/tileentity/TileEntityTesla.java index cdd33cff4..adbbecbb3 100644 --- a/common/mekanism/induction/common/tileentity/TileEntityTesla.java +++ b/common/mekanism/induction/common/tileentity/TileEntityTesla.java @@ -8,8 +8,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import mekanism.api.Object3D; import mekanism.api.induction.ITesla; +import mekanism.common.Object3D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketDataRequest; diff --git a/resources/assets/mekanism/lang/en_US.lang b/resources/assets/mekanism/lang/en_US.lang index 1c2e77d54..0bd8c4455 100644 --- a/resources/assets/mekanism/lang/en_US.lang +++ b/resources/assets/mekanism/lang/en_US.lang @@ -121,6 +121,121 @@ gas.oxygen=Oxygen fluid.hydrogen=Liquid Hydrogen fluid.oxygen=Liquid Oxygen +//Gui text +gui.configuration=Configuration +gui.removeSpeedUpgrade=Remove speed upgrade +gui.removeEnergyUpgrade=Remove energy upgrade +gui.condensentrating=Condensentrating +gui.decondensentrating=Decondensentrating +gui.power=Power +gui.confirm=Confirm +gui.open=Open +gui.allOK=All OK +gui.none=None +gui.new=New +gui.edit=Edit +gui.save=Save +gui.output=Output +gui.delete=Delete +gui.status=Status +gui.autoEject=Auto-eject +gui.itemstack=ItemStack +gui.oredict=OreDict +gui.out=Out +gui.noFluid=No fluid +gui.empty=Empty +gui.volume=Volume +gui.start=Start +gui.stop=Stop +gui.config=Config +gui.teleport=Teleport + +gui.factory.secondaryEnergy=Secondary energy +gui.factory.smelting=Smelting +gui.factory.enriching=Enriching +gui.factory.crushing=Crushing +gui.factory.compressing=Compressing +gui.factory.combining=Combining +gui.factory.purifying=Purifying + +gui.oredictFilter=OreDict Filter +gui.oredictFilter.noKey=No key entered +gui.oredictFilter.sameKey=Same key + +gui.itemFilter=Item Filter +gui.itemFilter.details=ItemStack Details +gui.itemFilter.min=Min +gui.itemFilter.max=Max + +gui.portableTeleporter=Portable Teleporter + +gui.teleporter.notReady=Not Ready +gui.teleporter.ready=Ready +gui.teleporter.needsEnergy=Needs energy +gui.teleporter.linksCapacity=Links > 2 +gui.teleporter.noLink=No link found + +gui.robit=Robit +gui.robit.smelting=Robit Smelting +gui.robit.inventory=Robit Inventory +gui.robit.crafting=Robit Crafting +gui.robit.greeting=Hi, I'm +gui.robit.toggleFollow=Toggle 'follow' mode +gui.robit.rename=Rename this Robit +gui.robit.teleport=Teleport back home +gui.robit.togglePickup=Toggle 'drop pickup' mode + +gui.password.setPassword=Set password +gui.password.enterPassword=Enter password +gui.password.fieldsEmpty=Field(s) empty +gui.password.notMatching=Not matching +gui.password.identical=Identical +gui.password.invalid=Invalid +gui.password=Password + +gui.logisticalSorter.filters=Filters +gui.logisticalSorter.default=Default +gui.logisticalSorter.auto=Auto +gui.logisticalSorter.roundRobin=Round robin + +gui.electricChest.editPassword=Edit Password + +gui.digitalMinerConfig=Digital Miner Config + +gui.digitalMiner.autoPull=Auto-pull +gui.digitalMiner.replaceBlock=Replace block +gui.digitalMiner.reset=Reset +gui.digitalMiner.silkTouch=Silk touch +gui.digitalMiner.eject=Eject +gui.digitalMiner.pull=Pull +gui.digitalMiner.silk=Silk +gui.digitalMiner.toMine=To mine +gui.digitalMiner.running=Running +gui.digitalMiner.idle=Idle + +//Redstone control +control.disabled=Disabled +control.high=High +control.low=Low + +//Colors +color.black=Black +color.darkBlue=Dark Blue +color.darkGreen=Dark Green +color.darkAqua=Dark Aqua +color.darkRed=Dark Red +color.purple=Purple +color.orange=Orange +color.grey=Grey +color.darkGrey=Dark Grey +color.indigo=Indigo +color.brightGreen=Bright Green +color.aqua=Aqua +color.red=Red +color.pink=Pink +color.yellow=Yellow +color.white=White + //Creative tab itemGroup.tabMekanism=Mekanism @@ -237,3 +352,12 @@ tile.Battery.name=Modular Battery //Items item.Linker.name=Electrostatic Linker + +//Gui text +gui.heatGenerator.fuel=Fuel + +gui.solarGenerator.sun=Sun + +gui.bioGenerator.biofuel=BioFuel + +gui.electrolyticSeparator.dump=Dump