Merge pull request #17 from agilmore2/1.6.4_lite

(Merge) Fixes accessor issue
makamys · May 1, 2014 · 0090704 · 0090704
2 parents 603144f + ff6e99b
commit 0090704
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -212,15 +212,15 @@ 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:
 				setValue(43, (int) (player.fallDistance * 1000));
 				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
@@ -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);