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

Work on localization support, move around some API classes to make better compatibility

Browse source
This commit is contained in:
Aidan Brady 2013-11-30 00:28:02 -05:00
parent 686cca5032
commit b224a01f39
171 changed files with 569 additions and 432 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
common/mekanism/api/EnumColor.java
View file

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

4
common/mekanism/api/gas/Gas.java
View file

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

2
common/mekanism/api/gas/GasTransmission.java
View file

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

19
common/mekanism/api/transmitters/DynamicNetwork.java
View file

@ -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<A, N> implements ITransmitterNetwork<A, N>, IClientTicker
@ -251,7 +250,17 @@ public abstract class DynamicNetwork<A, N> implements ITransmitterNetwork<A, N>,
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;
}
}

4
common/mekanism/client/ClientPlayerTickHandler.java
View file

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

2
common/mekanism/client/ClientProxy.java
View file

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

2
common/mekanism/client/ThreadTankSparkle.java
View file

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

2
common/mekanism/client/gui/GuiAdvancedElectricMachine.java
View file

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

10
common/mekanism/client/gui/GuiConfiguration.java
View file

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

4
common/mekanism/client/gui/GuiConfigurationTab.java
View file

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

2
common/mekanism/client/gui/GuiCredits.java
View file

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

32
common/mekanism/client/gui/GuiDigitalMiner.java
View file

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

4
common/mekanism/client/gui/GuiDigitalMinerConfig.java
View file

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

10
common/mekanism/client/gui/GuiDynamicTank.java
View file

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

10
common/mekanism/client/gui/GuiElectricChest.java
View file

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

8
common/mekanism/client/gui/GuiElectricPump.java
View file

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

6
common/mekanism/client/gui/GuiEnergyCube.java
View file

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

6
common/mekanism/client/gui/GuiFactory.java
View file

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

4
common/mekanism/client/gui/GuiGasTank.java
View file

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

26
common/mekanism/client/gui/GuiLogisticalSorter.java
View file

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

4
common/mekanism/client/gui/GuiMItemStackFilter.java
View file

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

4
common/mekanism/client/gui/GuiMOreDictFilter.java
View file

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

4
common/mekanism/client/gui/GuiMekanism.java
View file

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

6
common/mekanism/client/gui/GuiMetallurgicInfuser.java
View file

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

16
common/mekanism/client/gui/GuiPasswordEnter.java
View file

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

18
common/mekanism/client/gui/GuiPasswordModify.java
View file

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

4
common/mekanism/client/gui/GuiPortableTeleporter.java
View file

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

2
common/mekanism/client/gui/GuiRedstoneControl.java
View file

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

4
common/mekanism/client/gui/GuiRobitCrafting.java
View file

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

4
common/mekanism/client/gui/GuiRobitInventory.java
View file

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

14
common/mekanism/client/gui/GuiRobitMain.java
View file

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

4
common/mekanism/client/gui/GuiRobitRepair.java
View file

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

4
common/mekanism/client/gui/GuiRobitSmelting.java
View file

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

6
common/mekanism/client/gui/GuiRotaryCondensentrator.java
View file

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

24
common/mekanism/client/gui/GuiTItemStackFilter.java
View file

@ -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");
}
}

24
common/mekanism/client/gui/GuiTOreDictFilter.java
View file

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

6
common/mekanism/client/gui/GuiTeleporter.java
View file

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

6
common/mekanism/client/gui/GuiUpgradeManagement.java
View file

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

4
common/mekanism/client/render/MekanismRenderer.java
View file

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

2
common/mekanism/client/render/RenderTickHandler.java
View file

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

2
common/mekanism/client/render/item/ItemRenderingHandler.java
View file

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

2
common/mekanism/client/render/tileentity/RenderBin.java
View file

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

6
common/mekanism/client/render/tileentity/RenderConfigurableMachine.java
View file

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

2
common/mekanism/client/render/tileentity/RenderDynamicTank.java
View file

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

2
common/mekanism/client/render/tileentity/RenderEnergyCube.java
View file

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

2
common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java
View file

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

2
common/mekanism/client/render/tileentity/RenderPressurizedTube.java
View file

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

2
common/mekanism/client/sound/SoundHandler.java
View file

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

1
common/mekanism/common/CommandMekanism.java
View file

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

1
common/mekanism/common/CommonWorldTickHandler.java
View file

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

1
common/mekanism/common/ConnectedTextureRenderer.java
View file

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

1
common/mekanism/common/DynamicFluidTank.java
View file

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

