From 978e50a42e18ee2471627fbe5f715eb08fc15888 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 7 Jan 2016 15:52:02 -0800 Subject: [PATCH] Cleaned up lots of localization --- .../WayofTime/bloodmagic/block/BlockLifeEssence.java | 3 ++- .../WayofTime/bloodmagic/client/gui/GuiSoulForge.java | 2 +- .../WayofTime/bloodmagic/client/gui/GuiTeleposer.java | 2 +- .../java/WayofTime/bloodmagic/item/ItemBindable.java | 2 +- .../java/WayofTime/bloodmagic/item/ItemBloodOrb.java | 5 +++-- .../WayofTime/bloodmagic/item/ItemBoundSword.java | 11 +++++------ .../java/WayofTime/bloodmagic/item/ItemBoundTool.java | 6 ++---- .../bloodmagic/item/ItemTelepositionFocus.java | 4 ++-- .../java/WayofTime/bloodmagic/tile/TileInventory.java | 10 ++++------ 9 files changed, 21 insertions(+), 24 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java index 31adcbaf..fb763e33 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.api.BloodMagicAPI; import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.util.helper.TextHelper; import lombok.Getter; import net.minecraft.block.material.Material; import net.minecraft.util.BlockPos; @@ -62,7 +63,7 @@ public class BlockLifeEssence extends BlockFluidClassic @Override public String getLocalizedName(FluidStack fluidStack) { - return StatCollector.translateToLocal("tile.BloodMagic.fluid.lifeEssence.name"); + return TextHelper.localize("tile.BloodMagic.fluid.lifeEssence.name"); } } } diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java index a025bc08..abebc3a6 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java @@ -26,7 +26,7 @@ public class GuiSoulForge extends GuiContainer protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { this.fontRendererObj.drawString(TextHelper.localize("tile.BloodMagic.soulForge.name"), 64, 23, 4210752); - this.fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, 47, 4210752); + this.fontRendererObj.drawString(TextHelper.localize("container.inventory"), 8, 47, 4210752); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java index f9ecbb5a..3310133a 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java @@ -24,7 +24,7 @@ public class GuiTeleposer extends GuiContainer protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { this.fontRendererObj.drawString(TextHelper.localize("tile.BloodMagic.teleposer.name"), 64, 23, 4210752); - this.fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, 47, 4210752); + this.fontRendererObj.drawString(TextHelper.localize("container.inventory"), 8, 47, 4210752); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBindable.java b/src/main/java/WayofTime/bloodmagic/item/ItemBindable.java index 33b89bbb..c052795a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBindable.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBindable.java @@ -153,7 +153,7 @@ public class ItemBindable extends Item implements IBindable NBTHelper.checkNBT(stack); if (!Strings.isNullOrEmpty(stack.getTagCompound().getString(Constants.NBT.OWNER_UUID))) - tooltip.add(TextHelper.getFormattedText(String.format(StatCollector.translateToLocal("tooltip.BloodMagic.currentOwner"), PlayerHelper.getUsernameFromStack(stack)))); + tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.currentOwner", PlayerHelper.getUsernameFromStack(stack))); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java index 6cbe1682..8d6ca20f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java @@ -7,6 +7,7 @@ import WayofTime.bloodmagic.api.orb.IBloodOrb; import WayofTime.bloodmagic.api.registry.OrbRegistry; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -77,10 +78,10 @@ public class ItemBloodOrb extends ItemBindable implements IBloodOrb, IBindable @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - tooltip.add(StatCollector.translateToLocal("tooltip.BloodMagic.orb.desc")); + tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.orb.desc")); if (advanced) - tooltip.add(String.format(StatCollector.translateToLocal("tooltip.BloodMagic.orb.owner"), getOrb(stack.getItemDamage()).getOwner())); + tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.orb.owner", getOrb(stack.getItemDamage()).getOwner())); super.addInformation(stack, player, tooltip, advanced); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index 310b2841..92b82651 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -22,6 +22,7 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -59,7 +60,7 @@ public class ItemBoundSword extends ItemSword ItemBindable.syphonNetwork(stack, playerIn, (int) (i * i * i / 2.7)); - if (net.minecraftforge.event.ForgeEventFactory.onExplosionStart(worldIn, explosion)) + if (ForgeEventFactory.onExplosionStart(worldIn, explosion)) return; explosion.doExplosionA(); explosion.doExplosionB(true); @@ -132,13 +133,11 @@ public class ItemBoundSword extends ItemSword if (StatCollector.canTranslate("tooltip.BloodMagic.bound.sword.desc")) tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.bound.sword.desc")); - if (getActivated(stack)) - tooltip.add(TextHelper.localize("tooltip.BloodMagic.activated")); - else - tooltip.add(TextHelper.localize("tooltip.BloodMagic.deactivated")); + + tooltip.add(TextHelper.localize("tooltip.BloodMagic." + (getActivated(stack) ? "activated" : "deactivated"))); if (!Strings.isNullOrEmpty(stack.getTagCompound().getString(Constants.NBT.OWNER_UUID))) - tooltip.add(TextHelper.getFormattedText(String.format(StatCollector.translateToLocal("tooltip.BloodMagic.currentOwner"), stack.getTagCompound().getString(Constants.NBT.OWNER_UUID)))); + tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.currentOwner", stack.getTagCompound().getString(Constants.NBT.OWNER_UUID))); } private boolean getActivated(ItemStack stack) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index bccab3c4..9b31ab2b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -203,10 +203,8 @@ public class ItemBoundTool extends ItemBindable if (StatCollector.canTranslate(tooltipBase + "desc")) tooltip.add(TextHelper.localizeEffect(tooltipBase + "desc")); - if (getActivated(stack)) - tooltip.add(TextHelper.localize("tooltip.BloodMagic.activated")); - else - tooltip.add(TextHelper.localize("tooltip.BloodMagic.deactivated")); + + tooltip.add(TextHelper.localize("tooltip.BloodMagic." + (getActivated(stack) ? "activated" : "deactivated"))); super.addInformation(stack, player, tooltip, advanced); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java index 299b2eb2..493665cd 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java @@ -82,8 +82,8 @@ public class ItemTelepositionFocus extends ItemBindable if (coords != null && tag != null) { - tooltip.add(String.format(StatCollector.translateToLocal("tooltip.BloodMagic.telepositionFocus.coords"), coords.getX(), coords.getY(), coords.getZ())); - tooltip.add(String.format(StatCollector.translateToLocal("tooltip.BloodMagic.telepositionFocus.dimension"), tag.getInteger(Constants.NBT.DIMENSION_ID))); + tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.telepositionFocus.coords", coords.getX(), coords.getY(), coords.getZ())); + tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.telepositionFocus.dimension", tag.getInteger(Constants.NBT.DIMENSION_ID))); } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java b/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java index 43685915..2942a303 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.tile; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -11,10 +12,7 @@ import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.StatCollector; +import net.minecraft.util.*; import net.minecraft.world.World; public class TileInventory extends TileEntity implements IInventory @@ -234,7 +232,7 @@ public class TileInventory extends TileEntity implements IInventory @Override public String getName() { - return StatCollector.translateToLocal("tile.BloodMagic." + name + ".name"); + return TextHelper.localize("tile.BloodMagic." + name + ".name"); } @Override @@ -246,6 +244,6 @@ public class TileInventory extends TileEntity implements IInventory @Override public IChatComponent getDisplayName() { - return new ChatComponentTranslation("tile.BloodMagic." + name + ".name"); + return new ChatComponentText(getName()); } }