From 45753995ee60b999a20d76ca67b6ad64ee2f271d Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 25 Apr 2014 13:55:04 +0800 Subject: [PATCH] Fixed machine tooltips. --- .../java/crazypants/enderio/ClientProxy.java | 2 +- src/main/java/crazypants/enderio/EnderIO.java | 6 +-- .../item/darksteel/AnvilRecipeManager.java | 29 +++++++++++++ .../{ => darksteel}/DarkSteelController.java | 2 +- .../item/{ => darksteel}/EnergyContainer.java | 2 +- .../{ => darksteel}/ItemDarkSteelArmor.java | 4 +- .../{ => darksteel}/ItemDarkSteelPickaxe.java | 2 +- .../{ => darksteel}/ItemDarkSteelSword.java | 2 +- .../PacketDarkSteelPowerPacket.java | 2 +- .../{ => darksteel}/PoweredItemRenderer.java | 2 +- .../enderio/machine/AbstractMachineBlock.java | 41 +------------------ 11 files changed, 44 insertions(+), 50 deletions(-) create mode 100644 src/main/java/crazypants/enderio/item/darksteel/AnvilRecipeManager.java rename src/main/java/crazypants/enderio/item/{ => darksteel}/DarkSteelController.java (99%) rename src/main/java/crazypants/enderio/item/{ => darksteel}/EnergyContainer.java (98%) rename src/main/java/crazypants/enderio/item/{ => darksteel}/ItemDarkSteelArmor.java (98%) rename src/main/java/crazypants/enderio/item/{ => darksteel}/ItemDarkSteelPickaxe.java (99%) rename src/main/java/crazypants/enderio/item/{ => darksteel}/ItemDarkSteelSword.java (99%) rename src/main/java/crazypants/enderio/item/{ => darksteel}/PacketDarkSteelPowerPacket.java (96%) rename src/main/java/crazypants/enderio/item/{ => darksteel}/PoweredItemRenderer.java (98%) diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 88463ba6..3168655d 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -39,9 +39,9 @@ import crazypants.enderio.enderface.TileEnderIO; import crazypants.enderio.farm.BlockFarmStation; import crazypants.enderio.farm.FarmingStationRenderer; import crazypants.enderio.gui.TooltipAddera; -import crazypants.enderio.item.PoweredItemRenderer; import crazypants.enderio.item.YetaWrenchOverlayRenderer; import crazypants.enderio.item.YetaWrenchTickHandler; +import crazypants.enderio.item.darksteel.PoweredItemRenderer; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineRenderer; import crazypants.enderio.machine.generator.BlockCombustionGenerator; diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index d86485d7..6e13f1d8 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -36,11 +36,11 @@ import crazypants.enderio.farm.BlockFarmStation; import crazypants.enderio.fluid.BlockFluidEio; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.fluid.ItemBucketEio; -import crazypants.enderio.item.ItemDarkSteelArmor; -import crazypants.enderio.item.ItemDarkSteelPickaxe; -import crazypants.enderio.item.ItemDarkSteelSword; import crazypants.enderio.item.ItemRecipes; import crazypants.enderio.item.ItemYetaWrench; +import crazypants.enderio.item.darksteel.ItemDarkSteelArmor; +import crazypants.enderio.item.darksteel.ItemDarkSteelPickaxe; +import crazypants.enderio.item.darksteel.ItemDarkSteelSword; import crazypants.enderio.machine.MachineRecipes; import crazypants.enderio.machine.PacketRedstoneMode; import crazypants.enderio.machine.alloy.AlloyRecipeManager; diff --git a/src/main/java/crazypants/enderio/item/darksteel/AnvilRecipeManager.java b/src/main/java/crazypants/enderio/item/darksteel/AnvilRecipeManager.java new file mode 100644 index 00000000..b74daca9 --- /dev/null +++ b/src/main/java/crazypants/enderio/item/darksteel/AnvilRecipeManager.java @@ -0,0 +1,29 @@ +package crazypants.enderio.item.darksteel; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.event.AnvilUpdateEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import crazypants.enderio.EnderIO; + +public class AnvilRecipeManager { + + public static AnvilRecipeManager instance= new AnvilRecipeManager(); + + + public AnvilRecipeManager( ) { + + } + + @SubscribeEvent + public void handleAnvilEvent(AnvilUpdateEvent evt) { + if(evt.left == null || evt.right == null) { + return; + } + if(evt.left.getItem() == EnderIO.itemDarkSteelHelmet && evt.right.getItem() == Items.apple) { + evt.output = new ItemStack(Items.boat); + evt.cost = 30; + } + } + +} diff --git a/src/main/java/crazypants/enderio/item/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java similarity index 99% rename from src/main/java/crazypants/enderio/item/DarkSteelController.java rename to src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index dafc2ef5..2b15bab8 100644 --- a/src/main/java/crazypants/enderio/item/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -1,4 +1,4 @@ -package crazypants.enderio.item; +package crazypants.enderio.item.darksteel; import java.util.UUID; diff --git a/src/main/java/crazypants/enderio/item/EnergyContainer.java b/src/main/java/crazypants/enderio/item/darksteel/EnergyContainer.java similarity index 98% rename from src/main/java/crazypants/enderio/item/EnergyContainer.java rename to src/main/java/crazypants/enderio/item/darksteel/EnergyContainer.java index 5a94d76e..6f1446b7 100644 --- a/src/main/java/crazypants/enderio/item/EnergyContainer.java +++ b/src/main/java/crazypants/enderio/item/darksteel/EnergyContainer.java @@ -1,4 +1,4 @@ -package crazypants.enderio.item; +package crazypants.enderio.item.darksteel; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/crazypants/enderio/item/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java similarity index 98% rename from src/main/java/crazypants/enderio/item/ItemDarkSteelArmor.java rename to src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java index d9f99d09..09dd357d 100644 --- a/src/main/java/crazypants/enderio/item/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java @@ -1,4 +1,4 @@ -package crazypants.enderio.item; +package crazypants.enderio.item.darksteel; import java.util.List; @@ -9,6 +9,7 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraftforge.common.ISpecialArmor; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.FMLCommonHandler; @@ -35,6 +36,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte static { FMLCommonHandler.instance().bus().register(DarkSteelController.instance); + MinecraftForge.EVENT_BUS.register(AnvilRecipeManager.instance); } public static ItemDarkSteelArmor forArmorType(short armorType) { diff --git a/src/main/java/crazypants/enderio/item/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java similarity index 99% rename from src/main/java/crazypants/enderio/item/ItemDarkSteelPickaxe.java rename to src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index 426be52b..8ab5c2cc 100644 --- a/src/main/java/crazypants/enderio/item/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -1,4 +1,4 @@ -package crazypants.enderio.item; +package crazypants.enderio.item.darksteel; import java.util.List; diff --git a/src/main/java/crazypants/enderio/item/ItemDarkSteelSword.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java similarity index 99% rename from src/main/java/crazypants/enderio/item/ItemDarkSteelSword.java rename to src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java index ff9e3e97..bdfc0624 100644 --- a/src/main/java/crazypants/enderio/item/ItemDarkSteelSword.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java @@ -1,4 +1,4 @@ -package crazypants.enderio.item; +package crazypants.enderio.item.darksteel; import java.util.List; diff --git a/src/main/java/crazypants/enderio/item/PacketDarkSteelPowerPacket.java b/src/main/java/crazypants/enderio/item/darksteel/PacketDarkSteelPowerPacket.java similarity index 96% rename from src/main/java/crazypants/enderio/item/PacketDarkSteelPowerPacket.java rename to src/main/java/crazypants/enderio/item/darksteel/PacketDarkSteelPowerPacket.java index 77b86a8d..86f262c9 100644 --- a/src/main/java/crazypants/enderio/item/PacketDarkSteelPowerPacket.java +++ b/src/main/java/crazypants/enderio/item/darksteel/PacketDarkSteelPowerPacket.java @@ -1,4 +1,4 @@ -package crazypants.enderio.item; +package crazypants.enderio.item.darksteel; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/src/main/java/crazypants/enderio/item/PoweredItemRenderer.java b/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java similarity index 98% rename from src/main/java/crazypants/enderio/item/PoweredItemRenderer.java rename to src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java index e39c3d1f..9a4a00da 100644 --- a/src/main/java/crazypants/enderio/item/PoweredItemRenderer.java +++ b/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java @@ -1,4 +1,4 @@ -package crazypants.enderio.item; +package crazypants.enderio.item.darksteel; import java.awt.Color; diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index 88dc5fd5..055d53e5 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -1,7 +1,6 @@ package crazypants.enderio.machine; import java.util.ArrayList; -import java.util.List; import java.util.Random; import net.minecraft.block.Block; @@ -30,10 +29,9 @@ 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; +import crazypants.enderio.gui.IResourceTooltipProvider; -public abstract class AbstractMachineBlock extends BlockContainer implements IGuiHandler, IAdvancedTooltipProvider { +public abstract class AbstractMachineBlock extends BlockContainer implements IGuiHandler, IResourceTooltipProvider { public static int renderId; @@ -86,40 +84,6 @@ 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) { @@ -127,7 +91,6 @@ public abstract class AbstractMachineBlock exte if(entityPlayer.isSneaking() && entityPlayer.getCurrentEquippedItem().getItem() instanceof IToolWrench) { IToolWrench wrench = (IToolWrench) entityPlayer.getCurrentEquippedItem().getItem(); if(wrench.canWrench(entityPlayer, x, y, z)) { - //TODO: Store Machine IO settings, power etc removedByPlayer(world, entityPlayer, x, y, z); if(entityPlayer.getCurrentEquippedItem().getItem() instanceof IToolWrench) { ((IToolWrench) entityPlayer.getCurrentEquippedItem().getItem()).wrenchUsed(entityPlayer, x, y, z);