From dd69c6ced778877e53dfc8cfb898206492e0fe87 Mon Sep 17 00:00:00 2001 From: pahimar Date: Sat, 2 May 2015 20:36:26 -0400 Subject: [PATCH] Hide some stuff in NEI that shouldn't display, and always display EMC values in the Transmutation Tablet GUI (Closes #790) --- .../pahimar/ee3/client/handler/ItemTooltipEventHandler.java | 3 ++- src/main/java/com/pahimar/ee3/nei/NEIConfig.java | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java b/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java index 692e2cdd..56dcef09 100644 --- a/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java +++ b/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java @@ -4,6 +4,7 @@ import com.pahimar.ee3.api.EnergyValue; import com.pahimar.ee3.api.EnergyValueRegistryProxy; import com.pahimar.ee3.exchange.WrappedStack; import com.pahimar.ee3.inventory.ContainerAlchemicalTome; +import com.pahimar.ee3.inventory.ContainerTransmutationTablet; import com.pahimar.ee3.reference.Messages; import com.pahimar.ee3.util.IOwnable; import com.pahimar.ee3.util.ItemHelper; @@ -35,7 +36,7 @@ public class ItemTooltipEventHandler @SubscribeEvent public void handleItemTooltipEvent(ItemTooltipEvent event) { - if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || (event.entityPlayer != null && event.entityPlayer.openContainer instanceof ContainerAlchemicalTome)) + if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || (event.entityPlayer != null && (event.entityPlayer.openContainer instanceof ContainerAlchemicalTome || event.entityPlayer.openContainer instanceof ContainerTransmutationTablet))) { WrappedStack wrappedItemStack = WrappedStack.wrap(event.itemStack); EnergyValue energyValue = EnergyValueRegistryProxy.getEnergyValue(wrappedItemStack); diff --git a/src/main/java/com/pahimar/ee3/nei/NEIConfig.java b/src/main/java/com/pahimar/ee3/nei/NEIConfig.java index b85ad31e..7c22a104 100644 --- a/src/main/java/com/pahimar/ee3/nei/NEIConfig.java +++ b/src/main/java/com/pahimar/ee3/nei/NEIConfig.java @@ -2,7 +2,9 @@ package com.pahimar.ee3.nei; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; +import com.pahimar.ee3.init.ModBlocks; import com.pahimar.ee3.reference.Reference; +import net.minecraft.item.ItemStack; public class NEIConfig implements IConfigureNEI { @@ -21,7 +23,6 @@ public class NEIConfig implements IConfigureNEI @Override public void loadConfig() { - AludelRecipeHandler aludelRecipeHandler = new AludelRecipeHandler(); CalcinationHandler calcinationHandler = new CalcinationHandler(); @@ -31,5 +32,8 @@ public class NEIConfig implements IConfigureNEI API.registerRecipeHandler(calcinationHandler); API.registerUsageHandler(calcinationHandler); + API.hideItem(new ItemStack(ModBlocks.transmutationTablet)); + API.hideItem(new ItemStack(ModBlocks.dummyArray)); + API.hideItem(new ItemStack(ModBlocks.alchemyArray)); } }