diff --git a/main-src/eu/ha3/matmos/game/data/MAtAccessors.java b/main-src/eu/ha3/matmos/game/data/MAtAccessors.java index eb8b00c4..07257238 100644 --- a/main-src/eu/ha3/matmos/game/data/MAtAccessors.java +++ b/main-src/eu/ha3/matmos/game/data/MAtAccessors.java @@ -1,5 +1,7 @@ package eu.ha3.matmos.game.data; +import net.minecraft.src.Entity; +import net.minecraft.src.EntityLivingBase; import net.minecraft.src.EntityPlayerSP; import net.minecraft.src.FoodStats; import net.minecraft.src.Minecraft; @@ -34,10 +36,10 @@ public static FoodStats getFoodStatsOf(EntityPlayerSP player) return player.getFoodStats(); } - public static boolean getIsJumpingOf(EntityPlayerSP player) + public static boolean getIsJumpingOf(Utility util, EntityPlayerSP player) { try { - return (Boolean) ((Utility) HaddonUtilitySingleton.getInstance()).getPrivate(player, "isJumping"); + return (Boolean) (util.getPrivate((EntityLivingBase)player, "isJumping")); } catch (PrivateAccessException e) { @@ -47,11 +49,10 @@ public static boolean getIsJumpingOf(EntityPlayerSP player) //return player.isJumping; } - public static boolean getIsInWebOf(EntityPlayerSP player) + public static boolean getIsInWebOf(Utility util, EntityPlayerSP player) { try { - return (Boolean) ((Utility) HaddonUtilitySingleton - .getInstance()).getPrivate(player, "isInWeb"); + return (Boolean) (util.getPrivate((Entity)player, "isInWeb")); } catch (PrivateAccessException e) { diff --git a/main-src/eu/ha3/matmos/game/data/MAtProcessorFrequent.java b/main-src/eu/ha3/matmos/game/data/MAtProcessorFrequent.java index 8f47a045..19cbe628 100644 --- a/main-src/eu/ha3/matmos/game/data/MAtProcessorFrequent.java +++ b/main-src/eu/ha3/matmos/game/data/MAtProcessorFrequent.java @@ -212,7 +212,7 @@ protected void doProcess() break; case 42: - setValue(42, MAtAccessors.getIsJumpingOf(player) ? 1 : 0); + setValue(42, MAtAccessors.getIsJumpingOf(mod().util(),player) ? 1 : 0); break; case 43: @@ -220,7 +220,7 @@ protected void doProcess() break; case 44: - setValue(44, MAtAccessors.getIsInWebOf(player) ? 1 : 0); + setValue(44, MAtAccessors.getIsInWebOf(mod().util(),player) ? 1 : 0); break; case 45: diff --git a/main-src/eu/ha3/matmos/game/system/MAtMod.java b/main-src/eu/ha3/matmos/game/system/MAtMod.java index 4d8fbbbb..c7225562 100644 --- a/main-src/eu/ha3/matmos/game/system/MAtMod.java +++ b/main-src/eu/ha3/matmos/game/system/MAtMod.java @@ -10,6 +10,7 @@ import java.util.Map; import net.minecraft.src.Entity; +import net.minecraft.src.EntityLivingBase; import net.minecraft.src.EntityPlayerSP; import net.minecraft.src.FolderResourcePack; import net.minecraft.src.KeyBinding; @@ -105,7 +106,7 @@ public void onLoad() util() .registerPrivateGetter("soundPoolSounds", SoundManager.class, -1, "soundPoolSounds", "field_77379_b", "d"); - util().registerPrivateGetter("isJumping", EntityPlayerSP.class, -1, "isJumping", "field_70703_bu", "bd"); + util().registerPrivateGetter("isJumping", EntityLivingBase.class, -1, "isJumping", "field_70703_bu", "bd"); util().registerPrivateGetter("isInWeb", Entity.class, -1, "isInWeb", "field_70134_J", "K"); this.chatter = new Chatter(this, MOD_RAW_NAME);