1
common/mekanism/common/DynamicTankCache.java
View file

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

1
common/mekanism/common/EnergyNetwork.java
View file

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

1
common/mekanism/common/EntityRobit.java
View file

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

64
common/mekanism/common/EnumColor.java Normal file
View file

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

1
common/mekanism/common/IAdvancedBoundingBlock.java
View file

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

2
common/mekanism/api/IConfigurable.java → common/mekanism/common/IConfigurable.java
View file

@ -1,4 +1,4 @@
package mekanism.api;
package mekanism.common;
import java.util.ArrayList;

2
common/mekanism/api/IEjector.java → common/mekanism/common/IEjector.java
View file

@ -1,4 +1,4 @@
package mekanism.api;
package mekanism.common;
import net.minecraftforge.common.ForgeDirection;

15
common/mekanism/common/IFactory.java
View file

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

10
common/mekanism/common/IRedstoneControl.java
View file

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

2
common/mekanism/api/IUpgradeManagement.java → common/mekanism/common/IUpgradeManagement.java
View file

@ -1,4 +1,4 @@
package mekanism.api;
package mekanism.common;
/**
* Implement this if your block or item can store Mekanism-based upgrades.

1
common/mekanism/common/IUpgradeTile.java
View file

@ -1,6 +1,5 @@
package mekanism.common;
import mekanism.api.IUpgradeManagement;
public interface IUpgradeTile extends IUpgradeManagement
{

10
common/mekanism/common/Mekanism.java
View file

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

1
common/mekanism/common/MekanismRecipe.java
View file

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

2
common/mekanism/api/Object3D.java → common/mekanism/common/Object3D.java
View file

@ -1,4 +1,4 @@
package mekanism.api;
package mekanism.common;
import java.util.ArrayList;

1
common/mekanism/common/PacketHandler.java
View file

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

1
common/mekanism/common/PipeUtils.java
View file

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

2
common/mekanism/api/SideData.java → common/mekanism/common/SideData.java
View file

@ -1,4 +1,4 @@
package mekanism.api;
package mekanism.common;
public class SideData
{

1
common/mekanism/common/SynchronizedTankData.java
View file

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

1
common/mekanism/common/TankUpdateProtocol.java
View file

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

1
common/mekanism/common/Tier.java
View file

@ -1,6 +1,5 @@
package mekanism.common;
import mekanism.api.EnumColor;
import net.minecraft.util.ResourceLocation;
/**

5
common/mekanism/common/TileComponentEjector.java
View file

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

2
common/mekanism/common/block/BlockBasic.java
View file

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

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

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

2
common/mekanism/common/item/ItemAtomicDisassembler.java
View file

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

2
common/mekanism/common/item/ItemBlockBasic.java
View file

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

4
common/mekanism/common/item/ItemBlockEnergyCube.java
View file

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

2
common/mekanism/common/item/ItemBlockGasTank.java
View file

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

6
common/mekanism/common/item/ItemBlockMachine.java
View file

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

2
common/mekanism/common/item/ItemBlockOre.java
View file

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

3
common/mekanism/common/item/ItemBlockTransmitter.java
View file

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

6
common/mekanism/common/item/ItemConfigurator.java
View file

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

2
common/mekanism/common/item/ItemElectricBow.java
View file

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

2
common/mekanism/common/item/ItemEnergized.java
View file

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

2
common/mekanism/common/item/ItemNetworkReader.java
View file

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

17
common/mekanism/common/item/ItemPortableTeleporter.java
View file

@ -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");
}
}

4
common/mekanism/common/item/ItemRobit.java
View file

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

2
common/mekanism/common/item/ItemWalkieTalkie.java
View file

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

2
common/mekanism/common/miner/ThreadMinerSearch.java
View file

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

4
common/mekanism/common/network/PacketConfigurationUpdate.java
View file

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

2
common/mekanism/common/network/PacketDataRequest.java
View file

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

2
common/mekanism/common/network/PacketDigitalMinerGui.java
View file

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

2
common/mekanism/common/network/PacketEditFilter.java
View file

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

2
common/mekanism/common/network/PacketElectricChest.java
View file

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

2
common/mekanism/common/network/PacketLogisticalSorterGui.java
View file

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

2
common/mekanism/common/network/PacketNewFilter.java
View file

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

2
common/mekanism/common/network/PacketPortableTeleport.java
View file

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

2
common/mekanism/common/network/PacketPortalFX.java
View file

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

2
common/mekanism/common/network/PacketRedstoneControl.java
View file

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

Some files were not shown because too many files have changed in this diff Show more