From 8be3c5ea97dfa680469855ddaf689d7d7020202c Mon Sep 17 00:00:00 2001 From: Alexander Date: Fri, 25 Mar 2016 22:05:26 -0400 Subject: [PATCH] Fix crash with forge 1809. --- build.gradle | 2 +- .../mods/ironchest/OcelotsSitOnChestsHandler.java | 2 +- .../ironchest/client/IronChestEventHandler.java | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index aaca566..885b653 100755 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ archivesBaseName = "ironchest" // Setup the forge minecraft plugin data. Specify the preferred forge/minecraft version here minecraft { - version = "1.9-12.16.0.1802-1.9" + version = "1.9-12.16.0.1809-1.9" mappings = "snapshot_20160319" runDir = "run" } diff --git a/src/main/java/cpw/mods/ironchest/OcelotsSitOnChestsHandler.java b/src/main/java/cpw/mods/ironchest/OcelotsSitOnChestsHandler.java index 76fda59..31ee052 100755 --- a/src/main/java/cpw/mods/ironchest/OcelotsSitOnChestsHandler.java +++ b/src/main/java/cpw/mods/ironchest/OcelotsSitOnChestsHandler.java @@ -10,7 +10,7 @@ public class OcelotsSitOnChestsHandler @SubscribeEvent public void changeSittingTaskForOcelots(LivingEvent.LivingUpdateEvent evt) { - if (evt.entityLiving.ticksExisted < 5 && evt.entityLiving instanceof EntityOcelot) + if (evt.getEntityLiving().ticksExisted < 5 && evt.getEntityLiving() instanceof EntityOcelot) { // EntityOcelot ocelot = (EntityOcelot) evt.entityLiving; // Set tasks = ocelot.tasks.taskEntries; diff --git a/src/main/java/cpw/mods/ironchest/client/IronChestEventHandler.java b/src/main/java/cpw/mods/ironchest/client/IronChestEventHandler.java index f8a478b..a831508 100644 --- a/src/main/java/cpw/mods/ironchest/client/IronChestEventHandler.java +++ b/src/main/java/cpw/mods/ironchest/client/IronChestEventHandler.java @@ -12,14 +12,14 @@ public class IronChestEventHandler @SubscribeEvent public void onPreTextureStiching(TextureStitchEvent.Pre event) { - if (event.map == FMLClientHandler.instance().getClient().getTextureMapBlocks()) + if (event.getMap() == FMLClientHandler.instance().getClient().getTextureMapBlocks()) { - event.map.registerSprite(new ResourceLocation("ironchest:blocks/copperbreak")); - event.map.registerSprite(new ResourceLocation("ironchest:blocks/crystalbreak")); - event.map.registerSprite(new ResourceLocation("ironchest:blocks/diamondbreak")); - event.map.registerSprite(new ResourceLocation("ironchest:blocks/goldbreak")); - event.map.registerSprite(new ResourceLocation("ironchest:blocks/ironbreak")); - event.map.registerSprite(new ResourceLocation("ironchest:blocks/silverbreak")); + event.getMap().registerSprite(new ResourceLocation("ironchest:blocks/copperbreak")); + event.getMap().registerSprite(new ResourceLocation("ironchest:blocks/crystalbreak")); + event.getMap().registerSprite(new ResourceLocation("ironchest:blocks/diamondbreak")); + event.getMap().registerSprite(new ResourceLocation("ironchest:blocks/goldbreak")); + event.getMap().registerSprite(new ResourceLocation("ironchest:blocks/ironbreak")); + event.getMap().registerSprite(new ResourceLocation("ironchest:blocks/silverbreak")); } } }