potential NPE fix

This commit is contained in:
Jared committed 2016-10-29 17:53:37 +02:00
1 parent 12077b5cce
commit 40ec1f65c2
3 files changed
+47 -42

No files matched your search

@@ -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());
}
}
}
}
}
@@ -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());
}
}
}
}
}
@@ -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());
}
}
}
}
}