MobESP now includes PlayerESP

instance01 · May 13, 2014 · 1bed456 · 1bed456
1 parent c03ad8d
commit 1bed456
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 14 deletions.
diff --git a/src/minecraft/com/comze_instancelabs/client/InstanceMain.java b/src/minecraft/com/comze_instancelabs/client/InstanceMain.java
@@ -19,13 +19,13 @@
 
 public class InstanceMain
 {
-    static Render r;
+    static InstanceRender r;
     static InstanceGuiManager guimanager;
 
     public static boolean xray = false;
     public static boolean freecam = false;
     public static boolean autofish = false;
-    
+
     public static List<Module> modList = new ArrayList<Module>();
 
     public InstanceMain()
@@ -35,7 +35,7 @@ public InstanceMain()
 
     public static void init()
     {
-        r  = new Render();
+        r  = new InstanceRender();
         modList.add(new HelpModule());
         modList.add(new FullbrightModule());
         modList.add(new ColoredMobsModule());
@@ -57,7 +57,7 @@ public static void initGUI()
         Settings.loadEnabledMods();
     }
 
-    public static Render getRender()
+    public static InstanceRender getRender()
     {
         return r;
     }

diff --git a/...com/comze_instancelabs/client/Render.java → ...e_instancelabs/client/InstanceRender.java b/...com/comze_instancelabs/client/Render.java → ...e_instancelabs/client/InstanceRender.java
@@ -16,15 +16,15 @@
 
 import com.comze_instancelabs.client.gui.CmdTextboxGUI;
 
-public class Render
+public class InstanceRender
 {
     public boolean ingameInfos = true;
     public boolean cmdTab = false;
     public boolean ingamegui = false;
 
     public Frame modulelistframe = null;
 
-    public Render()
+    public InstanceRender()
     {
     }
 

diff --git a/src/minecraft/com/comze_instancelabs/client/modules/ChestESPModule.java b/src/minecraft/com/comze_instancelabs/client/modules/ChestESPModule.java
@@ -5,7 +5,7 @@
 import net.minecraft.util.EnumChatFormatting;
 
 import com.comze_instancelabs.client.Module;
-import com.comze_instancelabs.client.Render;
+import com.comze_instancelabs.client.InstanceRender;
 
 public class ChestESPModule extends Module
 {

diff --git a/src/minecraft/com/comze_instancelabs/client/modules/ColoredMobsModule.java b/src/minecraft/com/comze_instancelabs/client/modules/ColoredMobsModule.java
@@ -5,7 +5,7 @@
 import net.minecraft.util.EnumChatFormatting;
 
 import com.comze_instancelabs.client.Module;
-import com.comze_instancelabs.client.Render;
+import com.comze_instancelabs.client.InstanceRender;
 
 public class ColoredMobsModule extends Module
 {

diff --git a/src/minecraft/com/comze_instancelabs/client/modules/FreecamModule.java b/src/minecraft/com/comze_instancelabs/client/modules/FreecamModule.java
@@ -1,6 +1,9 @@
 package com.comze_instancelabs.client.modules;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+
+import org.lwjgl.input.Keyboard;
 
 import com.comze_instancelabs.client.InstanceMain;
 import com.comze_instancelabs.client.Module;
@@ -22,7 +25,9 @@ public void execute()
 
         if (this.isEnabled())
         {
-            Minecraft.getMinecraft().theWorld.spawnEntityInWorld(new CEntityPlayer(Minecraft.getMinecraft().theWorld));
+        	if(Minecraft.getMinecraft().theWorld != null){
+                Minecraft.getMinecraft().theWorld.spawnEntityInWorld(new CEntityPlayer(Minecraft.getMinecraft().theWorld));
+        	}
         }
     }
 
@@ -44,4 +49,45 @@ public void disable()
             Minecraft.getMinecraft().theWorld.removeEntity(c);
         }
     }
+
+
+    public static void fly(EntityPlayerSP s){
+    	s.onGround = false;
+    	s.motionX = 0.0D;
+		s.motionY = 0.0D;
+		s.motionZ = 0.0D;
+		if (Keyboard.isKeyDown(57) && Minecraft.getMinecraft().inGameHasFocus) {
+			s.motionY++;
+		} else if (Keyboard.isKeyDown(42) && Minecraft.getMinecraft().inGameHasFocus) {
+			s.motionY--;
+		}
+		double d5 = s.rotationPitch + 90F;
+		double d7 = s.rotationYaw + 90F;
+		boolean flag4 = Keyboard.isKeyDown(17) && Minecraft.getMinecraft().inGameHasFocus;
+		boolean flag6 = Keyboard.isKeyDown(31) && Minecraft.getMinecraft().inGameHasFocus;
+		boolean flag8 = Keyboard.isKeyDown(30) && Minecraft.getMinecraft().inGameHasFocus;
+		boolean flag10 = Keyboard.isKeyDown(32) && Minecraft.getMinecraft().inGameHasFocus;
+		if (flag4) {
+			if (flag8) {
+				d7 -= 45D;
+			} else if (flag10) {
+				d7 += 45D;
+			}
+		} else if (flag6) {
+			d7 += 180D;
+			if (flag8) {
+				d7 += 45D;
+			} else if (flag10) {
+				d7 -= 45D;
+			}
+		} else if (flag8) {
+			d7 -= 90D;
+		} else if (flag10) {
+			d7 += 90D;
+		}
+		if (flag4 || flag8 || flag6 || flag10) {
+			s.motionX = Math.cos(Math.toRadians(d7));
+			s.motionZ = Math.sin(Math.toRadians(d7));
+		}
+    }
 }
