Fixed machine tooltips.

This commit is contained in:
CrazyPants committed 2014-04-25 13:55:04 +08:00
1 parent 9c78589d44
commit 45753995ee
11 files changed
+44 -50

No files matched your search

@@ -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;
@@ -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;
@@ -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;
}
}
}
@@ -1,4 +1,4 @@
package crazypants.enderio.item;
package crazypants.enderio.item.darksteel;
import java.util.UUID;
@@ -1,4 +1,4 @@
package crazypants.enderio.item;
package crazypants.enderio.item.darksteel;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -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) {
@@ -1,4 +1,4 @@
package crazypants.enderio.item;
package crazypants.enderio.item.darksteel;
import java.util.List;
@@ -1,4 +1,4 @@
package crazypants.enderio.item;
package crazypants.enderio.item.darksteel;
import java.util.List;
@@ -1,4 +1,4 @@
package crazypants.enderio.item;
package crazypants.enderio.item.darksteel;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
@@ -1,4 +1,4 @@
package crazypants.enderio.item;
package crazypants.enderio.item.darksteel;
import java.awt.Color;
@@ -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<T extends AbstractMachineEntity> extends BlockContainer implements IGuiHandler, IAdvancedTooltipProvider {
public abstract class AbstractMachineBlock<T extends AbstractMachineEntity> extends BlockContainer implements IGuiHandler, IResourceTooltipProvider {
public static int renderId;
@@ -86,40 +84,6 @@ public abstract class AbstractMachineBlock<T extends AbstractMachineEntity> 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<T extends AbstractMachineEntity> 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);