From 40ec1f65c28964e184fba00a2441f93f4153c435 Mon Sep 17 00:00:00 2001 From: Jared Date: Sat, 29 Oct 2016 17:53:37 +0200 Subject: [PATCH] potential NPE fix --- .../minetweaker/mc1102/ForgeEventHandler.java | 24 +++++----- .../minetweaker/mc1710/ForgeEventHandler.java | 45 ++++++++++--------- .../minetweaker/mc18/ForgeEventHandler.java | 20 +++++---- 3 files changed, 47 insertions(+), 42 deletions(-) diff --git a/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/ForgeEventHandler.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/ForgeEventHandler.java index 0da3048..6c210af 100644 --- a/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/ForgeEventHandler.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/ForgeEventHandler.java @@ -20,7 +20,7 @@ import org.lwjgl.input.Keyboard; /** * @author Stan */ -public class ForgeEventHandler{ +public class ForgeEventHandler { @SubscribeEvent public void onPlayerInteract(PlayerInteractEvent ev) { minetweaker.api.event.PlayerInteractEvent event = new minetweaker.api.event.PlayerInteractEvent( @@ -34,18 +34,20 @@ public class ForgeEventHandler{ } @SubscribeEvent - public void onItemTooltip(ItemTooltipEvent ev){ - IItemStack itemStack = MineTweakerMC.getIItemStack(ev.getItemStack()); - for(IFormattedText tooltip : IngredientTooltips.getTooltips(itemStack)){ - ev.getToolTip().add(((IMCFormattedString) tooltip).getTooltipString()); - } - if (!Keyboard.isCreated()) { - return; - } - if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)){ - for(IFormattedText tooltip : IngredientTooltips.getShiftTooltips(itemStack)){ + public void onItemTooltip(ItemTooltipEvent ev) { + if(ev.getItemStack() != null) { + IItemStack itemStack = MineTweakerMC.getIItemStack(ev.getItemStack()); + for(IFormattedText tooltip : IngredientTooltips.getTooltips(itemStack)) { ev.getToolTip().add(((IMCFormattedString) tooltip).getTooltipString()); } + if(!Keyboard.isCreated()) { + return; + } + if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { + for(IFormattedText tooltip : IngredientTooltips.getShiftTooltips(itemStack)) { + ev.getToolTip().add(((IMCFormattedString) tooltip).getTooltipString()); + } + } } } } diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/ForgeEventHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/ForgeEventHandler.java index 657effb..85b905b 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/ForgeEventHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/ForgeEventHandler.java @@ -18,32 +18,33 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import org.lwjgl.input.Keyboard; /** - * * @author Stan */ public class ForgeEventHandler { - @SubscribeEvent - public void onPlayerInteract(PlayerInteractEvent ev) { - minetweaker.api.event.PlayerInteractEvent event = new minetweaker.api.event.PlayerInteractEvent( - MineTweakerMC.getIPlayer(ev.entityPlayer), - MineTweakerMC.getDimension(ev.world), - ev.x, ev.y, ev.z - ); + @SubscribeEvent + public void onPlayerInteract(PlayerInteractEvent ev) { + minetweaker.api.event.PlayerInteractEvent event = new minetweaker.api.event.PlayerInteractEvent( + MineTweakerMC.getIPlayer(ev.entityPlayer), + MineTweakerMC.getDimension(ev.world), + ev.x, ev.y, ev.z + ); - MineTweakerImplementationAPI.events.publishPlayerInteract(event); - } + MineTweakerImplementationAPI.events.publishPlayerInteract(event); + } - @SubscribeEvent - public void onItemTooltip(ItemTooltipEvent ev) { - IItemStack itemStack = MineTweakerMC.getIItemStack(ev.itemStack); - for (IFormattedText tooltip : IngredientTooltips.getTooltips(itemStack)) { - ev.toolTip.add(((IMCFormattedString) tooltip).getTooltipString()); - } + @SubscribeEvent + public void onItemTooltip(ItemTooltipEvent ev) { + if(ev.itemStack!= null) { + IItemStack itemStack = MineTweakerMC.getIItemStack(ev.itemStack); + for(IFormattedText tooltip : IngredientTooltips.getTooltips(itemStack)) { + ev.toolTip.add(((IMCFormattedString) tooltip).getTooltipString()); + } - if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { - for (IFormattedText tooltip : IngredientTooltips.getShiftTooltips(itemStack)) { - ev.toolTip.add(((IMCFormattedString) tooltip).getTooltipString()); - } - } - } + if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { + for(IFormattedText tooltip : IngredientTooltips.getShiftTooltips(itemStack)) { + ev.toolTip.add(((IMCFormattedString) tooltip).getTooltipString()); + } + } + } + } } diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/ForgeEventHandler.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/ForgeEventHandler.java index 19e48d2..5c50f69 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/ForgeEventHandler.java +++ b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/ForgeEventHandler.java @@ -35,17 +35,19 @@ public class ForgeEventHandler { @SubscribeEvent public void onItemTooltip(ItemTooltipEvent ev) { - IItemStack itemStack = MineTweakerMC.getIItemStack(ev.itemStack); - for (IFormattedText tooltip : IngredientTooltips.getTooltips(itemStack)) { - ev.toolTip.add(((IMCFormattedString) tooltip).getTooltipString()); - } - if (!Keyboard.isCreated()) { - return; - } - if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { - for (IFormattedText tooltip : IngredientTooltips.getShiftTooltips(itemStack)) { + if(ev.itemStack != null) { + IItemStack itemStack = MineTweakerMC.getIItemStack(ev.itemStack); + for(IFormattedText tooltip : IngredientTooltips.getTooltips(itemStack)) { ev.toolTip.add(((IMCFormattedString) tooltip).getTooltipString()); } + if(!Keyboard.isCreated()) { + return; + } + if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { + for(IFormattedText tooltip : IngredientTooltips.getShiftTooltips(itemStack)) { + ev.toolTip.add(((IMCFormattedString) tooltip).getTooltipString()); + } + } } } }