diff --git a/resources/assets/enderio/lang/de_DE.lang b/resources/assets/enderio/lang/de_DE.lang index 2dbca7d0..c4e12025 100644 --- a/resources/assets/enderio/lang/de_DE.lang +++ b/resources/assets/enderio/lang/de_DE.lang @@ -348,9 +348,6 @@ item.darkSteel_sword.name=Der Ender item.darkSteel_pickaxe.name=Dunkelspitzhacke item.darkSteel_axe.name=Dunkelaxt -enderio.item.tooltip.showDetails= -enderio.item.darkSteel.tooltip.durability=Haltbarkeit: - enderio.item.darkSteel_pickaxe.tooltip.effPowered=Effizienz, wenn aktiviert enderio.item.darkSteel_pickaxe.tooltip.effObs=Effizienz baut Obsidian ab diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index c49f2f34..1f9bde1f 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -649,8 +649,6 @@ item.darkSteel_pickaxe.name=Dark Pick item.darkSteel_axe.name=Dark Axe item.darkSteel_shears.name=Dark Shears -enderio.item.tooltip.showDetails= -enderio.item.darkSteel.tooltip.durability=Durability: enderio.item.darkSteel.tooltip.lvs=lvs enderio.item.darkSteel_pickaxe.tooltip.effPowered=Efficiency when powered diff --git a/resources/assets/enderio/lang/ko_KR.lang b/resources/assets/enderio/lang/ko_KR.lang index f2d968fd..b6e9ce9e 100644 --- a/resources/assets/enderio/lang/ko_KR.lang +++ b/resources/assets/enderio/lang/ko_KR.lang @@ -524,9 +524,6 @@ item.darkSteel_sword.name=디 엔더 item.darkSteel_pickaxe.name=암흑의 곡괭이 item.darkSteel_axe.name=암흑의 도끼 -enderio.item.tooltip.showDetails= -enderio.item.darkSteel.tooltip.durability=내구도: - enderio.item.darkSteel_pickaxe.tooltip.effPowered=충전되어 있을 시 채굴 속도가 증가합니다. enderio.item.darkSteel_pickaxe.tooltip.effObs=흑요석에 대한 채굴 속도가 증가합니다. diff --git a/resources/assets/enderio/lang/ru_RU.lang b/resources/assets/enderio/lang/ru_RU.lang index a4585f30..54c91bcd 100644 --- a/resources/assets/enderio/lang/ru_RU.lang +++ b/resources/assets/enderio/lang/ru_RU.lang @@ -604,8 +604,6 @@ item.darkSteel_pickaxe.name=Тёмная кирка item.darkSteel_axe.name=Тёмный топор item.darkSteel_shears.name=Тёмные ножницы -enderio.item.tooltip.showDetails=<Зажмите Shift> -enderio.item.darkSteel.tooltip.durability=Прочность: enderio.item.darkSteel.tooltip.lvs=уровней enderio.item.darkSteel_pickaxe.tooltip.effPowered=Эффективность при питании diff --git a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java index b1953a05..f194ea3a 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java +++ b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java @@ -190,7 +190,7 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider, SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack); if(itemstack.getItemDamage() == FacadeType.HARDENED.ordinal()) { list.add(""); - list.add(EnderIO.lang.localize(getUnlocalizedName(itemstack) + ".tooltip", false)); + list.add(EnderIO.lang.localizeExact(getUnlocalizedName(itemstack) + ".tooltip")); } } 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 1f6fe1cc..29329609 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java @@ -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(EnderIO.lang.localize(upgrade.unlocName.concat(".name"), false)); + list.add(EnderIO.lang.localizeExact(upgrade.unlocName.concat(".name"))); } functionUpgradeTooltip = new GuiToolTip(new Rectangle(x - 21 - 18*2, customTop + 3 + 34, 18, 18), list) { @Override diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java index 9bfd0220..6ca31b24 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java @@ -182,7 +182,7 @@ public class ItemConduitNetwork extends AbstractConduitNetwork list, boolean flag) { - list.add(EnumChatFormatting.DARK_AQUA + EnderIO.lang.localize(getUnlocalizedName() + ".name", false)); + list.add(EnumChatFormatting.DARK_AQUA + EnderIO.lang.localizeExact(getUnlocalizedName() + ".name")); } @Override @SideOnly(Side.CLIENT) public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(EnumChatFormatting.DARK_AQUA + EnderIO.lang.localize(getUnlocalizedName() + ".name", false)); + list.add(EnumChatFormatting.DARK_AQUA + EnderIO.lang.localizeExact(getUnlocalizedName() + ".name")); 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 662ddee9..8ca093c7 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java @@ -189,7 +189,7 @@ public class DarkSteelRecipeManager { if(!applyableUpgrades.isEmpty()) { list.add(EnumChatFormatting.YELLOW + EnderIO.lang.localize("tooltip.anvilupgrades") + " "); for (IDarkSteelUpgrade up : applyableUpgrades) { - list.add(EnumChatFormatting.DARK_AQUA + "" + "" + EnderIO.lang.localize(up.getUnlocalizedName() + ".name", false) + ": "); + list.add(EnumChatFormatting.DARK_AQUA + "" + "" + EnderIO.lang.localizeExact(up.getUnlocalizedName() + ".name") + ": "); list.add(EnumChatFormatting.DARK_AQUA + "" + EnumChatFormatting.ITALIC + " " + up.getUpgradeItemName() + " + " + up.getLevelCost() + " " + 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 0bad1d11..14fc1c47 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java @@ -202,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 + EnderIO.lang.localize(getUnlocalizedName() + ".name", false)); + upgradeStr.add(EnumChatFormatting.DARK_AQUA + EnderIO.lang.localizeExact(getUnlocalizedName() + ".name")); SpecialTooltipHandler.addDetailedTooltipFromResources(upgradeStr, getUnlocalizedName()); String percDamage = (int)Math.round(getAbsorptionRatio(itemstack) * 100) + ""; diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index ca075cf3..7e535444 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -535,7 +535,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi if(stack.hasDisplayName()) { name = stack.getDisplayName(); } else { - name = EnderIO.lang.localize(stack.getUnlocalizedName() + ".name", false); + name = EnderIO.lang.localizeExact(stack.getUnlocalizedName() + ".name"); } name += " " + EnderIO.lang.localize("machine.tooltip.configured"); stack.setStackDisplayName(name); diff --git a/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java b/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java index b9c222d6..947f121e 100644 --- a/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java +++ b/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java @@ -2,6 +2,7 @@ package crazypants.enderio.machine; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; @@ -38,20 +39,30 @@ public class TechneMachineRenderer extends Tech @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { T te = (T) world.getTileEntity(x, y, z); - if(te != null) { + if (te != null) { setFacingDir(te.getFacingDir()); overlay.setTile(te); } super.renderWorldBlock(world, x, y, z, block, modelId, renderer); - if(renderer.overrideBlockTexture == null) { + if (renderer.overrideBlockTexture == null) { ccr.renderBlock(world, block, x, y, z, overlay); } return true; } + @Override + protected IIcon getModelIcon(Block block, int metadata) { + return ((AbstractMachineBlock) block).getModelIcon(); + } + + @Override + protected IIcon getModelIcon(IBlockAccess world, int x, int y, int z, Block block) { + return getModelIcon(block, 0); + } + private void setFacingDir(ForgeDirection dir) { VertexRotationFacing rot = (VertexRotationFacing) ((VertexTransformComposite) vt).xforms[0]; rot.setRotation(dir); diff --git a/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java index 8ec4d77b..41d5beb5 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java @@ -155,7 +155,7 @@ public class GuiBuffer extends GuiPoweredMachineBase { super.drawGuiContainerBackgroundLayer(par1, par2, par3); - String invName = EnderIO.lang.localize(getTileEntity().getInventoryName() + ".name", false); + String invName = EnderIO.lang.localizeExact(getTileEntity().getInventoryName() + ".name"); getFontRenderer().drawStringWithShadow(invName, sx + (xSize / 2) - (getFontRenderer().getStringWidth(invName) / 2), sy + 4, 0xFFFFFF); if(getTileEntity().hasPower()) { diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java index 7383f0db..23dc18be 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java @@ -140,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 = EnderIO.lang.localize("tile.blockCapBank.tooltip.hasItems", false); + String msg = EnderIO.lang.localizeExact("tile.blockCapBank.tooltip.hasItems"); list.add(EnumChatFormatting.GOLD + MessageFormat.format(msg, itemList.tagCount())); } } diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java index 070b0b4d..97a4856c 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java @@ -52,7 +52,7 @@ public class GuiStirlingGenerator extends GuiPoweredMachineBase { headerCrafting = EnderIO.lang.localize("gui.inventorypanel.header.crafting"); headerReturn = EnderIO.lang.localize("gui.inventorypanel.header.return"); - headerInventory = EnderIO.lang.localize("container.inventory", false); + headerInventory = EnderIO.lang.localizeExact("container.inventory"); infoTextFilter = EnderIO.lang.localize("gui.inventorypanel.info.filter"); infoTextOffline = EnderIO.lang.localize("gui.inventorypanel.info.offline"); diff --git a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java index b9567708..40176f4b 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java @@ -295,7 +295,7 @@ public class BlockPoweredSpawner extends AbstractMachineBlock