From 5cdf1602bbaba6923b9579ee5e8d9ac787d589a6 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Tue, 14 Jan 2014 22:12:40 +0800 Subject: [PATCH] Fixed tank texture --- .../fluid/pipe/ItemBlockFluidContainer.java | 186 +++++++++--------- .../languages/en_US.properties | 6 +- 2 files changed, 101 insertions(+), 91 deletions(-) diff --git a/src/main/java/resonantinduction/mechanical/fluid/pipe/ItemBlockFluidContainer.java b/src/main/java/resonantinduction/mechanical/fluid/pipe/ItemBlockFluidContainer.java index bc2859309..b4e5e5a7f 100644 --- a/src/main/java/resonantinduction/mechanical/fluid/pipe/ItemBlockFluidContainer.java +++ b/src/main/java/resonantinduction/mechanical/fluid/pipe/ItemBlockFluidContainer.java @@ -2,7 +2,10 @@ package resonantinduction.mechanical.fluid.pipe; import java.util.List; +import calclavia.lib.utility.LanguageUtility; +import codechicken.lib.vec.Translation; import net.minecraft.block.Block; +import net.minecraft.client.resources.Language; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -24,102 +27,109 @@ import universalelectricity.api.vector.Vector3; public class ItemBlockFluidContainer extends ItemBlock { - public ItemBlockFluidContainer(int id) - { - super(id); - this.setMaxDamage(0); - this.setHasSubtypes(true); - } + public ItemBlockFluidContainer(int id) + { + super(id); + this.setMaxDamage(0); + this.setHasSubtypes(true); + } - @Override - public int getMetadata(int damage) - { - return damage; - } + @Override + public int getMetadata(int damage) + { + return damage; + } - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) - { - if (stack.getTagCompound() != null && stack.getTagCompound().hasKey("fluid")) - { - FluidStack fluid = FluidStack.loadFluidStackFromNBT(stack.getTagCompound().getCompoundTag("fluid")); + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) + { + if (stack.getTagCompound() != null && stack.getTagCompound().hasKey("fluid")) + { + FluidStack fluid = FluidStack.loadFluidStackFromNBT(stack.getTagCompound().getCompoundTag("fluid")); - if (fluid != null) - { - list.add("Fluid: " + fluid.getFluid().getLocalizedName()); - list.add("Volume: " + UnitDisplay.getDisplay(fluid.amount, Unit.LITER, UnitPrefix.MILLI)); - } - } - } + if (fluid != null) + { + list.add("Fluid: " + fluid.getFluid().getLocalizedName()); + list.add("Volume: " + UnitDisplay.getDisplay(fluid.amount, Unit.LITER, UnitPrefix.MILLI)); + } + } + } - public static ItemStack getWrenchedItem(World world, Vector3 vec) - { - TileEntity entity = vec.getTileEntity(world); - if (entity instanceof TileTank && ((TileTank) entity).getTank() != null && ((TileTank) entity).getTank().getFluid() != null) - { - ItemStack itemStack = new ItemStack(Mechanical.blockTank); - FluidStack stack = ((TileTank) entity).getTank().getFluid(); + public static ItemStack getWrenchedItem(World world, Vector3 vec) + { + TileEntity entity = vec.getTileEntity(world); + if (entity instanceof TileTank && ((TileTank) entity).getTank() != null && ((TileTank) entity).getTank().getFluid() != null) + { + ItemStack itemStack = new ItemStack(Mechanical.blockTank); + FluidStack stack = ((TileTank) entity).getTank().getFluid(); - if (itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - if (stack != null) - { - ((TileTank) entity).drain(ForgeDirection.UNKNOWN, stack.amount, true); - itemStack.getTagCompound().setCompoundTag("fluid", stack.writeToNBT(new NBTTagCompound())); - } - return itemStack; - } - return null; - } + if (itemStack.getTagCompound() == null) + { + itemStack.setTagCompound(new NBTTagCompound()); + } + if (stack != null) + { + ((TileTank) entity).drain(ForgeDirection.UNKNOWN, stack.amount, true); + itemStack.getTagCompound().setCompoundTag("fluid", stack.writeToNBT(new NBTTagCompound())); + } + return itemStack; + } + return null; + } - @Override - public void onUpdate(ItemStack itemStack, World par2World, Entity entity, int par4, boolean par5) - { - if (entity instanceof EntityPlayer) - { - EntityPlayer player = (EntityPlayer) entity; + @Override + public void onUpdate(ItemStack itemStack, World par2World, Entity entity, int par4, boolean par5) + { + if (entity instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer) entity; - if (itemStack.getTagCompound() != null && !player.capabilities.isCreativeMode && itemStack.getTagCompound().hasKey("fluid")) - { - player.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 5, 0)); - } - } - } + if (itemStack.getTagCompound() != null && !player.capabilities.isCreativeMode && itemStack.getTagCompound().hasKey("fluid")) + { + player.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 5, 0)); + } + } + } - @Override - public int getItemStackLimit(ItemStack stack) - { - if (stack.getTagCompound() != null && stack.getTagCompound().hasKey("fluid")) - { - return 1; - } - return this.maxStackSize; - } + @Override + public int getItemStackLimit(ItemStack stack) + { + if (stack.getTagCompound() != null && stack.getTagCompound().hasKey("fluid")) + { + return 1; + } + return this.maxStackSize; + } - @Override - public String getUnlocalizedName(ItemStack itemStack) - { - return Block.blocksList[this.getBlockID()].getUnlocalizedName() + "." + itemStack.getItemDamage(); - } + @Override + public String getUnlocalizedName(ItemStack itemStack) + { + String translation = LanguageUtility.getLocal(Block.blocksList[this.getBlockID()].getUnlocalizedName() + "." + itemStack.getItemDamage()); - @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) - { - if (super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, (metadata / FluidContainerMaterial.spacing))) - { - TileEntity tile = world.getBlockTileEntity(x, y, z); - if (tile instanceof TileFluidNetwork) - { - ((TileFluidNetwork) tile).setSubID(stack.getItemDamage()); - if (stack.getTagCompound() != null && stack.getTagCompound().hasKey("fluid")) - { - ((TileFluidNetwork) tile).fill(ForgeDirection.UNKNOWN, FluidStack.loadFluidStackFromNBT(stack.getTagCompound().getCompoundTag("fluid")), true); - } - } - return true; - } - return false; - } + if (translation == null || translation.isEmpty()) + { + return Block.blocksList[this.getBlockID()].getUnlocalizedName(); + } + + return Block.blocksList[this.getBlockID()].getUnlocalizedName() + "." + itemStack.getItemDamage(); + } + + @Override + public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) + { + if (super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, (metadata / FluidContainerMaterial.spacing))) + { + TileEntity tile = world.getBlockTileEntity(x, y, z); + if (tile instanceof TileFluidNetwork) + { + ((TileFluidNetwork) tile).setSubID(stack.getItemDamage()); + if (stack.getTagCompound() != null && stack.getTagCompound().hasKey("fluid")) + { + ((TileFluidNetwork) tile).fill(ForgeDirection.UNKNOWN, FluidStack.loadFluidStackFromNBT(stack.getTagCompound().getCompoundTag("fluid")), true); + } + } + return true; + } + return false; + } } diff --git a/src/main/resources/assets/resonantinduction/languages/en_US.properties b/src/main/resources/assets/resonantinduction/languages/en_US.properties index ffcfc5f15..c8388c8c4 100644 --- a/src/main/resources/assets/resonantinduction/languages/en_US.properties +++ b/src/main/resources/assets/resonantinduction/languages/en_US.properties @@ -23,14 +23,14 @@ tile.resonantinduction\:fluidPipe.1.name=Stone Trough ### Mechanical Module ## Energy -tile.resonantinduction\:gear.name=Gear -tile.resonantinduction\:gearShaft.name=Gear Shaft +item.resonantinduction\:gear.name=Gear +item.resonantinduction\:gearShaft.name=Gear Shaft ## Transport tile.resonantinduction\:pump.name=Pump tile.resonantinduction\:grate.name=Grate tile.resonantinduction\:conveyorBelt.name=Conveyor Belt -tile.resonantinduction\:tank.0.name=Tank +tile.resonantinduction\:tank.name=Tank tile.resonantinduction\:detector.name=Detector tile.resonantinduction\:manipulator.name=Manipulator tile.resonantinduction\:rejector.name=Rejector