Fixes #274 and Fixes #268

This commit is contained in:
Modmuss50 2015-11-17 07:52:47 +00:00
parent 3fc8587200
commit 50a45560ab

View file

@ -10,6 +10,7 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import reborncore.api.IListInfoProvider; import reborncore.api.IListInfoProvider;
import reborncore.common.util.Color; import reborncore.common.util.Color;
import techreborn.Core;
import techreborn.api.power.IEnergyInterfaceItem; import techreborn.api.power.IEnergyInterfaceItem;
public class StackToolTipEvent { public class StackToolTipEvent {
@ -35,6 +36,7 @@ public class StackToolTipEvent {
event.toolTip.add(Color.GREEN + "" + (int) ((IEnergyInterfaceItem) event.itemStack.getItem()).getMaxTransfer(event.itemStack) + ChatFormatting.LIGHT_PURPLE + " eu/tick in/out"); event.toolTip.add(Color.GREEN + "" + (int) ((IEnergyInterfaceItem) event.itemStack.getItem()).getMaxTransfer(event.itemStack) + ChatFormatting.LIGHT_PURPLE + " eu/tick in/out");
} }
} else { } else {
try{
Block block = Block.getBlockFromItem(event.itemStack.getItem()); Block block = Block.getBlockFromItem(event.itemStack.getItem());
if (block != null && block instanceof BlockContainer && block.getClass().getCanonicalName().startsWith("techreborn.")) { if (block != null && block instanceof BlockContainer && block.getClass().getCanonicalName().startsWith("techreborn.")) {
TileEntity tile = block.createTileEntity(Minecraft.getMinecraft().theWorld, event.itemStack.getItemDamage()); TileEntity tile = block.createTileEntity(Minecraft.getMinecraft().theWorld, event.itemStack.getItemDamage());
@ -42,6 +44,9 @@ public class StackToolTipEvent {
((IListInfoProvider) tile).addInfo(event.toolTip, false); ((IListInfoProvider) tile).addInfo(event.toolTip, false);
} }
} }
} catch (NullPointerException e){
Core.logHelper.debug("Failed to load info for " + event.itemStack.getDisplayName());
}
} }
} }