diff --git a/src/main/java/gregtechmod/GT_Mod.java b/src/main/java/gregtechmod/GT_Mod.java index e8ef861..eee4b1c 100644 --- a/src/main/java/gregtechmod/GT_Mod.java +++ b/src/main/java/gregtechmod/GT_Mod.java @@ -458,6 +458,7 @@ public class GT_Mod implements IGT_Mod { GregTech_API.registerMachineBlock(GregTech_API.sBlockList[0], new boolean[]{true, true, false, false, false, false, true, false, false, false, true, false, false, true, true, true}); GregTech_API.registerMachineBlock(GregTech_API.sBlockList[1], new boolean[]{true}); GregTech_API.registerMachineBlock(GregTech_API.sBlockList[4], new boolean[]{false, false, false, false, false, false, false, false, true, true, false, false, false, true}); + GregTech_API.registerMachineBlock(GregTech_API.sBlockList[4], 13); GT_Log.log.info("Register the few old TileEntities."); GameRegistry.registerTileEntity(GT_TileEntity_ComputerCube.class , "GregTech_Computercube"); diff --git a/src/main/java/gregtechmod/api/gui/GT_GUIContainer_MultiMachine.java b/src/main/java/gregtechmod/api/gui/GT_GUIContainer_MultiMachine.java index 88008c0..739edb8 100644 --- a/src/main/java/gregtechmod/api/gui/GT_GUIContainer_MultiMachine.java +++ b/src/main/java/gregtechmod/api/gui/GT_GUIContainer_MultiMachine.java @@ -28,21 +28,19 @@ public class GT_GUIContainer_MultiMachine extends GT_GUIContainerMetaTile_Machin if (mContainer != null) { GT_Container_MultiMachine m = (GT_Container_MultiMachine) mContainer; int errorCode = m.mDisplayErrorCode.get(); - if ((errorCode & 1) != 0) fontRenderer.drawString("Pipe is loose.", 10, 16, 16448255); // FIXME locale - if ((errorCode & 2) != 0) fontRenderer.drawString("Screws are missing.", 10, 24, 16448255); - if ((errorCode & 4) != 0) fontRenderer.drawString("Something is stuck.", 10, 32, 16448255); - if ((errorCode & 8) != 0) fontRenderer.drawString("Platings are dented.", 10, 40, 16448255); - if ((errorCode & 16) != 0) fontRenderer.drawString("Circuitry burned out.", 10, 48, 16448255); - if ((errorCode & 32) != 0) fontRenderer.drawString("That doesn't belong there.", 10, 56, 16448255); - if ((errorCode & 64) != 0) fontRenderer.drawString("Incomplete Structure.", 10, 64, 16448255); + if ((errorCode & 1) != 0) fontRenderer.drawString(I18n.format("metatileentity.status.malfunction.0"), 10, 16, 16448255); + if ((errorCode & 2) != 0) fontRenderer.drawString(I18n.format("metatileentity.status.malfunction.1"), 10, 24, 16448255); + if ((errorCode & 4) != 0) fontRenderer.drawString(I18n.format("metatileentity.status.malfunction.2"), 10, 32, 16448255); + if ((errorCode & 8) != 0) fontRenderer.drawString(I18n.format("metatileentity.status.malfunction.3"), 10, 40, 16448255); + if ((errorCode & 16) != 0) fontRenderer.drawString(I18n.format("metatileentity.status.malfunction.4"), 10, 48, 16448255); + if ((errorCode & 32) != 0) fontRenderer.drawString(I18n.format("metatileentity.status.malfunction.5"), 10, 56, 16448255); + if ((errorCode & 64) != 0) fontRenderer.drawString(I18n.format("metatileentity.status.malfunction.6"), 10, 64, 16448255); if (errorCode == 0) { if (m.mActive.get()) { - fontRenderer.drawString("Running perfectly.", 10, 16, 16448255); + fontRenderer.drawString(I18n.format("metatileentity.status.multiblock.running"), 10, 16, 16448255); } else { - fontRenderer.drawString("Hit with Rubber Hammer", 10, 16, 16448255); // FIXME locale - fontRenderer.drawString("to (re-)start the Machine", 10, 24, 16448255); - fontRenderer.drawString("if it doesn't start.", 10, 32, 16448255); + fontRenderer.drawSplitString(I18n.format("metatileentity.status.multiblock.idle"), 10, 16, 150, 16448255); } } } diff --git a/src/main/java/gregtechmod/api/items/GT_HardHammer_Item.java b/src/main/java/gregtechmod/api/items/GT_HardHammer_Item.java index c61dda2..f2914a3 100644 --- a/src/main/java/gregtechmod/api/items/GT_HardHammer_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_HardHammer_Item.java @@ -15,6 +15,7 @@ import net.minecraft.entity.monster.EntityIronGolem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidBlock; @@ -97,7 +98,7 @@ public class GT_HardHammer_Item extends GT_Tool_Item { String tString = GT_OreDictUnificator.getAssociation(new ItemStack(aBlock, 1, aMeta)); if (tString != null && tString.startsWith("ore")) { - GT_Utility.sendChatToPlayer(aPlayer, "This is " + GT_Utility.capitalizeString(tString.replaceFirst("ore", "")) + " Ore."); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("gregtech.tool.hammer.ore.0", new ChatComponentTranslation("materials." + tString.replaceFirst("ore", "")))); GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(1), 1.0F, -1, aX, aY, aZ); return true; } @@ -114,19 +115,19 @@ public class GT_HardHammer_Item extends GT_Tool_Item { tBlock = aWorld.getBlock(tX, tY, tZ); if (tBlock == Blocks.lava || tBlock == Blocks.flowing_lava) { - GT_Utility.sendChatToPlayer(aPlayer, "There is Lava behind this Rock."); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("gregtech.tool.hammer.lava")); break; } if (tBlock == Blocks.water || tBlock == Blocks.flowing_water || (tBlock !=null && tBlock instanceof IFluidBlock)) { - GT_Utility.sendChatToPlayer(aPlayer, "There is a Liquid behind this Rock."); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("gregtech.tool.hammer.liquid")); break; } if (tBlock == Blocks.monster_egg || !GT_Utility.hasBlockHitBox(aWorld, tX, tY, tZ)) { - GT_Utility.sendChatToPlayer(aPlayer, "There is an Air Pocket behind this Rock."); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("gregtech.tool.hammer.air")); break; } if (tBlock != aBlock) { - if (i < 4) GT_Utility.sendChatToPlayer(aPlayer, "Material is changing behind this Rock."); + if (i < 4) GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("gregtech.tool.hammer.diff")); break; } } @@ -140,12 +141,12 @@ public class GT_HardHammer_Item extends GT_Tool_Item { tMetaID = aWorld.getBlockMetadata(tX, tY, tZ); tString = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); if (tString != null && tString.startsWith("ore")) { - GT_Utility.sendChatToPlayer(aPlayer, "Found traces of " + GT_Utility.capitalizeString(tString.replaceFirst("ore", "")) + " Ore."); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("gregtech.tool.hammer.ore.1", new ChatComponentTranslation("materials." + tString.replaceFirst("ore", "")))); GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(1), 1.0F, -1, aX, aY, aZ); return true; } } - GT_Utility.sendChatToPlayer(aPlayer, "No Ores found."); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("gregtech.tool.hammer.ore.2")); } return true; } diff --git a/src/main/java/gregtechmod/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtechmod/api/metatileentity/BaseMetaPipeEntity.java index ab575ff..896e2bb 100644 --- a/src/main/java/gregtechmod/api/metatileentity/BaseMetaPipeEntity.java +++ b/src/main/java/gregtechmod/api/metatileentity/BaseMetaPipeEntity.java @@ -23,6 +23,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; @@ -592,7 +593,7 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE if (GT_Utility.isItemStackInList(aPlayer.inventory.getCurrentItem(), GregTech_API.sSolderingToolList, true)) { if (GT_ModHandler.useSolderingIron(aPlayer.inventory.getCurrentItem(), aPlayer)) { mStrongRedstone ^= (1 << tSide); - GT_Utility.sendChatToPlayer(aPlayer, "Redstone Output at Side " + tSide + " set to: " + ((mStrongRedstone & (1 << tSide))!=0?"Strong":"Weak")); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.status.redstone", tSide, new ChatComponentTranslation("metatileentity.status." + ((mStrongRedstone & (1 << tSide))!=0?"redstone_strong":"redstone_weak")))); GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(103), 3.0F, -1, xCoord, yCoord, zCoord); } return true; diff --git a/src/main/java/gregtechmod/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java b/src/main/java/gregtechmod/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java index 55bbe08..e94469b 100644 --- a/src/main/java/gregtechmod/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java +++ b/src/main/java/gregtechmod/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java @@ -7,6 +7,7 @@ import gregtechmod.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ChatComponentTranslation; public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_BasicTank { @@ -88,16 +89,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_BasicTank public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (!getBaseMetaTileEntity().getCoverBehaviorAtSide(aSide).isGUIClickable(aSide, getBaseMetaTileEntity().getCoverIDAtSide(aSide), getBaseMetaTileEntity().getCoverDataAtSide(aSide), getBaseMetaTileEntity())) return; mMode = (byte)((mMode + 1) % 8); - switch (mMode) { - case 0: GT_Utility.sendChatToPlayer(aPlayer, "Outputs Liquids, Steam and Items"); break; - case 1: GT_Utility.sendChatToPlayer(aPlayer, "Outputs Steam and Items"); break; - case 2: GT_Utility.sendChatToPlayer(aPlayer, "Outputs Steam and Liquids"); break; - case 3: GT_Utility.sendChatToPlayer(aPlayer, "Outputs Steam"); break; - case 4: GT_Utility.sendChatToPlayer(aPlayer, "Outputs Liquids and Items"); break; - case 5: GT_Utility.sendChatToPlayer(aPlayer, "Outputs only Items"); break; - case 6: GT_Utility.sendChatToPlayer(aPlayer, "Outputs only Liquids"); break; - case 7: GT_Utility.sendChatToPlayer(aPlayer, "Outputs nothing"); break; - } + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.status.fluid_io." + mMode)); } public boolean outputsSteam() { diff --git a/src/main/java/gregtechmod/common/GT_TickHandler.java b/src/main/java/gregtechmod/common/GT_TickHandler.java index b016399..9148f42 100644 --- a/src/main/java/gregtechmod/common/GT_TickHandler.java +++ b/src/main/java/gregtechmod/common/GT_TickHandler.java @@ -18,6 +18,7 @@ import java.util.Random; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentTranslation; import net.minecraft.world.WorldSettings.GameType; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -164,10 +165,10 @@ public class GT_TickHandler { boolean temp = event.player.capabilities.allowEdit || event.player.isCurrentToolAdventureModeExempt(0, -10000, 0); event.player.capabilities.allowEdit = false; if (temp) { - GT_Utility.sendChatToPlayer(event.player, "Adventure Mode has been broken."); + GT_Utility.sendChatToPlayer(event.player, new ChatComponentTranslation("gregtech.adventure.1")); } if (GT_Mod.sAxeWhenAdventure) { - if (!temp) GT_Utility.sendChatToPlayer(event.player, "It's dangerous to go alone! Take this."); + if (!temp) GT_Utility.sendChatToPlayer(event.player, new ChatComponentTranslation("gregtech.adventure.2")); event.player.worldObj.spawnEntityInWorld(new EntityItem(event.player.worldObj, event.player.posX, event.player.posY, event.player.posZ, GT_Items.Tool_Axe_Flint.get(1))); } } diff --git a/src/main/java/gregtechmod/common/blocks/GT_BlockMetaID_Block2.java b/src/main/java/gregtechmod/common/blocks/GT_BlockMetaID_Block2.java index c64efb1..7754143 100644 --- a/src/main/java/gregtechmod/common/blocks/GT_BlockMetaID_Block2.java +++ b/src/main/java/gregtechmod/common/blocks/GT_BlockMetaID_Block2.java @@ -73,7 +73,8 @@ public class GT_BlockMetaID_Block2 extends Block { @Override public void onBlockAdded(World aWorld, int aX, int aY, int aZ) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + int meta = aWorld.getBlockMetadata(aX, aY, aZ); + if (GregTech_API.isMachineBlock(this, meta) || (GregTech_API.sMachineIDs.containsKey(this) && meta == 13)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/gregtechmod/common/covers/GT_Cover_ControlsWork.java b/src/main/java/gregtechmod/common/covers/GT_Cover_ControlsWork.java index 3daf95e..6033a92 100644 --- a/src/main/java/gregtechmod/common/covers/GT_Cover_ControlsWork.java +++ b/src/main/java/gregtechmod/common/covers/GT_Cover_ControlsWork.java @@ -6,6 +6,7 @@ import gregtechmod.api.util.GT_CoverBehavior; import gregtechmod.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentTranslation; public class GT_Cover_ControlsWork extends GT_CoverBehavior { @@ -64,9 +65,7 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior { @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable=(aCoverVariable+1)%3; - if (aCoverVariable== 0) GT_Utility.sendChatToPlayer(aPlayer, "Normal"); - if (aCoverVariable== 1) GT_Utility.sendChatToPlayer(aPlayer, "Inverted"); - if (aCoverVariable== 2) GT_Utility.sendChatToPlayer(aPlayer, "No Work at all"); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.cover.work." + aCoverVariable)); return aCoverVariable; } diff --git a/src/main/java/gregtechmod/common/covers/GT_Cover_Conveyor.java b/src/main/java/gregtechmod/common/covers/GT_Cover_Conveyor.java index 48570ca..22defea 100644 --- a/src/main/java/gregtechmod/common/covers/GT_Cover_Conveyor.java +++ b/src/main/java/gregtechmod/common/covers/GT_Cover_Conveyor.java @@ -7,6 +7,7 @@ import gregtechmod.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentTranslation; public class GT_Cover_Conveyor extends GT_CoverBehavior { @@ -43,18 +44,7 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior { @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable=(aCoverVariable+1)%12; - if (aCoverVariable== 0) GT_Utility.sendChatToPlayer(aPlayer, "Export"); - if (aCoverVariable== 1) GT_Utility.sendChatToPlayer(aPlayer, "Import"); - if (aCoverVariable== 2) GT_Utility.sendChatToPlayer(aPlayer, "Export (conditional)"); - if (aCoverVariable== 3) GT_Utility.sendChatToPlayer(aPlayer, "Import (conditional)"); - if (aCoverVariable== 4) GT_Utility.sendChatToPlayer(aPlayer, "Export (invert cond)"); - if (aCoverVariable== 5) GT_Utility.sendChatToPlayer(aPlayer, "Import (invert cond)"); - if (aCoverVariable== 6) GT_Utility.sendChatToPlayer(aPlayer, "Export allow Input"); - if (aCoverVariable== 7) GT_Utility.sendChatToPlayer(aPlayer, "Import allow Output"); - if (aCoverVariable== 8) GT_Utility.sendChatToPlayer(aPlayer, "Export allow Input (conditional)"); - if (aCoverVariable== 9) GT_Utility.sendChatToPlayer(aPlayer, "Import allow Output (conditional)"); - if (aCoverVariable==10) GT_Utility.sendChatToPlayer(aPlayer, "Export allow Input (invert cond)"); - if (aCoverVariable==11) GT_Utility.sendChatToPlayer(aPlayer, "Import allow Output (invert cond)"); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.cover.io." + aCoverVariable)); return aCoverVariable; } diff --git a/src/main/java/gregtechmod/common/covers/GT_Cover_DoesWork.java b/src/main/java/gregtechmod/common/covers/GT_Cover_DoesWork.java index f935d93..dc9fa25 100644 --- a/src/main/java/gregtechmod/common/covers/GT_Cover_DoesWork.java +++ b/src/main/java/gregtechmod/common/covers/GT_Cover_DoesWork.java @@ -6,6 +6,7 @@ import gregtechmod.api.util.GT_CoverBehavior; import gregtechmod.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentTranslation; public class GT_Cover_DoesWork extends GT_CoverBehavior { @@ -35,10 +36,8 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior { @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable=(aCoverVariable+1)%4; - if (aCoverVariable == 0) GT_Utility.sendChatToPlayer(aPlayer, "Normal"); - if (aCoverVariable == 1) GT_Utility.sendChatToPlayer(aPlayer, "Inverted"); - if (aCoverVariable == 2) GT_Utility.sendChatToPlayer(aPlayer, "Ready to work"); - if (aCoverVariable == 3) GT_Utility.sendChatToPlayer(aPlayer, "Not ready to work"); + if (aCoverVariable < 2) GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.cover.work." + aCoverVariable)); + else GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.cover.work_1." + aCoverVariable)); return aCoverVariable; } diff --git a/src/main/java/gregtechmod/common/covers/GT_Cover_Drain.java b/src/main/java/gregtechmod/common/covers/GT_Cover_Drain.java index ad7da21..e092fd9 100644 --- a/src/main/java/gregtechmod/common/covers/GT_Cover_Drain.java +++ b/src/main/java/gregtechmod/common/covers/GT_Cover_Drain.java @@ -9,6 +9,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentTranslation; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; @@ -65,12 +66,8 @@ public class GT_Cover_Drain extends GT_CoverBehavior { @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable=(aCoverVariable+1)%6; - if (aCoverVariable == 0) GT_Utility.sendChatToPlayer(aPlayer, "Import"); - if (aCoverVariable == 1) GT_Utility.sendChatToPlayer(aPlayer, "Import (conditional)"); - if (aCoverVariable == 2) GT_Utility.sendChatToPlayer(aPlayer, "Import (invert cond)"); - if (aCoverVariable == 3) GT_Utility.sendChatToPlayer(aPlayer, "Keep Liquids Away"); - if (aCoverVariable == 4) GT_Utility.sendChatToPlayer(aPlayer, "Keep Liquids Away (conditional)"); - if (aCoverVariable == 5) GT_Utility.sendChatToPlayer(aPlayer, "Keep Liquids Away (invert cond)"); + if (aCoverVariable < 3) GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.cover.io." + Math.max(1, aCoverVariable + (aCoverVariable * 2)))); + else GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.cover.drain." + (aCoverVariable - 3))); return aCoverVariable; } diff --git a/src/main/java/gregtechmod/common/covers/GT_Cover_EUMeter.java b/src/main/java/gregtechmod/common/covers/GT_Cover_EUMeter.java index 0d04d95..a37d4fc 100644 --- a/src/main/java/gregtechmod/common/covers/GT_Cover_EUMeter.java +++ b/src/main/java/gregtechmod/common/covers/GT_Cover_EUMeter.java @@ -5,6 +5,7 @@ import gregtechmod.api.util.GT_CoverBehavior; import gregtechmod.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentTranslation; public class GT_Cover_EUMeter extends GT_CoverBehavior { @@ -64,18 +65,7 @@ public class GT_Cover_EUMeter extends GT_CoverBehavior { @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable=(aCoverVariable+1)%12; - if (aCoverVariable == 0) GT_Utility.sendChatToPlayer(aPlayer, "Normal Universal Storage"); - if (aCoverVariable == 1) GT_Utility.sendChatToPlayer(aPlayer, "Inverted Universal Storage"); - if (aCoverVariable == 2) GT_Utility.sendChatToPlayer(aPlayer, "Normal Electricity Storage"); - if (aCoverVariable == 3) GT_Utility.sendChatToPlayer(aPlayer, "Inverted Electricity Storage"); - if (aCoverVariable == 4) GT_Utility.sendChatToPlayer(aPlayer, "Normal MJ Storage"); - if (aCoverVariable == 5) GT_Utility.sendChatToPlayer(aPlayer, "Inverted MJ Storage"); - if (aCoverVariable == 6) GT_Utility.sendChatToPlayer(aPlayer, "Normal Steam Storage"); - if (aCoverVariable == 7) GT_Utility.sendChatToPlayer(aPlayer, "Inverted Steam Storage"); - if (aCoverVariable == 8) GT_Utility.sendChatToPlayer(aPlayer, "Normal Average Electric Input"); - if (aCoverVariable == 9) GT_Utility.sendChatToPlayer(aPlayer, "Inverted Average Electric Input"); - if (aCoverVariable == 10) GT_Utility.sendChatToPlayer(aPlayer, "Normal Average Electric Output"); - if (aCoverVariable == 11) GT_Utility.sendChatToPlayer(aPlayer, "Inverted Average Electric Output"); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.cover.drain.eu_meter." + aCoverVariable)); return aCoverVariable; } diff --git a/src/main/java/gregtechmod/common/covers/GT_Cover_EnergyOnly.java b/src/main/java/gregtechmod/common/covers/GT_Cover_EnergyOnly.java index 1854e5b..60a7892 100644 --- a/src/main/java/gregtechmod/common/covers/GT_Cover_EnergyOnly.java +++ b/src/main/java/gregtechmod/common/covers/GT_Cover_EnergyOnly.java @@ -6,6 +6,7 @@ import gregtechmod.api.util.GT_CoverBehavior; import gregtechmod.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentTranslation; public class GT_Cover_EnergyOnly extends GT_CoverBehavior { @@ -16,9 +17,7 @@ public class GT_Cover_EnergyOnly extends GT_CoverBehavior { @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable=(aCoverVariable+1)%3; - if (aCoverVariable == 0) GT_Utility.sendChatToPlayer(aPlayer, "Allow"); - if (aCoverVariable == 1) GT_Utility.sendChatToPlayer(aPlayer, "Allow (conditional)"); - if (aCoverVariable == 2) GT_Utility.sendChatToPlayer(aPlayer, "Disallow (conditional)"); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.cover.drain.energy_only." + aCoverVariable)); return aCoverVariable; } diff --git a/src/main/java/gregtechmod/common/covers/GT_Cover_Generic.java b/src/main/java/gregtechmod/common/covers/GT_Cover_Generic.java index 31f03e3..566215c 100644 --- a/src/main/java/gregtechmod/common/covers/GT_Cover_Generic.java +++ b/src/main/java/gregtechmod/common/covers/GT_Cover_Generic.java @@ -5,6 +5,9 @@ import gregtechmod.api.interfaces.ICoverable; import gregtechmod.api.util.GT_CoverBehavior; import gregtechmod.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.IChatComponent; public class GT_Cover_Generic extends GT_CoverBehavior { /** @@ -23,7 +26,18 @@ public class GT_Cover_Generic extends GT_CoverBehavior { @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable=((aCoverVariable+1)&15); - GT_Utility.sendChatToPlayer(aPlayer, ((aCoverVariable & 1) != 0?"Redstone ":"") + ((aCoverVariable & 2) != 0?"Energy ":"") + ((aCoverVariable & 4) != 0?"Fluids ":"") + ((aCoverVariable & 8) != 0?"Items ":"")); + IChatComponent result = new ChatComponentText(""); + if ((aCoverVariable & 1) != 0) + result.appendSibling(new ChatComponentTranslation("metatileentity.cover.generic.0")); + if ((aCoverVariable & 2) != 0) + result.appendSibling(new ChatComponentTranslation("metatileentity.cover.generic.1")); + if ((aCoverVariable & 4) != 0) + result.appendSibling(new ChatComponentTranslation("metatileentity.cover.generic.2")); + if ((aCoverVariable & 8) != 0) + result.appendSibling(new ChatComponentTranslation("metatileentity.cover.generic.3")); + + if (!result.getUnformattedText().isEmpty()) + GT_Utility.sendChatToPlayer(aPlayer, result); return aCoverVariable; } diff --git a/src/main/java/gregtechmod/common/covers/GT_Cover_ItemMeter.java b/src/main/java/gregtechmod/common/covers/GT_Cover_ItemMeter.java index 7e9abea..b6bf03f 100644 --- a/src/main/java/gregtechmod/common/covers/GT_Cover_ItemMeter.java +++ b/src/main/java/gregtechmod/common/covers/GT_Cover_ItemMeter.java @@ -5,6 +5,7 @@ import gregtechmod.api.util.GT_CoverBehavior; import gregtechmod.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentTranslation; public class GT_Cover_ItemMeter extends GT_CoverBehavior { @@ -34,10 +35,7 @@ public class GT_Cover_ItemMeter extends GT_CoverBehavior { @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { - if (aCoverVariable==0) - GT_Utility.sendChatToPlayer(aPlayer, "Inverted"); - else - GT_Utility.sendChatToPlayer(aPlayer, "Normal"); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.cover.meters." + aCoverVariable)); return aCoverVariable==0?1:0; } diff --git a/src/main/java/gregtechmod/common/covers/GT_Cover_LiquidMeter.java b/src/main/java/gregtechmod/common/covers/GT_Cover_LiquidMeter.java index 6850633..580cf51 100644 --- a/src/main/java/gregtechmod/common/covers/GT_Cover_LiquidMeter.java +++ b/src/main/java/gregtechmod/common/covers/GT_Cover_LiquidMeter.java @@ -5,6 +5,7 @@ import gregtechmod.api.util.GT_CoverBehavior; import gregtechmod.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentTranslation; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -42,10 +43,7 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehavior { @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { - if (aCoverVariable==0) - GT_Utility.sendChatToPlayer(aPlayer, "Inverted"); - else - GT_Utility.sendChatToPlayer(aPlayer, "Normal"); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.cover.meters." + aCoverVariable)); return aCoverVariable==0?1:0; } diff --git a/src/main/java/gregtechmod/common/covers/GT_Cover_RedstoneConductor.java b/src/main/java/gregtechmod/common/covers/GT_Cover_RedstoneConductor.java index 92787eb..bf56f9b 100644 --- a/src/main/java/gregtechmod/common/covers/GT_Cover_RedstoneConductor.java +++ b/src/main/java/gregtechmod/common/covers/GT_Cover_RedstoneConductor.java @@ -5,6 +5,7 @@ import gregtechmod.api.util.GT_CoverBehavior; import gregtechmod.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentTranslation; public class GT_Cover_RedstoneConductor extends GT_CoverBehavior { @@ -23,15 +24,7 @@ public class GT_Cover_RedstoneConductor extends GT_CoverBehavior { @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable = (aCoverVariable + 1) % 7; - switch (aCoverVariable) { - case 0: GT_Utility.sendChatToPlayer(aPlayer, "Conducts strongest Input"); break; - case 1: GT_Utility.sendChatToPlayer(aPlayer, "Conducts from bottom Input"); break; - case 2: GT_Utility.sendChatToPlayer(aPlayer, "Conducts from top Input"); break; - case 3: GT_Utility.sendChatToPlayer(aPlayer, "Conducts from north Input"); break; - case 4: GT_Utility.sendChatToPlayer(aPlayer, "Conducts from south Input"); break; - case 5: GT_Utility.sendChatToPlayer(aPlayer, "Conducts from west Input"); break; - case 6: GT_Utility.sendChatToPlayer(aPlayer, "Conducts from east Input"); break; - } + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.cover.redstone_conductor." + aCoverVariable)); return aCoverVariable; } diff --git a/src/main/java/gregtechmod/common/covers/GT_Cover_RedstoneSignalizer.java b/src/main/java/gregtechmod/common/covers/GT_Cover_RedstoneSignalizer.java index 6830b7a..71738f3 100644 --- a/src/main/java/gregtechmod/common/covers/GT_Cover_RedstoneSignalizer.java +++ b/src/main/java/gregtechmod/common/covers/GT_Cover_RedstoneSignalizer.java @@ -5,6 +5,7 @@ import gregtechmod.api.util.GT_CoverBehavior; import gregtechmod.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentTranslation; public class GT_Cover_RedstoneSignalizer extends GT_CoverBehavior { public GT_Cover_RedstoneSignalizer(ItemStack aStack) { @@ -14,7 +15,7 @@ public class GT_Cover_RedstoneSignalizer extends GT_CoverBehavior { @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable = (aCoverVariable + 1) & 15; - GT_Utility.sendChatToPlayer(aPlayer, "Signal = " + aCoverVariable); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.cover.redstone_singnalizer", aCoverVariable)); return aCoverVariable; } diff --git a/src/main/java/gregtechmod/common/covers/GT_Cover_RedstoneWirelessBase.java b/src/main/java/gregtechmod/common/covers/GT_Cover_RedstoneWirelessBase.java index 62339c9..ead340e 100644 --- a/src/main/java/gregtechmod/common/covers/GT_Cover_RedstoneWirelessBase.java +++ b/src/main/java/gregtechmod/common/covers/GT_Cover_RedstoneWirelessBase.java @@ -6,6 +6,8 @@ import gregtechmod.api.util.GT_CoverBehavior; import gregtechmod.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.StatCollector; public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior { @@ -25,7 +27,7 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior { GregTech_API.sWirelessRedstone.put(aCoverVariable, (byte)0); aCoverVariable = GT_Utility.stackToInt(aPlayer.inventory.getCurrentItem()); aTileEntity.setCoverDataAtSide(aSide, aCoverVariable); - GT_Utility.sendChatToPlayer(aPlayer, "Frequency: " + aCoverVariable); // TODO locale + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.GT_Tesseract.message.1", aCoverVariable)); return true; } return false; @@ -72,7 +74,7 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior { break; } } - GT_Utility.sendChatToPlayer(aPlayer, "Frequency: " + aCoverVariable); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.GT_Tesseract.message.1", aCoverVariable)); return aCoverVariable; } @@ -108,7 +110,7 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior { @Override public String getDescription(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { - return "Frequency: " + aCoverVariable; + return StatCollector.translateToLocalFormatted("metatileentity.GT_Tesseract.message.1", aCoverVariable); } @Override diff --git a/src/main/java/gregtechmod/common/covers/GT_Cover_Valve.java b/src/main/java/gregtechmod/common/covers/GT_Cover_Valve.java index f6e0ef8..8f50309 100644 --- a/src/main/java/gregtechmod/common/covers/GT_Cover_Valve.java +++ b/src/main/java/gregtechmod/common/covers/GT_Cover_Valve.java @@ -6,6 +6,7 @@ import gregtechmod.api.util.GT_CoverBehavior; import gregtechmod.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentTranslation; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; @@ -64,18 +65,7 @@ public class GT_Cover_Valve extends GT_CoverBehavior { @Override public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable=(aCoverVariable+1)%12; - if (aCoverVariable== 0) GT_Utility.sendChatToPlayer(aPlayer, "Export"); - if (aCoverVariable== 1) GT_Utility.sendChatToPlayer(aPlayer, "Import"); - if (aCoverVariable== 2) GT_Utility.sendChatToPlayer(aPlayer, "Export (conditional)"); - if (aCoverVariable== 3) GT_Utility.sendChatToPlayer(aPlayer, "Import (conditional)"); - if (aCoverVariable== 4) GT_Utility.sendChatToPlayer(aPlayer, "Export (invert cond)"); - if (aCoverVariable== 5) GT_Utility.sendChatToPlayer(aPlayer, "Import (invert cond)"); - if (aCoverVariable== 6) GT_Utility.sendChatToPlayer(aPlayer, "Export allow Input"); - if (aCoverVariable== 7) GT_Utility.sendChatToPlayer(aPlayer, "Import allow Output"); - if (aCoverVariable== 8) GT_Utility.sendChatToPlayer(aPlayer, "Export allow Input (conditional)"); - if (aCoverVariable== 9) GT_Utility.sendChatToPlayer(aPlayer, "Import allow Output (conditional)"); - if (aCoverVariable==10) GT_Utility.sendChatToPlayer(aPlayer, "Export allow Input (invert cond)"); - if (aCoverVariable==11) GT_Utility.sendChatToPlayer(aPlayer, "Import allow Output (invert cond)"); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.cover.io." + aCoverVariable)); return aCoverVariable; } diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_AESU_Meta.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_AESU_Meta.java index c955cb6..e1d7664 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_AESU_Meta.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_AESU_Meta.java @@ -5,6 +5,7 @@ import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.util.GT_Utility; import gregtechmod.common.containers.GT_Container_AESU_Meta; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; public class GT_GUIContainer_AESU_Meta extends GT_GUIContainerMetaTile_Machine { @@ -15,12 +16,12 @@ public class GT_GUIContainer_AESU_Meta extends GT_GUIContainerMetaTile_Machine { @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { - fontRenderer.drawString("A.E.S.U.", 11, 8, 16448255); + fontRenderer.drawString(I18n.format("tile.BlockMetaID_Machine.Adjustable_Energystorageunit.UI.name"), 11, 8, 16448255); if (mContainer != null) { - fontRenderer.drawString("EU: " + GT_Utility.parseNumberToString(mContainer.mEnergy.get()), 11, 16, 16448255); - fontRenderer.drawString("MAX: " + GT_Utility.parseNumberToString(mContainer.mStorage.get()), 11, 24, 16448255); - fontRenderer.drawString("MAX EU/t IN: " + GT_Utility.parseNumberToString(mContainer.mInput.get()), 11, 32, 16448255); - fontRenderer.drawString("EU/t OUT: " + GT_Utility.parseNumberToString(mContainer.mOutput.get()), 11, 40, 16448255); + fontRenderer.drawString(I18n.format("metatileentity.STORAGE_EU", GT_Utility.parseNumberToString(mContainer.mEnergy.get())), 11, 16, 16448255); + fontRenderer.drawString(I18n.format("metatileentity.STORAGE_EU_MAX", GT_Utility.parseNumberToString(mContainer.mStorage.get())), 11, 24, 16448255); + fontRenderer.drawString(I18n.format("metatileentity.STORAGE_EU_T_IN", GT_Utility.parseNumberToString(mContainer.mInput.get())), 11, 32, 16448255); + fontRenderer.drawString(I18n.format("metatileentity.STORAGE_EU_T_OUT", GT_Utility.parseNumberToString(mContainer.mOutput.get())), 11, 40, 16448255); } } diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_AdvancedPump.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_AdvancedPump.java index 82e30e7..aee317a 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_AdvancedPump.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_AdvancedPump.java @@ -16,7 +16,7 @@ public class GT_GUIContainer_AdvancedPump extends GT_GUIContainerMetaTile_Machin @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752); - fontRenderer.drawString("Advanced Pump", 8, 6, 4210752); + fontRenderer.drawString(StatCollector.translateToLocal("metatileentity.GT_Pump.name"), 8, 6, 4210752); fontRenderer.drawString("", 10, 20, 16448255); } diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_BlastFurnace.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_BlastFurnace.java index 3153e98..10c93bf 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_BlastFurnace.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_BlastFurnace.java @@ -4,6 +4,7 @@ import gregtechmod.api.GregTech_API; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.common.containers.GT_Container_BlastFurnace; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -15,13 +16,13 @@ public class GT_GUIContainer_BlastFurnace extends GT_GUIContainerMetaTile_Machin @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { - fontRenderer.drawString("Industrial Blast Furnace", 8, 4, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.GT_BlastFurnace.name"), 8, 4, 4210752); if (((GT_Container_BlastFurnace)mContainer).mMachine.get()) - fontRenderer.drawString("Heat Capacity: " + ((GT_Container_BlastFurnace)mContainer).mHeatCapacity.get() + " K", 8, ySize - 103, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.GT_BlastFurnace.UI.heat_capacity", ((GT_Container_BlastFurnace)mContainer).mHeatCapacity.get()), 8, ySize - 103, 4210752); else - fontRenderer.drawString("Incomplete Machine Casing!", 8, ySize - 103, 4210752); // FIXME locale + fontRenderer.drawString(I18n.format("metatileentity.status.multiblock.incomplete"), 8, ySize - 103, 0xF00000); if (((mContainer).mDisplayErrorCode.get() & 1) != 0) - fontRenderer.drawString("Insufficient Energy Line!", 8, ySize - 94, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.NOT_ENOUGH_ENERGY"), 8, ySize - 94, 4210752); else fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 94, 4210752); } diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_BronzeBlastFurnace.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_BronzeBlastFurnace.java index b963cd6..7a4401f 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_BronzeBlastFurnace.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_BronzeBlastFurnace.java @@ -4,6 +4,8 @@ import gregtechmod.api.GregTech_API; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.common.containers.GT_Container_BronzeBlastFurnace; + +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; public class GT_GUIContainer_BronzeBlastFurnace extends GT_GUIContainerMetaTile_Machine { @@ -14,7 +16,11 @@ public class GT_GUIContainer_BronzeBlastFurnace extends GT_GUIContainerMetaTile_ @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { - fontRenderer.drawString("Bronze Blast Furnace", 8, 4, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.GT_BronzeBlastFurnace.name"), 8, 4, 4210752); + if (mContainer != null) { + if (((GT_Container_BronzeBlastFurnace) mContainer).mDisplayErrorCode.get() > 0) + fontRenderer.drawString(I18n.format("metatileentity.status.multiblock.incomplete"), 8, ySize - 95, 0x9d2913); + } } @Override diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_BronzeBoiler.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_BronzeBoiler.java index 9600561..fe7da95 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_BronzeBoiler.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_BronzeBoiler.java @@ -4,6 +4,7 @@ import gregtechmod.api.GregTech_API; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.common.containers.GT_Container_BronzeBoiler; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; public class GT_GUIContainer_BronzeBoiler extends GT_GUIContainerMetaTile_Machine { @@ -14,7 +15,7 @@ public class GT_GUIContainer_BronzeBoiler extends GT_GUIContainerMetaTile_Machin @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { - fontRenderer.drawString("Small Coal Boiler", 8, 4, 4210752); // TODO LOCALE + fontRenderer.drawString(I18n.format("metatileentity.GT_BronzeBoiler.name"), 8, 4, 4210752); } @Override diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_DistillationTower.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_DistillationTower.java index 1236c10..70acc84 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_DistillationTower.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_DistillationTower.java @@ -4,6 +4,7 @@ import gregtechmod.api.GregTech_API; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.common.containers.GT_Container_DistillationTower; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; public class GT_GUIContainer_DistillationTower extends GT_GUIContainerMetaTile_Machine { @@ -14,12 +15,11 @@ public class GT_GUIContainer_DistillationTower extends GT_GUIContainerMetaTile_M @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { - fontRenderer.drawString("Distillation" , 116, 4, 4210752); - fontRenderer.drawString("Tower" , 116, 12, 4210752); + fontRenderer.drawSplitString(I18n.format("metatileentity.GT_DistillationTower.name"), 116, 4, 60, 4210752); if (!((GT_Container_DistillationTower)mContainer).mMachine.get()) - fontRenderer.drawSplitString("Incomplete Machine Casing!", 116, 20, 60, 4210752); // TODO locale + fontRenderer.drawSplitString(I18n.format("metatileentity.status.multiblock.incomplete"), 116, 30, 60, 0xF00000); if (((mContainer).mDisplayErrorCode.get() & 1) != 0) - fontRenderer.drawSplitString("Insufficient Energy Line!", 116, 48, 60, 4210752); + fontRenderer.drawSplitString(I18n.format("metatileentity.NOT_ENOUGH_ENERGY"), 116, 48, 60, 4210752); } @Override diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Electrolyzer.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Electrolyzer.java index e09c207..e2ae178 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Electrolyzer.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Electrolyzer.java @@ -4,6 +4,7 @@ import gregtechmod.api.GregTech_API; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.common.containers.GT_Container_Electrolyzer; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -15,9 +16,9 @@ public class GT_GUIContainer_Electrolyzer extends GT_GUIContainerMetaTile_Machin @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { - fontRenderer.drawString("Industrial Electrolyzer", 8, 4, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.GT_Electrolyzer.name"), 8, 4, 4210752); if (((mContainer).mDisplayErrorCode.get() & 1) != 0) - fontRenderer.drawString("Insufficient Energy Line!", 8, ySize - 94, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.NOT_ENOUGH_ENERGY"), 8, ySize - 94, 4210752); else fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 94, 4210752); } diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_FusionExtractor.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_FusionExtractor.java index bf353c8..c70f737 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_FusionExtractor.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_FusionExtractor.java @@ -5,6 +5,7 @@ import gregtechmod.api.gui.GT_Container_BasicTank; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.util.GT_Utility; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -17,9 +18,9 @@ public class GT_GUIContainer_FusionExtractor extends GT_GUIContainerMetaTile_Mac @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752); - fontRenderer.drawString("Material Extractor", 8, 6, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.GT_Fusion_Extractor.name"), 8, 6, 4210752); if (mContainer != null) { - fontRenderer.drawString("Liquid Amount", 10, 20, 16448255); + fontRenderer.drawString(I18n.format("metatileentity.HACTHES.amount"), 10, 20, 16448255); fontRenderer.drawString(GT_Utility.parseNumberToString(((GT_Container_BasicTank)mContainer).mContent.get()), 10, 30, 16448255); } } diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_FusionInjector.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_FusionInjector.java index 8bae439..df99a47 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_FusionInjector.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_FusionInjector.java @@ -5,6 +5,7 @@ import gregtechmod.api.gui.GT_Container_BasicTank; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.util.GT_Utility; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -17,9 +18,9 @@ public class GT_GUIContainer_FusionInjector extends GT_GUIContainerMetaTile_Mach @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752); - fontRenderer.drawString("Material Injector", 8, 6, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.GT_Fusion_Injector.name"), 8, 6, 4210752); if (mContainer != null) { - fontRenderer.drawString("Liquid Amount", 10, 20, 16448255); + fontRenderer.drawString(I18n.format("metatileentity.HACTHES.amount"), 10, 20, 16448255); fontRenderer.drawString(GT_Utility.parseNumberToString(((GT_Container_BasicTank)mContainer).mContent.get()), 10, 30, 16448255); } } diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_GasTurbine.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_GasTurbine.java index 1b35f9b..0d6f638 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_GasTurbine.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_GasTurbine.java @@ -5,6 +5,7 @@ import gregtechmod.api.gui.GT_Container_BasicTank; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.util.GT_Utility; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -17,9 +18,9 @@ public class GT_GUIContainer_GasTurbine extends GT_GUIContainerMetaTile_Machine @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752); - fontRenderer.drawString("Gas Turbine", 8, 6, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.GT_GasTurbine.name"), 8, 6, 4210752); if (mContainer != null) { - fontRenderer.drawString("Gas Amount", 10, 20, 16448255); // TODO locale + fontRenderer.drawString(I18n.format("metatileentity.GT_GasTurbine.amount"), 10, 20, 16448255); fontRenderer.drawString(GT_Utility.parseNumberToString(((GT_Container_BasicTank)mContainer).mContent.get()), 10, 30, 16448255); } } diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Grinder.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Grinder.java index 03afb43..44d7eda 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Grinder.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Grinder.java @@ -4,6 +4,7 @@ import gregtechmod.api.GregTech_API; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.common.containers.GT_Container_Grinder; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -17,9 +18,9 @@ public class GT_GUIContainer_Grinder extends GT_GUIContainerMetaTile_Machine { protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRenderer.drawString("Industrial Grinder", 8, 4, 4210752); if (!((GT_Container_Grinder)mContainer).mMachine.get()) - fontRenderer.drawString("Incomplete Machine Casing!", 8, ySize - 104, 4210752); // TODO locale + fontRenderer.drawString(I18n.format("metatileentity.status.multiblock.incomplete"), 8, ySize - 104, 0xF00000); if (((mContainer).mDisplayErrorCode.get() & 1) != 0) - fontRenderer.drawString("Insufficient Energy Line!", 8, ySize - 94, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.NOT_ENOUGH_ENERGY"), 8, ySize - 94, 4210752); else fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 94, 4210752); } diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Hatch_Input.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Hatch_Input.java index 80e0ade..23a422d 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Hatch_Input.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Hatch_Input.java @@ -5,6 +5,7 @@ import gregtechmod.api.gui.GT_Container_BasicTank; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.util.GT_Utility; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -17,9 +18,9 @@ public class GT_GUIContainer_Hatch_Input extends GT_GUIContainerMetaTile_Machine @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752); - fontRenderer.drawString("Input Hatch", 8, 6, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.GT_Input_Hatch.name"), 8, 6, 4210752); if (mContainer != null) { - fontRenderer.drawString("Liquid Amount", 10, 20, 16448255); // TODO LOCALE + fontRenderer.drawString(I18n.format("metatileentity.HACTHES.amount"), 10, 20, 16448255); fontRenderer.drawString(GT_Utility.parseNumberToString(((GT_Container_BasicTank)mContainer).mContent.get()), 10, 30, 16448255); } } diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Hatch_Output.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Hatch_Output.java index aeabd4c..2287850 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Hatch_Output.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Hatch_Output.java @@ -5,6 +5,7 @@ import gregtechmod.api.gui.GT_Container_BasicTank; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.util.GT_Utility; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -17,9 +18,9 @@ public class GT_GUIContainer_Hatch_Output extends GT_GUIContainerMetaTile_Machin @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752); - fontRenderer.drawString("Output Hatch", 8, 6, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.GT_Output_Hatch.name"), 8, 6, 4210752); if (mContainer != null) { - fontRenderer.drawString("Liquid Amount", 10, 20, 16448255); + fontRenderer.drawString(I18n.format("metatileentity.HACTHES.amount"), 10, 20, 16448255); fontRenderer.drawString(GT_Utility.parseNumberToString(((GT_Container_BasicTank)mContainer).mContent.get()), 10, 30, 16448255); } } diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_IDSU_Meta.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_IDSU_Meta.java index 5489e83..2c8e130 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_IDSU_Meta.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_IDSU_Meta.java @@ -5,6 +5,7 @@ import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.util.GT_Utility; import gregtechmod.common.containers.GT_Container_IDSU_Meta; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; public class GT_GUIContainer_IDSU_Meta extends GT_GUIContainerMetaTile_Machine { @@ -15,14 +16,14 @@ public class GT_GUIContainer_IDSU_Meta extends GT_GUIContainerMetaTile_Machine { @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { - fontRenderer.drawString("I.D.S.U.", 11, 8, 16448255); + fontRenderer.drawString(I18n.format("metatileentity.GT_IDSU.UI.name"), 11, 8, 16448255); if (mContainer != null) { GT_Container_IDSU_Meta idsu = (GT_Container_IDSU_Meta) mContainer; - fontRenderer.drawString("ID: " + idsu.mPlayerHash.get(), 11, 16, 16448255); - fontRenderer.drawString("EU: " + GT_Utility.parseNumberToString(idsu.mEnergy.get()), 11, 24, 16448255); - fontRenderer.drawString("MAX: " + GT_Utility.parseNumberToString(idsu.mStorage.get()), 11, 32, 16448255); - fontRenderer.drawString("MAX EU/t IN: " + GT_Utility.parseNumberToString(mContainer.mInput.get()), 11, 40, 16448255); - fontRenderer.drawString("EU/t OUT: " + GT_Utility.parseNumberToString(mContainer.mOutput.get()), 11, 48, 16448255); + fontRenderer.drawString(I18n.format("metatileentity.GT_IDSU.UI.ID", GT_Utility.parseNumberToString(idsu.mPlayerHash.get())), 11, 17, 16448255); + fontRenderer.drawString(I18n.format("metatileentity.STORAGE_EU", GT_Utility.parseNumberToString(idsu.mEnergy.get())), 11, 26, 16448255); + fontRenderer.drawString(I18n.format("metatileentity.STORAGE_EU_MAX", GT_Utility.parseNumberToString(idsu.mStorage.get())), 11, 35, 16448255); + fontRenderer.drawString(I18n.format("metatileentity.STORAGE_EU_T_IN", GT_Utility.parseNumberToString(mContainer.mInput.get())), 11, 44, 16448255); + fontRenderer.drawString(I18n.format("metatileentity.STORAGE_EU_T_OUT", GT_Utility.parseNumberToString(mContainer.mOutput.get())), 11, 53, 16448255); } } diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_ImplosionCompressor.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_ImplosionCompressor.java index 0fcaf32..e8a1d7e 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_ImplosionCompressor.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_ImplosionCompressor.java @@ -4,6 +4,7 @@ import gregtechmod.api.GregTech_API; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.common.containers.GT_Container_ImplosionCompressor; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -16,9 +17,9 @@ public class GT_GUIContainer_ImplosionCompressor extends GT_GUIContainerMetaTile @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 94, 4210752); - fontRenderer.drawString("Implosion Compressor", 8, 4, 4210752); - if (!((GT_Container_ImplosionCompressor)mContainer).mMachine.get()) // TODO LOCALE - fontRenderer.drawString("Incomplete Machine Casing!", 8, ySize - 103, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.GT_ImplosionCompressor.name"), 8, 4, 4210752); + if (!((GT_Container_ImplosionCompressor)mContainer).mMachine.get()); + fontRenderer.drawString(I18n.format("metatileentity.status.multiblock.incomplete"), 8, ySize - 103, 0xF00000); } @Override diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_MagicEnergyAbsorber.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_MagicEnergyAbsorber.java index 7b4e04a..18c0f85 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_MagicEnergyAbsorber.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_MagicEnergyAbsorber.java @@ -4,6 +4,7 @@ import gregtechmod.api.GregTech_API; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.common.containers.GT_Container_MagicEnergyAbsorber; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -16,7 +17,7 @@ public class GT_GUIContainer_MagicEnergyAbsorber extends GT_GUIContainerMetaTile @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752); - fontRenderer.drawString("Magic Energy Absorber", 8, 6, 4210752); // TODO locale + fontRenderer.drawString(I18n.format("metatileentity.GT_MagicAbsorber.name"), 8, 6, 4210752); } @Override diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_MagicEnergyConverter.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_MagicEnergyConverter.java index b7ba44d..6bde944 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_MagicEnergyConverter.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_MagicEnergyConverter.java @@ -5,6 +5,7 @@ import gregtechmod.api.gui.GT_Container_BasicTank; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.util.GT_Utility; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -17,9 +18,9 @@ public class GT_GUIContainer_MagicEnergyConverter extends GT_GUIContainerMetaTil @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752); - fontRenderer.drawString("Magic Energy Converter", 8, 6, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.GT_MagicConverter.name"), 8, 6, 4210752); if (mContainer != null) { - fontRenderer.drawString("Liquid Amount", 10, 20, 16448255); + fontRenderer.drawString(I18n.format("metatileentity.HACTHES.amount"), 10, 20, 16448255); fontRenderer.drawString(GT_Utility.parseNumberToString(((GT_Container_BasicTank)mContainer).mContent.get()), 10, 30, 16448255); } } diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_MaintenanceHatch.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_MaintenanceHatch.java index 512c427..fe1d4d7 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_MaintenanceHatch.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_MaintenanceHatch.java @@ -4,6 +4,7 @@ import gregtechmod.api.GregTech_API; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.common.containers.GT_Container_MaintenanceHatch; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; public class GT_GUIContainer_MaintenanceHatch extends GT_GUIContainerMetaTile_Machine { @@ -14,8 +15,8 @@ public class GT_GUIContainer_MaintenanceHatch extends GT_GUIContainerMetaTile_Ma @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { - fontRenderer.drawString("Maintenance Hatch", 8, 4, 4210752); - fontRenderer.drawString("Click with Tool to repair.", 8, 12, 4210752); // TODO locale + fontRenderer.drawString(I18n.format("metatileentity.GT_Maintenance_Hatch.name"), 8, 4, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.GT_Maintenance_Hatch.UI.info"), 8, 12, 4210752); } @Override diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_PlasmaGenerator.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_PlasmaGenerator.java index 03b0688..520988c 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_PlasmaGenerator.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_PlasmaGenerator.java @@ -5,6 +5,7 @@ import gregtechmod.api.gui.GT_Container_BasicTank; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.util.GT_Utility; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -17,9 +18,9 @@ public class GT_GUIContainer_PlasmaGenerator extends GT_GUIContainerMetaTile_Mac @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752); - fontRenderer.drawString("Plasma Generator", 8, 6, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.GT_PlasmaGenerator.name"), 8, 6, 4210752); if (mContainer != null) { - fontRenderer.drawString("Plasma Amount", 10, 20, 16448255); + fontRenderer.drawString(I18n.format("metatileentity.GT_PlasmaGenerator.amount"), 10, 20, 16448255); fontRenderer.drawString(GT_Utility.parseNumberToString(((GT_Container_BasicTank)mContainer).mContent.get()), 10, 30, 16448255); } } diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Quantumtank.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Quantumtank.java index 3fd1a2f..9f7fd84 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Quantumtank.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Quantumtank.java @@ -7,6 +7,7 @@ import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.util.GT_Utility; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -20,9 +21,9 @@ public class GT_GUIContainer_Quantumtank extends GT_GUIContainerMetaTile_Machine protected void drawGuiContainerForegroundLayer(int par1, int par2) { FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752); - fontRenderer.drawString("Quantum Tank", 8, 6, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.GT_QuantumTank.name"), 8, 6, 4210752); if (mContainer != null) { - fontRenderer.drawString("Liquid Amount", 10, 20, 16448255); + fontRenderer.drawString(I18n.format("metatileentity.HACTHES.amount"), 10, 20, 16448255); fontRenderer.drawString(GT_Utility.parseNumberToString(((GT_Container_BasicTank)mContainer).mContent.get()), 10, 30, 16448255); } } diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_RockBreaker.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_RockBreaker.java index 1a0bde6..d3ac75a 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_RockBreaker.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_RockBreaker.java @@ -4,6 +4,7 @@ import gregtechmod.api.GregTech_API; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.common.containers.GT_Container_RockBreaker; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; public class GT_GUIContainer_RockBreaker extends GT_GUIContainerMetaTile_Machine { @@ -14,7 +15,7 @@ public class GT_GUIContainer_RockBreaker extends GT_GUIContainerMetaTile_Machine @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { - fontRenderer.drawString("Rock Breaker", 5, 5, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.GT_RockBreaker.name"), 5, 5, 4210752); } @Override diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Sawmill.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Sawmill.java index ab9ab39..ead4575 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Sawmill.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Sawmill.java @@ -4,6 +4,7 @@ import gregtechmod.api.GregTech_API; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.common.containers.GT_Container_Sawmill; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -15,11 +16,11 @@ public class GT_GUIContainer_Sawmill extends GT_GUIContainerMetaTile_Machine { @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { - fontRenderer.drawString("Industrial Sawmill", 8, 4, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.GT_Sawmill.name"), 8, 4, 4210752); if (!((GT_Container_Sawmill)mContainer).mMachine.get()) - fontRenderer.drawString("Incomplete Machine Casing!", 8, ySize - 104, 4210752); // TODO locale + fontRenderer.drawString(I18n.format("metatileentity.status.multiblock.incomplete"), 8, ySize - 104, 0xF00000); if (((mContainer).mDisplayErrorCode.get() & 1) != 0) - fontRenderer.drawString("Insufficient Energy Line!", 8, ySize - 94, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.NOT_ENOUGH_ENERGY"), 8, ySize - 94, 4210752); else fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 94, 4210752); diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Scrapboxinator.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Scrapboxinator.java index 438a3e3..d6f222d 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Scrapboxinator.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Scrapboxinator.java @@ -4,6 +4,7 @@ import gregtechmod.api.GregTech_API; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.common.containers.GT_Container_Scrapboxinator; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; public class GT_GUIContainer_Scrapboxinator extends GT_GUIContainerMetaTile_Machine { @@ -14,7 +15,7 @@ public class GT_GUIContainer_Scrapboxinator extends GT_GUIContainerMetaTile_Mach @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { - fontRenderer.drawString("Scrapboxinator", 5, 5, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.GT_Scrapboxinator.name"), 5, 5, 4210752); } @Override diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_SemifluidGenerator.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_SemifluidGenerator.java index aeb16d6..e927efc 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_SemifluidGenerator.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_SemifluidGenerator.java @@ -5,6 +5,7 @@ import gregtechmod.api.gui.GT_Container_BasicTank; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.util.GT_Utility; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -17,9 +18,9 @@ public class GT_GUIContainer_SemifluidGenerator extends GT_GUIContainerMetaTile_ @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752); - fontRenderer.drawString("Semifluid Generator", 8, 6, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.GT_SemifluidGenerator.name"), 8, 6, 4210752); if (mContainer != null) { - fontRenderer.drawString("Liquid Amount", 10, 20, 16448255); + fontRenderer.drawString(I18n.format("metatileentity.HACTHES.amount"), 10, 20, 16448255); fontRenderer.drawString(GT_Utility.parseNumberToString(((GT_Container_BasicTank)mContainer).mContent.get()), 10, 30, 16448255); } } diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_SteelBoiler.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_SteelBoiler.java index 86a551f..2412ac1 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_SteelBoiler.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_SteelBoiler.java @@ -4,6 +4,7 @@ import gregtechmod.api.GregTech_API; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.common.containers.GT_Container_SteelBoiler; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; public class GT_GUIContainer_SteelBoiler extends GT_GUIContainerMetaTile_Machine { @@ -14,7 +15,7 @@ public class GT_GUIContainer_SteelBoiler extends GT_GUIContainerMetaTile_Machine @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { - fontRenderer.drawString("High Pressure Coal Boiler", 8, 4, 4210752); // TODO locale + fontRenderer.drawString(I18n.format("metatileentity.GT_SteelBoiler.name"), 8, 4, 4210752); } @Override diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Teleporter.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Teleporter.java index 7df082b..2c6171f 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Teleporter.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_Teleporter.java @@ -7,6 +7,7 @@ import gregtechmod.api.util.GT_Utility; import gregtechmod.common.containers.GT_Container_Teleporter; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.world.WorldProvider; import net.minecraftforge.common.DimensionManager; @@ -20,7 +21,7 @@ public class GT_GUIContainer_Teleporter extends GT_GUIContainerMetaTile_Machine @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; - fontRenderer.drawString("Teleporter", 46, 8, 16448255); // TODO LOCALE + fontRenderer.drawString(I18n.format("metatileentity.GT_Teleporter.name"), 46, 8, 16448255); if (mContainer != null) { fontRenderer.drawString("X: " + GT_Utility.parseNumberToString(((GT_Container_Teleporter)mContainer).mTargetX.get()), 46, 16, 16448255); fontRenderer.drawString("Y: " + GT_Utility.parseNumberToString(((GT_Container_Teleporter)mContainer).mTargetY.get()), 46, 24, 16448255); diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_ThermalGenerator.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_ThermalGenerator.java index 3e79260..9750e91 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_ThermalGenerator.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_ThermalGenerator.java @@ -5,6 +5,7 @@ import gregtechmod.api.gui.GT_Container_BasicTank; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.util.GT_Utility; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -17,9 +18,9 @@ public class GT_GUIContainer_ThermalGenerator extends GT_GUIContainerMetaTile_Ma @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752); - fontRenderer.drawString("Thermal Generator", 8, 6, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.GT_ThermalGenerator.name"), 8, 6, 4210752); if (mContainer != null) { - fontRenderer.drawString("Liquid Amount", 10, 20, 16448255); + fontRenderer.drawString(I18n.format("metatileentity.HACTHES.amount"), 10, 20, 16448255); fontRenderer.drawString(GT_Utility.parseNumberToString(((GT_Container_BasicTank)mContainer).mContent.get()), 10, 30, 16448255); } } diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_TradeOMat_Inventory_Money.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_TradeOMat_Inventory_Money.java index ca38116..44955be 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_TradeOMat_Inventory_Money.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_TradeOMat_Inventory_Money.java @@ -1,5 +1,6 @@ package gregtechmod.common.gui; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.*; import gregtechmod.api.interfaces.*; import gregtechmod.common.containers.*; @@ -13,7 +14,7 @@ public class GT_GUIContainer_TradeOMat_Inventory_Money extends GT_GUIContainerMe @Override protected void drawGuiContainerForegroundLayer(final int par1, final int par2) { - this.fontRenderer.drawString("Your Income", 8, 5, 4210752); + this.fontRenderer.drawString(I18n.format("util.GT_TradeOMat.income"), 8, 5, 4210752); } @Override diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_TradeOMat_Inventory_Objects.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_TradeOMat_Inventory_Objects.java index 1ca1112..8a439f4 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_TradeOMat_Inventory_Objects.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_TradeOMat_Inventory_Objects.java @@ -1,5 +1,6 @@ package gregtechmod.common.gui; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.*; import gregtechmod.api.interfaces.*; import gregtechmod.common.containers.*; @@ -13,7 +14,7 @@ public class GT_GUIContainer_TradeOMat_Inventory_Objects extends GT_GUIContainer @Override protected void drawGuiContainerForegroundLayer(final int par1, final int par2) { - this.fontRenderer.drawString("Your Offer", 8, 5, 4210752); + this.fontRenderer.drawString(I18n.format("util.GT_TradeOMat.offer"), 8, 5, 4210752); } @Override diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_TradeOMat_Main.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_TradeOMat_Main.java index d9f600f..290023c 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_TradeOMat_Main.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_TradeOMat_Main.java @@ -1,5 +1,6 @@ package gregtechmod.common.gui; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.*; import gregtechmod.api.interfaces.*; import gregtechmod.common.containers.*; @@ -13,7 +14,7 @@ public class GT_GUIContainer_TradeOMat_Main extends GT_GUIContainerMetaTile_Mach @Override protected void drawGuiContainerForegroundLayer(final int par1, final int par2) { - this.fontRenderer.drawString("Trade-O-Mat", 8, 5, 4210752); + this.fontRenderer.drawString(I18n.format("metatileentity.GT_TradeOMat.name"), 8, 5, 4210752); } @Override diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_TradeOMat_Settings.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_TradeOMat_Settings.java index ef17280..bf99465 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_TradeOMat_Settings.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_TradeOMat_Settings.java @@ -1,5 +1,6 @@ package gregtechmod.common.gui; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.*; import gregtechmod.api.interfaces.*; import gregtechmod.common.containers.*; @@ -14,9 +15,9 @@ public class GT_GUIContainer_TradeOMat_Settings extends GT_GUIContainerMetaTile_ @Override protected void drawGuiContainerForegroundLayer(final int par1, final int par2) { - this.fontRenderer.drawString("Settings", 8, 5, 4210752); - this.fontRenderer.drawString("Your Price", 30, 27, 4210752); - this.fontRenderer.drawString("Your Offer", 30, 45, 4210752); // TODO LOCALE + this.fontRenderer.drawString(I18n.format("util.GT_TradeOMat.settings"), 8, 5, 4210752); + this.fontRenderer.drawString(I18n.format("util.GT_TradeOMat.price"), 30, 27, 4210752); + this.fontRenderer.drawString(I18n.format("util.GT_TradeOMat.offer"), 30, 45, 4210752); if (this.mContainer != null) { this.fontRenderer.drawString("Performed Trades: " + GT_Utility.parseNumberToString(((GT_Container_TradeOMat_Settings)this.mContainer).mPerformedTrades.get()), 8, 64, 4210752); } diff --git a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_VacuumFreezer.java b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_VacuumFreezer.java index 46a8d69..e54114d 100644 --- a/src/main/java/gregtechmod/common/gui/GT_GUIContainer_VacuumFreezer.java +++ b/src/main/java/gregtechmod/common/gui/GT_GUIContainer_VacuumFreezer.java @@ -4,6 +4,7 @@ import gregtechmod.api.GregTech_API; import gregtechmod.api.gui.GT_GUIContainerMetaTile_Machine; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.common.containers.GT_Container_VacuumFreezer; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -16,12 +17,12 @@ public class GT_GUIContainer_VacuumFreezer extends GT_GUIContainerMetaTile_Machi @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { if (((mContainer).mDisplayErrorCode.get() & 1) != 0) - fontRenderer.drawString("Insufficient Energy Line!", 8, ySize - 94, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.NOT_ENOUGH_ENERGY"), 8, ySize - 94, 4210752); else fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 94, 4210752); - fontRenderer.drawString("Vacuum Freezer", 8, 4, 4210752); + fontRenderer.drawString(I18n.format("metatileentity.GT_VacuumFreezer.name"), 8, 4, 4210752); if (!((GT_Container_VacuumFreezer)mContainer).mMachine.get()) - fontRenderer.drawString("Incomplete Machine Casing!", 8, ySize - 103, 4210752); // TODO LOCALE + fontRenderer.drawString(I18n.format("metatileentity.status.multiblock.incomplete"), 8, ySize - 103, 0xF00000); } @Override diff --git a/src/main/java/gregtechmod/common/tileentities/automation/GT_MetaTileEntity_ElectricBufferSmall.java b/src/main/java/gregtechmod/common/tileentities/automation/GT_MetaTileEntity_ElectricBufferSmall.java index 0360c51..58cf3c6 100644 --- a/src/main/java/gregtechmod/common/tileentities/automation/GT_MetaTileEntity_ElectricBufferSmall.java +++ b/src/main/java/gregtechmod/common/tileentities/automation/GT_MetaTileEntity_ElectricBufferSmall.java @@ -6,6 +6,7 @@ import gregtechmod.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ChatComponentTranslation; public class GT_MetaTileEntity_ElectricBufferSmall extends MetaTileEntity { @@ -78,9 +79,9 @@ public class GT_MetaTileEntity_ElectricBufferSmall extends MetaTileEntity { if (aSide == getBaseMetaTileEntity().getBackFacing()) { mTargetStackSize=(byte)((mTargetStackSize+1)%64); if (mTargetStackSize == 0) { - GT_Utility.sendChatToPlayer(aPlayer, "Do not regulate Item Stack Size"); // TODO locale + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.status.regulate.0")); } else { - GT_Utility.sendChatToPlayer(aPlayer, "Regulate Item Stack Size to: " + mTargetStackSize); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.status.regulate.1", mTargetStackSize)); } } } diff --git a/src/main/java/gregtechmod/common/tileentities/automation/GT_MetaTileEntity_ElectricSorter.java b/src/main/java/gregtechmod/common/tileentities/automation/GT_MetaTileEntity_ElectricSorter.java index 17c9c6c..1fe9ce5 100644 --- a/src/main/java/gregtechmod/common/tileentities/automation/GT_MetaTileEntity_ElectricSorter.java +++ b/src/main/java/gregtechmod/common/tileentities/automation/GT_MetaTileEntity_ElectricSorter.java @@ -9,6 +9,7 @@ import java.util.ArrayList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ChatComponentTranslation; public class GT_MetaTileEntity_ElectricSorter extends GT_MetaTileEntity_ElectricBufferSmall { @@ -61,9 +62,9 @@ public class GT_MetaTileEntity_ElectricSorter extends GT_MetaTileEntity_Electric if (aSide == getBaseMetaTileEntity().getBackFacing() || aSide == mTargetDirection) { mTargetStackSize=(byte)((mTargetStackSize+1)%64); if (mTargetStackSize == 0) { - GT_Utility.sendChatToPlayer(aPlayer, "Do not regulate Item Stack Size"); // TODO locale + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.status.regulate.0")); } else { - GT_Utility.sendChatToPlayer(aPlayer, "Regulate Item Stack Size to: " + mTargetStackSize); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.status.regulate.1", mTargetStackSize)); } } } diff --git a/src/main/java/gregtechmod/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/main/java/gregtechmod/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java index 7e7b4e7..b3bb5e6 100644 --- a/src/main/java/gregtechmod/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java +++ b/src/main/java/gregtechmod/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java @@ -20,7 +20,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -127,7 +126,8 @@ public class GT_MetaTileEntity_TesseractGenerator extends MetaTileEntity { mFrequency+=1; break; } - GT_Utility.sendChatToPlayer(aPlayer, "Frequency: " + mFrequency + (sTesseractGenerators.get(mFrequency) != null && sTesseractGenerators.get(mFrequency) != this?EnumChatFormatting.RED+" (Occupied)":"")); + int var = (sTesseractGenerators.get(mFrequency) != null && sTesseractGenerators.get(mFrequency) != this) ? 2 : 1; + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.GT_Tesseract.message." + var, mFrequency)); } return true; diff --git a/src/main/java/gregtechmod/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java b/src/main/java/gregtechmod/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java index 0a09fe4..64c9be7 100644 --- a/src/main/java/gregtechmod/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java +++ b/src/main/java/gregtechmod/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java @@ -9,12 +9,12 @@ import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.util.GT_Config; import gregtechmod.api.util.GT_Utility; import gregtechmod.api.util.InfoBuilder; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -139,7 +139,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends MetaTileEntity { mFrequency+=512; break; } - GT_Utility.sendChatToPlayer(aPlayer, "Frequency: " + mFrequency + (getTesseract(mFrequency, false)==null?"":EnumChatFormatting.GREEN+" (Connected)")); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.GT_Tesseract.message." + (getTesseract(mFrequency, false) == null ? 1 : 3), mFrequency)); } } diff --git a/src/main/java/gregtechmod/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java b/src/main/java/gregtechmod/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java index 96ea985..82cef5c 100644 --- a/src/main/java/gregtechmod/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java +++ b/src/main/java/gregtechmod/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java @@ -86,6 +86,7 @@ public class GT_MetaTileEntity_BronzeBlastFurnace extends BaseMultiWorkable { if (needCheckStruct) { structComplete = checkMachine(); needCheckStruct = false; + getBaseMetaTileEntity().setErrorDisplayID(structComplete ? 0 : 1); } else if (!needCheckStruct && !structComplete && getBaseMetaTileEntity().getTimer() % 600 == 0) { structComplete = checkMachine(); } diff --git a/src/main/java/gregtechmod/common/tileentities/storage/GT_MetaTileEntity_DigitalChest.java b/src/main/java/gregtechmod/common/tileentities/storage/GT_MetaTileEntity_DigitalChest.java index d3fd50a..030958d 100644 --- a/src/main/java/gregtechmod/common/tileentities/storage/GT_MetaTileEntity_DigitalChest.java +++ b/src/main/java/gregtechmod/common/tileentities/storage/GT_MetaTileEntity_DigitalChest.java @@ -20,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentTranslation; public class GT_MetaTileEntity_DigitalChest extends MetaTileEntity { @@ -100,8 +101,7 @@ public class GT_MetaTileEntity_DigitalChest extends MetaTileEntity { } } } - - GT_Utility.sendChatToPlayer(aPlayer, mInventory[0].stackSize + " of " + mInventory[0].getDisplayName()); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.GT_Barrel.count_msg", mInventory[0].stackSize, mInventory[0].getUnlocalizedName() + ".name")); } } else { if(isDigitalChest && GT_OreDictUnificator.isItemStackInstanceOf(tPlayerItem, "craftingQuantumChestUpgrade")) { @@ -134,7 +134,7 @@ public class GT_MetaTileEntity_DigitalChest extends MetaTileEntity { } } else { - GT_Utility.sendChatToPlayer(aPlayer, mInventory[0].stackSize + " of " + mInventory[0].getDisplayName()); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.GT_Barrel.count_msg", mInventory[0].stackSize, mInventory[0].getUnlocalizedName() + ".name")); } } diff --git a/src/main/resources/assets/gregtech_addon/lang/en_US.lang b/src/main/resources/assets/gregtech_addon/lang/en_US.lang index 9782977..44089b6 100644 --- a/src/main/resources/assets/gregtech_addon/lang/en_US.lang +++ b/src/main/resources/assets/gregtech_addon/lang/en_US.lang @@ -73,6 +73,7 @@ tile.BlockMetaID_Machine.Sonictron.name=Sonictron tile.BlockMetaID_Machine.Lapotronic_Energystorageunit.name=Lapotronic Energy Storage Unit tile.BlockMetaID_Machine.Interdimensional_Energystorageunit.name=Interdimensional Energy Storage Unit tile.BlockMetaID_Machine.Adjustable_Energystorageunit.name=Adjustable Energy Storage Unit +tile.BlockMetaID_Machine.Adjustable_Energystorageunit.UI.name=A.E.S.U tile.BlockMetaID_Machine.Charge_O_Mat.name=Charge-O-Mat tile.BlockMetaID_Machine.Industrial_Centrifuge.name=Industrial Centrifuge tile.BlockMetaID_Machine.Superconductorwire.name=Superconductor Wire @@ -112,6 +113,7 @@ metatileentity.GT_Grinder.name=Industrial Grinder metatilentity.GT_Grinder.tooltip=Ultimaceratron 42b metatileentity.GT_BlastFurnace.name=Industrial Blast Furnace metatileentity.GT_BlastFurnace.tooltip=You'll have a Blast! +metatileentity.GT_BlastFurnace.UI.heat_capacity=Heat Capacity: %s K metatileentity.GT_QuantumTank.name=Quantum Tank metatileentity.GT_QuantumTank.tooltip=With a capacity of 488.28125 Chunks! metatileentity.GT_ImplosionCompressor.name=Implosion Compressor @@ -122,12 +124,14 @@ metatileentity.GT_DieselGenerator.name=Diesel Generator metatileentity.GT_DieselGenerator.tooltip=The burning Fuel as 100%% Efficiency metatileentity.GT_GasTurbine.name=Gas Turbine metatileentity.GT_GasTurbine.tooltip=Generate Power from Flatulence, uhh I mean Methane (75%%) +metatileentity.GT_GasTurbine.amount=Gas Amount metatileentity.GT_ThermalGenerator.name=Thermal Generator metatileentity.GT_ThermalGenerator.tooltip=Generates Energy from Lava at 80%% Efficiency metatileentity.GT_SemifluidGenerator.name=Semifluid Generator metatileentity.GT_SemifluidGenerator.tooltip=Makes Energy of more dense Fluids (100%%) metatileentity.GT_PlasmaGenerator.name=Plasma Generator metatileentity.GT_PlasmaGenerator.tooltip=Harness 100%% of the immense Power of Plasma +metatileentity.GT_PlasmaGenerator.amount=Plasma Amount metatileentity.GT_VacuumFreezer.name=Vacuum Freezer metatileentity.GT_VacuumFreezer.tooltip=Cools down anything metatileentity.GT_RegulatorAdvanced.name=Advanced Regulator @@ -152,6 +156,7 @@ metatileentity.GT_Barrel.name=Digital Chest metatileentity.GT_Barrel.tooltip=To lock the saved Item as Filter, use Rubber Hammer on it. metatileentity.GT_Barrel.item=Item: %s metatileentity.GT_Barrel.count=%s / %s +metatileentity.GT_Barrel.count_msg=%s of %s metatileentity.GT_QuantumChest.name=Quantum Chest metatileentity.GT_Macerator.name=Automatic Macerator metatileentity.GT_Macerator.tooltip=Maceratron-E-901 @@ -223,8 +228,8 @@ metatileentity.GT_Tesseract_Generator.tooltip=Generates a Tesseract for the atta metatileentity.GT_Tesseract_Terminal.name=Tesseract Terminal metatileentity.GT_Tesseract_Terminal.tooltip=Accesses Tesseracts remotely metatileentity.GT_Tesseract.message.1=Frequency: %s -metatileentity.GT_Tesseract.message.2=Frequency: %d §c (Occupied) -metatileentity.GT_Tesseract.message.3=Frequency: %d §a (Connected) +metatileentity.GT_Tesseract.message.2=Frequency: %s §c (Occupied) +metatileentity.GT_Tesseract.message.3=Frequency: %s §a (Connected) metatileentity.GT_Tesseract.status=Status: %s metatileentity.GT_Tesseract.status.1=Active metatileentity.GT_Tesseract.status.2=Inactive @@ -244,8 +249,10 @@ metatileentity.GT_Input_Hatch.name=Input Hatch metatileentity.GT_Input_Hatch.tooltip=For inputting Materials into Multiblocks metatileentity.GT_Output_Hatch.name=Output Hatch metatileentity.GT_Output_Hatch.tooltip=Use Screwdriver to specify Output Type +metatileentity.HACTHES.amount=Liquid Amount metatileentity.GT_Maintenance_Hatch.name=Maintenance Hatch metatileentity.GT_Maintenance_Hatch.tooltip=For maintaining Multiblocks +metatileentity.GT_Maintenance_Hatch.UI.info=Click with Tool to repair. metatileentity.GT_Dynamo_Hatch.name=Dynamo Hatch metatileentity.GT_Dynamo_Hatch.tooltip=Generating electric Energy from Multiblocks metatileentity.GT_Energy_Hatch.name=Energy Hatch @@ -260,6 +267,8 @@ metatileentity.GT_AESU.name=AESU metatileentity.GT_AESU.tooltip=Adjustable Energy Storage Unit metatileentity.GT_IDSU.name=IDSU metatileentity.GT_IDSU.tooltip=Interdimensional Storage Unit +metatileentity.GT_IDSU.UI.name=I.D.S.U +metatileentity.GT_IDSU.UI.ID=ID: %s metatileentity.GT_Lightningrod.name=Lightning Rod metatileentity.GT_Supercondensator.name=Supercondensator metatileentity.GT_Supercondensator.tooltip=To output massive amounts of Energy in a short period of time. @@ -350,6 +359,10 @@ metatileentity.ENERGYCELLS.tooltip=%d Energy Cell Upgrades metatileentity.STEAMTANKS.tooltip=%d Steam Tank Upgrades metatileentity.EUSTORAGES.tooltip=%d Additional EU-Storage metatileentity.NOT_ENOUGH_ENERGY=Insufficient Energy Line! +metatileentity.STORAGE_EU=EU: %s +metatileentity.STORAGE_EU_MAX=MAX: %s +metatileentity.STORAGE_EU_T_IN=MAX EU/t IN: %s +metatileentity.STORAGE_EU_T_OUT=EU/t OUT: %s metatileentity.generator.efficiency=Efficiency: %s%% @@ -376,6 +389,90 @@ metatileentity.status.ignore_nbt.false=NBT has to match metatileentity.status.items_with_nbt.true=Allow Items with NBT metatileentity.status.items_with_nbt.false=Don't allow Items with NBT +metatileentity.status.fluid_io.0=Outputs Liquids, Steam and Items +metatileentity.status.fluid_io.1=Outputs Steam and Items +metatileentity.status.fluid_io.2=Outputs Steam and Liquids +metatileentity.status.fluid_io.3=Outputs Steam +metatileentity.status.fluid_io.4=Outputs Liquids and Items +metatileentity.status.fluid_io.5=Outputs only Items +metatileentity.status.fluid_io.6=Outputs only Liquids +metatileentity.status.fluid_io.7=Outputs nothing + +metatileentity.status.regulate.0=Do not regulate Item Stack Size +metatileentity.status.regulate.1=Regulate Item Stack Size to: %s + +metatileentity.status.multiblock.incomplete=Incomplete Machine Casing! +metatileentity.status.multiblock.running=Running perfectly. +metatileentity.status.multiblock.idle=Hit with Rubber Hammer to (re-)start the Machine if it doesn't start. + +metatileentity.status.malfunction.0=Pipe is loose. +metatileentity.status.malfunction.1=Screws are missing. +metatileentity.status.malfunction.2=Something is stuck. +metatileentity.status.malfunction.3=Platings are dented. +metatileentity.status.malfunction.4=Circuitry burned out. +metatileentity.status.malfunction.5=That doesn't belong there. +metatileentity.status.malfunction.6=Incomplete Structure. + +metatileentity.cover.work.0=Normal +metatileentity.cover.work.1=Inverted +metatileentity.cover.work.2=No Work at all + +metatileentity.cover.work_1.2=Ready to work +metatileentity.cover.work_1.3=Not ready to work + +metatileentity.cover.io.0=Export +metatileentity.cover.io.1=Import +metatileentity.cover.io.2=Export (conditional) +metatileentity.cover.io.3=Import (conditional) +metatileentity.cover.io.4=Export (invert cond) +metatileentity.cover.io.5=Import (invert cond) +metatileentity.cover.io.6=Export allow Input +metatileentity.cover.io.7=Import allow Output +metatileentity.cover.io.8=Export allow Input (conditional) +metatileentity.cover.io.9=Import allow Output (conditional) +metatileentity.cover.io.10=Export allow Input (invert cond) +metatileentity.cover.io.11=Import allow Output (invert cond) + +metatileentity.cover.drain.0=Keep Liquids Away +metatileentity.cover.drain.1=Keep Liquids Away (conditional) +metatileentity.cover.drain.2=Keep Liquids Away (invert cond) + +metatileentity.cover.drain.energy_only.0=Allow +metatileentity.cover.drain.energy_only.1=Allow (conditional) +metatileentity.cover.drain.energy_only.2=Disallow (conditional) + +metatileentity.cover.drain.eu_meter.0=Normal Universal Storage +metatileentity.cover.drain.eu_meter.1=Inverted Universal Storage +metatileentity.cover.drain.eu_meter.2=Normal Electricity Storage +metatileentity.cover.drain.eu_meter.3=Inverted Electricity Storage +metatileentity.cover.drain.eu_meter.4=Normal RF Storage +metatileentity.cover.drain.eu_meter.5=Inverted RF Storage +metatileentity.cover.drain.eu_meter.6=Normal Steam Storage +metatileentity.cover.drain.eu_meter.7=Inverted Steam Storage +metatileentity.cover.drain.eu_meter.8=Normal Average Electric Input +metatileentity.cover.drain.eu_meter.9=Inverted Average Electric Input +metatileentity.cover.drain.eu_meter.10=Normal Average Electric Output +metatileentity.cover.drain.eu_meter.11=Inverted Average Electric Output + +metatileentity.cover.generic.0=Redstone\s +metatileentity.cover.generic.1=Energy\s +metatileentity.cover.generic.2=Fluids\s +metatileentity.cover.generic.3=Items\s + +metatileentity.cover.meters.0=Normal +metatileentity.cover.meters.1=Inverted + +metatileentity.cover.redstone_conductor.0=Conducts strongest Input +metatileentity.cover.redstone_conductor.1=Conducts from bottom Input +metatileentity.cover.redstone_conductor.2=Conducts from top Input +metatileentity.cover.redstone_conductor.3=Conducts from north Input +metatileentity.cover.redstone_conductor.4=Conducts from south Input +metatileentity.cover.redstone_conductor.5=Conducts from west Input +metatileentity.cover.redstone_conductor.6=Conducts from east Input + +metatileentity.cover.redstone_singnalizer=Signal = %s + + metatileentity.turbine.speed=Speed: %s%% metatileentity.turbine.durability=Turbine HP: %s metatileentity.turbine.no_turbine=No turbine installed @@ -942,14 +1039,28 @@ util.GT_TradeOMat.Infinite=Infinite util.GT_TradeOMat.received=Received: %s util.GT_TradeOMat.selling=Selling: %sx %s util.GT_TradeOMat.buying=Buying: %sx %s +util.GT_TradeOMat.settings=Settings +util.GT_TradeOMat.price=Your Price +util.GT_TradeOMat.offer=Your Offer +util.GT_TradeOMat.income=Your Income util.GregTech_MetaGenerated_Item_01.Contains_tier=Contains %d EU Tier: %d util.GregTech_MetaGenerated_Item_01.charge=%d / %d EU - Voltage: %d util.missIC2NC=Nuclear Control not installed util.GT_IntegratedCircuit.configuration=Configuration: %s +gregtech.tool.hammer.ore.0=This is %s ore. +gregtech.tool.hammer.ore.1=Found traces of %s ore. +gregtech.tool.hammer.ore.2=No Ores found. +gregtech.tool.hammer.lava=There is Lava behind this Rock. +gregtech.tool.hammer.liquid=There is a Liquid behind this Rock. +gregtech.tool.hammer.air=There is an Air Pocket behind this Rock. +gregtech.tool.hammer.diff=Material is changing behind this Rock. + itemGroup.gregtech=GregTech Intergalactical itemGroup.gregtech_materials=GregTech Materials +gregtech.adventure.1=Adventure Mode has been broken. +gregtech.adventure.2=It's dangerous to go alone! Take this. block.deny_mobs_spawn.tooltip=Mobs can't spawn on this block sensor.progress.percentage=Progress: %s%% sensor.progress.secs=%s sec.