lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Cleaned up lots of localization

Browse source
This commit is contained in:
Nick 2016-01-07 15:52:02 -08:00
parent 5c7af4f039
commit 978e50a42e
9 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java
View file

@ -2,6 +2,7 @@ package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.api.BloodMagicAPI; import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.util.helper.TextHelper;
import lombok.Getter; import lombok.Getter;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos;
@ -62,7 +63,7 @@ public class BlockLifeEssence extends BlockFluidClassic
@Override @Override
public String getLocalizedName(FluidStack fluidStack) public String getLocalizedName(FluidStack fluidStack)
{ {
return StatCollector.translateToLocal("tile.BloodMagic.fluid.lifeEssence.name"); return TextHelper.localize("tile.BloodMagic.fluid.lifeEssence.name");
} }
} }
} }

2
src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java
View file

@ -26,7 +26,7 @@ public class GuiSoulForge extends GuiContainer
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{ {
this.fontRendererObj.drawString(TextHelper.localize("tile.BloodMagic.soulForge.name"), 64, 23, 4210752); 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 @Override

2
src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java
View file

@ -24,7 +24,7 @@ public class GuiTeleposer extends GuiContainer
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
{ {
this.fontRendererObj.drawString(TextHelper.localize("tile.BloodMagic.teleposer.name"), 64, 23, 4210752); 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 @Override

2
src/main/java/WayofTime/bloodmagic/item/ItemBindable.java
View file

@ -153,7 +153,7 @@ public class ItemBindable extends Item implements IBindable
NBTHelper.checkNBT(stack); NBTHelper.checkNBT(stack);
if (!Strings.isNullOrEmpty(stack.getTagCompound().getString(Constants.NBT.OWNER_UUID))) 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 @Override

5
src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java
View file

@ -7,6 +7,7 @@ import WayofTime.bloodmagic.api.orb.IBloodOrb;
import WayofTime.bloodmagic.api.registry.OrbRegistry; import WayofTime.bloodmagic.api.registry.OrbRegistry;
import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
import WayofTime.bloodmagic.api.util.helper.PlayerHelper; import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import WayofTime.bloodmagic.util.helper.TextHelper;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -77,10 +78,10 @@ public class ItemBloodOrb extends ItemBindable implements IBloodOrb, IBindable
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced)
{ {
tooltip.add(StatCollector.translateToLocal("tooltip.BloodMagic.orb.desc")); tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.orb.desc"));
if (advanced) 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); super.addInformation(stack, player, tooltip, advanced);
} }

11
src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java
View file

@ -22,6 +22,7 @@ import net.minecraft.util.StatCollector;
import net.minecraft.world.Explosion; import net.minecraft.world.Explosion;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.ForgeEventFactory;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; 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)); ItemBindable.syphonNetwork(stack, playerIn, (int) (i * i * i / 2.7));
if (net.minecraftforge.event.ForgeEventFactory.onExplosionStart(worldIn, explosion)) if (ForgeEventFactory.onExplosionStart(worldIn, explosion))
return; return;
explosion.doExplosionA(); explosion.doExplosionA();
explosion.doExplosionB(true); explosion.doExplosionB(true);
@ -132,13 +133,11 @@ public class ItemBoundSword extends ItemSword
if (StatCollector.canTranslate("tooltip.BloodMagic.bound.sword.desc")) if (StatCollector.canTranslate("tooltip.BloodMagic.bound.sword.desc"))
tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.bound.sword.desc")); tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.bound.sword.desc"));
if (getActivated(stack))
tooltip.add(TextHelper.localize("tooltip.BloodMagic.activated")); tooltip.add(TextHelper.localize("tooltip.BloodMagic." + (getActivated(stack) ? "activated" : "deactivated")));
else
tooltip.add(TextHelper.localize("tooltip.BloodMagic.deactivated"));
if (!Strings.isNullOrEmpty(stack.getTagCompound().getString(Constants.NBT.OWNER_UUID))) 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) private boolean getActivated(ItemStack stack)

6
src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java
View file

@ -203,10 +203,8 @@ public class ItemBoundTool extends ItemBindable
if (StatCollector.canTranslate(tooltipBase + "desc")) if (StatCollector.canTranslate(tooltipBase + "desc"))
tooltip.add(TextHelper.localizeEffect(tooltipBase + "desc")); tooltip.add(TextHelper.localizeEffect(tooltipBase + "desc"));
if (getActivated(stack))
tooltip.add(TextHelper.localize("tooltip.BloodMagic.activated")); tooltip.add(TextHelper.localize("tooltip.BloodMagic." + (getActivated(stack) ? "activated" : "deactivated")));
else
tooltip.add(TextHelper.localize("tooltip.BloodMagic.deactivated"));
super.addInformation(stack, player, tooltip, advanced); super.addInformation(stack, player, tooltip, advanced);
} }

4
src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java
View file

@ -82,8 +82,8 @@ public class ItemTelepositionFocus extends ItemBindable
if (coords != null && tag != null) if (coords != null && tag != null)
{ {
tooltip.add(String.format(StatCollector.translateToLocal("tooltip.BloodMagic.telepositionFocus.coords"), coords.getX(), coords.getY(), coords.getZ())); tooltip.add(TextHelper.localizeEffect("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.dimension", tag.getInteger(Constants.NBT.DIMENSION_ID)));
} }
} }

10
src/main/java/WayofTime/bloodmagic/tile/TileInventory.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.tile; package WayofTime.bloodmagic.tile;
import WayofTime.bloodmagic.util.helper.TextHelper;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
@ -11,10 +12,7 @@ import net.minecraft.network.NetworkManager;
import net.minecraft.network.Packet; import net.minecraft.network.Packet;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos; import net.minecraft.util.*;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.IChatComponent;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World; import net.minecraft.world.World;
public class TileInventory extends TileEntity implements IInventory public class TileInventory extends TileEntity implements IInventory
@ -234,7 +232,7 @@ public class TileInventory extends TileEntity implements IInventory
@Override @Override
public String getName() public String getName()
{ {
return StatCollector.translateToLocal("tile.BloodMagic." + name + ".name"); return TextHelper.localize("tile.BloodMagic." + name + ".name");
} }
@Override @Override
@ -246,6 +244,6 @@ public class TileInventory extends TileEntity implements IInventory
@Override @Override
public IChatComponent getDisplayName() public IChatComponent getDisplayName()
{ {
return new ChatComponentTranslation("tile.BloodMagic." + name + ".name"); return new ChatComponentText(getName());
} }
} }