2 files changed, 185 insertions, 185 deletions
diff --git a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
index 2ccabd8dc6..f381ffc9d7 100644
--- a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
+++ b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
@@ -1,92 +1,92 @@
-package gregtech.common.items;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
-import gregtech.api.items.GT_Generic_Item;
-import gregtech.api.util.GT_Utility;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IIcon;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidRegistry;
-
-import java.util.List;
-
-public class GT_FluidDisplayItem
-        extends GT_Generic_Item {
-    public GT_FluidDisplayItem() {
-        super("GregTech_FluidDisplay", "Fluid Display", null);
-        ItemList.Display_Fluid.set(this);
-    }
-
-    protected void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {
-        NBTTagCompound aNBT = aStack.getTagCompound();
-        if (GT_Values.D1) {
-            Fluid tFluid = FluidRegistry.getFluid(aStack.getItemDamage());
-            if (tFluid != null) {
-                aList.add("Registry: " + tFluid.getName());
-            }
-        }
-        if (aNBT != null) {
-            long tToolTipAmount = aNBT.getLong("mFluidDisplayAmount");
-            if (tToolTipAmount > 0L) {
-                aList.add(EnumChatFormatting.BLUE + "Amount: " + tToolTipAmount + EnumChatFormatting.GRAY);
-            }
-            aList.add(EnumChatFormatting.RED + "Temperature: " + aNBT.getLong("mFluidDisplayHeat") + " K" + EnumChatFormatting.GRAY);
-            aList.add(EnumChatFormatting.GREEN + "State: " + (aNBT.getBoolean("mFluidState") ? "Gas" : "Liquid") + EnumChatFormatting.GRAY);
-        }
-    }
-
-    @SideOnly(Side.CLIENT)
-    public void registerIcons(IIconRegister aIconRegister) {
-    }
-
-    public IIcon getIconFromDamage(int aMeta) {
-        Fluid tFluid = FluidRegistry.getFluid(aMeta);
-        return tFluid == null ? FluidRegistry.WATER.getStillIcon() : tFluid.getStillIcon();
-    }
-
-    @SideOnly(Side.CLIENT)
-    public int getColorFromItemStack(ItemStack aStack, int aRenderPass) {
-        Fluid tFluid = FluidRegistry.getFluid(aStack.getItemDamage());
-        return tFluid == null ? 16777215 : tFluid.getColor();
-    }
-
-    public int getSpriteNumber() {
-        return 0;
-    }
-
-    public String getUnlocalizedName(ItemStack aStack) {
-        if (aStack != null) {
-            return GT_Utility.getFluidName(FluidRegistry.getFluid(aStack.getItemDamage()), false);
-        }
-        return "";
-    }
-
-    public String getItemStackDisplayName(ItemStack aStack) {
-        if (aStack != null) {
-            return GT_Utility.getFluidName(FluidRegistry.getFluid(aStack.getItemDamage()), true);
-        }
-        return "";
-    }
-
-    @SideOnly(Side.CLIENT)
-    public void getSubItems(Item aItem, CreativeTabs aTab, List aList) {
-        if (GT_Values.D1) {
-            int i = 0;
-            for (int j = FluidRegistry.getMaxID(); i < j; i++) {
-                ItemStack tStack = GT_Utility.getFluidDisplayStack(FluidRegistry.getFluid(i));
-                if (tStack != null) {
-                    aList.add(tStack);
-                }
-            }
-        }
-    }
-}
+package gregtech.common.items;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
+import gregtech.api.items.GT_Generic_Item;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+
+import java.util.List;
+
+public class GT_FluidDisplayItem
+        extends GT_Generic_Item {
+    public GT_FluidDisplayItem() {
+        super("GregTech_FluidDisplay", "Fluid Display", null);
+        ItemList.Display_Fluid.set(this);
+    }
+
+    protected void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {
+        NBTTagCompound aNBT = aStack.getTagCompound();
+        if (GT_Values.D1) {
+            Fluid tFluid = FluidRegistry.getFluid(aStack.getItemDamage());
+            if (tFluid != null) {
+                aList.add("Registry: " + tFluid.getName());
+            }
+        }
+        if (aNBT != null) {
+            long tToolTipAmount = aNBT.getLong("mFluidDisplayAmount");
+            if (tToolTipAmount > 0L) {
+            	aList.add(EnumChatFormatting.BLUE + String.format(trans("016", "Amount: %s L"), "" + tToolTipAmount) + EnumChatFormatting.GRAY);
+            }
+            aList.add(EnumChatFormatting.RED + String.format(trans("017", "Temperature: %s K"), "" + aNBT.getLong("mFluidDisplayHeat")) + EnumChatFormatting.GRAY);
+            aList.add(EnumChatFormatting.GREEN + String.format(trans("018", "State: %s"), aNBT.getBoolean("mFluidState") ? "Gas" : "Liquid") + EnumChatFormatting.GRAY);
+        }
+    }
+
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(IIconRegister aIconRegister) {
+    }
+
+    public IIcon getIconFromDamage(int aMeta) {
+        Fluid tFluid = FluidRegistry.getFluid(aMeta);
+        return tFluid == null ? FluidRegistry.WATER.getStillIcon() : tFluid.getStillIcon();
+    }
+
+    @SideOnly(Side.CLIENT)
+    public int getColorFromItemStack(ItemStack aStack, int aRenderPass) {
+        Fluid tFluid = FluidRegistry.getFluid(aStack.getItemDamage());
+        return tFluid == null ? 16777215 : tFluid.getColor();
+    }
+
+    public int getSpriteNumber() {
+        return 0;
+    }
+
+    public String getUnlocalizedName(ItemStack aStack) {
+        if (aStack != null) {
+            return GT_Utility.getFluidName(FluidRegistry.getFluid(aStack.getItemDamage()), false);
+        }
+        return "";
+    }
+
+    public String getItemStackDisplayName(ItemStack aStack) {
+        if (aStack != null) {
+            return GT_Utility.getFluidName(FluidRegistry.getFluid(aStack.getItemDamage()), true);
+        }
+        return "";
+    }
+
+    @SideOnly(Side.CLIENT)
+    public void getSubItems(Item aItem, CreativeTabs aTab, List aList) {
+        if (GT_Values.D1) {
+            int i = 0;
+            for (int j = FluidRegistry.getMaxID(); i < j; i++) {
+                ItemStack tStack = GT_Utility.getFluidDisplayStack(FluidRegistry.getFluid(i));
+                if (tStack != null) {
+                    aList.add(tStack);
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/gregtech/common/items/GT_SensorCard_Item.java b/src/main/java/gregtech/common/items/GT_SensorCard_Item.java
index 01a6b105f8..3f29054e9d 100644
--- a/src/main/java/gregtech/common/items/GT_SensorCard_Item.java
+++ b/src/main/java/gregtech/common/items/GT_SensorCard_Item.java
@@ -1,93 +1,93 @@
-package gregtech.common.items;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation;
-import gregtech.api.items.GT_Generic_Item;
-import gregtech.api.util.GT_LanguageManager;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ChunkCoordinates;
-import net.minecraft.world.World;
-import shedar.mods.ic2.nuclearcontrol.api.*;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.UUID;
-
-public class GT_SensorCard_Item
-        extends GT_Generic_Item
-        implements IRemoteSensor, IPanelDataSource {
-    private static final UUID CARD_TYPE = new UUID(0L, 41L);
-
-    public GT_SensorCard_Item(String aUnlocalized, String aEnglish) {
-        super(aUnlocalized, aEnglish, "Insert into Display Panel");
-        setMaxStackSize(1);
-    }
-
-    public void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {
-        super.addAdditionalToolTips(aList, aStack, aPlayer);
-        if (aStack != null) {
-            NBTTagCompound tNBT = aStack.getTagCompound();
-            if (tNBT == null) {
-                aList.add("Missing Coodinates!");
-            } else {
-                aList.add("Device at:");
-                aList.add(String.format("x: %d, y: %d, z: %d", new Object[]{Integer.valueOf(tNBT.getInteger("x")), Integer.valueOf(tNBT.getInteger("y")), Integer.valueOf(tNBT.getInteger("z"))}));
-            }
-        }
-    }
-
-    @Override
-    public CardState update(TileEntity aPanel, ICardWrapper aCard, int aMaxRange) {
-        return update(aPanel.getWorldObj(), aCard, aMaxRange);
-    }
-
-    @Override
-    public CardState update(World world, ICardWrapper aCard, int aMaxRange) {
-        ChunkCoordinates target = aCard.getTarget();
-
-        TileEntity tTileEntity = world.getTileEntity(target.posX, target.posY, target.posZ);
-        if (((tTileEntity instanceof IGregTechDeviceInformation)) && (((IGregTechDeviceInformation) tTileEntity).isGivingInformation())) {
-            String[] tInfoData = ((IGregTechDeviceInformation) tTileEntity).getInfoData();
-            for (int i = 0; i < tInfoData.length; i++) {
-                aCard.setString("mString" + i, tInfoData[i]);
-            }
-            return CardState.OK;
-        }
-        return CardState.NO_TARGET;
-    }
-
-    public List<PanelString> getStringData(int aSettings, ICardWrapper aCard, boolean aLabels) {
-        List<PanelString> rList = new LinkedList();
-        for (int i = 0; i < 8; i++) {
-            if ((aSettings & 1 << i) != 0) {
-                PanelString line = new PanelString();
-                line.textLeft = GT_LanguageManager.getTranslation(aCard.getString("mString" + i), "\\\\");
-                rList.add(line);
-            }
-        }
-        return rList;
-    }
-
-    public List<PanelSetting> getSettingsList() {
-        List<PanelSetting> rList = new ArrayList(30);
-        for (int i = 0; i < 8; i++) {
-            rList.add(new PanelSetting(String.valueOf((i + 1)), 1 << i, getCardType()));
-        }
-        return rList;
-    }
-
-    public UUID getCardType() {
-        return CARD_TYPE;
-    }
-
-    @SideOnly(Side.CLIENT)
-    public void getSubItems(Item var1, CreativeTabs aTab, List aList) {
-    }
-}
+package gregtech.common.items;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation;
+import gregtech.api.items.GT_Generic_Item;
+import gregtech.api.util.GT_LanguageManager;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ChunkCoordinates;
+import net.minecraft.world.World;
+import shedar.mods.ic2.nuclearcontrol.api.*;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.UUID;
+
+public class GT_SensorCard_Item
+        extends GT_Generic_Item
+        implements IRemoteSensor, IPanelDataSource {
+    private static final UUID CARD_TYPE = new UUID(0L, 41L);
+
+    public GT_SensorCard_Item(String aUnlocalized, String aEnglish) {
+        super(aUnlocalized, aEnglish, "Insert into Display Panel");
+        setMaxStackSize(1);
+    }
+
+    public void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {
+        super.addAdditionalToolTips(aList, aStack, aPlayer);
+        if (aStack != null) {
+            NBTTagCompound tNBT = aStack.getTagCompound();
+            if (tNBT == null) {
+            	aList.add(trans("014", "Missing Coodinates!"));
+            } else {
+            	aList.add(trans("015", "Device at:"));
+                aList.add(String.format("x: %d, y: %d, z: %d", new Object[]{Integer.valueOf(tNBT.getInteger("x")), Integer.valueOf(tNBT.getInteger("y")), Integer.valueOf(tNBT.getInteger("z"))}));
+            }
+        }
+    }
+
+    @Override
+    public CardState update(TileEntity aPanel, ICardWrapper aCard, int aMaxRange) {
+        return update(aPanel.getWorldObj(), aCard, aMaxRange);
+    }
+
+    @Override
+    public CardState update(World world, ICardWrapper aCard, int aMaxRange) {
+        ChunkCoordinates target = aCard.getTarget();
+
+        TileEntity tTileEntity = world.getTileEntity(target.posX, target.posY, target.posZ);
+        if (((tTileEntity instanceof IGregTechDeviceInformation)) && (((IGregTechDeviceInformation) tTileEntity).isGivingInformation())) {
+            String[] tInfoData = ((IGregTechDeviceInformation) tTileEntity).getInfoData();
+            for (int i = 0; i < tInfoData.length; i++) {
+                aCard.setString("mString" + i, tInfoData[i]);
+            }
+            return CardState.OK;
+        }
+        return CardState.NO_TARGET;
+    }
+
+    public List<PanelString> getStringData(int aSettings, ICardWrapper aCard, boolean aLabels) {
+        List<PanelString> rList = new LinkedList();
+        for (int i = 0; i < 8; i++) {
+            if ((aSettings & 1 << i) != 0) {
+                PanelString line = new PanelString();
+                line.textLeft = GT_LanguageManager.getTranslation(aCard.getString("mString" + i), "\\\\");
+                rList.add(line);
+            }
+        }
+        return rList;
+    }
+
+    public List<PanelSetting> getSettingsList() {
+        List<PanelSetting> rList = new ArrayList(30);
+        for (int i = 0; i < 8; i++) {
+            rList.add(new PanelSetting(String.valueOf((i + 1)), 1 << i, getCardType()));
+        }
+        return rList;
+    }
+
+    public UUID getCardType() {
+        return CARD_TYPE;
+    }
+
+    @SideOnly(Side.CLIENT)
+    public void getSubItems(Item var1, CreativeTabs aTab, List aList) {
+    }
+}