diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 7df67978..f8c44a48 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -8,6 +8,11 @@ enderio.power.maxOutput=Max Output //Ender IO / Enderface tile.blockEnderIo.name=Ender IO +tile.blockEnderIo.description.line1=Allow remote access to near by +tile.blockEnderIo.description.line2=blocks. +tile.blockEnderIo.description.line3=Used with Travel Anchors or +tile.blockEnderIo.description.line4=the Staff of Travel + item.enderio.itemEnderface.name=Enderface //Conduits @@ -101,22 +106,76 @@ enderio.machine.tooltip.upgrade=Machine Upgrade //Machines tile.blockStirlingGenerator.name=Stirling Generator +tile.blockStirlingGenerator.description.line1=Burns solid fuel to generate power +tile.blockStirlingGenerator.description.line2=Can be upgraded to increase output +tile.blockStirlingGenerator.description.line3=and efficiency + tile.blockReservoir.name=Reservoir +tile.blockReservoir.description.line1=Formed when placed 2x2x1 +tile.blockReservoir.description.line2=Add two buckets of water for +tile.blockReservoir.description.line3=an infinite water source +tile.blockReservoir.description.line4=Produces one bucket a second +tile.blockReservoir.description.line5=Right click with a wrench to +tile.blockReservoir.description.line6=enable auto-output + tile.blockAlloySmelter.name=Alloy Smelter +tile.blockAlloySmelter.description.line1=Used to create EnderIO alloys +tile.blockAlloySmelter.description.line2=Can also be used as a powered +tile.blockAlloySmelter.description.line3=furnace + tile.blockSolarPanel.name=Photovoltaic Cell +tile.blockSolarPanel.description.line1=Produces power during daylight hours +tile.blockSolarPanel.description.line2=Must have a clear line of site to +tile.blockSolarPanel.description.line3=the sky + tile.blockElectricLight.name=Powered Light +tile.blockElectricLight.description.line1=Lights a large area when supplied with +tile.blockElectricLight.description.line2=power and a redstone signal + tile.blockCapacitorBank.name=Capacitor Bank +tile.blockCapacitorBank.description.line1=Multi-block energy storage. +tile.blockCapacitorBank.description.line2=Can charge RF powered items. tile.blockCapacitorBank.tooltipPrefix=Contains + tile.blockSagMill.name=SAG Mill +tile.blockSagMill.description.line1=Grinds ore and other items +tile.blockSagMill.description.line2=Can be upgraded to increase speed +tile.blockSagMill.description.line3=Add grinding balls to increase output +tile.blockSagMill.description.line4=and efficiency +tile.blockSagMill.tooltipPrefix=Contains + tile.blockHyperCube.name=Dimensional Transceiver +tile.blockHyperCube.description.line1=Transports items, fluids and power +tile.blockHyperCube.description.line2=wirelessly across any distance and +tile.blockHyperCube.description.line3=between dimensions + tile.blockPowerMonitor.name=Power Monitor +tile.blockPowerMonitor.description.line1=Displays details of power use and +tile.blockPowerMonitor.description.line2=and storage +tile.blockPowerMonitor.description.line3=Can be used to emit redstone based +tile.blockPowerMonitor.description.line4=based on stored power levels +tile.blockPowerMonitor.description.line5=Must be attached to an EnderIO +tile.blockPowerMonitor.description.line6=conduit + tile.blockVat.name=The Vat +tile.blockVat.description.line1=Used to brew EnderIO fluids + tile.blockCombustionGenerator.name=Combustion Generator +tile.blockCombustionGenerator.description.line1=Burns liquid fuel to generate power +tile.blockCombustionGenerator.description.line2=Requires a coolant (e.g. water) +tile.blockCombustionGenerator.description.line3=Output dependent on fuel + tile.blockFarmStation.name=Farming Station [NOT IMPLEMENTED] enderio.machine.tooltip.configured=(Configured) //Travel tile.blockTravelAnchor.name=Travel Anchor +tile.blockTravelAnchor.description.line1=Allows teleportation between anchors +tile.blockTravelAnchor.description.line2=Stand an one Anchor, look at +tile.blockTravelAnchor.description.line3=another and jump to travel +tile.blockTravelAnchor.description.line4=Can also be used with the Staff +tile.blockTravelAnchor.description.line5=of Travel + enderio.blockTravelPlatform.invalidTarget=Destination is Obstructed enderio.blockTravelPlatform.outOfRange=Destination out of range item.itemTravelStaff.name=Staff of Traveling @@ -132,6 +191,12 @@ tile.blockPaintedStair.name=Painted Stairs tile.blockPaintedSlab.name=Painted Slab tile.blockPaintedDoubleSlab.name=Painted Slab +tile.blockPainter.description.line1=Used to paint: +tile.blockPainter.description.line2= Conduit Facades, Stairs, Fences +tile.blockPainter.description.line3= Gates, Slabs, Cobblestone Walls +tile.blockPainter.description.line3= Glass Frames + + //Items item.itemYetaWrench.name=Yeta Wrench item.enderio.itemConduitProbe.name=Conduit Probe diff --git a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java index 1746dd30..bb2bebf0 100644 --- a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java +++ b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java @@ -1,5 +1,7 @@ package crazypants.enderio.enderface; +import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -17,10 +19,12 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.Log; import crazypants.enderio.ModObject; import crazypants.enderio.enderface.te.MeProxy; +import crazypants.enderio.gui.IAdvancedTooltipProvider; +import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.teleport.ITravelAccessable; import crazypants.util.Lang; -public class BlockEnderIO extends BlockEio { +public class BlockEnderIO extends BlockEio implements IAdvancedTooltipProvider { public static BlockEnderIO create() { @@ -60,6 +64,22 @@ public class BlockEnderIO extends BlockEio { super(ModObject.blockEnderIo.unlocalisedName, TileEnderIO.class); } + @Override + @SideOnly(Side.CLIENT) + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + } + + @Override + @SideOnly(Side.CLIENT) + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + } + + @Override + @SideOnly(Side.CLIENT) + public void addAdvancedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + TooltipAddera.addDescriptionFromResources(list, itemstack); + } + @Override @SideOnly(Side.CLIENT) public int getRenderBlockPass() { diff --git a/src/main/java/crazypants/enderio/fluid/BucketHandler.java b/src/main/java/crazypants/enderio/fluid/BucketHandler.java index 6256a14b..a5bd501e 100644 --- a/src/main/java/crazypants/enderio/fluid/BucketHandler.java +++ b/src/main/java/crazypants/enderio/fluid/BucketHandler.java @@ -1,28 +1,17 @@ package crazypants.enderio.fluid; import java.util.HashMap; -import java.util.List; import java.util.Map; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.FillBucketEvent; -import net.minecraftforge.event.entity.player.ItemTooltipEvent; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; -import buildcraft.api.fuels.IronEngineFuel; -import buildcraft.api.fuels.IronEngineFuel.Fuel; import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import crazypants.enderio.Config; -import crazypants.enderio.machine.power.PowerDisplayUtil; -import crazypants.util.Lang; public class BucketHandler { @@ -62,31 +51,31 @@ public class BucketHandler { } } - @SubscribeEvent - public void addFuelTooltip(ItemTooltipEvent evt) { - ItemStack stack = evt.itemStack; - if(stack == null) { - return; - } - - if(Config.addFuelTooltipsToAllFluidContainers || stack.getItem() instanceof ItemBucketEio) { - FluidStack fluidStack = FluidContainerRegistry.getFluidForFilledItem(stack); - if(fluidStack == null) { - return; - } - addTooltipForFluid(evt.toolTip, fluidStack.getFluid()); - } - } - - protected void addTooltipForFluid(List list, Fluid fluid) { - if(fluid != null) { - Fuel fuel = IronEngineFuel.getFuelForFluid(fluid); - if(fuel != null) { - list.add(Lang.localize("fuel.tooltip.heading")); - list.add(EnumChatFormatting.ITALIC + " " + PowerDisplayUtil.formatPowerPerTick(fuel.powerPerCycle)); - list.add(EnumChatFormatting.ITALIC + " " + fuel.totalBurningTime + " " + Lang.localize("fuel.tooltip.burnTime")); - } - } - } + // @SubscribeEvent + // public void addFuelTooltip(ItemTooltipEvent evt) { + // ItemStack stack = evt.itemStack; + // if(stack == null) { + // return; + // } + // + // if(Config.addFuelTooltipsToAllFluidContainers || stack.getItem() instanceof ItemBucketEio) { + // FluidStack fluidStack = FluidContainerRegistry.getFluidForFilledItem(stack); + // if(fluidStack == null) { + // return; + // } + // addTooltipForFluid(evt.toolTip, fluidStack.getFluid()); + // } + // } + // + // protected void addTooltipForFluid(List list, Fluid fluid) { + // if(fluid != null) { + // Fuel fuel = IronEngineFuel.getFuelForFluid(fluid); + // if(fuel != null) { + // list.add(Lang.localize("fuel.tooltip.heading")); + // list.add(EnumChatFormatting.ITALIC + " " + PowerDisplayUtil.formatPowerPerTick(fuel.powerPerCycle)); + // list.add(EnumChatFormatting.ITALIC + " " + fuel.totalBurningTime + " " + Lang.localize("fuel.tooltip.burnTime")); + // } + // } + // } } diff --git a/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java b/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java index 45c999bc..e95e9135 100644 --- a/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java +++ b/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java @@ -1,6 +1,9 @@ package crazypants.enderio.fluid; +import java.util.List; + import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemStack; @@ -10,9 +13,13 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import org.apache.commons.lang3.StringUtils; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; +import crazypants.enderio.gui.IAdvancedTooltipProvider; +import crazypants.enderio.gui.TooltipAddera; -public class ItemBucketEio extends ItemBucket { +public class ItemBucketEio extends ItemBucket implements IAdvancedTooltipProvider{ public static ItemBucketEio create(Fluid fluid) { ItemBucketEio b = new ItemBucketEio(fluid.getBlock(), fluid.getName()); @@ -40,4 +47,24 @@ public class ItemBucketEio extends ItemBucket { GameRegistry.registerItem(this, "bucket" + StringUtils.capitalize(fluidName)); } + @Override + @SideOnly(Side.CLIENT) + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + } + + @Override + @SideOnly(Side.CLIENT) + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + } + + @Override + @SideOnly(Side.CLIENT) + public void addAdvancedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + TooltipAddera.instance.addTooltipForFluid(list, itemstack); + } + + + + + } diff --git a/src/main/java/crazypants/enderio/gui/IAdvancedTooltipProvider.java b/src/main/java/crazypants/enderio/gui/IAdvancedTooltipProvider.java index 1569aaa3..c7ed3f90 100644 --- a/src/main/java/crazypants/enderio/gui/IAdvancedTooltipProvider.java +++ b/src/main/java/crazypants/enderio/gui/IAdvancedTooltipProvider.java @@ -4,13 +4,18 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public interface IAdvancedTooltipProvider { + @SideOnly(Side.CLIENT) public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag); + @SideOnly(Side.CLIENT) public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag); + @SideOnly(Side.CLIENT) public void addAdvancedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag); diff --git a/src/main/java/crazypants/enderio/gui/TooltipAddera.java b/src/main/java/crazypants/enderio/gui/TooltipAddera.java index 4b1ae1bb..68f5840b 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipAddera.java +++ b/src/main/java/crazypants/enderio/gui/TooltipAddera.java @@ -1,10 +1,26 @@ package crazypants.enderio.gui; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; + +import org.lwjgl.input.Keyboard; + +import buildcraft.api.fuels.IronEngineFuel; +import buildcraft.api.fuels.IronEngineFuel.Fuel; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import crazypants.enderio.Config; +import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.util.Lang; public class TooltipAddera { @@ -26,6 +42,86 @@ public class TooltipAddera { evt.toolTip.add("Burn time " + time); } } + + if(evt.itemStack.getItem() instanceof IAdvancedTooltipProvider) { + IAdvancedTooltipProvider ttp = (IAdvancedTooltipProvider)evt.itemStack.getItem(); + addInformation(ttp, evt.itemStack, evt.entityPlayer, evt.toolTip, false); + return; + } + + Block blk = Block.getBlockFromItem(evt.itemStack.getItem()); + if(blk instanceof IAdvancedTooltipProvider) { + addInformation((IAdvancedTooltipProvider)blk, evt.itemStack, evt.entityPlayer, evt.toolTip, false); + return; + } + + if(Config.addFuelTooltipsToAllFluidContainers) { + addTooltipForFluid(evt.toolTip, evt.itemStack); + } + } + + public static void addTooltipForFluid(List list, ItemStack stk) { + FluidStack fluidStack = FluidContainerRegistry.getFluidForFilledItem(stk); + if(fluidStack == null) { + return; + } + addTooltipForFluid(list, fluidStack.getFluid()); + } + + public static void addTooltipForFluid(List list, Fluid fluid) { + if(fluid != null) { + Fuel fuel = IronEngineFuel.getFuelForFluid(fluid); + if(fuel != null) { + if(showAdvancedTooltips()) { + list.add(Lang.localize("fuel.tooltip.heading")); + list.add(EnumChatFormatting.ITALIC + " " + PowerDisplayUtil.formatPowerPerTick(fuel.powerPerCycle)); + list.add(EnumChatFormatting.ITALIC + " " + fuel.totalBurningTime + " " + Lang.localize("fuel.tooltip.burnTime")); + } else { + addShowDetailsTooltip(list); + } + } + } + } + + public static void addInformation(IAdvancedTooltipProvider tt, ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + tt.addCommonEntries(itemstack, entityplayer, list, flag); + if(showAdvancedTooltips()) { + tt.addAdvancedEntries(itemstack, entityplayer, list, flag); + } else { + tt.addBasicEntries(itemstack, entityplayer, list, flag); + addShowDetailsTooltip(list); + } + } + + public static void addShowDetailsTooltip(List list) { + list.add(EnumChatFormatting.WHITE + "" + EnumChatFormatting.ITALIC + Lang.localize("item.tooltip.showDetails")); + } + + public static boolean showAdvancedTooltips() { + return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT); + } + + public static void addDescriptionFromResources(List list,ItemStack itemstack) { + if(itemstack.getItem() == null) { + return; + } + Block blk = Block.getBlockFromItem(itemstack.getItem()); + if(blk == null) { + return; + } + String keyBase = blk.getUnlocalizedName() + ".description.line"; + boolean done = false; + int line = 1; + while(!done) { + String key = keyBase + line; + String val = Lang.localize(key, false); + if(val == null || val.trim().length() < 0 || val.equals(key) || line > 12) { + done = true; + } else { + list.add(val); + line++; + } + } } diff --git a/src/main/java/crazypants/enderio/gui/TooltipUtil.java b/src/main/java/crazypants/enderio/gui/TooltipUtil.java deleted file mode 100644 index 3cb8e713..00000000 --- a/src/main/java/crazypants/enderio/gui/TooltipUtil.java +++ /dev/null @@ -1,25 +0,0 @@ -package crazypants.enderio.gui; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; - -import org.lwjgl.input.Keyboard; - -import crazypants.util.Lang; - -public class TooltipUtil { - - public static void addInformation(IAdvancedTooltipProvider tt, ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - tt.addCommonEntries(itemstack, entityplayer, list, flag); - if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { - tt.addAdvancedEntries(itemstack, entityplayer, list, flag); - } else { - tt.addBasicEntries(itemstack, entityplayer, list, flag); - list.add(EnumChatFormatting.WHITE + "" + EnumChatFormatting.ITALIC + Lang.localize("item.tooltip.showDetails")); - } - } - -} diff --git a/src/main/java/crazypants/enderio/item/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/ItemDarkSteelArmor.java index 4c2619de..d9f99d09 100644 --- a/src/main/java/crazypants/enderio/item/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/ItemDarkSteelArmor.java @@ -8,24 +8,20 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.util.EnumHelper; - -import org.lwjgl.input.Keyboard; - import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; +import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.material.Alloy; import crazypants.util.ItemUtil; -import crazypants.util.Lang; -public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerItem, ISpecialArmor { +public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerItem, ISpecialArmor, IAdvancedTooltipProvider { public static final ArmorMaterial MATERIAL = EnumHelper.addArmorMaterial("darkSteel", 33, new int[] { 2, 7, 5, 2 }, 25); @@ -82,14 +78,17 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte } @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - list.add(Lang.localize("item.darkSteel.tooltip.line1")); - } else { - list.add(ItemUtil.getDurabilityString(itemstack)); - list.add(PowerDisplayUtil.getStoredEnergyString(itemstack)); - list.add(EnumChatFormatting.WHITE + "" + EnumChatFormatting.ITALIC + Lang.localize("item.tooltip.showDetails")); - } + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + } + + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + } + + @Override + public void addAdvancedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + list.add(ItemUtil.getDurabilityString(itemstack)); + list.add(PowerDisplayUtil.getStoredEnergyString(itemstack)); } @Override diff --git a/src/main/java/crazypants/enderio/item/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/ItemDarkSteelPickaxe.java index 3848093c..426be52b 100644 --- a/src/main/java/crazypants/enderio/item/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/ItemDarkSteelPickaxe.java @@ -18,7 +18,6 @@ import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.gui.IAdvancedTooltipProvider; -import crazypants.enderio.gui.TooltipUtil; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.material.Alloy; import crazypants.util.ItemUtil; @@ -154,11 +153,6 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine return i2 != null && i2.getItem() == EnderIO.itemAlloy && i2.getItemDamage() == Alloy.DARK_STEEL.ordinal(); } - @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - TooltipUtil.addInformation(this, itemstack, entityplayer, list, flag); - } - @Override public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { } diff --git a/src/main/java/crazypants/enderio/item/ItemDarkSteelSword.java b/src/main/java/crazypants/enderio/item/ItemDarkSteelSword.java index fad92480..ff9e3e97 100644 --- a/src/main/java/crazypants/enderio/item/ItemDarkSteelSword.java +++ b/src/main/java/crazypants/enderio/item/ItemDarkSteelSword.java @@ -24,7 +24,6 @@ import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.gui.IAdvancedTooltipProvider; -import crazypants.enderio.gui.TooltipUtil; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.material.Alloy; import crazypants.util.ItemUtil; @@ -219,11 +218,6 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte return i2 != null && i2.getItem() == EnderIO.itemAlloy && i2.getItemDamage() == Alloy.DARK_STEEL.ordinal(); } - @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - TooltipUtil.addInformation(this, itemstack, entityplayer, list, flag); - } - @Override public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index 9e5624e6..88dc5fd5 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -1,6 +1,7 @@ package crazypants.enderio.machine; import java.util.ArrayList; +import java.util.List; import java.util.Random; import net.minecraft.block.Block; @@ -29,8 +30,10 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.ConduitUtil; +import crazypants.enderio.gui.IAdvancedTooltipProvider; +import crazypants.util.Lang; -public abstract class AbstractMachineBlock extends BlockContainer implements IGuiHandler { +public abstract class AbstractMachineBlock extends BlockContainer implements IGuiHandler, IAdvancedTooltipProvider { public static int renderId; @@ -83,6 +86,40 @@ public abstract class AbstractMachineBlock exte } } + @Override + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + } + + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + } + + @Override + public void addAdvancedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + if(itemstack.getItem() == null) { + return; + } + Block blk = Block.getBlockFromItem(itemstack.getItem()); + if(blk == null) { + return; + } + + String keyBase = blk.getUnlocalizedName() + ".description.line"; + boolean done = false; + int line = 1; + while(!done) { + String key = keyBase + line; + String val = Lang.localize(key, false); + if(val == null || val.trim().length() < 0 || val.equals(key) || line > 12) { + done = true; + } else { + list.add(val); + line++; + } + } + + } + @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { diff --git a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java index 0fc1f5b4..fe63a741 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java @@ -2,6 +2,7 @@ package crazypants.enderio.machine.hypercube; import java.text.NumberFormat; import java.util.ArrayList; +import java.util.List; import java.util.Random; import net.minecraft.block.Block; @@ -21,17 +22,21 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.IGuiHandler; +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.conduit.ConduitUtil; import crazypants.enderio.enderface.BlockEio; +import crazypants.enderio.gui.IAdvancedTooltipProvider; +import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode; import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.Util; -public class BlockHyperCube extends BlockEio implements IGuiHandler { +public class BlockHyperCube extends BlockEio implements IGuiHandler, IAdvancedTooltipProvider { static final NumberFormat NF = NumberFormat.getIntegerInstance(); @@ -63,6 +68,24 @@ public class BlockHyperCube extends BlockEio implements IGuiHandler { EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_HYPER_CUBE, this); } + + + @Override + @SideOnly(Side.CLIENT) + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + } + + @Override + @SideOnly(Side.CLIENT) + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + } + + @Override + @SideOnly(Side.CLIENT) + public void addAdvancedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + TooltipAddera.addDescriptionFromResources(list, itemstack); + } + public IIcon getPortalIcon() { return blockIcon; } diff --git a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java index d9def107..facef99d 100644 --- a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java @@ -1,7 +1,11 @@ package crazypants.enderio.machine.light; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; @@ -13,9 +17,11 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.ModObject; import crazypants.enderio.enderface.BlockEio; +import crazypants.enderio.gui.IAdvancedTooltipProvider; +import crazypants.enderio.gui.TooltipAddera; import crazypants.vecmath.Vector3f; -public class BlockElectricLight extends BlockEio { +public class BlockElectricLight extends BlockEio implements IAdvancedTooltipProvider { private static final float BLOCK_HEIGHT = 0.05f; private static final float BLOCK_WIDTH = 0.3f; @@ -48,6 +54,19 @@ public class BlockElectricLight extends BlockEio { GameRegistry.registerTileEntity(TileElectricLight.class, ModObject.blockElectricLight.unlocalisedName + "TileEntity"); } + @Override + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + } + + @Override + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + } + + @Override + public void addAdvancedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + TooltipAddera.addDescriptionFromResources(list, itemstack); + } + @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { return null; diff --git a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java index bab684f8..d89ece05 100644 --- a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java @@ -27,13 +27,15 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.enderface.BlockEio; +import crazypants.enderio.gui.IAdvancedTooltipProvider; +import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.IoMode; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.BlockCoord; import crazypants.util.Util; import crazypants.vecmath.Vector3d; -public class BlockCapacitorBank extends BlockEio implements IGuiHandler { +public class BlockCapacitorBank extends BlockEio implements IGuiHandler, IAdvancedTooltipProvider { public static int renderId = -1; @@ -75,6 +77,23 @@ public class BlockCapacitorBank extends BlockEio implements IGuiHandler { } + @Override + @SideOnly(Side.CLIENT) + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + } + + @Override + @SideOnly(Side.CLIENT) + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + list.add(PowerDisplayUtil.formatStoredPower(PowerHandlerUtil.getStoredEnergyForItem(itemstack), TileCapacitorBank.BASE_CAP.getMaxEnergyStored())); + } + + @Override + @SideOnly(Side.CLIENT) + public void addAdvancedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + TooltipAddera.addDescriptionFromResources(list, itemstack); + } + @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { diff --git a/src/main/java/crazypants/enderio/machine/power/BlockItemCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockItemCapacitorBank.java index 9d2670fc..8107f5b7 100644 --- a/src/main/java/crazypants/enderio/machine/power/BlockItemCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/BlockItemCapacitorBank.java @@ -3,15 +3,11 @@ package crazypants.enderio.machine.power; import java.util.List; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.power.PowerHandlerUtil; -import crazypants.util.Lang; public class BlockItemCapacitorBank extends ItemBlock { @@ -26,14 +22,6 @@ public class BlockItemCapacitorBank extends ItemBlock { setHasSubtypes(true); } - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) { - list.add(Lang.localize("tile.enderio.blockCapacitorBank.tooltipPrefix", false) + " " - + PowerDisplayUtil.formatPower(PowerHandlerUtil.getStoredEnergyForItem(itemStack)) + " " + PowerDisplayUtil.abrevation()); - super.addInformation(itemStack, par2EntityPlayer, list, par4); - } - @Override public int getMetadata(int par1) { return par1; diff --git a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java index 7245dd4c..70547d63 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.reservoir; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -22,12 +24,14 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.ConduitUtil; +import crazypants.enderio.gui.IAdvancedTooltipProvider; +import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.reservoir.TileReservoir.Pos; import crazypants.util.BlockCoord; import crazypants.util.Util; import crazypants.vecmath.Vector3d; -public class BlockReservoir extends BlockContainer { +public class BlockReservoir extends BlockContainer implements IAdvancedTooltipProvider { public static BlockReservoir create() { BlockReservoir result = new BlockReservoir(); @@ -74,6 +78,24 @@ public class BlockReservoir extends BlockContainer { GameRegistry.registerTileEntity(TileReservoir.class, ModObject.blockReservoir.unlocalisedName + "TileEntity"); } + + + @Override + @SideOnly(Side.CLIENT) + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + } + + @Override + @SideOnly(Side.CLIENT) + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + } + + @Override + @SideOnly(Side.CLIENT) + public void addAdvancedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + TooltipAddera.addDescriptionFromResources(list, itemstack); + } + @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { @@ -251,7 +273,7 @@ public class BlockReservoir extends BlockContainer { boolean isRight; if(tr.isVertical()) { // to to flip right and left for back faces of - // vertical multiblocks + // vertical multiblocks isRight = !pos.isRight; } else { isRight = pos.isRight; @@ -263,7 +285,7 @@ public class BlockReservoir extends BlockContainer { } } - if(tr.up == side || tr.up == side.getOpposite()) { // up or down face + if(tr.up == side || tr.up == side.getOpposite()) { // up or down face if(tr.isVertical()) { if(tr.right.offsetX != 0) { return pos.isRight ? mbIcons[MbFace.L.ordinal()] : mbIcons[MbFace.R.ordinal()]; diff --git a/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java index 28b8e0e7..b3810d33 100644 --- a/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java @@ -1,5 +1,7 @@ package crazypants.enderio.teleport; +import java.util.List; + import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -11,11 +13,15 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.enderface.BlockEio; +import crazypants.enderio.gui.IAdvancedTooltipProvider; +import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.teleport.packet.PacketAccessMode; import crazypants.enderio.teleport.packet.PacketConfigSync; import crazypants.enderio.teleport.packet.PacketDrainStaff; @@ -23,7 +29,7 @@ import crazypants.enderio.teleport.packet.PacketOpenAuthGui; import crazypants.enderio.teleport.packet.PacketTravelEvent; import crazypants.util.Lang; -public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEntityProvider { +public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEntityProvider, IAdvancedTooltipProvider { public static BlockTravelAnchor create() { @@ -58,6 +64,22 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_TRAVEL_AUTH, this); } + @Override + @SideOnly(Side.CLIENT) + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + } + + @Override + @SideOnly(Side.CLIENT) + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + } + + @Override + @SideOnly(Side.CLIENT) + public void addAdvancedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + TooltipAddera.addDescriptionFromResources(list, itemstack); + } + @Override public void registerBlockIcons(IIconRegister iIconRegister) { super.registerBlockIcons(iIconRegister);