diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 3746dbfa..36d0cfeb 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -15,6 +15,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; +import com.enderio.core.common.Lang; import com.enderio.core.common.network.MessageTileNBT; import com.enderio.core.common.util.EntityUtil; import com.google.common.collect.ImmutableList; @@ -157,6 +158,7 @@ import crazypants.enderio.teleport.anchor.BlockTravelAnchor; import crazypants.enderio.teleport.telepad.BlockTelePad; import crazypants.enderio.teleport.telepad.ItemCoordSelector; import crazypants.enderio.thaumcraft.ThaumcraftCompat; + import static crazypants.enderio.EnderIO.*; @Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:Forge@10.13.0.1150,);after:MineFactoryReloaded;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv2-beta-8,)", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") @@ -176,6 +178,8 @@ public class EnderIO { public static GuiHandler guiHandler = new GuiHandler(); + public static final Lang lang = new Lang("enderio"); + // Materials public static ItemCapacitor itemBasicCapacitor; public static ItemAlloy itemAlloy; diff --git a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java index 511767f3..0a586d10 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java @@ -19,6 +19,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.DyeColor; import cpw.mods.fml.common.FMLCommonHandler; @@ -50,8 +51,6 @@ import crazypants.enderio.conduit.redstone.Signal; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.tool.ToolUtil; -import com.enderio.core.common.util.BlockCoord; - public class ConduitUtil { public static final Random RANDOM = new Random(); diff --git a/src/main/java/crazypants/enderio/conduit/ConnectionMode.java b/src/main/java/crazypants/enderio/conduit/ConnectionMode.java index d7b71c8a..519b06d7 100644 --- a/src/main/java/crazypants/enderio/conduit/ConnectionMode.java +++ b/src/main/java/crazypants/enderio/conduit/ConnectionMode.java @@ -1,6 +1,6 @@ package crazypants.enderio.conduit; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; public enum ConnectionMode { @@ -47,6 +47,6 @@ public enum ConnectionMode { } public String getLocalisedName() { - return Lang.localize(unlocalisedName); + return EnderIO.lang.localize(unlocalisedName); } } diff --git a/src/main/java/crazypants/enderio/conduit/IConduit.java b/src/main/java/crazypants/enderio/conduit/IConduit.java index 6ea91637..6923bfa2 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduit.java +++ b/src/main/java/crazypants/enderio/conduit/IConduit.java @@ -12,9 +12,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.conduit.geom.CollidableCache.CacheKey; import crazypants.enderio.conduit.geom.CollidableComponent; -import com.enderio.core.common.util.BlockCoord; public interface IConduit { diff --git a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java index d4d2c51e..644a8fe5 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java @@ -13,6 +13,9 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; import appeng.api.networking.IGridHost; import cofh.api.transport.IItemDuct; + +import com.enderio.core.common.util.BlockCoord; + import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.relauncher.Side; @@ -21,7 +24,6 @@ import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.geom.Offset; import crazypants.enderio.power.IInternalPowerHandler; -import com.enderio.core.common.util.BlockCoord; @InterfaceList({ @Interface(iface = "appeng.api.networking.IGridHost", modid = "appliedenergistics2"), diff --git a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java index 036593ad..b1953a05 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java +++ b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java @@ -16,7 +16,6 @@ import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.api.client.gui.IResourceTooltipProvider; import com.enderio.core.client.handlers.SpecialTooltipHandler; -import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.Util; import cpw.mods.fml.common.registry.GameRegistry; @@ -178,7 +177,7 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider, @SideOnly(Side.CLIENT) public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { if(PainterUtil.getSourceBlock(itemstack) == null) { - list.add(Lang.localize("item.itemConduitFacade.tooltip.notpainted")); + list.add(EnderIO.lang.localize("item.itemConduitFacade.tooltip.notpainted")); } else { list.add(PainterUtil.getTooltTipText(itemstack)); } @@ -191,7 +190,7 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider, SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack); if(itemstack.getItemDamage() == FacadeType.HARDENED.ordinal()) { list.add(""); - list.add(Lang.localize(getUnlocalizedName(itemstack) + ".tooltip", false)); + list.add(EnderIO.lang.localize(getUnlocalizedName(itemstack) + ".tooltip", false)); } } diff --git a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java index 16add867..e4026337 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java @@ -7,10 +7,10 @@ import net.minecraft.item.ItemStack; import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.client.handlers.SpecialTooltipHandler; -import com.enderio.core.common.util.Lang; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.AbstractItemConduit; import crazypants.enderio.conduit.IConduit; @@ -60,11 +60,11 @@ public class ItemGasConduit extends AbstractItemConduit implements IAdvancedTool @Override @SideOnly(Side.CLIENT) public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - String gpt = " " + Lang.localize("gas.gasTick"); + String gpt = " " + EnderIO.lang.localize("gas.gasTick"); int extractRate = Config.gasConduitExtractRate; int maxIo = Config.gasConduitMaxIoRate; - list.add(Lang.localize("itemGasConduit.tooltip.maxExtract") + " " + extractRate + gpt); - list.add(Lang.localize("itemGasConduit.tooltip.maxIo") + " " + maxIo + gpt); + list.add(EnderIO.lang.localize("itemGasConduit.tooltip.maxExtract") + " " + extractRate + gpt); + list.add(EnderIO.lang.localize("itemGasConduit.tooltip.maxIo") + " " + maxIo + gpt); SpecialTooltipHandler.addDetailedTooltipFromResources(list, "enderio.itemGasConduit"); } diff --git a/src/main/java/crazypants/enderio/conduit/gas/PacketGasLevel.java b/src/main/java/crazypants/enderio/conduit/gas/PacketGasLevel.java index 4318e903..742e0344 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/PacketGasLevel.java +++ b/src/main/java/crazypants/enderio/conduit/gas/PacketGasLevel.java @@ -1,10 +1,11 @@ package crazypants.enderio.conduit.gas; -import com.enderio.core.common.network.MessageTileEntity; - import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; + +import com.enderio.core.common.network.MessageTileEntity; + import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java index cce99f29..166ea1f7 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java +++ b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java @@ -12,8 +12,8 @@ import com.enderio.core.api.client.gui.ITabPanel; import com.enderio.core.api.client.render.IWidgetIcon; import com.enderio.core.client.gui.button.MultiIconButton; import com.enderio.core.client.render.ColorUtil; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.packet.PacketConnectionMode; @@ -49,7 +49,7 @@ public class BaseSettingsPanel implements ITabPanel { this.gui = gui; this.con = con; - modeLabel = Lang.localize("gui.conduit.ioMode"); + modeLabel = EnderIO.lang.localize("gui.conduit.ioMode"); FontRenderer fr = Minecraft.getMinecraft().fontRenderer; int x = gap * 3 + fr.getStringWidth(modeLabel); diff --git a/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java b/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java index 397454e5..587ac65c 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java @@ -10,8 +10,8 @@ import com.enderio.core.client.gui.button.ColorButton; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.DyeColor; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.gas.IGasConduit; @@ -32,12 +32,12 @@ public class GasSettings extends BaseSettingsPanel { private ColorButton colorB; - private String autoExtractStr = Lang.localize("gui.conduit.gas.autoExtract"); + private String autoExtractStr = EnderIO.lang.localize("gui.conduit.gas.autoExtract"); private IGasConduit conduit; protected GasSettings(final GuiExternalConnection gui, IConduit con) { - super(IconEIO.WRENCH_OVERLAY_GAS, Lang.localize("itemGasConduit.name"), gui, con); + super(IconEIO.WRENCH_OVERLAY_GAS, EnderIO.lang.localize("itemGasConduit.name"), gui, con); conduit = (IGasConduit) con; gui.getContainer().setInventorySlotsVisible(false); @@ -65,7 +65,7 @@ public class GasSettings extends BaseSettingsPanel { x += rsB.getWidth() + gap; colorB = new ColorButton(gui, ID_COLOR_BUTTON, x, y); - colorB.setToolTipHeading(Lang.localize("gui.conduit.redstone.signalColor")); + colorB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.redstone.signalColor")); colorB.setColorIndex(conduit.getExtractionSignalColor(gui.getDir()).ordinal()); } diff --git a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java index b43f4dde..48cf15fd 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java @@ -21,8 +21,8 @@ import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.DyeColor; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.liquid.EnderLiquidConduit; @@ -47,8 +47,8 @@ public class LiquidSettings extends BaseSettingsPanel { private final RedstoneModeButton rsB; private final ColorButton colorB; - private static final String autoExtractStr = Lang.localize("gui.conduit.fluid.autoExtract"); - private static final String filterStr = Lang.localize("gui.conduit.fluid.filter"); + private static final String autoExtractStr = EnderIO.lang.localize("gui.conduit.fluid.autoExtract"); + private static final String filterStr = EnderIO.lang.localize("gui.conduit.fluid.filter"); private final ILiquidConduit conduit; @@ -64,7 +64,7 @@ public class LiquidSettings extends BaseSettingsPanel { private IconButton whiteListB; protected LiquidSettings(final GuiExternalConnection gui, IConduit con) { - super(IconEIO.WRENCH_OVERLAY_FLUID, Lang.localize("itemLiquidConduit.name"), gui, con); + super(IconEIO.WRENCH_OVERLAY_FLUID, EnderIO.lang.localize("itemLiquidConduit.name"), gui, con); conduit = (ILiquidConduit) con; if(con instanceof EnderLiquidConduit) { @@ -80,7 +80,7 @@ public class LiquidSettings extends BaseSettingsPanel { y = filterY + 1; whiteListB = new IconButton(gui, ID_WHITELIST, x, y, IconEIO.FILTER_WHITELIST); - whiteListB.setToolTip(Lang.localize("gui.conduit.fluid.whitelist")); + whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.fluid.whitelist")); } else { isEnder = false; gui.getContainer().setInventorySlotsVisible(false); @@ -109,7 +109,7 @@ public class LiquidSettings extends BaseSettingsPanel { x += rsB.getWidth() + gap; colorB = new ColorButton(gui, ID_COLOR_BUTTON, x, y); - colorB.setToolTipHeading(Lang.localize("gui.conduit.redstone.signalColor")); + colorB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.redstone.signalColor")); colorB.setColorIndex(conduit.getExtractionSignalColor(gui.getDir()).ordinal()); } @@ -227,10 +227,10 @@ public class LiquidSettings extends BaseSettingsPanel { private void updateWhiteListButton(FluidFilter filter) { if(filter != null && filter.isBlacklist()) { whiteListB.setIcon(IconEIO.FILTER_BLACKLIST); - whiteListB.setToolTip(Lang.localize("gui.conduit.fluid.blacklist")); + whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.fluid.blacklist")); } else { whiteListB.setIcon(IconEIO.FILTER_WHITELIST); - whiteListB.setToolTip(Lang.localize("gui.conduit.fluid.whitelist")); + whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.fluid.whitelist")); } } @@ -264,7 +264,7 @@ public class LiquidSettings extends BaseSettingsPanel { if(isEnder && isFilterVisible()) { if(conduit.getConnectionMode(gui.getDir()) == ConnectionMode.IN_OUT) { - String inOutStr = inOutShowIn ? Lang.localize("gui.conduit.ioMode.input") : Lang.localize("gui.conduit.ioMode.output"); + String inOutStr = inOutShowIn ? EnderIO.lang.localize("gui.conduit.ioMode.input") : EnderIO.lang.localize("gui.conduit.ioMode.output"); int x = gui.getGuiLeft() + gui.getXSize() - 20 - 5 - gui.getFontRenderer().getStringWidth(inOutStr); int y = top; gui.getFontRenderer().drawString(inOutStr, x, y, ColorUtil.getRGB(Color.DARK_GRAY)); diff --git a/src/main/java/crazypants/enderio/conduit/gui/MESettings.java b/src/main/java/crazypants/enderio/conduit/gui/MESettings.java index c7298c27..6b0b337b 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/MESettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/MESettings.java @@ -1,14 +1,13 @@ package crazypants.enderio.conduit.gui; -import com.enderio.core.common.util.Lang; - +import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.gui.IconEIO; public class MESettings extends BaseSettingsPanel { public MESettings(GuiExternalConnection gui, IConduit con) { - super(IconEIO.WRENCH_OVERLAY_ME, Lang.localize("itemMEConduit.name"), gui, con); + super(IconEIO.WRENCH_OVERLAY_ME, EnderIO.lang.localize("itemMEConduit.name"), gui, con); } diff --git a/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java b/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java index 751c236c..eab6abb6 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java +++ b/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java @@ -1,11 +1,12 @@ package crazypants.enderio.conduit.gui; -import com.enderio.core.common.network.MessageTileEntity; - import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; + +import com.enderio.core.common.network.MessageTileEntity; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java b/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java index e321640c..4439eca9 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java @@ -4,8 +4,8 @@ import net.minecraft.client.gui.GuiButton; import com.enderio.core.client.gui.button.ColorButton; import com.enderio.core.common.util.DyeColor; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.packet.PacketExtractMode; import crazypants.enderio.conduit.power.IPowerConduit; @@ -26,7 +26,7 @@ public class PowerSettings extends BaseSettingsPanel { private ColorButton colorB; protected PowerSettings(final GuiExternalConnection gui, IConduit con) { - super(IconEIO.WRENCH_OVERLAY_POWER, Lang.localize("itemPowerConduit.name"), gui, con); + super(IconEIO.WRENCH_OVERLAY_POWER, EnderIO.lang.localize("itemPowerConduit.name"), gui, con); conduit = (IPowerConduit) con; int x = 38; @@ -52,7 +52,7 @@ public class PowerSettings extends BaseSettingsPanel { x += rsB.getWidth() + gap; colorB = new ColorButton(gui, ID_COLOR_BUTTON, x, y); - colorB.setToolTipHeading(Lang.localize("gui.conduit.redstone.signalColor")); + colorB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.redstone.signalColor")); colorB.setColorIndex(conduit.getExtractionSignalColor(gui.getDir()).ordinal()); } diff --git a/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java b/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java index b8a80ed1..356554f2 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java @@ -8,8 +8,8 @@ import com.enderio.core.client.gui.button.CheckBox; import com.enderio.core.client.gui.button.ColorButton; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.common.util.DyeColor; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.packet.PacketRedstoneConduitOutputStrength; import crazypants.enderio.conduit.packet.PacketRedstoneConduitSignalColor; @@ -25,14 +25,14 @@ public class RedstoneSettings extends BaseSettingsPanel { private CheckBox strongCB; - private String signalColorStr = Lang.localize("gui.conduit.redstone.color"); - private String signalStringthStr = Lang.localize("gui.conduit.redstone.signalStrengh"); + private String signalColorStr = EnderIO.lang.localize("gui.conduit.redstone.color"); + private String signalStringthStr = EnderIO.lang.localize("gui.conduit.redstone.signalStrengh"); private IInsulatedRedstoneConduit insCon; private int stongLabelX; public RedstoneSettings(GuiExternalConnection gui, IConduit con) { - super(IconEIO.WRENCH_OVERLAY_REDSTONE, Lang.localize("itemRedstoneConduitInsulated.name"), gui, con); + super(IconEIO.WRENCH_OVERLAY_REDSTONE, EnderIO.lang.localize("itemRedstoneConduitInsulated.name"), gui, con); int x = 0; int y = customTop; @@ -45,7 +45,7 @@ public class RedstoneSettings extends BaseSettingsPanel { if(!insCon.isSpecialConnection(gui.getDir())) { x += gap + gap + 2 + gui.getFontRenderer().getStringWidth(signalColorStr); cb = new ColorButton(gui, ID_COLOR_BUTTON, x, y); - cb.setToolTipHeading(Lang.localize("gui.conduit.redstone.signalColor")); + cb.setToolTipHeading(EnderIO.lang.localize("gui.conduit.redstone.signalColor")); DyeColor sigCol = insCon.getSignalColor(gui.getDir()); cb.setColorIndex(sigCol.ordinal()); x += cb.getButtonWidth(); @@ -54,7 +54,7 @@ public class RedstoneSettings extends BaseSettingsPanel { stongLabelX = x; x += gap + gui.getFontRenderer().getStringWidth(signalStringthStr) + gap + 3; strongCB = new CheckBox(gui, ID_STRONG_BUTTON, x, y); - strongCB.setToolTip(Lang.localize("gui.conduit.redstone.signalStrengh.tooltip")); + strongCB.setToolTip(EnderIO.lang.localize("gui.conduit.redstone.signalStrengh.tooltip")); } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java index 23279852..fa3b6804 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java @@ -8,8 +8,8 @@ import com.enderio.core.client.gui.GuiContainerBase; import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.item.filter.ItemFilter; import crazypants.enderio.gui.IconEIO; @@ -62,19 +62,19 @@ public class BasicItemFilterGui implements IItemFilterGui { int x = butLeft; int y = yOffset + 1; whiteListB = new IconButton(gui, ID_WHITELIST + buttonIdOffset, x, y, IconEIO.FILTER_WHITELIST); - whiteListB.setToolTip(Lang.localize("gui.conduit.item.whitelist")); + whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist")); x += 20; useMetaB = new ToggleButton(gui, ID_META + buttonIdOffset, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META); - useMetaB.setSelectedToolTip(Lang.localize("gui.conduit.item.matchMetaData")); - useMetaB.setUnselectedToolTip(Lang.localize("gui.conduit.item.ignoreMetaData")); + useMetaB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchMetaData")); + useMetaB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreMetaData")); useMetaB.setPaintSelectedBorder(false); x += 20; stickyB = new ToggleButton(gui, ID_STICKY + buttonIdOffset, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); - String[] lines = Lang.localizeList("gui.conduit.item.stickyEnabled"); + String[] lines = EnderIO.lang.localizeList("gui.conduit.item.stickyEnabled"); stickyB.setSelectedToolTip(lines); - stickyB.setUnselectedToolTip(Lang.localize("gui.conduit.item.stickyDisbaled")); + stickyB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.stickyDisbaled")); stickyB.setPaintSelectedBorder(false); y += 20; @@ -82,14 +82,14 @@ public class BasicItemFilterGui implements IItemFilterGui { x += 20; useNbtB = new ToggleButton(gui, ID_NBT + buttonIdOffset, x, y, IconEIO.FILTER_NBT_OFF, IconEIO.FILTER_NBT); - useNbtB.setSelectedToolTip(Lang.localize("gui.conduit.item.matchNBT")); - useNbtB.setUnselectedToolTip(Lang.localize("gui.conduit.item.ignoreNBT")); + useNbtB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchNBT")); + useNbtB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreNBT")); useNbtB.setPaintSelectedBorder(false); x = butLeft; useOreDictB = new ToggleButton(gui, ID_ORE_DICT + buttonIdOffset, x, y, IconEIO.FILTER_ORE_DICT_OFF, IconEIO.FILTER_ORE_DICT); - useOreDictB.setSelectedToolTip(Lang.localize("gui.conduit.item.oreDicEnabled")); - useOreDictB.setUnselectedToolTip(Lang.localize("gui.conduit.item.oreDicDisabled")); + useOreDictB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicEnabled")); + useOreDictB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicDisabled")); useOreDictB.setPaintSelectedBorder(false); } @@ -129,10 +129,10 @@ public class BasicItemFilterGui implements IItemFilterGui { whiteListB.onGuiInit(); if(activeFilter.isBlacklist()) { whiteListB.setIcon(IconEIO.FILTER_BLACKLIST); - whiteListB.setToolTip(Lang.localize("gui.conduit.item.blacklist")); + whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.blacklist")); } else { whiteListB.setIcon(IconEIO.FILTER_WHITELIST); - whiteListB.setToolTip(Lang.localize("gui.conduit.item.whitelist")); + whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist")); } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java index e9d1ca2b..2a1e9202 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java @@ -15,9 +15,9 @@ import com.enderio.core.api.client.gui.IGuiOverlay; import com.enderio.core.api.client.gui.IGuiScreen; import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.Lang; import com.enderio.core.common.vecmath.Vector4f; +import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.filter.ExistingItemFilter; @@ -72,15 +72,15 @@ public class ExistingItemFilterGui implements IItemFilterGui { int y = 68; useMetaB = new ToggleButton(gui, ID_META, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META); - useMetaB.setSelectedToolTip(Lang.localize("gui.conduit.item.matchMetaData")); - useMetaB.setUnselectedToolTip(Lang.localize("gui.conduit.item.ignoreMetaData")); + useMetaB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchMetaData")); + useMetaB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreMetaData")); useMetaB.setPaintSelectedBorder(false); x += 20; stickyB = new ToggleButton(gui, ID_STICKY, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); - String[] lines = Lang.localizeList("gui.conduit.item.stickyEnabled"); + String[] lines = EnderIO.lang.localizeList("gui.conduit.item.stickyEnabled"); stickyB.setSelectedToolTip(lines); - stickyB.setUnselectedToolTip(Lang.localize("gui.conduit.item.stickyDisbaled")); + stickyB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.stickyDisbaled")); stickyB.setPaintSelectedBorder(false); y += 20; @@ -88,20 +88,20 @@ public class ExistingItemFilterGui implements IItemFilterGui { x += 20; useNbtB = new ToggleButton(gui, ID_NBT, x, y, IconEIO.FILTER_NBT_OFF, IconEIO.FILTER_NBT); - useNbtB.setSelectedToolTip(Lang.localize("gui.conduit.item.matchNBT")); - useNbtB.setUnselectedToolTip(Lang.localize("gui.conduit.item.ignoreNBT")); + useNbtB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchNBT")); + useNbtB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreNBT")); useNbtB.setPaintSelectedBorder(false); x = butLeft; useOreDictB = new ToggleButton(gui, ID_ORE_DICT, x, y, IconEIO.FILTER_ORE_DICT_OFF, IconEIO.FILTER_ORE_DICT); - useOreDictB.setSelectedToolTip(Lang.localize("gui.conduit.item.oreDicEnabled")); - useOreDictB.setUnselectedToolTip(Lang.localize("gui.conduit.item.oreDicDisabled")); + useOreDictB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicEnabled")); + useOreDictB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicDisabled")); useOreDictB.setPaintSelectedBorder(false); - snapshotB = new GuiButton(ID_SNAPSHOT, 0, 0, 60, 20, Lang.localize("gui.conduit.button.snap")); - mergeB = new GuiButton(ID_MERGE, 0, 0, 40, 20, Lang.localize("gui.conduit.button.merge")); - clearB = new GuiButton(ID_CLEAR, 0, 0, 60, 20, Lang.localize("gui.conduit.button.clear")); - showB = new GuiButton(ID_SHOW, 0, 0, 40, 20, Lang.localize("gui.conduit.button.show")); + snapshotB = new GuiButton(ID_SNAPSHOT, 0, 0, 60, 20, EnderIO.lang.localize("gui.conduit.button.snap")); + mergeB = new GuiButton(ID_MERGE, 0, 0, 40, 20, EnderIO.lang.localize("gui.conduit.button.merge")); + clearB = new GuiButton(ID_CLEAR, 0, 0, 60, 20, EnderIO.lang.localize("gui.conduit.button.clear")); + showB = new GuiButton(ID_SHOW, 0, 0, 40, 20, EnderIO.lang.localize("gui.conduit.button.show")); snapshotOverlay = new SnapshotOverlay(); gui.addOverlay(snapshotOverlay); diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java index d18e81d8..1f6fe1cc 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java @@ -18,8 +18,8 @@ import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.EnderWidget; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.DyeColor; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.gui.BaseSettingsPanel; @@ -87,11 +87,11 @@ public class ItemSettings extends BaseSettingsPanel { private IItemFilterGui filterGui; public ItemSettings(final GuiExternalConnection gui, IConduit con) { - super(IconEIO.WRENCH_OVERLAY_ITEM, Lang.localize("itemItemConduit.name"), gui, con); + super(IconEIO.WRENCH_OVERLAY_ITEM, EnderIO.lang.localize("itemItemConduit.name"), gui, con); itemConduit = (IItemConduit) con; - inputHeading = Lang.localize("gui.conduit.item.extractionFilter"); - outputHeading = Lang.localize("gui.conduit.item.insertionFilter"); + inputHeading = EnderIO.lang.localize("gui.conduit.item.extractionFilter"); + outputHeading = EnderIO.lang.localize("gui.conduit.item.insertionFilter"); int x = 52; int y = customTop; @@ -101,15 +101,15 @@ public class ItemSettings extends BaseSettingsPanel { x = 66; channelB = new ColorButton(gui, ID_CHANNEL, x, y); channelB.setColorIndex(0); - channelB.setToolTipHeading(Lang.localize("gui.conduit.item.channel")); + channelB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.item.channel")); - filterUpgradeTooltip = new GuiToolTip(new Rectangle(x - 21 - 18 * 2, customTop + 3 + 16, 18, 18), Lang.localize("gui.conduit.item.filterupgrade")) { + filterUpgradeTooltip = new GuiToolTip(new Rectangle(x - 21 - 18 * 2, customTop + 3 + 16, 18, 18), EnderIO.lang.localize("gui.conduit.item.filterupgrade")) { @Override public boolean shouldDraw() { return !gui.getContainer().hasFilterUpgrades(isInputVisible()) && super.shouldDraw(); } }; - speedUpgradeTooltip = new GuiToolTip(new Rectangle(x - 21 - 18, customTop + 3 + 16, 18, 18), Lang.localize("gui.conduit.item.speedupgrade"), Lang.localize("gui.conduit.item.speedupgrade2")) { + speedUpgradeTooltip = new GuiToolTip(new Rectangle(x - 21 - 18, customTop + 3 + 16, 18, 18), EnderIO.lang.localize("gui.conduit.item.speedupgrade"), EnderIO.lang.localize("gui.conduit.item.speedupgrade2")) { @Override public boolean shouldDraw() { return !gui.getContainer().hasSpeedUpgrades() && super.shouldDraw(); @@ -119,7 +119,7 @@ public class ItemSettings extends BaseSettingsPanel { ArrayList list = new ArrayList(); SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.conduit.item.functionupgrade.line"); for(FunctionUpgrade upgrade : FunctionUpgrade.values()) { - list.add(Lang.localize(upgrade.unlocName.concat(".name"), false)); + list.add(EnderIO.lang.localize(upgrade.unlocName.concat(".name"), false)); } functionUpgradeTooltip = new GuiToolTip(new Rectangle(x - 21 - 18*2, customTop + 3 + 34, 18, 18), list) { @Override @@ -152,21 +152,21 @@ public class ItemSettings extends BaseSettingsPanel { x += rsB.getWidth() + 4; colorB = new ColorButton(gui, ID_COLOR_BUTTON, x, y); colorB.setColorIndex(itemConduit.getExtractionSignalColor(gui.getDir()).ordinal()); - colorB.setToolTipHeading(Lang.localize("gui.conduit.item.sigCol")); + colorB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.item.sigCol")); x += 4 + colorB.getWidth(); roundRobinB = new ToggleButton(gui, ID_ROUND_ROBIN, x, y, IconEIO.ROUND_ROBIN_OFF, IconEIO.ROUND_ROBIN); - roundRobinB.setSelectedToolTip(Lang.localize("gui.conduit.item.roundRobinEnabled")); - roundRobinB.setUnselectedToolTip(Lang.localize("gui.conduit.item.roundRobinDisabled")); + roundRobinB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.roundRobinEnabled")); + roundRobinB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.roundRobinDisabled")); roundRobinB.setPaintSelectedBorder(false); x += 4 + roundRobinB.getWidth(); loopB = new ToggleButton(gui, ID_LOOP, x, y, IconEIO.LOOP_OFF, IconEIO.LOOP); - loopB.setSelectedToolTip(Lang.localize("gui.conduit.item.selfFeedEnabled")); - loopB.setUnselectedToolTip(Lang.localize("gui.conduit.item.selfFeedDisabled")); + loopB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.selfFeedEnabled")); + loopB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.selfFeedDisabled")); loopB.setPaintSelectedBorder(false); - priorityTooltip = new GuiToolTip(new Rectangle(priLeft + 9, y, priWidth, 16), Lang.localize("gui.conduit.item.priority")); + priorityTooltip = new GuiToolTip(new Rectangle(priLeft + 9, y, priWidth, 16), EnderIO.lang.localize("gui.conduit.item.priority")); x = priLeft + priWidth + 9; priUpB = MultiIconButton.createAddButton(gui, ID_PRIORITY_UP, x, y); diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java index 4f5c9ca1..a355ca52 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java @@ -3,8 +3,8 @@ package crazypants.enderio.conduit.gui.item; import net.minecraft.client.gui.GuiButton; import com.enderio.core.client.gui.button.ToggleButton; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.gui.GuiExternalConnection; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.filter.PowerItemFilter; @@ -48,9 +48,9 @@ public class PowerItemFilterGui implements IItemFilterGui { x += 20; stickyB = new ToggleButton(gui, ID_STICKY, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); - String[] lines = Lang.localizeList("gui.conduit.item.stickyEnabled"); + String[] lines = EnderIO.lang.localizeList("gui.conduit.item.stickyEnabled"); stickyB.setSelectedToolTip(lines); - stickyB.setUnselectedToolTip(Lang.localize("gui.conduit.item.stickyDisbaled")); + stickyB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.stickyDisbaled")); stickyB.setPaintSelectedBorder(false); modeB = new GuiButton(ID_MORE, 0, 0, 40, 20, ""); diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java index b89db575..9bfd0220 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java @@ -11,8 +11,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.AbstractConduitNetwork; import crazypants.enderio.conduit.item.NetworkedInventory.Target; import crazypants.enderio.conduit.item.filter.IItemFilter; @@ -182,7 +182,7 @@ public class ItemConduitNetwork extends AbstractConduitNetwork { public AbstractConduitBundlePacket() { diff --git a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java index 136212db..6ebe7500 100644 --- a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java @@ -4,11 +4,9 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; - -import com.enderio.core.common.util.Lang; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.AbstractItemConduit; import crazypants.enderio.conduit.IConduit; @@ -52,7 +50,7 @@ public class ItemPowerConduit extends AbstractItemConduit { public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) { if(PREFIX == null) { POSTFIX = " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); - PREFIX = Lang.localize("power.maxOutput") + " "; + PREFIX = EnderIO.lang.localize("power.maxOutput") + " "; } super.addInformation(itemStack, par2EntityPlayer, list, par4); ICapacitor cap = PowerConduit.getCapacitors()[itemStack.getItemDamage()]; diff --git a/src/main/java/crazypants/enderio/config/GuiConfigFactoryEIO.java b/src/main/java/crazypants/enderio/config/GuiConfigFactoryEIO.java index e7114a36..54a6f06d 100644 --- a/src/main/java/crazypants/enderio/config/GuiConfigFactoryEIO.java +++ b/src/main/java/crazypants/enderio/config/GuiConfigFactoryEIO.java @@ -6,9 +6,6 @@ import java.util.List; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.ConfigElement; - -import com.enderio.core.common.util.Lang; - import cpw.mods.fml.client.config.GuiConfig; import cpw.mods.fml.client.config.IConfigElement; import crazypants.enderio.EnderIO; @@ -19,20 +16,18 @@ import static crazypants.enderio.config.Config.config; @SuppressWarnings({ "rawtypes" }) public class GuiConfigFactoryEIO extends GuiConfig { - public GuiConfigFactoryEIO(GuiScreen parentScreen) - { - super(parentScreen, getConfigElements(parentScreen), EnderIO.MODID, false, false, Lang.localize("config.title", true)); + public GuiConfigFactoryEIO(GuiScreen parentScreen) { + super(parentScreen, getConfigElements(parentScreen), EnderIO.MODID, false, false, EnderIO.lang.localize("config.title", true)); } - private static List getConfigElements(GuiScreen parent) - { + private static List getConfigElements(GuiScreen parent) { List list = new ArrayList(); - String prefix = Lang.prefix + "config."; - + String prefix = EnderIO.lang.addPrefix("config."); + for (Section section : Config.sections) { list.add(new ConfigElement(config.getCategory(section.lc()).setLanguageKey(prefix + section.lang))); } - + return list; } } diff --git a/src/main/java/crazypants/enderio/enchantment/EnchantmentSoulBound.java b/src/main/java/crazypants/enderio/enchantment/EnchantmentSoulBound.java index 89f139e3..96b4a9bb 100644 --- a/src/main/java/crazypants/enderio/enchantment/EnchantmentSoulBound.java +++ b/src/main/java/crazypants/enderio/enchantment/EnchantmentSoulBound.java @@ -18,11 +18,11 @@ import net.minecraftforge.event.entity.player.PlayerDropsEvent; import net.minecraftforge.event.entity.player.PlayerEvent; import com.enderio.core.api.common.enchant.IAdvancedEnchant; -import com.enderio.core.common.util.Lang; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.util.BaublesUtil; @@ -159,6 +159,6 @@ public class EnchantmentSoulBound extends Enchantment implements IAdvancedEnchan @Override public String[] getTooltipDetails(ItemStack stack) { - return new String[] { Lang.localize("description.enchantment.enderio.soulBound", false) }; + return new String[] { EnderIO.lang.localize("description.enchantment.enderio.soulBound", false) }; } } diff --git a/src/main/java/crazypants/enderio/enderface/ItemEnderface.java b/src/main/java/crazypants/enderio/enderface/ItemEnderface.java index 6a0421b4..02ba5e63 100644 --- a/src/main/java/crazypants/enderio/enderface/ItemEnderface.java +++ b/src/main/java/crazypants/enderio/enderface/ItemEnderface.java @@ -91,27 +91,27 @@ public class ItemEnderface extends Item implements IGuiHandler { // int dimension = tag.getInteger(KEY_DIMENSION); // // if(world.provider.dimensionId != dimension) { -// ChatMessageComponent c = ChatMessageComponent.createFromText(Lang.localize("itemEnderface.wrongDimension")); +// ChatMessageComponent c = ChatMessageComponent.createFromText(EnderIO.lang.localize("itemEnderface.wrongDimension")); // entityPlayer.sendChatToPlayer(c); // return itemStack; // } // // Chunk c = world.getChunkFromBlockCoords(x, z); // if(c == null || !c.isChunkLoaded) { -// ChatMessageComponent cm = ChatMessageComponent.createFromText(Lang.localize("itemEnderface.tooFar")); +// ChatMessageComponent cm = ChatMessageComponent.createFromText(EnderIO.lang.localize("itemEnderface.tooFar")); // entityPlayer.sendChatToPlayer(cm); // return itemStack; // } // int blockId = world.getBlockId(x, y, z); // if(blockId != EnderIO.blockEnderIo.blockID) { -// ChatMessageComponent cm = ChatMessageComponent.createFromText(Lang.localize("itemEnderface.destroyed")); +// ChatMessageComponent cm = ChatMessageComponent.createFromText(EnderIO.lang.localize("itemEnderface.destroyed")); // entityPlayer.sendChatToPlayer(cm); // return itemStack; // } // entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_ENDERFACE, world, x, y, z); // return itemStack; // } -// ChatMessageComponent cm = ChatMessageComponent.createFromText(Lang.localize("itemEnderface.noSync")); +// ChatMessageComponent cm = ChatMessageComponent.createFromText(EnderIO.lang.localize("itemEnderface.noSync")); // entityPlayer.sendChatToPlayer(cm); return itemStack; } diff --git a/src/main/java/crazypants/enderio/fluid/BucketHandler.java b/src/main/java/crazypants/enderio/fluid/BucketHandler.java index a5bd501e..0c15f229 100644 --- a/src/main/java/crazypants/enderio/fluid/BucketHandler.java +++ b/src/main/java/crazypants/enderio/fluid/BucketHandler.java @@ -71,9 +71,9 @@ public class BucketHandler { // if(fluid != null) { // Fuel fuel = IronEngineFuel.getFuelForFluid(fluid); // if(fuel != null) { - // list.add(Lang.localize("fuel.tooltip.heading")); + // list.add(EnderIO.lang.localize("fuel.tooltip.heading")); // list.add(EnumChatFormatting.ITALIC + " " + PowerDisplayUtil.formatPowerPerTick(fuel.powerPerCycle)); - // list.add(EnumChatFormatting.ITALIC + " " + fuel.totalBurningTime + " " + Lang.localize("fuel.tooltip.burnTime")); + // list.add(EnumChatFormatting.ITALIC + " " + fuel.totalBurningTime + " " + EnderIO.lang.localize("fuel.tooltip.burnTime")); // } // } // } diff --git a/src/main/java/crazypants/enderio/fluid/Fluids.java b/src/main/java/crazypants/enderio/fluid/Fluids.java index 0c3f0447..cd1e768f 100644 --- a/src/main/java/crazypants/enderio/fluid/Fluids.java +++ b/src/main/java/crazypants/enderio/fluid/Fluids.java @@ -1,7 +1,7 @@ package crazypants.enderio.fluid; import net.minecraftforge.fluids.IFluidTank; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; public class Fluids { @@ -21,7 +21,7 @@ public class Fluids { } public static String MB() { - return Lang.localize("fluid.millibucket.abr"); + return EnderIO.lang.localize("fluid.millibucket.abr"); } diff --git a/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java b/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java index c87b6dad..03b623e9 100644 --- a/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java +++ b/src/main/java/crazypants/enderio/gui/RedstoneModeButton.java @@ -5,8 +5,8 @@ import net.minecraft.client.Minecraft; import com.enderio.core.api.client.gui.IGuiScreen; import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.PacketRedstoneMode; import crazypants.enderio.machine.RedstoneControlMode; @@ -33,7 +33,7 @@ public class RedstoneModeButton extends IconButton { this.model = model; this.bc = bc; curMode = model.getRedstoneControlMode(); - setToolTip(Lang.localize("gui.tooltip.redstoneControlMode"), curMode.getTooltip()); + setToolTip(EnderIO.lang.localize("gui.tooltip.redstoneControlMode"), curMode.getTooltip()); setIcon(ICONS[curMode.ordinal()]); } @@ -61,7 +61,7 @@ public class RedstoneModeButton extends IconButton { public void setTooltipKey(String tooltipKey) { this.tooltipKey = tooltipKey; - setToolTip(Lang.localize(tooltipKey, false), model.getRedstoneControlMode().getTooltip()); + setToolTip(EnderIO.lang.localize(tooltipKey, false), model.getRedstoneControlMode().getTooltip()); } private void nextMode() { @@ -83,7 +83,7 @@ public class RedstoneModeButton extends IconButton { return; } curMode = mode; - setToolTip(Lang.localize(tooltipKey, false), mode.getTooltip()); + setToolTip(EnderIO.lang.localize(tooltipKey, false), mode.getTooltip()); setIcon(ICONS[mode.ordinal()]); model.setRedstoneControlMode(mode); if(bc != null) { diff --git a/src/main/java/crazypants/enderio/gui/TooltipHandlerBurnTime.java b/src/main/java/crazypants/enderio/gui/TooltipHandlerBurnTime.java index 7357e7a3..6c3872e8 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipHandlerBurnTime.java +++ b/src/main/java/crazypants/enderio/gui/TooltipHandlerBurnTime.java @@ -8,8 +8,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityFurnace; import com.enderio.core.client.handlers.SpecialTooltipHandler.ITooltipCallback; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.generator.stirling.StirlingGeneratorContainer; @@ -27,17 +27,17 @@ public class TooltipHandlerBurnTime implements ITooltipCallback { int rate = gen.getPowerUsePerTick(); String msg = String.format("%s %s %s %s %s %s%s", - Lang.localize("power.generates"), + EnderIO.lang.localize("power.generates"), PowerDisplayUtil.formatPower((long)gen.getBurnTime(itemstack) * rate), PowerDisplayUtil.abrevation(), - Lang.localize("power.generation_rate"), + EnderIO.lang.localize("power.generation_rate"), PowerDisplayUtil.formatPower(rate), PowerDisplayUtil.abrevation(), PowerDisplayUtil.perTickStr()); list.add(msg); } else if (Config.addFurnaceFuelTootip && (time = TileEntityFurnace.getItemBurnTime(itemstack)) > 0) { - list.add(Lang.localize("tooltip.burntime") + " " + time); + list.add(EnderIO.lang.localize("tooltip.burntime") + " " + time); } } diff --git a/src/main/java/crazypants/enderio/gui/TooltipHandlerFluid.java b/src/main/java/crazypants/enderio/gui/TooltipHandlerFluid.java index 0d5e4739..f9a31dd2 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipHandlerFluid.java +++ b/src/main/java/crazypants/enderio/gui/TooltipHandlerFluid.java @@ -8,10 +8,9 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; -import com.enderio.core.client.handlers.SpecialTooltipHandler; import com.enderio.core.client.handlers.SpecialTooltipHandler.ITooltipCallback; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.fluid.FluidFuelRegister; import crazypants.enderio.fluid.IFluidCoolant; import crazypants.enderio.fluid.IFluidFuel; @@ -36,15 +35,15 @@ public class TooltipHandlerFluid implements ITooltipCallback { if (fluid != null) { IFluidFuel fuel = FluidFuelRegister.instance.getFuel(fluid); if (fuel != null) { - list.add(Lang.localize("fuel.tooltip.heading")); + list.add(EnderIO.lang.localize("fuel.tooltip.heading")); list.add(EnumChatFormatting.ITALIC + " " + PowerDisplayUtil.formatPowerPerTick(fuel.getPowerPerCycle())); - list.add(EnumChatFormatting.ITALIC + " " + fuel.getTotalBurningTime() + " " + Lang.localize("fuel.tooltip.burnTime")); + list.add(EnumChatFormatting.ITALIC + " " + fuel.getTotalBurningTime() + " " + EnderIO.lang.localize("fuel.tooltip.burnTime")); } else { IFluidCoolant coolant = FluidFuelRegister.instance.getCoolant(fluid); if (coolant != null) { - list.add(Lang.localize("coolant.tooltip.heading")); + list.add(EnderIO.lang.localize("coolant.tooltip.heading")); list.add(EnumChatFormatting.ITALIC + " " + PowerDisplayUtil.formatPowerFloat(coolant.getDegreesCoolingPerMB(100) * 1000) + " " - + Lang.localize("coolant.tooltip.degreesPerBucket")); + + EnderIO.lang.localize("coolant.tooltip.degreesPerBucket")); } } } diff --git a/src/main/java/crazypants/enderio/gui/TooltipHandlerGrinding.java b/src/main/java/crazypants/enderio/gui/TooltipHandlerGrinding.java index d0e532cb..0b6a30d1 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipHandlerGrinding.java +++ b/src/main/java/crazypants/enderio/gui/TooltipHandlerGrinding.java @@ -7,10 +7,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import com.enderio.core.client.handlers.SpecialTooltipHandler.ITooltipCallback; -import com.enderio.core.common.util.Lang; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; import crazypants.enderio.machine.crusher.CrusherRecipeManager; import crazypants.enderio.machine.crusher.IGrindingMultiplier; @@ -35,10 +35,10 @@ public class TooltipHandlerGrinding implements ITooltipCallback { if (ball == null) { return; } - list.add(EnumChatFormatting.BLUE + Lang.localize("darkGrindingBall.tooltip.detailed.line1")); - list.add(EnumChatFormatting.GRAY + Lang.localize("darkGrindingBall.tooltip.detailed.line2") + toPercent(ball.getGrindingMultiplier())); - list.add(EnumChatFormatting.GRAY + Lang.localize("darkGrindingBall.tooltip.detailed.line3") + toPercent(ball.getChanceMultiplier())); - list.add(EnumChatFormatting.GRAY + Lang.localize("darkGrindingBall.tooltip.detailed.line4") + toPercent(1 - ball.getPowerMultiplier())); + list.add(EnumChatFormatting.BLUE + EnderIO.lang.localize("darkGrindingBall.tooltip.detailed.line1")); + list.add(EnumChatFormatting.GRAY + EnderIO.lang.localize("darkGrindingBall.tooltip.detailed.line2") + toPercent(ball.getGrindingMultiplier())); + list.add(EnumChatFormatting.GRAY + EnderIO.lang.localize("darkGrindingBall.tooltip.detailed.line3") + toPercent(ball.getChanceMultiplier())); + list.add(EnumChatFormatting.GRAY + EnderIO.lang.localize("darkGrindingBall.tooltip.detailed.line4") + toPercent(1 - ball.getPowerMultiplier())); } private String toPercent(float fl) { diff --git a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java index 1c301c03..0efce64c 100644 --- a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java +++ b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java @@ -30,7 +30,6 @@ import net.minecraftforge.fluids.FluidRegistry; import com.enderio.core.api.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.DyeColor; import com.enderio.core.common.util.EntityUtil; -import com.enderio.core.common.util.Lang; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -369,13 +368,13 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider { if(mobName != null) { par3List.add(EntityUtil.getDisplayNameForEntity(mobName)); } else { - par3List.add(Lang.localize("item.itemSoulVessel.tooltip.empty")); + par3List.add(EnderIO.lang.localize("item.itemSoulVessel.tooltip.empty")); } float health = getHealthFromStack(par1ItemStack); if(health >= 0) { float maxHealth = getMaxHealthFromStack(par1ItemStack); - String msg = Lang.localize("item.itemSoulVessel.tooltip.health"); + String msg = EnderIO.lang.localize("item.itemSoulVessel.tooltip.health"); if(maxHealth >= 0) { par3List.add(String.format("%s %3.1f/%3.1f", msg, health, maxHealth)); } else { @@ -387,13 +386,13 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider { if(fluidName != null) { Fluid fluid = FluidRegistry.getFluid(fluidName); if(fluid != null) { - par3List.add(Lang.localize("item.itemSoulVessel.tooltip.fluidname") + " " + fluid.getLocalizedName()); + par3List.add(EnderIO.lang.localize("item.itemSoulVessel.tooltip.fluidname") + " " + fluid.getLocalizedName()); } } DyeColor color = getColorFromStack(par1ItemStack); if(color != null) { - par3List.add(Lang.localize("item.itemSoulVessel.tooltip.color") + " " + color.getLocalisedName()); + par3List.add(EnderIO.lang.localize("item.itemSoulVessel.tooltip.color") + " " + color.getLocalisedName()); } } } diff --git a/src/main/java/crazypants/enderio/item/KeyTracker.java b/src/main/java/crazypants/enderio/item/KeyTracker.java index fe6f6130..c9da568c 100644 --- a/src/main/java/crazypants/enderio/item/KeyTracker.java +++ b/src/main/java/crazypants/enderio/item/KeyTracker.java @@ -10,8 +10,6 @@ import net.minecraft.util.ChatComponentTranslation; import org.lwjgl.input.Keyboard; -import com.enderio.core.common.util.Lang; - import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -64,25 +62,25 @@ public class KeyTracker { private KeyBinding magnetKey; public KeyTracker() { - glideKey = new KeyBinding(Lang.localize("keybind.glidertoggle"), Keyboard.KEY_G, Lang.localize("category.darksteelarmor")); + glideKey = new KeyBinding(EnderIO.lang.localize("keybind.glidertoggle"), Keyboard.KEY_G, EnderIO.lang.localize("category.darksteelarmor")); ClientRegistry.registerKeyBinding(glideKey); - soundDetectorKey = new KeyBinding(Lang.localize("keybind.soundlocator"), Keyboard.KEY_L, Lang.localize("category.darksteelarmor")); + soundDetectorKey = new KeyBinding(EnderIO.lang.localize("keybind.soundlocator"), Keyboard.KEY_L, EnderIO.lang.localize("category.darksteelarmor")); ClientRegistry.registerKeyBinding(soundDetectorKey); - nightVisionKey = new KeyBinding(Lang.localize("keybind.nightvision"), Keyboard.KEY_P, Lang.localize("category.darksteelarmor")); + nightVisionKey = new KeyBinding(EnderIO.lang.localize("keybind.nightvision"), Keyboard.KEY_P, EnderIO.lang.localize("category.darksteelarmor")); ClientRegistry.registerKeyBinding(nightVisionKey); - gogglesKey = new KeyBinding(Lang.localize("keybind.gogglesofrevealing"), Keyboard.KEY_R, Lang.localize("category.darksteelarmor")); + gogglesKey = new KeyBinding(EnderIO.lang.localize("keybind.gogglesofrevealing"), Keyboard.KEY_R, EnderIO.lang.localize("category.darksteelarmor")); ClientRegistry.registerKeyBinding(gogglesKey); - stepAssistKey = new KeyBinding(Lang.localize("keybind.stepassist"), Keyboard.KEY_NONE, Lang.localize("category.darksteelarmor")); + stepAssistKey = new KeyBinding(EnderIO.lang.localize("keybind.stepassist"), Keyboard.KEY_NONE, EnderIO.lang.localize("category.darksteelarmor")); ClientRegistry.registerKeyBinding(stepAssistKey); - speedKey = new KeyBinding(Lang.localize("keybind.speed"), Keyboard.KEY_NONE, Lang.localize("category.darksteelarmor")); + speedKey = new KeyBinding(EnderIO.lang.localize("keybind.speed"), Keyboard.KEY_NONE, EnderIO.lang.localize("category.darksteelarmor")); ClientRegistry.registerKeyBinding(speedKey); - yetaWrenchMode = new KeyBinding(Lang.localize("keybind.yetawrenchmode"), Keyboard.KEY_Y, Lang.localize("category.tools")); + yetaWrenchMode = new KeyBinding(EnderIO.lang.localize("keybind.yetawrenchmode"), Keyboard.KEY_Y, EnderIO.lang.localize("category.tools")); ClientRegistry.registerKeyBinding(yetaWrenchMode); - magnetKey = new KeyBinding(Lang.localize("keybind.magnet"), Keyboard.CHAR_NONE, Lang.localize("category.tools")); + magnetKey = new KeyBinding(EnderIO.lang.localize("keybind.magnet"), Keyboard.CHAR_NONE, EnderIO.lang.localize("category.tools")); ClientRegistry.registerKeyBinding(magnetKey); } @@ -131,9 +129,9 @@ public class KeyTracker { isSpeedActive = !isSpeedActive; String message; if(isSpeedActive) { - message = Lang.localize("darksteel.upgrade.speed.enabled"); + message = EnderIO.lang.localize("darksteel.upgrade.speed.enabled"); } else { - message = Lang.localize("darksteel.upgrade.speed.disabled"); + message = EnderIO.lang.localize("darksteel.upgrade.speed.disabled"); } Minecraft.getMinecraft().thePlayer.addChatComponentMessage(new ChatComponentTranslation(message)); DarkSteelController.instance.setSpeedActive(Minecraft.getMinecraft().thePlayer, isSpeedActive); @@ -149,9 +147,9 @@ public class KeyTracker { isStepAssistActive = !isStepAssistActive; String message; if(isStepAssistActive) { - message = Lang.localize("darksteel.upgrade.stepAssist.enabled"); + message = EnderIO.lang.localize("darksteel.upgrade.stepAssist.enabled"); } else { - message = Lang.localize("darksteel.upgrade.stepAssist.disabled"); + message = EnderIO.lang.localize("darksteel.upgrade.stepAssist.disabled"); } Minecraft.getMinecraft().thePlayer.addChatComponentMessage(new ChatComponentTranslation(message)); DarkSteelController.instance.setStepAssistActive(Minecraft.getMinecraft().thePlayer, isStepAssistActive); @@ -209,9 +207,9 @@ public class KeyTracker { isSoundDectorActive = !isSoundDectorActive; String message; if(isSoundDectorActive) { - message = Lang.localize("darksteel.upgrade.sound.enabled"); + message = EnderIO.lang.localize("darksteel.upgrade.sound.enabled"); } else { - message = Lang.localize("darksteel.upgrade.sound.disabled"); + message = EnderIO.lang.localize("darksteel.upgrade.sound.disabled"); } Minecraft.getMinecraft().thePlayer.addChatComponentMessage(new ChatComponentTranslation(message)); SoundDetector.instance.setEnabled(isSoundDectorActive); @@ -227,9 +225,9 @@ public class KeyTracker { isGlideActive = !isGlideActive; String message; if(isGlideActive) { - message = Lang.localize("darksteel.upgrade.glider.enabled"); + message = EnderIO.lang.localize("darksteel.upgrade.glider.enabled"); } else { - message = Lang.localize("darksteel.upgrade.glider.disabled"); + message = EnderIO.lang.localize("darksteel.upgrade.glider.disabled"); } Minecraft.getMinecraft().thePlayer.addChatComponentMessage(new ChatComponentTranslation(message)); DarkSteelController.instance.setGlideActive(Minecraft.getMinecraft().thePlayer, isGlideActive); diff --git a/src/main/java/crazypants/enderio/item/PacketConduitProbe.java b/src/main/java/crazypants/enderio/item/PacketConduitProbe.java index b0d0e06b..29f46652 100644 --- a/src/main/java/crazypants/enderio/item/PacketConduitProbe.java +++ b/src/main/java/crazypants/enderio/item/PacketConduitProbe.java @@ -11,12 +11,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import com.enderio.core.common.util.Lang; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.EnderIO; import crazypants.enderio.Log; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.TileConduitBundle; @@ -33,22 +31,22 @@ import crazypants.enderio.power.IInternalPoweredTile; public class PacketConduitProbe implements IMessage, IMessageHandler { - private static final String OF = " " + Lang.localize("gui.powerMonitor.of") + " "; - private static final String CON_STORAGE = " " + Lang.localize("gui.powerMonitor.monHeading1") + ": "; - private static final String CAP_BANK_STOR = " " + Lang.localize("gui.powerMonitor.monHeading2") + ": "; - private static final String MACH_BUF_STOR = " " + Lang.localize("gui.powerMonitor.monHeading3") + ": "; - private static final String AVE_OUT = " " + Lang.localize("gui.powerMonitor.monHeading4") + ": "; - private static final String AVE_IN = " " + Lang.localize("gui.powerMonitor.monHeading5") + ": "; + private static final String OF = " " + EnderIO.lang.localize("gui.powerMonitor.of") + " "; + private static final String CON_STORAGE = " " + EnderIO.lang.localize("gui.powerMonitor.monHeading1") + ": "; + private static final String CAP_BANK_STOR = " " + EnderIO.lang.localize("gui.powerMonitor.monHeading2") + ": "; + private static final String MACH_BUF_STOR = " " + EnderIO.lang.localize("gui.powerMonitor.monHeading3") + ": "; + private static final String AVE_OUT = " " + EnderIO.lang.localize("gui.powerMonitor.monHeading4") + ": "; + private static final String AVE_IN = " " + EnderIO.lang.localize("gui.powerMonitor.monHeading5") + ": "; - private static final String NET_HEADING = Lang.localize("gui.mjReader.networkHeading"); - private static final String CON_BUF = " " + Lang.localize("gui.mjReader.conduitBuffer") + ": "; + private static final String NET_HEADING = EnderIO.lang.localize("gui.mjReader.networkHeading"); + private static final String CON_BUF = " " + EnderIO.lang.localize("gui.mjReader.conduitBuffer") + ": "; - private static final String ITEM_HEADING = Lang.localize("gui.mjReader.itemHeading"); - private static final String ITEM_NO_CONNECTIONS = Lang.localize("gui.mjReader.itemNoConnections"); + private static final String ITEM_HEADING = EnderIO.lang.localize("gui.mjReader.itemHeading"); + private static final String ITEM_NO_CONNECTIONS = EnderIO.lang.localize("gui.mjReader.itemNoConnections"); - private static final String ENERGY_CONDUIT = Lang.localize("itemPowerConduit"); - private static final String REQUEST_RANGE = " " + Lang.localize("gui.mjReader.requestRange") + ": ";; - private static final String CUR_REQUEST = " " + Lang.localize("gui.mjReader.currentRequest") + ": ";; + private static final String ENERGY_CONDUIT = EnderIO.lang.localize("itemPowerConduit"); + private static final String REQUEST_RANGE = " " + EnderIO.lang.localize("gui.mjReader.requestRange") + ": ";; + private static final String CUR_REQUEST = " " + EnderIO.lang.localize("gui.mjReader.currentRequest") + ": ";; public static boolean canCreatePacket(World world, int x, int y, int z) { Block block = world.getBlock(x, y, z); @@ -169,7 +167,7 @@ public class PacketConduitProbe implements IMessage, IMessageHandler targets = icn.getTargetsForExtraction(conduit.getLocation().getLocation(dir), conduit, input); if(targets.isEmpty()) { sb.append(" "); - sb.append(Lang.localize("gui.mjReader.noOutputs")); + sb.append(EnderIO.lang.localize("gui.mjReader.noOutputs")); sb.append(".\n"); } else { sb.append(" "); - sb.append(Lang.localize("gui.mjReader.insertedInto")); + sb.append(EnderIO.lang.localize("gui.mjReader.insertedInto")); sb.append("\n"); for (String str : targets) { sb.append(" - "); @@ -211,21 +209,21 @@ public class PacketConduitProbe implements IMessage, IMessageHandler targets = icn.getInputSourcesFor(conduit, dir, input); if(targets.isEmpty()) { if(input == null) { - sb.append(Lang.localize("gui.mjReader.noItems")); + sb.append(EnderIO.lang.localize("gui.mjReader.noItems")); } else { - sb.append(Lang.localize("gui.mjReader.noItem")); + sb.append(EnderIO.lang.localize("gui.mjReader.noItem")); sb.append(" "); sb.append(input.getDisplayName()); } } else { if(input == null) { - sb.append(Lang.localize("gui.mjReader.receiveItems")); + sb.append(EnderIO.lang.localize("gui.mjReader.receiveItems")); } else { - sb.append(Lang.localize("gui.mjReader.receiveItem1")); + sb.append(EnderIO.lang.localize("gui.mjReader.receiveItem1")); sb.append(" "); sb.append(input.getDisplayName()); sb.append(" "); - sb.append(Lang.localize("gui.mjReader.receiveItem2")); + sb.append(EnderIO.lang.localize("gui.mjReader.receiveItem2")); } sb.append("\n"); for (String str : targets) { diff --git a/src/main/java/crazypants/enderio/item/darksteel/AbstractUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/AbstractUpgrade.java index dfaa49b4..d58e4d9b 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/AbstractUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/AbstractUpgrade.java @@ -9,10 +9,10 @@ import net.minecraft.util.EnumChatFormatting; import com.enderio.core.client.handlers.SpecialTooltipHandler; import com.enderio.core.common.util.ItemUtil; -import com.enderio.core.common.util.Lang; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; public abstract class AbstractUpgrade implements IDarkSteelUpgrade { @@ -73,13 +73,13 @@ public abstract class AbstractUpgrade implements IDarkSteelUpgrade { @Override @SideOnly(Side.CLIENT) public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(EnumChatFormatting.DARK_AQUA + Lang.localize(getUnlocalizedName() + ".name", false)); + list.add(EnumChatFormatting.DARK_AQUA + EnderIO.lang.localize(getUnlocalizedName() + ".name", false)); } @Override @SideOnly(Side.CLIENT) public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(EnumChatFormatting.DARK_AQUA + Lang.localize(getUnlocalizedName() + ".name", false)); + list.add(EnumChatFormatting.DARK_AQUA + EnderIO.lang.localize(getUnlocalizedName() + ".name", false)); SpecialTooltipHandler.addDetailedTooltipFromResources(list, getUnlocalizedName()); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java index f5ee7911..662ddee9 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java @@ -13,7 +13,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.event.AnvilUpdateEvent; -import com.enderio.core.common.util.Lang; import com.google.common.collect.ImmutableList; import cpw.mods.fml.common.Loader; @@ -188,11 +187,11 @@ public class DarkSteelRecipeManager { } } if(!applyableUpgrades.isEmpty()) { - list.add(EnumChatFormatting.YELLOW + Lang.localize("tooltip.anvilupgrades") + " "); + list.add(EnumChatFormatting.YELLOW + EnderIO.lang.localize("tooltip.anvilupgrades") + " "); for (IDarkSteelUpgrade up : applyableUpgrades) { - list.add(EnumChatFormatting.DARK_AQUA + "" + "" + Lang.localize(up.getUnlocalizedName() + ".name", false) + ": "); + list.add(EnumChatFormatting.DARK_AQUA + "" + "" + EnderIO.lang.localize(up.getUnlocalizedName() + ".name", false) + ": "); list.add(EnumChatFormatting.DARK_AQUA + "" + EnumChatFormatting.ITALIC + " " + up.getUpgradeItemName() + " + " + up.getLevelCost() - + " " + Lang.localize("item.darkSteel.tooltip.lvs")); + + " " + EnderIO.lang.localize("item.darkSteel.tooltip.lvs")); } } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java index 05f33e93..0bad1d11 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java @@ -10,7 +10,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import com.enderio.core.client.handlers.SpecialTooltipHandler; -import com.enderio.core.common.util.Lang; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -203,7 +202,7 @@ public class EnergyUpgrade extends AbstractUpgrade { public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { List upgradeStr = new ArrayList(); - upgradeStr.add(EnumChatFormatting.DARK_AQUA + Lang.localize(getUnlocalizedName() + ".name", false)); + upgradeStr.add(EnumChatFormatting.DARK_AQUA + EnderIO.lang.localize(getUnlocalizedName() + ".name", false)); SpecialTooltipHandler.addDetailedTooltipFromResources(upgradeStr, getUnlocalizedName()); String percDamage = (int)Math.round(getAbsorptionRatio(itemstack) * 100) + ""; diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java index 045bd2fb..50ccdd4e 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java @@ -23,7 +23,6 @@ import cofh.api.energy.IEnergyContainerItem; import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.ItemUtil; -import com.enderio.core.common.util.Lang; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Optional.Interface; @@ -32,6 +31,7 @@ import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.config.Config; import crazypants.enderio.thaumcraft.GogglesOfRevealingUpgrade; @@ -173,11 +173,11 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte list.add(str); } if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { - list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_armor.tooltip.line1")); - list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_armor.tooltip.line2")); + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item.darkSteel_armor.tooltip.line1")); + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item.darkSteel_armor.tooltip.line2")); if(itemstack.getItem() == DarkSteelItems.itemDarkSteelBoots) { - list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_boots.tooltip.line1")); - list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_boots.tooltip.line2")); + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item.darkSteel_boots.tooltip.line1")); + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item.darkSteel_boots.tooltip.line2")); } } DarkSteelRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java index a0d561db..9e013d95 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java @@ -25,12 +25,12 @@ import cofh.api.energy.IEnergyContainerItem; import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.ItemUtil; -import com.enderio.core.common.util.Lang; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.config.Config; import crazypants.enderio.machine.farm.farmers.HarvestResult; @@ -268,9 +268,9 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I list.add(str); } if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { - list.add(Lang.localize("item.darkSteel_axe.tooltip.multiHarvest")); + list.add(EnderIO.lang.localize("item.darkSteel_axe.tooltip.multiHarvest")); list.add(EnumChatFormatting.WHITE + "+" + Config.darkSteelAxeEffeciencyBoostWhenPowered + " " - + Lang.localize("item.darkSteel_pickaxe.tooltip.effPowered")); + + EnderIO.lang.localize("item.darkSteel_pickaxe.tooltip.effPowered")); } DarkSteelRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index 7c98f30d..3e3837dd 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -21,7 +21,6 @@ import cofh.api.energy.IEnergyContainerItem; import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.ItemUtil; -import com.enderio.core.common.util.Lang; import com.google.common.collect.Sets; import cpw.mods.fml.common.registry.GameRegistry; @@ -281,10 +280,10 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine } if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { list.add(EnumChatFormatting.WHITE + "+" + Config.darkSteelPickEffeciencyBoostWhenPowered + " " - + Lang.localize("item.darkSteel_pickaxe.tooltip.effPowered")); + + EnderIO.lang.localize("item.darkSteel_pickaxe.tooltip.effPowered")); list.add(EnumChatFormatting.WHITE + "+" + Config.darkSteelPickEffeciencyObsidian + " " - + Lang.localize("item.darkSteel_pickaxe.tooltip.effObs") + " "); - list.add(EnumChatFormatting.WHITE + " " + "(" + Lang.localize("item.darkSteel_pickaxe.tooltip.cost") + " " + + EnderIO.lang.localize("item.darkSteel_pickaxe.tooltip.effObs") + " "); + list.add(EnumChatFormatting.WHITE + " " + "(" + EnderIO.lang.localize("item.darkSteel_pickaxe.tooltip.cost") + " " + PowerDisplayUtil.formatPower(Config.darkSteelPickPowerUseObsidian) + " " + PowerDisplayUtil.abrevation() + ")"); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java index cc1a5c5c..7ddf60bb 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java @@ -24,12 +24,12 @@ import cofh.api.energy.IEnergyContainerItem; import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.ItemUtil; -import com.enderio.core.common.util.Lang; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.config.Config; import crazypants.enderio.machine.farm.farmers.HarvestResult; @@ -259,9 +259,9 @@ public class ItemDarkSteelShears extends ItemShears implements IEnergyContainerI list.add(str); } if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { - list.add(Lang.localize("item.darkSteel_shears.tooltip.multiHarvest")); + list.add(EnderIO.lang.localize("item.darkSteel_shears.tooltip.multiHarvest")); list.add(EnumChatFormatting.WHITE + "+" + Config.darkSteelShearsEffeciencyBoostWhenPowered + " " - + Lang.localize("item.darkSteel_pickaxe.tooltip.effPowered")); + + EnderIO.lang.localize("item.darkSteel_pickaxe.tooltip.effPowered")); } DarkSteelRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java index fa239b72..8bf03865 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java @@ -27,7 +27,6 @@ import cofh.api.energy.IEnergyContainerItem; import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.ItemUtil; -import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.Util; import cpw.mods.fml.common.eventhandler.EventPriority; @@ -354,10 +353,10 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte if(str != null) { list.add(str); } - list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_sword.tooltip.line1")); + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item.darkSteel_sword.tooltip.line1")); if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { - list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_sword.tooltip.line2")); - list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_sword.tooltip.line3")); + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item.darkSteel_sword.tooltip.line2")); + list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item.darkSteel_sword.tooltip.line3")); } DarkSteelRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java b/src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java index 6b964a3e..a7986bf3 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java @@ -88,7 +88,7 @@ public class ItemGliderWing extends Item implements IResourceTooltipProvider { // @SideOnly(Side.CLIENT) // public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { // if(par1ItemStack != null && par1ItemStack.getItemDamage() > 0) { -// par3List.add(Lang.localize("machine.tooltip.upgrade")); +// par3List.add(EnderIO.lang.localize("machine.tooltip.upgrade")); // } // // } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index ed0d0740..ca075cf3 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -20,7 +20,6 @@ import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.InventoryWrapper; import com.enderio.core.common.util.ItemUtil; -import com.enderio.core.common.util.Lang; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; @@ -536,9 +535,9 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi if(stack.hasDisplayName()) { name = stack.getDisplayName(); } else { - name = Lang.localize(stack.getUnlocalizedName() + ".name", false); + name = EnderIO.lang.localize(stack.getUnlocalizedName() + ".name", false); } - name += " " + Lang.localize("machine.tooltip.configured"); + name += " " + EnderIO.lang.localize("machine.tooltip.configured"); stack.setStackDisplayName(name); } diff --git a/src/main/java/crazypants/enderio/machine/ClearConfigRecipe.java b/src/main/java/crazypants/enderio/machine/ClearConfigRecipe.java index 64e8b1f2..5283e686 100644 --- a/src/main/java/crazypants/enderio/machine/ClearConfigRecipe.java +++ b/src/main/java/crazypants/enderio/machine/ClearConfigRecipe.java @@ -10,10 +10,8 @@ import net.minecraft.world.World; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; - -import com.enderio.core.common.util.Lang; - import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import crazypants.enderio.EnderIO; public class ClearConfigRecipe implements IRecipe { @@ -67,7 +65,7 @@ public class ClearConfigRecipe implements IRecipe { @SubscribeEvent public void onTooltip(ItemTooltipEvent event) { if (output != null && ItemStack.areItemStacksEqual(output, event.itemStack)) { - event.toolTip.add(EnumChatFormatting.RED.toString() + EnumChatFormatting.ITALIC + Lang.localize("machine.tooltip.clearConfig", true)); + event.toolTip.add(EnumChatFormatting.RED.toString() + EnumChatFormatting.ITALIC + EnderIO.lang.localize("machine.tooltip.clearConfig", true)); } } } diff --git a/src/main/java/crazypants/enderio/machine/IoMode.java b/src/main/java/crazypants/enderio/machine/IoMode.java index 38231985..1e0f2ae9 100644 --- a/src/main/java/crazypants/enderio/machine/IoMode.java +++ b/src/main/java/crazypants/enderio/machine/IoMode.java @@ -1,9 +1,7 @@ package crazypants.enderio.machine; import net.minecraft.util.EnumChatFormatting; - -import com.enderio.core.common.util.Lang; - +import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConnectionMode; public enum IoMode { @@ -58,7 +56,7 @@ public enum IoMode { } public String getLocalisedName() { - return Lang.localize(unlocalisedName); + return EnderIO.lang.localize(unlocalisedName); } public String colorLocalisedName() { @@ -73,7 +71,7 @@ public enum IoMode { case PUSH: return EnumChatFormatting.GOLD + loc; case PUSH_PULL: - return String.format(Lang.localize(this.getUnlocalisedName() + ".colored"), EnumChatFormatting.GOLD, EnumChatFormatting.WHITE, EnumChatFormatting.AQUA); + return String.format(EnderIO.lang.localize(this.getUnlocalisedName() + ".colored"), EnumChatFormatting.GOLD, EnumChatFormatting.WHITE, EnumChatFormatting.AQUA); default: return loc; } } diff --git a/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java b/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java index 9d8259ef..11248965 100644 --- a/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java +++ b/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java @@ -1,8 +1,7 @@ package crazypants.enderio.machine; import net.minecraft.tileentity.TileEntity; - -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; public enum RedstoneControlMode { @@ -15,7 +14,7 @@ public enum RedstoneControlMode { } public String getTooltip() { - return Lang.localize("gui.tooltip.redstoneControlMode." + name().toLowerCase()); + return EnderIO.lang.localize("gui.tooltip.redstoneControlMode." + name().toLowerCase()); } public static boolean isConditionMet(RedstoneControlMode redstoneControlMode, int powerLevel) { diff --git a/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java b/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java index c4811e41..cd9b9321 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java +++ b/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java @@ -11,7 +11,6 @@ import org.lwjgl.opengl.GL11; import com.enderio.core.client.gui.button.IIconButton; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.Lang; import com.enderio.core.common.vecmath.Vector4f; import crazypants.enderio.EnderIO; @@ -84,8 +83,8 @@ public class GuiAlloySmelter extends GuiPoweredMachineBase { } vanillaFurnaceButton.setIcon(icon); vanillaFurnaceTooltip.setToolTipText( - Lang.localize("gui.alloy.mode.heading"), - Lang.localize(unlocText)); + EnderIO.lang.localize("gui.alloy.mode.heading"), + EnderIO.lang.localize(unlocText)); } /** diff --git a/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java index 4a075adf..8ec4d77b 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java @@ -9,8 +9,8 @@ import org.lwjgl.opengl.GL11; import com.enderio.core.client.gui.widget.TextFieldEnder; import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; @@ -155,15 +155,15 @@ public class GuiBuffer extends GuiPoweredMachineBase { super.drawGuiContainerBackgroundLayer(par1, par2, par3); - String invName = Lang.localize(getTileEntity().getInventoryName() + ".name", false); + String invName = EnderIO.lang.localize(getTileEntity().getInventoryName() + ".name", false); getFontRenderer().drawStringWithShadow(invName, sx + (xSize / 2) - (getFontRenderer().getStringWidth(invName) / 2), sy + 4, 0xFFFFFF); if(getTileEntity().hasPower()) { sx += isFull() ? 19 : 57; sy += 17; - getFontRenderer().drawStringWithShadow(Lang.localize("gui.simple.in"), sx, sy, 0xFFFFFF); - getFontRenderer().drawStringWithShadow(Lang.localize("gui.simple.out"), sx, sy + 27, 0xFFFFFF); + getFontRenderer().drawStringWithShadow(EnderIO.lang.localize("gui.simple.in"), sx, sy, 0xFFFFFF); + getFontRenderer().drawStringWithShadow(EnderIO.lang.localize("gui.simple.out"), sx, sy + 27, 0xFFFFFF); } } diff --git a/src/main/java/crazypants/enderio/machine/buffer/PacketBufferIO.java b/src/main/java/crazypants/enderio/machine/buffer/PacketBufferIO.java index eccca6ce..46ffed86 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/PacketBufferIO.java +++ b/src/main/java/crazypants/enderio/machine/buffer/PacketBufferIO.java @@ -1,8 +1,9 @@ package crazypants.enderio.machine.buffer; +import io.netty.buffer.ByteBuf; + import com.enderio.core.common.network.MessageTileEntity; -import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java index 271ededc..7383f0db 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java @@ -26,7 +26,6 @@ import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.client.handlers.SpecialTooltipHandler; import com.enderio.core.common.TileEntityEnder; -import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.Util; import com.enderio.core.common.vecmath.Vector3d; @@ -141,7 +140,7 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool .getMaxEnergyStored())); if(itemstack.stackTagCompound != null && itemstack.stackTagCompound.hasKey("Items")) { NBTTagList itemList = (NBTTagList) itemstack.stackTagCompound.getTag("Items"); - String msg = Lang.localize("tile.blockCapBank.tooltip.hasItems", false); + String msg = EnderIO.lang.localize("tile.blockCapBank.tooltip.hasItems", false); list.add(EnumChatFormatting.GOLD + MessageFormat.format(msg, itemList.tagCount())); } } @@ -521,9 +520,9 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool if(SpecialTooltipHandler.showAdvancedTooltips()) { String format = Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE; String suffix = Util.TAB + Util.ALIGNRIGHT + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); - tooltip.add(String.format("%s : %s%s%s", Lang.localize("capbank.maxIO"), format, PowerDisplayUtil.formatPower(nw.getMaxIO()), suffix)); - tooltip.add(String.format("%s : %s%s%s", Lang.localize("capbank.maxIn"), format, PowerDisplayUtil.formatPower(nw.getMaxInput()), suffix)); - tooltip.add(String.format("%s : %s%s%s", Lang.localize("capbank.maxOut"), format, PowerDisplayUtil.formatPower(nw.getMaxOutput()), suffix)); + tooltip.add(String.format("%s : %s%s%s", EnderIO.lang.localize("capbank.maxIO"), format, PowerDisplayUtil.formatPower(nw.getMaxIO()), suffix)); + tooltip.add(String.format("%s : %s%s%s", EnderIO.lang.localize("capbank.maxIn"), format, PowerDisplayUtil.formatPower(nw.getMaxInput()), suffix)); + tooltip.add(String.format("%s : %s%s%s", EnderIO.lang.localize("capbank.maxOut"), format, PowerDisplayUtil.formatPower(nw.getMaxOutput()), suffix)); tooltip.add(""); } diff --git a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java index 8743e0c2..387162aa 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java @@ -18,7 +18,6 @@ import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.gui.widget.TextFieldEnder; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.Lang; import com.enderio.core.common.vecmath.VecmathUtil; import crazypants.enderio.EnderIO; @@ -156,9 +155,9 @@ public class GuiCapBank extends GuiContainerBase { @Override protected String getLabelForMode(IoMode mode) { if(mode == IoMode.PUSH) { - return Lang.localize("gui.capBank.outputMode"); + return EnderIO.lang.localize("gui.capBank.outputMode"); } else if(mode == IoMode.PULL) { - return Lang.localize("gui.capBank.inputMode"); + return EnderIO.lang.localize("gui.capBank.inputMode"); } return super.getLabelForMode(mode); } @@ -261,7 +260,7 @@ public class GuiCapBank extends GuiContainerBase { int midX = sx + xSize / 2; - String str = Lang.localize("gui.capBank.maxIo") + " " + PowerDisplayUtil.formatPower(network.getMaxIO()) + + String str = EnderIO.lang.localize("gui.capBank.maxIo") + " " + PowerDisplayUtil.formatPower(network.getMaxIO()) + " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); FontRenderer fontRenderer = getFontRenderer(); int swid = fontRenderer.getStringWidth(str); @@ -270,13 +269,13 @@ public class GuiCapBank extends GuiContainerBase { drawString(fontRenderer, str, x, y, -1); - str = Lang.localize("gui.capBank.maxInput") + ":"; + str = EnderIO.lang.localize("gui.capBank.maxInput") + ":"; swid = fontRenderer.getStringWidth(str); x = guiLeft + inputX - swid - 3; y = guiTop + inputY + 2; drawString(fontRenderer, str, x, y, -1); - str = Lang.localize("gui.capBank.maxOutput") + ":"; + str = EnderIO.lang.localize("gui.capBank.maxOutput") + ":"; swid = fontRenderer.getStringWidth(str); x = guiLeft + outputX - swid - 3; y = guiTop + outputY + 2; diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java b/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java index 77f4f41b..7258c295 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java @@ -13,7 +13,6 @@ import org.lwjgl.opengl.GL11; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.Lang; import crazypants.enderio.EnderIO; import crazypants.enderio.machine.capbank.TileCapBank; @@ -231,7 +230,7 @@ public class IoDisplay implements IInfoRenderer { final int color; private HeadingText(int color) { - this.text = Lang.localize("capbank.iodisplay.".concat(name().toLowerCase(Locale.ENGLISH))); + this.text = EnderIO.lang.localize("capbank.iodisplay.".concat(name().toLowerCase(Locale.ENGLISH))); this.color = color; } } diff --git a/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java index 55b492f7..557924bf 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java @@ -12,8 +12,8 @@ import org.lwjgl.opengl.GL11; import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.gui.widget.GhostSlot; import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.PacketItemBuffer; @@ -32,8 +32,8 @@ public class GuiCrafter extends GuiPoweredMachineBase { int x = getXSize() - 5 - 16; int y = 43; bufferSizeB = new ToggleButton(this, 4327, x, y, IconEIO.ITEM_SINGLE, IconEIO.ITEM_STACK); - bufferSizeB.setSelectedToolTip(Lang.localize("gui.machine.bufferingstacks")); - bufferSizeB.setUnselectedToolTip(Lang.localize("gui.machine.bufferingsingle")); + bufferSizeB.setSelectedToolTip(EnderIO.lang.localize("gui.machine.bufferingstacks")); + bufferSizeB.setUnselectedToolTip(EnderIO.lang.localize("gui.machine.bufferingsingle")); bufferSizeB.setSelected(te.isBufferStacks()); } @@ -91,7 +91,7 @@ public class GuiCrafter extends GuiPoweredMachineBase { @Override protected void updatePowerBarTooltip(List text) { text.add(PowerDisplayUtil.formatPower(Config.crafterRfPerCraft) + " " + PowerDisplayUtil.abrevation() - + " " + Lang.localize("gui.machine.percraft")); + + " " + EnderIO.lang.localize("gui.machine.percraft")); super.updatePowerBarTooltip(text); } diff --git a/src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java index 98a38314..7d89d7b4 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java @@ -1,9 +1,10 @@ package crazypants.enderio.machine.crafter; -import com.enderio.core.common.network.MessageTileEntity; - import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; + +import com.enderio.core.common.network.MessageTileEntity; + import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/crazypants/enderio/machine/crusher/GrindingBall.java b/src/main/java/crazypants/enderio/machine/crusher/GrindingBall.java index 7421552d..50701bd7 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/GrindingBall.java +++ b/src/main/java/crazypants/enderio/machine/crusher/GrindingBall.java @@ -1,9 +1,6 @@ package crazypants.enderio.machine.crusher; -import com.enderio.core.client.handlers.SpecialTooltipHandler; - import net.minecraft.item.ItemStack; -import crazypants.enderio.gui.TooltipHandlerGrinding; import crazypants.enderio.machine.recipe.RecipeInput; public class GrindingBall extends RecipeInput implements IGrindingMultiplier { diff --git a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java index 1f60a837..dd5e95d1 100644 --- a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java @@ -12,9 +12,9 @@ import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.Lang; import com.enderio.core.common.vecmath.Vector4f; +import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; @@ -96,7 +96,7 @@ public class GuiFarmStation extends GuiPoweredMachineBase { @Override protected String getPowerOutputLabel() { - return Lang.localize("farm.gui.baseUse"); + return EnderIO.lang.localize("farm.gui.baseUse"); } @Override diff --git a/src/main/java/crazypants/enderio/machine/farm/PacketFarmLockedSlot.java b/src/main/java/crazypants/enderio/machine/farm/PacketFarmLockedSlot.java index 9c55d232..fc34d951 100644 --- a/src/main/java/crazypants/enderio/machine/farm/PacketFarmLockedSlot.java +++ b/src/main/java/crazypants/enderio/machine/farm/PacketFarmLockedSlot.java @@ -1,8 +1,9 @@ package crazypants.enderio.machine.farm; +import io.netty.buffer.ByteBuf; + import com.enderio.core.common.network.MessageTileEntity; -import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/machine/farm/PacketUpdateNotification.java b/src/main/java/crazypants/enderio/machine/farm/PacketUpdateNotification.java index d06b79ae..bb03afd2 100644 --- a/src/main/java/crazypants/enderio/machine/farm/PacketUpdateNotification.java +++ b/src/main/java/crazypants/enderio/machine/farm/PacketUpdateNotification.java @@ -1,8 +1,9 @@ package crazypants.enderio.machine.farm; +import io.netty.buffer.ByteBuf; + import com.enderio.core.common.network.MessageTileEntity; -import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index 3754ebe8..460d3b94 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -17,7 +17,6 @@ import net.minecraft.world.EnumSkyBlock; import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.Lang; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import crazypants.enderio.EnderIO; @@ -317,7 +316,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { } public void setNotification(String unloc) { - String newNote = Lang.localize("farm.note." + unloc); + String newNote = EnderIO.lang.localize("farm.note." + unloc); if(!newNote.equals(notification)) { notification = newNote; sendNotification = true; diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java index 7b71bd2e..b49d6184 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java @@ -11,8 +11,8 @@ import org.lwjgl.opengl.GL11; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; @@ -28,7 +28,7 @@ public class GuiCombustionGenerator extends GuiPoweredMachineBase tooltip, EntityPlayer player, World world, int x, int y, int z) { TileEntity te = world.getTileEntity(x, y, z); if(te != null && te instanceof TileZombieGenerator) { - tooltip.add(((TileZombieGenerator) te).getFluidStored(ForgeDirection.UNKNOWN) + " " + Lang.localize("fluid.millibucket.abr")); + tooltip.add(((TileZombieGenerator) te).getFluidStored(ForgeDirection.UNKNOWN) + " " + EnderIO.lang.localize("fluid.millibucket.abr")); } } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java index e6aab417..1263813d 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java @@ -11,8 +11,8 @@ import org.lwjgl.opengl.GL11; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; @@ -28,11 +28,11 @@ public class GuiZombieGenerator extends GuiPoweredMachineBase list = new ArrayList(); diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java index 2134c8aa..3c58767a 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java @@ -17,7 +17,6 @@ import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.Util; import com.enderio.core.common.vecmath.Vector4f; @@ -180,7 +179,7 @@ public abstract class GuiMachineBase extends Gu } protected String formatProgressTooltip(int scaledProgress, float progress) { - return MessageFormat.format(Lang.localize("gui.progress"), scaledProgress); + return MessageFormat.format(EnderIO.lang.localize("gui.progress"), scaledProgress); } protected int scaleProgressForTooltip(float progress) { diff --git a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java index 63637e97..28cb205f 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java @@ -21,9 +21,9 @@ import com.enderio.core.client.gui.widget.TextFieldEnder; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.PlayerUtil; +import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode; @@ -96,22 +96,22 @@ public class GuiHyperCube extends GuiContainerBase { }); addButton = new IconButton(this, ADD_BUTTON_ID, 137, 12, IconEIO.PLUS); - addButton.setToolTip(Lang.localize("gui.trans.addChannel")); + addButton.setToolTip(EnderIO.lang.localize("gui.trans.addChannel")); addButton.enabled = false; privateButton = new ToggleButton(this, PRIVATE_BUTTON_ID, 118, 12, IconEIO.LOCK_UNLOCKED, IconEIO.LOCK_LOCKED); - privateButton.setSelectedToolTip(Lang.localize("gui.trans.privateChannel")); - privateButton.setUnselectedToolTip(Lang.localize("gui.trans.publicChannel")); + privateButton.setSelectedToolTip(EnderIO.lang.localize("gui.trans.privateChannel")); + privateButton.setUnselectedToolTip(EnderIO.lang.localize("gui.trans.publicChannel")); deletePublicB = new IconButton(this, DELETE_PUBLIC_BUTTON_ID, 74, 117, IconEIO.MINUS); - deletePublicB.setToolTip(Lang.localize("gui.trans.deleteChannel")); + deletePublicB.setToolTip(EnderIO.lang.localize("gui.trans.deleteChannel")); selectPublicB = new IconButton(this, SELECT_PUBLIC_BUTTON_ID, 95, 117, IconEIO.TICK); - selectPublicB.setToolTip(Lang.localize("gui.trans.activateChannel")); + selectPublicB.setToolTip(EnderIO.lang.localize("gui.trans.activateChannel")); deletePrivateB = new IconButton(this, DELETE_PRIVATE_BUTTON_ID, 183, 117, IconEIO.MINUS); - deletePrivateB.setToolTip(Lang.localize("gui.trans.deleteChannel")); + deletePrivateB.setToolTip(EnderIO.lang.localize("gui.trans.deleteChannel")); selectPrivateB = new IconButton(this, SELECT_PRIVATE_BUTTON_ID, 204, 117, IconEIO.TICK); - selectPrivateB.setToolTip(Lang.localize("gui.trans.activateChannel")); + selectPrivateB.setToolTip(EnderIO.lang.localize("gui.trans.activateChannel")); int x = 163; int y = 12; @@ -182,7 +182,7 @@ public class GuiHyperCube extends GuiContainerBase { } else { powerB.setIcon(IconEIO.WRENCH_OVERLAY_POWER_OFF); } - powerB.setToolTip(Lang.localize("gui.trans.powerMode"), mode.getLocalisedName()); + powerB.setToolTip(EnderIO.lang.localize("gui.trans.powerMode"), mode.getLocalisedName()); mode = cube.getModeForChannel(SubChannel.FLUID); if(mode.isRecieveEnabled() || mode.isSendEnabled()) { @@ -190,7 +190,7 @@ public class GuiHyperCube extends GuiContainerBase { } else { fluidB.setIcon(IconEIO.WRENCH_OVERLAY_FLUID_OFF); } - fluidB.setToolTip(Lang.localize("gui.trans.fluidMode"), mode.getLocalisedName()); + fluidB.setToolTip(EnderIO.lang.localize("gui.trans.fluidMode"), mode.getLocalisedName()); mode = cube.getModeForChannel(SubChannel.ITEM); if(mode.isRecieveEnabled() || mode.isSendEnabled()) { @@ -198,7 +198,7 @@ public class GuiHyperCube extends GuiContainerBase { } else { itemB.setIcon(IconEIO.WRENCH_OVERLAY_ITEM_OFF); } - itemB.setToolTip(Lang.localize("gui.trans.itemMode"), mode.getLocalisedName()); + itemB.setToolTip(EnderIO.lang.localize("gui.trans.itemMode"), mode.getLocalisedName()); } private boolean isPublic(Channel chan) { @@ -366,10 +366,10 @@ public class GuiHyperCube extends GuiContainerBase { int x = guiLeft + 12; int y = guiTop + 35; int rgb = ColorUtil.getRGB(Color.white); - drawString(getFontRenderer(), Lang.localize("gui.trans.publicHeading"), x, y, rgb); + drawString(getFontRenderer(), EnderIO.lang.localize("gui.trans.publicHeading"), x, y, rgb); x += 109; - drawString(getFontRenderer(), Lang.localize("gui.trans.privateHeading"), x, y, rgb); + drawString(getFontRenderer(), EnderIO.lang.localize("gui.trans.privateHeading"), x, y, rgb); IoMode fluidMode = cube.getModeForChannel(SubChannel.FLUID); IoMode powerMode = cube.getModeForChannel(SubChannel.POWER); diff --git a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java index dce10ec8..d203f6b0 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java @@ -22,7 +22,6 @@ import net.minecraftforge.fluids.IFluidHandler; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.ItemUtil; -import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.PlayerUtil; import com.enderio.core.common.vecmath.VecmathUtil; @@ -91,7 +90,7 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerHandle } public String getLocalisedName() { - return Lang.localize(unlocalisedName); + return EnderIO.lang.localize(unlocalisedName); } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java index e5cb0b4a..a4f71a02 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java @@ -25,10 +25,10 @@ import com.enderio.core.client.handlers.SpecialTooltipHandler; import com.enderio.core.client.render.EnderWidget; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.ItemUtil; -import com.enderio.core.common.util.Lang; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.generator.zombie.NutrientTank; @@ -107,11 +107,11 @@ public class GuiInventoryPanel extends GuiMachineBase { textFields.add(tfFilter); - headerCrafting = Lang.localize("gui.inventorypanel.header.crafting"); - headerReturn = Lang.localize("gui.inventorypanel.header.return"); - headerInventory = Lang.localize("container.inventory", false); - infoTextFilter = Lang.localize("gui.inventorypanel.info.filter"); - infoTextOffline = Lang.localize("gui.inventorypanel.info.offline"); + headerCrafting = EnderIO.lang.localize("gui.inventorypanel.header.crafting"); + headerReturn = EnderIO.lang.localize("gui.inventorypanel.header.return"); + headerInventory = EnderIO.lang.localize("container.inventory", false); + infoTextFilter = EnderIO.lang.localize("gui.inventorypanel.info.filter"); + infoTextOffline = EnderIO.lang.localize("gui.inventorypanel.info.offline"); ArrayList list = new ArrayList(); SpecialTooltipHandler.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.return.line"); @@ -140,7 +140,7 @@ public class GuiInventoryPanel extends GuiMachineBase { @Override protected void updateText() { text.clear(); - text.add(Lang.localize("gui.inventorypanel.tooltip.fuelTank")); + text.add(EnderIO.lang.localize("gui.inventorypanel.tooltip.fuelTank")); text.add(Fluids.toCapactityString(getTileEntity().fuelTank)); } }); diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketItemInfo.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketItemInfo.java index 21dfab7a..97f72584 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/PacketItemInfo.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketItemInfo.java @@ -7,11 +7,12 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; + import com.enderio.core.common.network.MessageTileEntity; import com.enderio.core.common.network.NetworkUtil; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketItemList.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketItemList.java index 1b993f46..38c40fc0 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/PacketItemList.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketItemList.java @@ -7,11 +7,12 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; + import com.enderio.core.common.network.MessageTileEntity; import com.enderio.core.common.network.NetworkUtil; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketRequestMissingItems.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketRequestMissingItems.java index 1d6ce684..3042f8c8 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/PacketRequestMissingItems.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketRequestMissingItems.java @@ -7,12 +7,13 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.tileentity.TileEntity; + import com.enderio.core.common.network.CompressedDataOutput; import com.enderio.core.common.network.MessageTileEntity; import com.enderio.core.common.network.NetworkUtil; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java index e0d426a6..8cb87cc8 100644 --- a/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java @@ -10,9 +10,9 @@ import org.lwjgl.opengl.GL11; import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.SoundUtil; +import crazypants.enderio.EnderIO; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.IoMode; @@ -37,21 +37,21 @@ public class GuiKillerJoe extends GuiMachineBase { @Override protected void updateText() { text.clear(); - String heading = Lang.localize("killerJoe.fuelTank"); + String heading = EnderIO.lang.localize("killerJoe.fuelTank"); text.add(heading); text.add(Fluids.toCapactityString(getTileEntity().fuelTank)); if(tileEntity.fuelTank.getFluidAmount() < tileEntity.getActivationAmount()) { - text.add(Lang.localize("gui.fluid.minReq", tileEntity.getActivationAmount() + Fluids.MB())); + text.add(EnderIO.lang.localize("gui.fluid.minReq", tileEntity.getActivationAmount() + Fluids.MB())); } } }); xpB = new IconButton(this, XP_ID, 128, 56, IconEIO.XP); - xpB.setToolTip(Lang.localize("killerJoe.giveXp.tooltip")); + xpB.setToolTip(EnderIO.lang.localize("killerJoe.giveXp.tooltip")); xp10B = new IconButton(this, XP10_ID, 148, 56, IconEIO.XP_PLUS); - xp10B.setToolTip(Lang.localize("killerJoe.giveXp10.tooltip")); + xp10B.setToolTip(EnderIO.lang.localize("killerJoe.giveXp10.tooltip")); } diff --git a/src/main/java/crazypants/enderio/machine/killera/PacketSwing.java b/src/main/java/crazypants/enderio/machine/killera/PacketSwing.java index 978b789d..c8dc6322 100644 --- a/src/main/java/crazypants/enderio/machine/killera/PacketSwing.java +++ b/src/main/java/crazypants/enderio/machine/killera/PacketSwing.java @@ -1,8 +1,9 @@ package crazypants.enderio.machine.killera; +import net.minecraft.entity.player.EntityPlayer; + import com.enderio.core.common.network.MessageTileEntity; -import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java index 63f1e4d7..1f1946eb 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java @@ -16,10 +16,11 @@ import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.gui.widget.TextFieldEnder; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; + import static crazypants.enderio.machine.power.PowerDisplayUtil.*; public class GuiPowerMonitor extends GuiContainerBase { @@ -71,19 +72,19 @@ public class GuiPowerMonitor extends GuiContainerBase { xSize = WIDTH; ySize = HEIGHT; - titleStr = Lang.localize("gui.powerMonitor.engineControl"); - engineTxt1 = Lang.localize("gui.powerMonitor.engineSection1"); - engineTxt2 = Lang.localize("gui.powerMonitor.engineSection2"); - engineTxt3 = Lang.localize("gui.powerMonitor.engineSection3"); - engineTxt4 = Lang.localize("gui.powerMonitor.engineSection4"); - engineTxt5 = Lang.localize("gui.powerMonitor.engineSection5"); - engineTxt6 = Lang.localize("gui.powerMonitor.engineSection6"); + titleStr = EnderIO.lang.localize("gui.powerMonitor.engineControl"); + engineTxt1 = EnderIO.lang.localize("gui.powerMonitor.engineSection1"); + engineTxt2 = EnderIO.lang.localize("gui.powerMonitor.engineSection2"); + engineTxt3 = EnderIO.lang.localize("gui.powerMonitor.engineSection3"); + engineTxt4 = EnderIO.lang.localize("gui.powerMonitor.engineSection4"); + engineTxt5 = EnderIO.lang.localize("gui.powerMonitor.engineSection5"); + engineTxt6 = EnderIO.lang.localize("gui.powerMonitor.engineSection6"); - monHeading1 = Lang.localize("gui.powerMonitor.monHeading1"); - monHeading2 = Lang.localize("gui.powerMonitor.monHeading2"); - monHeading3 = Lang.localize("gui.powerMonitor.monHeading3"); - monHeading4 = Lang.localize("gui.powerMonitor.monHeading4"); - monHeading5 = Lang.localize("gui.powerMonitor.monHeading5"); + monHeading1 = EnderIO.lang.localize("gui.powerMonitor.monHeading1"); + monHeading2 = EnderIO.lang.localize("gui.powerMonitor.monHeading2"); + monHeading3 = EnderIO.lang.localize("gui.powerMonitor.monHeading3"); + monHeading4 = EnderIO.lang.localize("gui.powerMonitor.monHeading4"); + monHeading5 = EnderIO.lang.localize("gui.powerMonitor.monHeading5"); addToolTip(new GuiToolTip(new Rectangle(POWER_X, POWER_Y, POWER_WIDTH, POWER_HEIGHT), "") { @@ -99,8 +100,8 @@ public class GuiPowerMonitor extends GuiContainerBase { int x = MARGIN + Minecraft.getMinecraft().fontRenderer.getStringWidth(titleStr) + SPACING; enabledB = new CheckBox(this, 21267, x, 8); - enabledB.setSelectedToolTip(Lang.localize("gui.enabled")); - enabledB.setUnselectedToolTip(Lang.localize("gui.disabled")); + enabledB.setSelectedToolTip(EnderIO.lang.localize("gui.enabled")); + enabledB.setUnselectedToolTip(EnderIO.lang.localize("gui.disabled")); enabledB.setSelected(te.engineControlEnabled); diff --git a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java index 8cb2ffbe..3d7074e7 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java +++ b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java @@ -1,11 +1,12 @@ package crazypants.enderio.machine.monitor; -import com.enderio.core.common.network.MessageTileEntity; -import com.enderio.core.common.network.NetworkUtil; - import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; + +import com.enderio.core.common.network.MessageTileEntity; +import com.enderio.core.common.network.NetworkUtil; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java index aa66f449..ab1a2183 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java @@ -12,9 +12,9 @@ import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.Lang; import com.google.common.collect.Lists; +import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; @@ -33,7 +33,7 @@ public class GuiAttractor extends GuiPoweredMachineBase { addToolTip(new GuiToolTip(showRangeB.getBounds(), "null") { @Override public List getToolTipText() { - return Lists.newArrayList(Lang.localize(showRangeB.isSelected() ? "gui.spawnGurad.hideRange" : "gui.spawnGurad.showRange")); + return Lists.newArrayList(EnderIO.lang.localize(showRangeB.isSelected() ? "gui.spawnGurad.hideRange" : "gui.spawnGurad.showRange")); } }); } @@ -65,7 +65,7 @@ public class GuiAttractor extends GuiPoweredMachineBase { super.drawGuiContainerBackgroundLayer(par1, par2, par3); int range = (int) getTileEntity().getRange(); - drawCenteredString(fontRendererObj, Lang.localize("gui.spawnGurad.range") + " " + range, getGuiLeft() + sx/2 + 9, getGuiTop() + 68, ColorUtil.getRGB(Color.white)); + drawCenteredString(fontRendererObj, EnderIO.lang.localize("gui.spawnGurad.range") + " " + range, getGuiLeft() + sx/2 + 9, getGuiTop() + 68, ColorUtil.getRGB(Color.white)); } @Override diff --git a/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java index 5bff079b..de2f7f9f 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java @@ -12,9 +12,9 @@ import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.Lang; import com.google.common.collect.Lists; +import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; @@ -33,7 +33,7 @@ public class GuiAversionObelisk extends GuiPoweredMachineBase getToolTipText() { - return Lists.newArrayList(Lang.localize(showRangeB.isSelected() ? "gui.spawnGurad.hideRange" : "gui.spawnGurad.showRange")); + return Lists.newArrayList(EnderIO.lang.localize(showRangeB.isSelected() ? "gui.spawnGurad.hideRange" : "gui.spawnGurad.showRange")); } }); } @@ -57,7 +57,7 @@ public class GuiAversionObelisk extends GuiPoweredMachineBase { @@ -30,7 +30,7 @@ public class GuiInhibitorObelisk extends GuiPoweredMachineBase } private void addButton(IconButton button, WeatherTask task) { - String tt1 = EnumChatFormatting.WHITE + Lang.localize("gui.weather.task." + task.name().toLowerCase(Locale.ENGLISH)); - String tt2 = EnumChatFormatting.AQUA + String.format(Lang.localize("gui.weather.requireditem"), EnumChatFormatting.WHITE + task.requiredItem().getDisplayName()); - String tt3 = String.format("%s%s %s%s", EnumChatFormatting.GREEN, fmt.format(task.power), EnumChatFormatting.WHITE, Lang.localize("power.rf")); + String tt1 = EnumChatFormatting.WHITE + EnderIO.lang.localize("gui.weather.task." + task.name().toLowerCase(Locale.ENGLISH)); + String tt2 = EnumChatFormatting.AQUA + String.format(EnderIO.lang.localize("gui.weather.requireditem"), EnumChatFormatting.WHITE + task.requiredItem().getDisplayName()); + String tt3 = String.format("%s%s %s%s", EnumChatFormatting.GREEN, fmt.format(task.power), EnumChatFormatting.WHITE, EnderIO.lang.localize("power.rf")); button.setToolTip(tt1, tt2, tt3); button.onGuiInit(); } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketActivateWeather.java b/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketActivateWeather.java index d3a78885..4e59b1d8 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketActivateWeather.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/weather/PacketActivateWeather.java @@ -1,8 +1,9 @@ package crazypants.enderio.machine.obelisk.weather; +import io.netty.buffer.ByteBuf; + import com.enderio.core.common.network.MessageTileEntity; -import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/machine/obelisk/xp/GuiExperienceObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/xp/GuiExperienceObelisk.java index cc47d21d..d9b4e5bf 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/xp/GuiExperienceObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/xp/GuiExperienceObelisk.java @@ -9,8 +9,8 @@ import org.lwjgl.opengl.GL11; import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.gui.GuiMachineBase; import crazypants.enderio.network.PacketHandler; @@ -44,38 +44,38 @@ public class GuiExperienceObelisk extends GuiMachineBase { p = new IconButton(this, 800, x, y, IconEIO.SINGLE_PLUS); p.setSize(bw, bw); p.setIconMargin(2, 2); - p.setToolTip(Lang.localize("gui.machine.button.storelevel"), Lang.localize("gui.machine.tooltip.storelevel")); + p.setToolTip(EnderIO.lang.localize("gui.machine.button.storelevel"), EnderIO.lang.localize("gui.machine.tooltip.storelevel")); x += spacing + bw; pp = new IconButton(this, 801, x, y, IconEIO.DOUBLE_PLUS); pp.setSize(bw, bw); pp.setIconMargin(2, 2); - pp.setToolTip(Lang.localize("gui.machine.button.storelevels"), Lang.localize("gui.machine.tooltip.storelevels")); + pp.setToolTip(EnderIO.lang.localize("gui.machine.button.storelevels"), EnderIO.lang.localize("gui.machine.tooltip.storelevels")); x += spacing + bw; ppp = new IconButton(this, 802, x, y, IconEIO.TRIPLE_PLUS); ppp.setSize(bw, bw); ppp.setIconMargin(2, 2); - ppp.setToolTip(Lang.localize("gui.machine.button.storeall"), Lang.localize("gui.machine.tooltip.storeall")); + ppp.setToolTip(EnderIO.lang.localize("gui.machine.button.storeall"), EnderIO.lang.localize("gui.machine.tooltip.storeall")); x = startX; y = 75; m = new IconButton(this, 803, x, y, IconEIO.SINGLE_MINUS); m.setSize(bw, bw); m.setIconMargin(2, 2); - m.setToolTip(Lang.localize("gui.machine.button.retrievelevel"), Lang.localize("gui.machine.tooltip.retrievelevel")); + m.setToolTip(EnderIO.lang.localize("gui.machine.button.retrievelevel"), EnderIO.lang.localize("gui.machine.tooltip.retrievelevel")); x += spacing + bw; mm = new IconButton(this, 804, x, y, IconEIO.DOUBLE_MINUS); mm.setSize(bw, bw); mm.setIconMargin(2, 2); - mm.setToolTip(Lang.localize("gui.machine.button.retrievelevels"), Lang.localize("gui.machine.tooltip.retrievelevels")); + mm.setToolTip(EnderIO.lang.localize("gui.machine.button.retrievelevels"), EnderIO.lang.localize("gui.machine.tooltip.retrievelevels")); x += spacing + bw; mmm = new IconButton(this, 805, x, y, IconEIO.TRIPLE_MINUS); mmm.setSize(bw, bw); mmm.setIconMargin(2, 2); - mmm.setToolTip(Lang.localize("gui.machine.button.retrieveall")); + mmm.setToolTip(EnderIO.lang.localize("gui.machine.button.retrieveall")); } @Override diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java index 86e22cd2..c09010d9 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java @@ -24,7 +24,6 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import com.enderio.core.common.TileEntityEnder; -import com.enderio.core.common.util.Lang; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; @@ -264,7 +263,7 @@ public class BlockPaintedGlowstone extends BlockEio implements ITileEntityProvid public void onTooltip(ItemTooltipEvent event) { if (event.itemStack != null && Block.getBlockFromItem(event.itemStack.getItem()) == Blocks.glowstone && event.itemStack.stackTagCompound != null) { if (event.itemStack.stackTagCompound.getBoolean("wasPainted")) { - event.toolTip.add(Lang.localize("painter.tooltip.wasPainted")); + event.toolTip.add(EnderIO.lang.localize("painter.tooltip.wasPainted")); } } } diff --git a/src/main/java/crazypants/enderio/machine/painter/PainterUtil.java b/src/main/java/crazypants/enderio/machine/painter/PainterUtil.java index 31a1988a..01c8f342 100644 --- a/src/main/java/crazypants/enderio/machine/painter/PainterUtil.java +++ b/src/main/java/crazypants/enderio/machine/painter/PainterUtil.java @@ -8,9 +8,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -import com.enderio.core.common.util.Lang; import com.google.common.base.Strings; +import crazypants.enderio.EnderIO; + public final class PainterUtil { private PainterUtil() { @@ -63,7 +64,7 @@ public final class PainterUtil { sourceName = is.getDisplayName(); } } - return Lang.localize("blockPainter.paintedWith") + " " + sourceName; + return EnderIO.lang.localize("blockPainter.paintedWith") + " " + sourceName; } public static void setSourceBlock(ItemStack item, Block source, int meta) { diff --git a/src/main/java/crazypants/enderio/machine/painter/TileEntityPaintedBlock.java b/src/main/java/crazypants/enderio/machine/painter/TileEntityPaintedBlock.java index bbabfe4f..c9103b86 100644 --- a/src/main/java/crazypants/enderio/machine/painter/TileEntityPaintedBlock.java +++ b/src/main/java/crazypants/enderio/machine/painter/TileEntityPaintedBlock.java @@ -1,10 +1,10 @@ package crazypants.enderio.machine.painter; -import crazypants.enderio.TileEntityEio; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import crazypants.enderio.TileEntityEio; public class TileEntityPaintedBlock extends TileEntityEio implements IPaintableTileEntity { diff --git a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java index f2e6abb8..6b07bc6a 100644 --- a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java @@ -23,7 +23,6 @@ import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.client.handlers.SpecialTooltipHandler; import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.Util; import com.enderio.core.common.vecmath.Vector3d; @@ -366,9 +365,9 @@ public class BlockCapacitorBank extends BlockEio implements IGuiHandler, IAdvanc TileCapacitorBank cap = (TileCapacitorBank) te; String format = Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE; - tooltip.add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxIO"), format, PowerDisplayUtil.formatPower(cap.getMaxIO()), Util.TAB + Util.ALIGNRIGHT)); - tooltip.add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxIn"), format, PowerDisplayUtil.formatPower(cap.getMaxInput()), Util.TAB + Util.ALIGNRIGHT)); - tooltip.add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxOut"), format, PowerDisplayUtil.formatPower(cap.getMaxOutput()), Util.TAB + Util.ALIGNRIGHT)); + tooltip.add(String.format("%s : %s%s%sRF/t ", EnderIO.lang.localize("capbank.maxIO"), format, PowerDisplayUtil.formatPower(cap.getMaxIO()), Util.TAB + Util.ALIGNRIGHT)); + tooltip.add(String.format("%s : %s%s%sRF/t ", EnderIO.lang.localize("capbank.maxIn"), format, PowerDisplayUtil.formatPower(cap.getMaxInput()), Util.TAB + Util.ALIGNRIGHT)); + tooltip.add(String.format("%s : %s%s%sRF/t ", EnderIO.lang.localize("capbank.maxOut"), format, PowerDisplayUtil.formatPower(cap.getMaxOutput()), Util.TAB + Util.ALIGNRIGHT)); tooltip.add("Deprecated. Convert by placing in crafting grid"); } } diff --git a/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java index 30c2d43f..0b1c3b7d 100644 --- a/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java @@ -19,8 +19,8 @@ import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.IRedstoneModeControlable; @@ -114,7 +114,7 @@ public class GuiCapacitorBank extends GuiContainerBase { y += 20; configB = new IconButton(this, CONFIG_ID, x, y, IconEIO.IO_CONFIG_UP); - configB.setToolTip(Lang.localize("gui.machine.ioMode.overlay.tooltip")); + configB.setToolTip(EnderIO.lang.localize("gui.machine.ioMode.overlay.tooltip")); List coords = new ArrayList(); if(te.isMultiblock()) { @@ -139,9 +139,9 @@ public class GuiCapacitorBank extends GuiContainerBase { @Override protected String getLabelForMode(IoMode mode) { if(mode == IoMode.PUSH) { - return Lang.localize("gui.capBank.outputMode"); + return EnderIO.lang.localize("gui.capBank.outputMode"); } else if(mode == IoMode.PULL) { - return Lang.localize("gui.capBank.inputMode"); + return EnderIO.lang.localize("gui.capBank.inputMode"); } return super.getLabelForMode(mode); } @@ -278,7 +278,7 @@ public class GuiCapacitorBank extends GuiContainerBase { int midX = sx + xSize / 2; - String str = Lang.localize("gui.capBank.maxIo") + " " + PowerDisplayUtil.formatPower(capBank.getMaxIO()) + + String str = EnderIO.lang.localize("gui.capBank.maxIo") + " " + PowerDisplayUtil.formatPower(capBank.getMaxIO()) + " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); FontRenderer fontRenderer = getFontRenderer(); int swid = fontRenderer.getStringWidth(str); @@ -287,13 +287,13 @@ public class GuiCapacitorBank extends GuiContainerBase { drawString(fontRenderer, str, x, y, -1); - str = Lang.localize("gui.capBank.maxInput") + ":"; + str = EnderIO.lang.localize("gui.capBank.maxInput") + ":"; swid = fontRenderer.getStringWidth(str); x = guiLeft + inputX - swid - 3; y = guiTop + inputY + 2; drawString(fontRenderer, str, x, y, -1); - str = Lang.localize("gui.capBank.maxOutput") + ":"; + str = EnderIO.lang.localize("gui.capBank.maxOutput") + ":"; swid = fontRenderer.getStringWidth(str); x = guiLeft + outputX - swid - 3; y = guiTop + outputY + 2; diff --git a/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java b/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java index 3d2d5b69..30f084a0 100644 --- a/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java +++ b/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java @@ -7,11 +7,9 @@ import java.text.NumberFormat; import net.minecraft.client.gui.GuiTextField; import net.minecraft.item.ItemStack; import cofh.api.energy.IEnergyContainerItem; - -import com.enderio.core.common.util.Lang; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; public class PowerDisplayUtil { @@ -35,11 +33,11 @@ public class PowerDisplayUtil { } public static String perTickStr() { - return Lang.localize("power.tick"); + return EnderIO.lang.localize("power.tick"); } public static String ofStr() { - return Lang.localize("gui.powerMonitor.of"); + return EnderIO.lang.localize("gui.powerMonitor.of"); } static { @@ -56,7 +54,7 @@ public class PowerDisplayUtil { } IEnergyContainerItem ci = (IEnergyContainerItem)item.getItem(); - return Lang.localize("item.tooltip.power")+ " "+ PowerDisplayUtil.formatPower(ci.getEnergyStored(item)) + "/" + return EnderIO.lang.localize("item.tooltip.power")+ " "+ PowerDisplayUtil.formatPower(ci.getEnergyStored(item)) + "/" + PowerDisplayUtil.formatPower(ci.getMaxEnergyStored(item)) + " " + PowerDisplayUtil.abrevation(); } @@ -108,7 +106,7 @@ public class PowerDisplayUtil { } public static String abrevation() { - return Lang.localize("power.rf"); + return EnderIO.lang.localize("power.rf"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java index 98cce9dc..44ec1e2d 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java @@ -20,6 +20,7 @@ import com.enderio.core.common.vecmath.Vector3f; import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; + import static net.minecraftforge.fluids.FluidContainerRegistry.BUCKET_VOLUME; public class TileReservoir extends TileEntityEio implements IFluidHandler, ITankAccess { diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java index 3dd82e12..3c64fcfb 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java @@ -12,7 +12,6 @@ import net.minecraft.item.ItemStack; import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.api.client.gui.IResourceTooltipProvider; import com.enderio.core.client.handlers.SpecialTooltipHandler; -import com.enderio.core.common.util.Lang; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -74,7 +73,7 @@ public class BlockItemSolarPanel extends ItemBlockWithMetadata implements IAdvan if(itemstack.getItemDamage() == 1) { prod = Config.maxPhotovoltaicAdvancedOutputRF; } - list.add(Lang.localize("maxSolorProduction") + " " + PowerDisplayUtil.formatPowerPerTick(prod)); + list.add(EnderIO.lang.localize("maxSolorProduction") + " " + PowerDisplayUtil.formatPowerPerTick(prod)); } @Override diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java index b5b8a98d..b90242ad 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java @@ -16,12 +16,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.api.client.gui.IResourceTooltipProvider; -import com.enderio.core.common.util.Lang; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.BlockEio; +import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.waila.IWailaInfoProvider; @@ -142,9 +142,9 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide TileEntitySolarPanel solar = (TileEntitySolarPanel) te; float efficiency = solar.calculateLightRatio(); if(!solar.canSeeSun()) { - tooltip.add(EnumChatFormatting.RED + Lang.localize("tooltip.sunlightBlocked")); + tooltip.add(EnumChatFormatting.RED + EnderIO.lang.localize("tooltip.sunlightBlocked")); } else { - tooltip.add(String.format("%s : %s%.0f%%", EnumChatFormatting.WHITE + Lang.localize("tooltip.efficiency") + EnumChatFormatting.RESET, + tooltip.add(String.format("%s : %s%.0f%%", EnumChatFormatting.WHITE + EnderIO.lang.localize("tooltip.efficiency") + EnumChatFormatting.RESET, EnumChatFormatting.WHITE, efficiency * 100)); } } diff --git a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java index c44e5d3e..b9567708 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java @@ -28,7 +28,6 @@ import net.minecraftforge.event.world.BlockEvent.BreakEvent; import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.client.handlers.SpecialTooltipHandler; import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.Util; import cpw.mods.fml.common.FMLCommonHandler; @@ -296,7 +295,7 @@ public class BlockPoweredSpawner extends AbstractMachineBlock int left = getGuiLeft(); int top = getGuiTop(); - String txt = Lang.localize("gui.machine.poweredspawner.spawn"); + String txt = EnderIO.lang.localize("gui.machine.poweredspawner.spawn"); if(!spawner.isSpawnMode()) { - txt = Lang.localize("gui.machine.poweredspawner.capture"); + txt = EnderIO.lang.localize("gui.machine.poweredspawner.capture"); } FontRenderer fr = getFontRenderer(); int x = left + xSize / 2 - fr.getStringWidth(txt) / 2; diff --git a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java index 2b0f14f9..d85af80a 100644 --- a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java @@ -19,7 +19,6 @@ import net.minecraftforge.fluids.FluidStack; import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.client.handlers.SpecialTooltipHandler; -import com.enderio.core.common.util.Lang; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -200,7 +199,7 @@ public class BlockTank extends AbstractMachineBlock implements IAdvanc if(itemstack.stackTagCompound != null && itemstack.stackTagCompound.hasKey("tankContents")) { FluidStack fl = FluidStack.loadFluidStackFromNBT((NBTTagCompound) itemstack.stackTagCompound.getTag("tankContents")); if(fl != null && fl.getFluid() != null) { - String str = fl.amount + " " + Lang.localize("fluid.millibucket.abr") + " " + PowerDisplayUtil.ofStr() + " " + fl.getFluid().getLocalizedName(); + String str = fl.amount + " " + EnderIO.lang.localize("fluid.millibucket.abr") + " " + PowerDisplayUtil.ofStr() + " " + fl.getFluid().getLocalizedName(); list.add(str); } } @@ -211,7 +210,7 @@ public class BlockTank extends AbstractMachineBlock implements IAdvanc public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack); if(itemstack.getItemDamage() == 1) { - list.add(EnumChatFormatting.ITALIC + Lang.localize("blastResistant")); + list.add(EnumChatFormatting.ITALIC + EnderIO.lang.localize("blastResistant")); } } @@ -227,10 +226,10 @@ public class BlockTank extends AbstractMachineBlock implements IAdvanc if (te instanceof TileTank) { TileTank tank = (TileTank) te; FluidStack stored = tank.tank.getFluid(); - String fluid = stored == null ? Lang.localize("tooltip.none") : stored.getFluid().getLocalizedName(stored); + String fluid = stored == null ? EnderIO.lang.localize("tooltip.none") : stored.getFluid().getLocalizedName(stored); int amount = stored == null ? 0 : stored.amount; - tooltip.add(String.format("%s%s : %s (%d %s)", EnumChatFormatting.WHITE, Lang.localize("tooltip.fluidStored"), fluid, amount, Lang.localize("fluid.millibucket.abr"))); + tooltip.add(String.format("%s%s : %s (%d %s)", EnumChatFormatting.WHITE, EnderIO.lang.localize("tooltip.fluidStored"), fluid, amount, EnderIO.lang.localize("fluid.millibucket.abr"))); } } } diff --git a/src/main/java/crazypants/enderio/machine/tank/GuiTank.java b/src/main/java/crazypants/enderio/machine/tank/GuiTank.java index 88b81830..c0251166 100644 --- a/src/main/java/crazypants/enderio/machine/tank/GuiTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/GuiTank.java @@ -8,8 +8,8 @@ import org.lwjgl.opengl.GL11; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.machine.gui.GuiMachineBase; @@ -26,7 +26,7 @@ public class GuiTank extends GuiMachineBase { @Override protected void updateText() { text.clear(); - String heading = Lang.localize("tank.tank"); + String heading = EnderIO.lang.localize("tank.tank"); if(entity.tank.getFluid() != null) { heading += ": " + entity.tank.getFluid().getLocalizedName(); } diff --git a/src/main/java/crazypants/enderio/machine/tank/PacketTank.java b/src/main/java/crazypants/enderio/machine/tank/PacketTank.java index 3e33f073..66a3cf29 100644 --- a/src/main/java/crazypants/enderio/machine/tank/PacketTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/PacketTank.java @@ -1,11 +1,12 @@ package crazypants.enderio.machine.tank; -import com.enderio.core.common.network.MessageTileEntity; -import com.enderio.core.common.network.NetworkUtil; - import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; + +import com.enderio.core.common.network.MessageTileEntity; +import com.enderio.core.common.network.NetworkUtil; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java index 46f4e236..151b2141 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java @@ -10,12 +10,12 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.Util; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; @@ -137,14 +137,14 @@ public class BlockTransceiver extends AbstractMachineBlock { continue; } - tooltip.add(EnumChatFormatting.WHITE + Lang.localize("trans." + type.name().toLowerCase())); + tooltip.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("trans." + type.name().toLowerCase())); if(!isEmpty(recieve)) { - tooltip.add(String.format("%s%s " + Util.TAB + ": %s%s", Util.TAB, Lang.localize("trans.receiving"), Util.TAB + Util.ALIGNRIGHT + tooltip.add(String.format("%s%s " + Util.TAB + ": %s%s", Util.TAB, EnderIO.lang.localize("trans.receiving"), Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE, recieve)); } if(!isEmpty(send)) { - tooltip.add(String.format("%s%s " + Util.TAB + ": %s%s", Util.TAB, Lang.localize("trans.sending"), Util.TAB + Util.ALIGNRIGHT + tooltip.add(String.format("%s%s " + Util.TAB + ": %s%s", Util.TAB, EnderIO.lang.localize("trans.sending"), Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE, send)); } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketAddRemoveChannel.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketAddRemoveChannel.java index c913f815..16608f48 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketAddRemoveChannel.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketAddRemoveChannel.java @@ -1,9 +1,10 @@ package crazypants.enderio.machine.transceiver; -import com.enderio.core.common.network.NetworkUtil; - import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; + +import com.enderio.core.common.network.NetworkUtil; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java index 6f3c36c9..d34b3d63 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketChannelList.java @@ -5,10 +5,11 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.List; -import com.enderio.core.common.network.NetworkUtil; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; + +import com.enderio.core.common.network.NetworkUtil; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketItemFilter.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketItemFilter.java index ee1e0bab..c821381d 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketItemFilter.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketItemFilter.java @@ -1,11 +1,12 @@ package crazypants.enderio.machine.transceiver; -import com.enderio.core.common.network.MessageTileEntity; -import com.enderio.core.common.network.NetworkUtil; - import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; + +import com.enderio.core.common.network.MessageTileEntity; +import com.enderio.core.common.network.NetworkUtil; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannel.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannel.java index 6d3d0932..d650eb2a 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannel.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannel.java @@ -1,11 +1,12 @@ package crazypants.enderio.machine.transceiver; -import com.enderio.core.common.network.MessageTileEntity; -import com.enderio.core.common.network.NetworkUtil; - import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; + +import com.enderio.core.common.network.MessageTileEntity; +import com.enderio.core.common.network.NetworkUtil; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannelList.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannelList.java index 8dc7dce2..4cd38508 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannelList.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannelList.java @@ -6,12 +6,13 @@ import java.util.ArrayList; import java.util.EnumMap; import java.util.List; -import com.enderio.core.common.network.MessageTileEntity; -import com.enderio.core.common.network.NetworkUtil; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; + +import com.enderio.core.common.network.MessageTileEntity; +import com.enderio.core.common.network.NetworkUtil; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java index 1b73f883..16da322c 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java @@ -12,9 +12,9 @@ import com.enderio.core.client.gui.button.IconButton; import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.gui.widget.GuiScrollableList; import com.enderio.core.client.render.ColorUtil; -import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.PlayerUtil; +import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.transceiver.Channel; import crazypants.enderio.machine.transceiver.ChannelType; @@ -59,12 +59,12 @@ public class ChannelTab implements ITabPanel { newChannelTF = new GuiTextField(parent.getFontRenderer(), 7, 12, 103, 16); addButton = new IconButton(parent, ADD_BUTTON_ID, 137, 12, IconEIO.PLUS); - addButton.setToolTip(Lang.localize("gui.trans.addChannel")); + addButton.setToolTip(EnderIO.lang.localize("gui.trans.addChannel")); addButton.enabled = false; privateButton = new ToggleButton(parent, PRIVATE_BUTTON_ID, 118, 12, IconEIO.LOCK_UNLOCKED, IconEIO.LOCK_LOCKED); - privateButton.setSelectedToolTip(Lang.localize("gui.trans.privateChannel")); - privateButton.setUnselectedToolTip(Lang.localize("gui.trans.publicChannel")); + privateButton.setSelectedToolTip(EnderIO.lang.localize("gui.trans.privateChannel")); + privateButton.setUnselectedToolTip(EnderIO.lang.localize("gui.trans.publicChannel")); int w = 104; int h = 90; @@ -76,7 +76,7 @@ public class ChannelTab implements ITabPanel { channelList.setScrollButtonIds(100, 101); deleteChannelB = new IconButton(parent, DELETE_CHANNEL_BUTTON_ID, x + w - 20, y + h + 4, IconEIO.MINUS); - deleteChannelB.setToolTip(Lang.localize("gui.trans.deleteChannel")); + deleteChannelB.setToolTip(EnderIO.lang.localize("gui.trans.deleteChannel")); x += w + 32; @@ -189,13 +189,13 @@ public class ChannelTab implements ITabPanel { int top = parent.getGuiTop(); int x = left + 59; int y = top + 36; - parent.drawCenteredString(parent.getFontRenderer(), Lang.localize("gui.available"), x, y, ColorUtil.getRGB(Color.white)); + parent.drawCenteredString(parent.getFontRenderer(), EnderIO.lang.localize("gui.available"), x, y, ColorUtil.getRGB(Color.white)); x = left + 199; - parent.drawCenteredString(parent.getFontRenderer(), Lang.localize("gui.send"), x, y, ColorUtil.getRGB(Color.white)); + parent.drawCenteredString(parent.getFontRenderer(), EnderIO.lang.localize("gui.send"), x, y, ColorUtil.getRGB(Color.white)); y += 56; - parent.drawCenteredString(parent.getFontRenderer(), Lang.localize("gui.receive"), x, y, ColorUtil.getRGB(Color.white)); + parent.drawCenteredString(parent.getFontRenderer(), EnderIO.lang.localize("gui.receive"), x, y, ColorUtil.getRGB(Color.white)); } @Override diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java index a6a19cc6..02049e42 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java @@ -12,8 +12,8 @@ import com.enderio.core.api.client.gui.ITabPanel; import com.enderio.core.client.gui.button.MultiIconButton; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.gui.item.BasicItemFilterGui; import crazypants.enderio.conduit.gui.item.IItemFilterContainer; import crazypants.enderio.conduit.item.filter.ItemFilter; @@ -96,9 +96,9 @@ public class FilterTab implements ITabPanel { recGui.renderCustomOptions(0, par1, par2, par3); } - String txt = Lang.localize("gui.machine.sendfilter"); + String txt = EnderIO.lang.localize("gui.machine.sendfilter"); if(!showSend) { - txt = Lang.localize("gui.machine.receivefilter"); + txt = EnderIO.lang.localize("gui.machine.receivefilter"); } FontRenderer fr = parent.getFontRenderer(); int x = left + container.getFilterOffset().x; diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java index 3737bd01..ee7a667a 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java @@ -15,8 +15,8 @@ import com.enderio.core.client.gui.button.ToggleButton; import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.PacketItemBuffer; @@ -39,8 +39,8 @@ public class GeneralTab implements ITabPanel { int x = parent.getXSize() - 5 - 16; int y = 43; bufferSizeB = new ToggleButton(parent, 4327, x, y, IconEIO.ITEM_SINGLE, IconEIO.ITEM_STACK); - bufferSizeB.setSelectedToolTip(Lang.localize("gui.machine.bufferingstacks")); - bufferSizeB.setUnselectedToolTip(Lang.localize("gui.machine.bufferingsingle")); + bufferSizeB.setSelectedToolTip(EnderIO.lang.localize("gui.machine.bufferingstacks")); + bufferSizeB.setUnselectedToolTip(EnderIO.lang.localize("gui.machine.bufferingsingle")); bufferSizeB.setSelected(parent.getTransciever().isBufferStacks()); sendPowerBarTT = new GuiToolTip(new Rectangle(parent.getPowerX() + SEND_BAR_OFFSET, parent.getPowerY(), parent.getPowerWidth(), parent.getPowerHeight()), "") { @@ -91,11 +91,11 @@ public class GeneralTab implements ITabPanel { parent.drawTexturedModalRect(left + invRoot.x - 1 + (18 * 4) + container.getItemBufferSpacing(), top + invRoot.y - 1, 24, 180, 72, 36); FontRenderer fr = parent.getFontRenderer(); - String sendTxt = Lang.localize("gui.send"); + String sendTxt = EnderIO.lang.localize("gui.send"); int x = left + invRoot.x + 36 - fr.getStringWidth(sendTxt)/2; int y = top + invRoot.y - fr.FONT_HEIGHT - 3; fr.drawStringWithShadow(sendTxt, x, y, ColorUtil.getRGB(Color.WHITE)); - String recText = Lang.localize("gui.receive"); + String recText = EnderIO.lang.localize("gui.receive"); x = left + invRoot.x + 72 + container.getItemBufferSpacing() + 36 - fr.getStringWidth(recText)/2; fr.drawStringWithShadow(recText, x, y, ColorUtil.getRGB(Color.WHITE)); @@ -127,16 +127,16 @@ public class GeneralTab implements ITabPanel { } public void updatePowerBarTooltip(List text) { - text.add(Lang.localize("gui.machine.localbuffer")); - text.add(Lang.localize("gui.machine.upkeep") + " " + PowerDisplayUtil.formatPowerPerTick(parent.getPowerOutputValue())); + text.add(EnderIO.lang.localize("gui.machine.localbuffer")); + text.add(EnderIO.lang.localize("gui.machine.upkeep") + " " + PowerDisplayUtil.formatPowerPerTick(parent.getPowerOutputValue())); int maxEnergy = parent.getTransciever().getCapacitor().getMaxEnergyStored()/2; int energyStored = Math.min(parent.getTransciever().getEnergyStored(), maxEnergy); text.add(PowerDisplayUtil.formatStoredPower(energyStored, maxEnergy)); } private void updateSendPowerBarTooltip(List text) { - text.add(Lang.localize("gui.machine.sendReceivebuffer")); - text.add(Lang.localize("itemGasConduit.tooltip.maxIo") + " " + PowerDisplayUtil.formatPowerPerTick(Config.transceiverMaxIoRF)); + text.add(EnderIO.lang.localize("gui.machine.sendReceivebuffer")); + text.add(EnderIO.lang.localize("itemGasConduit.tooltip.maxIo") + " " + PowerDisplayUtil.formatPowerPerTick(Config.transceiverMaxIoRF)); int maxEnergy = parent.getTransciever().getCapacitor().getMaxEnergyStored()/2; int energyStored = Math.max(0, parent.getTransciever().getEnergyStored() - maxEnergy); text.add(PowerDisplayUtil.formatStoredPower(energyStored, maxEnergy)); diff --git a/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java index 2384af47..993fc187 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java @@ -20,8 +20,8 @@ import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.EnderWidget; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.item.filter.ItemFilter; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; @@ -64,7 +64,7 @@ public class GuiVacuumChest extends GuiContainerBase { int x = RANGE_LEFT; int y = RANGE_TOP; - rangeTooltip = new GuiToolTip(new Rectangle(x, y, RANGE_WIDTH, 16), Lang.localize("gui.vacuum.range")); + rangeTooltip = new GuiToolTip(new Rectangle(x, y, RANGE_WIDTH, 16), EnderIO.lang.localize("gui.vacuum.range")); x += RANGE_WIDTH; rangeUpB = MultiIconButton.createAddButton(this, ID_RANGE_UP, x, y); @@ -79,24 +79,24 @@ public class GuiVacuumChest extends GuiContainerBase { x = FILTER_LEFT + TileVacuumChest.FILTER_SLOTS*18 + 2; y = 86; whiteListB = new ToggleButton(this, ID_WHITELIST, x, y, IconEIO.FILTER_WHITELIST, IconEIO.FILTER_BLACKLIST); - whiteListB.setUnselectedToolTip(Lang.localize("gui.conduit.item.whitelist")); - whiteListB.setSelectedToolTip(Lang.localize("gui.conduit.item.blacklist")); + whiteListB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist")); + whiteListB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.blacklist")); whiteListB.setPaintSelectedBorder(false); y += 18; useMetaB = new ToggleButton(this, ID_MATCHMETA, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META); - useMetaB.setSelectedToolTip(Lang.localize("gui.conduit.item.matchMetaData")); - useMetaB.setUnselectedToolTip(Lang.localize("gui.conduit.item.ignoreMetaData")); + useMetaB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchMetaData")); + useMetaB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreMetaData")); useMetaB.setPaintSelectedBorder(false); for(int i=0 ; i { @Override protected void updateText() { text.clear(); - String heading = Lang.localize("vat.inputTank"); + String heading = EnderIO.lang.localize("vat.inputTank"); if(getTileEntity().inputTank.getFluid() != null) { heading += ": " + getTileEntity().inputTank.getFluid().getLocalizedName(); } @@ -52,7 +52,7 @@ public class GuiVat extends GuiPoweredMachineBase { @Override protected void updateText() { text.clear(); - String heading = Lang.localize("vat.outputTank"); + String heading = EnderIO.lang.localize("vat.outputTank"); if(getTileEntity().outputTank.getFluid() != null) { heading += ": " + getTileEntity().outputTank.getFluid().getLocalizedName(); } @@ -63,9 +63,9 @@ public class GuiVat extends GuiPoweredMachineBase { }); dump1 = new IconButton(this, 1, 29, 62, IconEIO.REDSTONE_MODE_NEVER); - dump1.setToolTip(Lang.localize("gui.machine.vat.dump.1")); + dump1.setToolTip(EnderIO.lang.localize("gui.machine.vat.dump.1")); dump2 = new IconButton(this, 2, 131, 62, IconEIO.REDSTONE_MODE_NEVER); - dump2.setToolTip(Lang.localize("gui.machine.vat.dump.2")); + dump2.setToolTip(EnderIO.lang.localize("gui.machine.vat.dump.2")); addProgressTooltip(81, 63, 14, 14); } diff --git a/src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java b/src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java index a42ffff5..09f716a9 100644 --- a/src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java +++ b/src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java @@ -1,9 +1,10 @@ package crazypants.enderio.machine.vat; -import com.enderio.core.common.network.MessageTileEntity; - import io.netty.buffer.ByteBuf; import net.minecraftforge.fluids.FluidTank; + +import com.enderio.core.common.network.MessageTileEntity; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/machine/vat/PacketTanks.java b/src/main/java/crazypants/enderio/machine/vat/PacketTanks.java index fd86f389..9745bfd9 100644 --- a/src/main/java/crazypants/enderio/machine/vat/PacketTanks.java +++ b/src/main/java/crazypants/enderio/machine/vat/PacketTanks.java @@ -1,11 +1,12 @@ package crazypants.enderio.machine.vat; -import com.enderio.core.common.network.MessageTileEntity; -import com.enderio.core.common.network.NetworkUtil; - import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; + +import com.enderio.core.common.network.MessageTileEntity; +import com.enderio.core.common.network.NetworkUtil; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/machine/vat/PacketVatProgress.java b/src/main/java/crazypants/enderio/machine/vat/PacketVatProgress.java index ddb7c520..6c0dbfbe 100644 --- a/src/main/java/crazypants/enderio/machine/vat/PacketVatProgress.java +++ b/src/main/java/crazypants/enderio/machine/vat/PacketVatProgress.java @@ -1,9 +1,10 @@ package crazypants.enderio.machine.vat; -import com.enderio.core.common.network.MessageTileEntity; - import io.netty.buffer.ByteBuf; import net.minecraftforge.fluids.FluidRegistry; + +import com.enderio.core.common.network.MessageTileEntity; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/material/BlockIngotStorage.java b/src/main/java/crazypants/enderio/material/BlockIngotStorage.java index 61191e77..ba844574 100644 --- a/src/main/java/crazypants/enderio/material/BlockIngotStorage.java +++ b/src/main/java/crazypants/enderio/material/BlockIngotStorage.java @@ -13,12 +13,12 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; -import com.enderio.core.common.util.Lang; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.BlockEio; +import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; public class BlockIngotStorage extends BlockEio implements IAdvancedTooltipProvider { @@ -90,7 +90,7 @@ public class BlockIngotStorage extends BlockEio implements IAdvancedTooltipProvi @Override public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(Lang.localize("tooltip.isBeaconBase")); + list.add(EnderIO.lang.localize("tooltip.isBeaconBase")); } @Override diff --git a/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java b/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java index 99d59770..4ee5e1f2 100644 --- a/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java +++ b/src/main/java/crazypants/enderio/material/BlockItemDarkIronBars.java @@ -6,11 +6,9 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; - -import com.enderio.core.common.util.Lang; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; public class BlockItemDarkIronBars extends ItemBlock { @@ -22,6 +20,6 @@ public class BlockItemDarkIronBars extends ItemBlock { @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - par3List.add(Lang.localize("blastResistant")); + par3List.add(EnderIO.lang.localize("blastResistant")); } } diff --git a/src/main/java/crazypants/enderio/material/ItemCapacitor.java b/src/main/java/crazypants/enderio/material/ItemCapacitor.java index 0a2ae50b..28d64289 100644 --- a/src/main/java/crazypants/enderio/material/ItemCapacitor.java +++ b/src/main/java/crazypants/enderio/material/ItemCapacitor.java @@ -11,11 +11,11 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import com.enderio.core.client.handlers.SpecialTooltipHandler; -import com.enderio.core.common.util.Lang; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.power.BasicCapacitor; @@ -89,7 +89,7 @@ public class ItemCapacitor extends Item implements ICapacitorItem { @SideOnly(Side.CLIENT) public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(par1ItemStack != null && par1ItemStack.getItemDamage() > 0) { - par3List.add(Lang.localize("machine.tooltip.upgrade")); + par3List.add(EnderIO.lang.localize("machine.tooltip.upgrade")); if(SpecialTooltipHandler.showAdvancedTooltips()) { SpecialTooltipHandler.addDetailedTooltipFromResources(par3List, "enderio.machine.tooltip.upgrade"); } else { diff --git a/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java b/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java index 5fc44224..dd118180 100644 --- a/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java +++ b/src/main/java/crazypants/enderio/material/ItemFusedQuartz.java @@ -9,11 +9,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlockWithMetadata; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; - -import com.enderio.core.common.util.Lang; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; public class ItemFusedQuartz extends ItemBlockWithMetadata { @@ -45,10 +43,10 @@ public class ItemFusedQuartz extends ItemBlockWithMetadata { int meta = par1ItemStack.getItemDamage(); meta = MathHelper.clamp_int(meta, 0, BlockFusedQuartz.Type.values().length - 1); if(meta == 0 || meta == 2) { - par3List.add(Lang.localize("blastResistant")); + par3List.add(EnderIO.lang.localize("blastResistant")); } if(meta > 1) { - par3List.add(Lang.localize("lightEmitter")); + par3List.add(EnderIO.lang.localize("lightEmitter")); } } diff --git a/src/main/java/crazypants/enderio/network/PacketHandler.java b/src/main/java/crazypants/enderio/network/PacketHandler.java index 5343928b..baa5d0d4 100644 --- a/src/main/java/crazypants/enderio/network/PacketHandler.java +++ b/src/main/java/crazypants/enderio/network/PacketHandler.java @@ -1,11 +1,11 @@ package crazypants.enderio.network; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import net.minecraft.entity.player.EntityPlayerMP; public class PacketHandler { diff --git a/src/main/java/crazypants/enderio/power/PowerDistributor.java b/src/main/java/crazypants/enderio/power/PowerDistributor.java index fb960d4c..6ca00c6d 100644 --- a/src/main/java/crazypants/enderio/power/PowerDistributor.java +++ b/src/main/java/crazypants/enderio/power/PowerDistributor.java @@ -7,9 +7,11 @@ import java.util.ListIterator; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.enderio.machine.AbstractMachineEntity; + import com.enderio.core.common.util.BlockCoord; +import crazypants.enderio.machine.AbstractMachineEntity; + public class PowerDistributor { diff --git a/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java b/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java index 3ac55f3b..92241fdf 100644 --- a/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java +++ b/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java @@ -16,8 +16,8 @@ import com.enderio.core.client.gui.widget.TextFieldEnder; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.api.teleport.ITravelAccessable; import crazypants.enderio.api.teleport.ITravelAccessable.AccessMode; import crazypants.enderio.network.PacketHandler; @@ -56,9 +56,9 @@ public class GuiTravelAccessable extends GuiContainerBase { this.te = container.ta; this.world = container.world; - publicStr = Lang.localize("gui.travelAccessable.public"); - privateStr = Lang.localize("gui.travelAccessable.private"); - protectedStr = Lang.localize("gui.travelAccessable.protected"); + publicStr = EnderIO.lang.localize("gui.travelAccessable.public"); + privateStr = EnderIO.lang.localize("gui.travelAccessable.private"); + protectedStr = EnderIO.lang.localize("gui.travelAccessable.protected"); FontRenderer fr = Minecraft.getMinecraft().fontRenderer; diff --git a/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java b/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java index 717356f6..c037f72e 100644 --- a/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java +++ b/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java @@ -14,8 +14,8 @@ import com.enderio.core.client.gui.GuiContainerBase; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.network.MessageTileNBT; -import com.enderio.core.common.util.Lang; +import crazypants.enderio.EnderIO; import crazypants.enderio.api.teleport.ITravelAccessable; import crazypants.enderio.network.PacketHandler; @@ -30,7 +30,7 @@ public class GuiTravelAuth extends GuiContainerBase { public GuiTravelAuth(EntityPlayer player, ITravelAccessable te, World world) { super(new ContainerTravelAuth(player.inventory)); this.ta = te; - title = Lang.localize("gui.travelAccessable.enterCode"); + title = EnderIO.lang.localize("gui.travelAccessable.enterCode"); this.player = player; } @@ -39,7 +39,7 @@ public class GuiTravelAuth extends GuiContainerBase { super.initGui(); int sx = (width - xSize) / 2; int sy = (height - ySize) / 2; - String str = Lang.localize("gui.travelAccessable.ok"); + String str = EnderIO.lang.localize("gui.travelAccessable.ok"); int strLen = getFontRenderer().getStringWidth(str); GuiButton okB = new GuiButton(0, width / 2 - (strLen / 2) - 5, sy + 50, strLen + 10, 20, str); buttonList.clear(); diff --git a/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java index 2ca0d6cd..921220a8 100644 --- a/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java @@ -19,7 +19,6 @@ import net.minecraftforge.common.UsernameCache; import com.enderio.core.api.client.gui.IResourceTooltipProvider; import com.enderio.core.common.TileEntityEnder; -import com.enderio.core.common.util.Lang; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.IGuiHandler; @@ -147,9 +146,9 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt public static void sendPrivateChatMessage(EntityPlayer player, UUID owner) { if(player.worldObj.isRemote && !player.isSneaking()) { - player.addChatComponentMessage(new ChatComponentText(Lang.localize("gui.travelAccessable.privateBlock1") + " " + player.addChatComponentMessage(new ChatComponentText(EnderIO.lang.localize("gui.travelAccessable.privateBlock1") + " " + EnumChatFormatting.RED + UsernameCache.getLastKnownUsername(owner) + EnumChatFormatting.WHITE + " " - + Lang.localize("gui.travelAccessable.privateBlock2"))); + + EnderIO.lang.localize("gui.travelAccessable.privateBlock2"))); } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/GuiAugmentedTravelAccessible.java b/src/main/java/crazypants/enderio/teleport/telepad/GuiAugmentedTravelAccessible.java index 9d2e425c..11203b65 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/GuiAugmentedTravelAccessible.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/GuiAugmentedTravelAccessible.java @@ -2,9 +2,6 @@ package crazypants.enderio.teleport.telepad; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.world.World; - -import com.enderio.core.common.util.Lang; - import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.gui.IconEIO; @@ -24,7 +21,7 @@ public class GuiAugmentedTravelAccessible extends GuiTravelAccessable implements super(playerInv, te, world); this.te = te; switchButton = new ToggleTravelButton(this, ID_SWITCH_BUTTON, GuiTelePad.SWITCH_X, GuiTelePad.SWITCH_Y, IconEIO.IO_WHATSIT); - switchButton.setToolTip(Lang.localize("gui.telepad.configure.telepad")); + switchButton.setToolTip(EnderIO.lang.localize("gui.telepad.configure.telepad")); } public GuiAugmentedTravelAccessible(ContainerTravelAccessable container) { diff --git a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java index 19e36da8..0f63d3a9 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java @@ -18,7 +18,6 @@ import com.enderio.core.client.gui.widget.GuiToolTip; import com.enderio.core.client.gui.widget.TextFieldEnder; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.Util; import com.google.common.collect.Lists; @@ -96,7 +95,7 @@ public class GuiTelePad extends GuiContainerBase implements IToggleableGui { textFields.addAll(Lists.newArrayList(xTF, yTF, zTF, dimTF)); switchButton = new ToggleTravelButton(this, ID_SWITCH_BUTTON, SWITCH_X, SWITCH_Y, IconEIO.IO_WHATSIT); - switchButton.setToolTip(Lang.localize("gui.telepad.configure.travel")); + switchButton.setToolTip(EnderIO.lang.localize("gui.telepad.configure.travel")); } private String getPowerOutputLabel() { @@ -118,7 +117,7 @@ public class GuiTelePad extends GuiContainerBase implements IToggleableGui { super.initGui(); switchButton.onGuiInit(); - String text = Lang.localize("gui.telepad.teleport"); + String text = EnderIO.lang.localize("gui.telepad.teleport"); int width = getFontRenderer().getStringWidth(text) + 10; int x = guiLeft + (xSize / 2) - (width / 2); @@ -189,7 +188,7 @@ public class GuiTelePad extends GuiContainerBase implements IToggleableGui { String name = e.getCommandSenderName(); fnt.drawString(name, sx + xSize / 2 - fnt.getStringWidth(name) / 2, sy + progressY + fnt.FONT_HEIGHT + 6, 0x000000); } else if(te.wasBlocked) { - String s = Lang.localize("gui.telepad.blocked"); + String s = EnderIO.lang.localize("gui.telepad.blocked"); fnt.drawString(s, sx + xSize / 2 - fnt.getStringWidth(s) / 2, sy + progressY + fnt.FONT_HEIGHT + 6, 0xAA0000); } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordSelector.java b/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordSelector.java index 88743a83..a5801a2d 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordSelector.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordSelector.java @@ -19,12 +19,12 @@ import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.api.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.Lang; import com.enderio.core.common.util.Util; import com.enderio.core.common.vecmath.Vector3d; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.api.teleport.ITelePad; @@ -109,7 +109,7 @@ public class ItemCoordSelector extends Item implements IResourceTooltipProvider tp.setCoords(bc); } if(!world.isRemote) { - player.addChatMessage(new ChatComponentText(Lang.localize("itemCoordSelector.chat.setCoords", bc.chatString()))); + player.addChatMessage(new ChatComponentText(EnderIO.lang.localize("itemCoordSelector.chat.setCoords", bc.chatString()))); } } @@ -120,7 +120,7 @@ public class ItemCoordSelector extends Item implements IResourceTooltipProvider tp.setTargetDim(dim); } if(!world.isRemote) { - player.addChatMessage(new ChatComponentText(Lang.localize("itemCoordSelector.chat.setDimension", EnumChatFormatting.GREEN.toString(), + player.addChatMessage(new ChatComponentText(EnderIO.lang.localize("itemCoordSelector.chat.setDimension", EnumChatFormatting.GREEN.toString(), Integer.toString(dim)))); } } @@ -191,13 +191,13 @@ public class ItemCoordSelector extends Item implements IResourceTooltipProvider private void onCoordsChanged(EntityPlayer player, BlockCoord bc) { if(!player.worldObj.isRemote) { - player.addChatMessage(new ChatComponentText(Lang.localize("itemCoordSelector.chat.newCoords", bc.chatString()))); + player.addChatMessage(new ChatComponentText(EnderIO.lang.localize("itemCoordSelector.chat.newCoords", bc.chatString()))); } } private void onDimensionChanged(EntityPlayer player, int dim) { if(!player.worldObj.isRemote) { - player.addChatMessage(new ChatComponentText(Lang.localize("itemCoordSelector.chat.newDimension", EnumChatFormatting.GREEN.toString(), Integer.toString(dim)))); + player.addChatMessage(new ChatComponentText(EnderIO.lang.localize("itemCoordSelector.chat.newDimension", EnumChatFormatting.GREEN.toString(), Integer.toString(dim)))); } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/PacketOpenServerGui.java b/src/main/java/crazypants/enderio/teleport/telepad/PacketOpenServerGui.java index 222e3656..d042697d 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/PacketOpenServerGui.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/PacketOpenServerGui.java @@ -1,10 +1,11 @@ package crazypants.enderio.teleport.telepad; -import com.enderio.core.common.network.MessageTileEntity; - import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; + +import com.enderio.core.common.network.MessageTileEntity; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/teleport/telepad/PacketTeleport.java b/src/main/java/crazypants/enderio/teleport/telepad/PacketTeleport.java index 4f4cf498..36f16764 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/PacketTeleport.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/PacketTeleport.java @@ -1,11 +1,12 @@ package crazypants.enderio.teleport.telepad; -import com.enderio.core.common.network.MessageTileEntity; - import io.netty.buffer.ByteBuf; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; + +import com.enderio.core.common.network.MessageTileEntity; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/crazypants/enderio/tool/AEToolProvider.java b/src/main/java/crazypants/enderio/tool/AEToolProvider.java index 02cd69da..a8e6d6e2 100644 --- a/src/main/java/crazypants/enderio/tool/AEToolProvider.java +++ b/src/main/java/crazypants/enderio/tool/AEToolProvider.java @@ -2,10 +2,10 @@ package crazypants.enderio.tool; import java.lang.reflect.Method; -import crazypants.enderio.api.tool.ITool; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import appeng.api.implementations.items.IAEWrench; +import crazypants.enderio.api.tool.ITool; public class AEToolProvider implements IToolProvider, IToolImpl { diff --git a/src/main/java/crazypants/enderio/tool/ArrayMappingTool.java b/src/main/java/crazypants/enderio/tool/ArrayMappingTool.java index 6233cc8c..887fb5f7 100644 --- a/src/main/java/crazypants/enderio/tool/ArrayMappingTool.java +++ b/src/main/java/crazypants/enderio/tool/ArrayMappingTool.java @@ -1,9 +1,6 @@ package crazypants.enderio.tool; import java.lang.reflect.Array; -import java.util.Arrays; - -import crazypants.enderio.machine.AbstractMachineEntity; public class ArrayMappingTool { diff --git a/src/main/java/crazypants/enderio/tool/BuildCraftToolProvider.java b/src/main/java/crazypants/enderio/tool/BuildCraftToolProvider.java index 6d2e93d4..a3a56408 100644 --- a/src/main/java/crazypants/enderio/tool/BuildCraftToolProvider.java +++ b/src/main/java/crazypants/enderio/tool/BuildCraftToolProvider.java @@ -2,10 +2,10 @@ package crazypants.enderio.tool; import java.lang.reflect.Method; -import crazypants.enderio.api.tool.ITool; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import buildcraft.api.tools.IToolWrench; +import crazypants.enderio.api.tool.ITool; public class BuildCraftToolProvider implements IToolProvider, IToolImpl { diff --git a/src/main/java/crazypants/enderio/tool/IToolProvider.java b/src/main/java/crazypants/enderio/tool/IToolProvider.java index c639cd2e..4d428510 100644 --- a/src/main/java/crazypants/enderio/tool/IToolProvider.java +++ b/src/main/java/crazypants/enderio/tool/IToolProvider.java @@ -1,7 +1,7 @@ package crazypants.enderio.tool; -import crazypants.enderio.api.tool.ITool; import net.minecraft.item.ItemStack; +import crazypants.enderio.api.tool.ITool; public interface IToolProvider { diff --git a/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java b/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java index ecb3b62f..27a77ec0 100644 --- a/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java +++ b/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java @@ -2,11 +2,11 @@ package crazypants.enderio.waila; import java.util.List; -import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; +import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; + public interface IWailaInfoProvider { public static final int BIT_BASIC = 0x1; diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index e774dcd2..01245118 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -28,7 +28,6 @@ import net.minecraftforge.fluids.FluidStack; import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.api.client.gui.IResourceTooltipProvider; import com.enderio.core.client.handlers.SpecialTooltipHandler; -import com.enderio.core.common.util.Lang; import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; @@ -46,6 +45,7 @@ import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.power.IInternalPoweredTile; import crazypants.util.IFacade; + import static crazypants.enderio.waila.IWailaInfoProvider.*; public class WailaCompat implements IWailaDataProvider { @@ -125,7 +125,7 @@ public class WailaCompat implements IWailaDataProvider { registrar.registerNBTProvider(INSTANCE, TileEntityEio.class); - ConfigHandler.instance().addConfig(EnderIO.MOD_NAME, "facades.hidden", Lang.localize("waila.config.hiddenfacades")); + ConfigHandler.instance().addConfig(EnderIO.MOD_NAME, "facades.hidden", EnderIO.lang.localize("waila.config.hiddenfacades")); } // IGNORE deprecation, the new method requires forge 1234 which is too new for cauldron! @@ -181,8 +181,8 @@ public class WailaCompat implements IWailaDataProvider { ForgeDirection side = accessor.getSide(); IoMode mode = machine.getIoMode(side); currenttip.add(EnumChatFormatting.YELLOW - + String.format(Lang.localize("gui.machine.side"), EnumChatFormatting.WHITE + Lang.localize("gui.machine.side." + side.name().toLowerCase()))); - currenttip.add(EnumChatFormatting.YELLOW + String.format(Lang.localize("gui.machine.ioMode"), mode.colorLocalisedName())); + + String.format(EnderIO.lang.localize("gui.machine.side"), EnumChatFormatting.WHITE + EnderIO.lang.localize("gui.machine.side." + side.name().toLowerCase()))); + currenttip.add(EnumChatFormatting.YELLOW + String.format(EnderIO.lang.localize("gui.machine.ioMode"), mode.colorLocalisedName())); } if(block instanceof IWailaInfoProvider) { @@ -272,7 +272,7 @@ public class WailaCompat implements IWailaDataProvider { if(nbtRoot.hasKey("fluidLocked") && nbtRoot.hasKey("FluidName")) { boolean fluidTypeLocked = nbtRoot.getBoolean("fluidLocked"); FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbtRoot); - String lockedStr = fluidTypeLocked ? Lang.localize("itemLiquidConduit.lockedWaila") : ""; + String lockedStr = fluidTypeLocked ? EnderIO.lang.localize("itemLiquidConduit.lockedWaila") : ""; String fluidName = fluid.getLocalizedName(); int fluidAmount = fluid.amount; if(fluidAmount > 0) { @@ -292,7 +292,7 @@ public class WailaCompat implements IWailaDataProvider { if(nbtRoot.hasKey("isDense")) { boolean isDense = nbtRoot.getBoolean("isDense"); int channelsInUse = nbtRoot.getInteger("channelsInUse"); - currenttip.add(MessageFormat.format(Lang.localize("itemMEConduit.channelsUsed"), + currenttip.add(MessageFormat.format(EnderIO.lang.localize("itemMEConduit.channelsUsed"), channelsInUse, isDense ? 32 : 8)); } }