From 285a747073e1a9171ccdfa0a243daf122562908b Mon Sep 17 00:00:00 2001 From: Adubbz Date: Tue, 5 Apr 2016 17:02:39 +1000 Subject: [PATCH] Updated to the latest Forge --- build.properties | 2 +- .../biomesoplenty/common/handler/AchievementEventHandler.java | 2 -- .../java/biomesoplenty/common/handler/DyeEventHandler.java | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build.properties b/build.properties index dbc15f1d3..e530cb932 100644 --- a/build.properties +++ b/build.properties @@ -1,4 +1,4 @@ minecraft_version=1.9 -forge_version=12.16.0.1831-1.9 +forge_version=12.16.0.1842-1.9 mod_version=4.0.0 mappings_version=snapshot_nodoc_20160324 \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java b/src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java index e896a6867..c8554d74a 100644 --- a/src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java +++ b/src/main/java/biomesoplenty/common/handler/AchievementEventHandler.java @@ -26,7 +26,6 @@ import biomesoplenty.common.enums.BOPTrees; import biomesoplenty.common.item.ItemJarFilled; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; @@ -40,7 +39,6 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.event.entity.living.LivingEntityUseItemEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent; diff --git a/src/main/java/biomesoplenty/common/handler/DyeEventHandler.java b/src/main/java/biomesoplenty/common/handler/DyeEventHandler.java index e99748b60..f304e4538 100644 --- a/src/main/java/biomesoplenty/common/handler/DyeEventHandler.java +++ b/src/main/java/biomesoplenty/common/handler/DyeEventHandler.java @@ -15,14 +15,14 @@ import net.minecraft.entity.passive.EntityWolf; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.event.entity.player.EntityInteractEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class DyeEventHandler { @SubscribeEvent - public void entityInteract(EntityInteractEvent event) + public void entityInteract(PlayerInteractEvent.EntityInteract event) { ItemStack stack = event.getEntityPlayer().getHeldItem(event.getHand()); if (stack == null) {return;}