diff --git a/src/minecraft/com/comze_instancelabs/client/modules/MobESPModule.java b/src/minecraft/com/comze_instancelabs/client/modules/MobESPModule.java
@@ -5,7 +5,7 @@
 import net.minecraft.util.EnumChatFormatting;
 
 import com.comze_instancelabs.client.Module;
-import com.comze_instancelabs.client.Render;
+import com.comze_instancelabs.client.InstanceRender;
 
 public class MobESPModule extends Module
 {

diff --git a/src/minecraft/com/comze_instancelabs/client/modules/XrayModule.java b/src/minecraft/com/comze_instancelabs/client/modules/XrayModule.java
@@ -6,7 +6,7 @@
 
 import com.comze_instancelabs.client.InstanceMain;
 import com.comze_instancelabs.client.Module;
-import com.comze_instancelabs.client.Render;
+import com.comze_instancelabs.client.InstanceRender;
 
 public class XrayModule extends Module
 {

diff --git a/src/minecraft/net/minecraft/client/entity/EntityPlayerSP.java b/src/minecraft/net/minecraft/client/entity/EntityPlayerSP.java
@@ -50,6 +50,7 @@
 import net.minecraft.world.World;
 
 import com.comze_instancelabs.client.InstanceMain;
+import com.comze_instancelabs.client.modules.FreecamModule;
 
 public class EntityPlayerSP extends AbstractClientPlayer
 {
@@ -533,6 +534,15 @@ private boolean isBlockTranslucent(int par1, int par2, int par3)
 
     protected boolean func_145771_j(double p_145771_1_, double p_145771_3_, double p_145771_5_)
     {
+    	//TODO t
+		if (InstanceMain.freecam) {
+			this.noClip = true;
+			FreecamModule.fly(this);
+			return false;
+		}else{
+			this.noClip = false;
+		}
+
         int var7 = MathHelper.floor_double(p_145771_1_);
         int var8 = MathHelper.floor_double(p_145771_3_);
         int var9 = MathHelper.floor_double(p_145771_5_);

diff --git a/src/minecraft/net/minecraft/client/renderer/RenderGlobal.java b/src/minecraft/net/minecraft/client/renderer/RenderGlobal.java
@@ -1,7 +1,7 @@
 package net.minecraft.client.renderer;
 
 import com.comze_instancelabs.client.InstanceMain;
-import com.comze_instancelabs.client.Render;
+import com.comze_instancelabs.client.InstanceRender;
 import com.google.common.collect.Maps;
 import java.nio.IntBuffer;
 import java.util.ArrayList;

diff --git a/src/minecraft/net/minecraft/client/renderer/entity/RenderManager.java b/src/minecraft/net/minecraft/client/renderer/entity/RenderManager.java
@@ -304,7 +304,7 @@ public boolean func_147939_a(Entity p_147939_1_, double p_147939_2_, double p_14
                         {
                             if (InstanceMain.getMod("coloredmobs").isEnabled())
                             {
-                                com.comze_instancelabs.client.Render.drawESP(p_147939_1_.posX, p_147939_1_.posY, p_147939_1_.posZ, 155, 155, 0);
+                                com.comze_instancelabs.client.InstanceRender.drawESP(p_147939_1_.posX, p_147939_1_.posY, p_147939_1_.posZ, 155, 155, 0);
                             }
                         }
 
@@ -388,7 +388,8 @@ private void func_85094_b(Entity par1Entity, double par2, double par4, double pa
         }
         else if (par1Entity instanceof EntityPlayer)
         {
-            //
+        	var11 = AxisAlignedBB.getAABBPool().getAABB(par2 - (double)var10, par4 - (double)par1Entity.height, par6 - (double)var10, par2 + (double)var10, par4, par6 + (double)var10);
+        	InstanceMain.getRender().drawESP(var11, 105, 0, 154); // yellowish
         }
         else
         {

diff --git a/src/minecraft/net/minecraft/entity/player/EntityPlayer.java b/src/minecraft/net/minecraft/entity/player/EntityPlayer.java
@@ -1,5 +1,6 @@
 package net.minecraft.entity.player;
 
+import com.comze_instancelabs.client.InstanceMain;
 import com.google.common.base.Charsets;
 import com.mojang.authlib.GameProfile;
 import java.util.Collection;
@@ -1381,6 +1382,10 @@ public void setDead()
      */
     public boolean isEntityInsideOpaqueBlock()
     {
+    	//TODO t
+    	if(InstanceMain.freecam){
+    		return false;
+    	}
         return !this.sleeping && super.isEntityInsideOpaqueBlock();
     }