2.7.3

lag fixed (real) and other stuff

14 files changed, 120 insertions, 25 deletions

diff --git a/src/main/java/rosegoldaddons/features/ArmorStandESPs.java b/src/main/java/rosegoldaddons/features/ArmorStandESPs.java
index 54616e7..f726052 100644
--- a/src/main/java/rosegoldaddons/features/ArmorStandESPs.java
+++ b/src/main/java/rosegoldaddons/features/ArmorStandESPs.java
@@ -28,11 +28,11 @@ public class ArmorStandESPs {
                     ItemStack itemStack = ((EntityArmorStand) entity).getCurrentArmor(3);
                     if (itemStack != null && itemStack.getItem() instanceof ItemSkull) {
                         if (itemStack.serializeNBT().getCompoundTag("tag").getCompoundTag("SkullOwner").getCompoundTag("Properties").toString().contains("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODZhZGRiZDVkZWRhZDQwOTk5NDczYmU0YTdmNDhmNjIzNmE3OWEwZGNlOTcxYjVkYmQ3MzcyMDE0YWUzOTRkIn19fQ==")) {
-                            RenderUtils.drawEntityBox(entity, Color.GREEN, true, event.partialTicks);
+                            RenderUtils.drawEntityBox(entity, Color.GREEN, Main.configFile.lineWidth, event.partialTicks);
                         } else if (itemStack.serializeNBT().getCompoundTag("tag").getCompoundTag("SkullOwner").getCompoundTag("Properties").toString().contains("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGRhNDE0ZDI5Y2M5ZWJiZmMxY2JkY2QyMTFlZWU0NzI2ZDA2NzZiZTI2MmU5Y2I4ZWVmZmFmZDFmYzM4MGIxNCJ9fX0=")) {
-                            RenderUtils.drawEntityBox(entity, Color.YELLOW, true, event.partialTicks);
+                            RenderUtils.drawEntityBox(entity, Color.YELLOW, Main.configFile.lineWidth, event.partialTicks);
                         } else if (itemStack.serializeNBT().getCompoundTag("tag").getCompoundTag("SkullOwner").getCompoundTag("Properties").toString().contains("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjMxMmE1YTEyZWNiMjRkNjg1MmRiMzg4ZTZhMzQ3MjFjYzY3ZjUyMmNjZGU3ZTgyNGI5Zjc1ZTk1MDM2YWM5MyJ9fX0=")) {
-                            RenderUtils.drawEntityBox(entity, Color.WHITE, true, event.partialTicks);
+                            RenderUtils.drawEntityBox(entity, Color.WHITE, Main.configFile.lineWidth, event.partialTicks);
                         }
                     }
                 }
diff --git a/src/main/java/rosegoldaddons/features/BrewingMacro.java b/src/main/java/rosegoldaddons/features/BrewingMacro.java
index e2fc381..242fd33 100644
--- a/src/main/java/rosegoldaddons/features/BrewingMacro.java
+++ b/src/main/java/rosegoldaddons/features/BrewingMacro.java
@@ -183,7 +183,7 @@ public class BrewingMacro {
         if (!Main.brewingMacro) return;
         stand = closestStand();
         if (stand != null) {
-            RenderUtils.drawBlockBox(stand, Color.YELLOW, true, event.partialTicks);
+            RenderUtils.drawBlockBox(stand, Color.YELLOW, Main.configFile.lineWidth, event.partialTicks);
         }
     }
 
diff --git a/src/main/java/rosegoldaddons/features/CropNuker.java b/src/main/java/rosegoldaddons/features/CropNuker.java
index 915acae..ab76cc3 100644
--- a/src/main/java/rosegoldaddons/features/CropNuker.java
+++ b/src/main/java/rosegoldaddons/features/CropNuker.java
@@ -23,7 +23,7 @@ public class CropNuker {
 
     @SubscribeEvent
     public void onTick(TickEvent.PlayerTickEvent event) {
-        //if(event.phase == TickEvent.Phase.END) return;
+        if(Main.configFile.farmSpeedIndex == 0 && event.phase == TickEvent.Phase.END) return;
         if (!Main.nukeCrops || Main.mc.thePlayer == null) {
             broken.clear();
             return;
@@ -41,7 +41,7 @@ public class CropNuker {
     public void onRender(RenderWorldLastEvent event) {
         if (!Main.nukeCrops) return;
         if(crop != null) {
-            RenderUtils.drawBlockBox(crop, new Color(255, 0, 0), true, event.partialTicks);
+            RenderUtils.drawBlockBox(crop, new Color(255, 0, 0), Main.configFile.lineWidth, event.partialTicks);
         }
     }
 
diff --git a/src/main/java/rosegoldaddons/features/DungeonESP.java b/src/main/java/rosegoldaddons/features/DungeonESP.java
new file mode 100644
index 0000000..b611fe9
--- /dev/null
+++ b/src/main/java/rosegoldaddons/features/DungeonESP.java
@@ -0,0 +1,87 @@
+package rosegoldaddons.features;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityArmorStand;
+import net.minecraft.entity.passive.EntityBat;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraftforge.client.event.RenderWorldLastEvent;
+import net.minecraftforge.event.entity.EntityJoinWorldEvent;
+import net.minecraftforge.event.world.WorldEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import rosegoldaddons.Main;
+import rosegoldaddons.events.RenderLivingEntityEvent;
+import rosegoldaddons.utils.ChatUtils;
+import rosegoldaddons.utils.RenderUtils;
+import rosegoldaddons.utils.ScoreboardUtils;
+
+import java.awt.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+
+public class DungeonESP {
+    private static HashMap<Entity, Color> highlightedEntities = new HashMap<>();
+    private static HashSet<Entity> checkedStarNameTags = new HashSet<>();
+
+    private static void highlightEntity(Entity entity, Color color) {
+        highlightedEntities.put(entity, color);
+    }
+
+    @SubscribeEvent
+    public void onEntityJoinWorld(EntityJoinWorldEvent event) {
+        if (!ScoreboardUtils.inDungeon || !Main.configFile.dungeonESP) return;
+        if (event.entity instanceof EntityPlayer) {
+            String name = event.entity.getName();
+            switch (name) {
+                case "Shadow Assassin":
+                    event.entity.setInvisible(false);
+                    highlightEntity(event.entity, Color.MAGENTA);
+                    break;
+
+                case "Lost Adventurer":
+                    highlightEntity(event.entity, Color.BLUE);
+                    break;
+
+                case "Diamond Guy":
+                    highlightEntity(event.entity, Color.CYAN);
+                    break;
+            }
+        }
+        if (event.entity instanceof EntityBat) {
+            highlightEntity(event.entity, Color.RED);
+        }
+    }
+
+    @SubscribeEvent
+    public void onRenderEntityLiving(RenderLivingEntityEvent event) {
+        if (!ScoreboardUtils.inDungeon || !Main.configFile.dungeonESP || checkedStarNameTags.contains(event.entity))
+            return;
+        if (event.entity instanceof EntityArmorStand) {
+            if (event.entity.hasCustomName() && event.entity.getCustomNameTag().contains("✯")) {
+                List<Entity> possibleEntities = event.entity.getEntityWorld().getEntitiesInAABBexcluding(event.entity, event.entity.getEntityBoundingBox().expand(0, 3, 0), entity -> !(entity instanceof EntityArmorStand));
+                if (!possibleEntities.isEmpty()) {
+                    highlightEntity(possibleEntities.get(0), Color.ORANGE);
+                }
+                checkedStarNameTags.add(event.entity);
+            }
+        }
+    }
+
+    @SubscribeEvent
+    public void onRenderWorld(RenderWorldLastEvent event) {
+        if(ScoreboardUtils.inDungeon && Main.configFile.dungeonESP) {
+            Main.mc.theWorld.loadedEntityList.forEach(entity -> {
+                if(highlightedEntities.containsKey(entity)) {
+                    RenderUtils.drawEntityBox(entity, highlightedEntities.get(entity), Main.configFile.lineWidth, event.partialTicks);
+                }
+            });
+        }
+    }
+
+    @SubscribeEvent
+    public void onWorldLoad(WorldEvent.Load event) {
+        highlightedEntities.clear();
+        checkedStarNameTags.clear();
+    }
+}
diff --git a/src/main/java/rosegoldaddons/features/EndermanMacro.java b/src/main/java/rosegoldaddons/features/EndermanMacro.java
index c0f3c6a..0e99af4 100644
--- a/src/main/java/rosegoldaddons/features/EndermanMacro.java
+++ b/src/main/java/rosegoldaddons/features/EndermanMacro.java
@@ -42,7 +42,7 @@ public class EndermanMacro {
     public void renderWorld(RenderWorldLastEvent event) {
         if (!Main.configFile.EndermanESP) return;
         if (enderman == null) return;
-        RenderUtils.drawEntityBox(enderman, Color.RED, true, event.partialTicks);
+        RenderUtils.drawEntityBox(enderman, Color.RED, Main.configFile.lineWidth, event.partialTicks);
     }
 
     private static Entity getClosestEnderman() {
diff --git a/src/main/java/rosegoldaddons/features/EntityReach.java b/src/main/java/rosegoldaddons/features/EntityReach.java
index 97a1c09..ae24a98 100644
--- a/src/main/java/rosegoldaddons/features/EntityReach.java
+++ b/src/main/java/rosegoldaddons/features/EntityReach.java
@@ -66,7 +66,7 @@ public class EntityReach {
             if(entityName.equals("") && stand != null) {
                 entityName = stand.getName();
             }
-            RenderUtils.drawEntityBox(toInteract, Color.RED, true, event.partialTicks);
+            RenderUtils.drawEntityBox(toInteract, Color.RED, Main.configFile.lineWidth, event.partialTicks);
             RenderUtils.renderWaypointText(entityName, toInteract.posX, toInteract.posY + toInteract.height, toInteract.posZ, event.partialTicks);
         }
         boolean found = false;
@@ -81,9 +81,9 @@ public class EntityReach {
                 if (itemStack != null && itemStack.getItem() instanceof ItemSkull) {
                     if(itemStack.serializeNBT().getCompoundTag("tag").getCompoundTag("SkullOwner").getCompoundTag("Properties").toString().contains("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjk2OTIzYWQyNDczMTAwMDdmNmFlNWQzMjZkODQ3YWQ1Mzg2NGNmMTZjMzU2NWExODFkYzhlNmIyMGJlMjM4NyJ9fX0=")) {
                         if(solved.contains(entity)) {
-                            RenderUtils.drawEntityBox(entity, Color.YELLOW, true, event.partialTicks);
+                            RenderUtils.drawEntityBox(entity, Color.YELLOW, Main.configFile.lineWidth, event.partialTicks);
                         } else {
-                            RenderUtils.drawEntityBox(entity, Color.MAGENTA, true, event.partialTicks);
+                            RenderUtils.drawEntityBox(entity, Color.MAGENTA, Main.configFile.lineWidth, event.partialTicks);
                         }
                     }
                 }
diff --git a/src/main/java/rosegoldaddons/features/GemstoneAura.java b/src/main/java/rosegoldaddons/features/GemstoneAura.java
index af919f9..4389d41 100644
--- a/src/main/java/rosegoldaddons/features/GemstoneAura.java
+++ b/src/main/java/rosegoldaddons/features/GemstoneAura.java
@@ -30,7 +30,10 @@ public class GemstoneAura {
         }
         if (event.phase == TickEvent.Phase.END && Main.mc.theWorld != null && Main.mc.thePlayer != null) {
             if (PlayerUtils.pickaxeAbilityReady) {
-                Main.mc.playerController.sendUseItem(Main.mc.thePlayer, Main.mc.theWorld, Main.mc.thePlayer.inventory.getStackInSlot(Main.mc.thePlayer.inventory.currentItem));
+                if(Main.mc.thePlayer.inventory.getStackInSlot(Main.mc.thePlayer.inventory.currentItem) != null) {
+                    Main.mc.playerController.sendUseItem(Main.mc.thePlayer, Main.mc.theWorld, Main.mc.thePlayer.inventory.getStackInSlot(Main.mc.thePlayer.inventory.currentItem));
+                    PlayerUtils.pickaxeAbilityReady = false;
+                }
             }
             if (currentDamage > 100) {
                 currentDamage = 0;
@@ -91,7 +94,7 @@ public class GemstoneAura {
             } else if (dyeColor == EnumDyeColor.MAGENTA) {
                 color = new Color(214, 15, 150);
             }
-            RenderUtils.drawBlockBox(blockPos, color, true, event.partialTicks);
+            RenderUtils.drawBlockBox(blockPos, color, Main.configFile.lineWidth, event.partialTicks);
         }
     }
 
diff --git a/src/main/java/rosegoldaddons/features/GhostMacro.java b/src/main/java/rosegoldaddons/features/GhostMacro.java
index 1e9f467..a7cf2dc 100644
--- a/src/main/java/rosegoldaddons/features/GhostMacro.java
+++ b/src/main/java/rosegoldaddons/features/GhostMacro.java
@@ -30,7 +30,7 @@ public class GhostMacro {
     public void renderWorld(RenderWorldLastEvent event) {
         if (!Main.GhostMacro) return;
         if (creeper == null) return;
-        RenderUtils.drawEntityBox(creeper, Color.RED, true, event.partialTicks);
+        RenderUtils.drawEntityBox(creeper, Color.RED, Main.configFile.lineWidth, event.partialTicks);
     }
 
     private static Entity getClosestCreeper() {
diff --git a/src/main/java/rosegoldaddons/features/HardstoneAura.java b/src/main/java/rosegoldaddons/features/HardstoneAura.java
index 4f92056..2551d56 100644
--- a/src/main/java/rosegoldaddons/features/HardstoneAura.java
+++ b/src/main/java/rosegoldaddons/features/HardstoneAura.java
@@ -130,10 +130,10 @@ public class HardstoneAura {
         closestStone = closestStone();
         closestChest = closestChest();
         if (closestStone != null) {
-            RenderUtils.drawBlockBox(closestStone, new Color(128, 128, 128), true, event.partialTicks);
+            RenderUtils.drawBlockBox(closestStone, new Color(128, 128, 128), Main.configFile.lineWidth, event.partialTicks);
         }
         if (closestChest != null) {
-            RenderUtils.drawBlockBox(new BlockPos(closestChest.xCoord, closestChest.yCoord, closestChest.zCoord), new Color(255, 128, 0), true, event.partialTicks);
+            RenderUtils.drawBlockBox(new BlockPos(closestChest.xCoord, closestChest.yCoord, closestChest.zCoord), new Color(255, 128, 0), Main.configFile.lineWidth, event.partialTicks);
         } else {
             stopHardstone = false;
         }
@@ -162,7 +162,7 @@ public class HardstoneAura {
             } else if (dyeColor == EnumDyeColor.MAGENTA) {
                 color = new Color(214, 15, 150);
             }
-            RenderUtils.drawBlockBox(gemstone, color, true, event.partialTicks);
+            RenderUtils.drawBlockBox(gemstone, color, Main.configFile.lineWidth, event.partialTicks);
         }
     }
 
diff --git a/src/main/java/rosegoldaddons/features/MithrilMacro.java b/src/main/java/rosegoldaddons/features/MithrilMacro.java
index e2645c5..4ee8fa1 100644
--- a/src/main/java/rosegoldaddons/features/MithrilMacro.java
+++ b/src/main/java/rosegoldaddons/features/MithrilMacro.java
@@ -44,8 +44,10 @@ public class MithrilMacro {
         }
         if (PlayerUtils.pickaxeAbilityReady) {
             KeyBinding.setKeyBindState(lc.getKeyCode(), false);
-            Main.mc.playerController.sendUseItem(Main.mc.thePlayer, Main.mc.theWorld, Main.mc.thePlayer.inventory.getStackInSlot(Main.mc.thePlayer.inventory.currentItem));
-            PlayerUtils.pickaxeAbilityReady = false;
+            if(Main.mc.thePlayer.inventory.getStackInSlot(Main.mc.thePlayer.inventory.currentItem) != null) {
+                Main.mc.playerController.sendUseItem(Main.mc.thePlayer, Main.mc.theWorld, Main.mc.thePlayer.inventory.getStackInSlot(Main.mc.thePlayer.inventory.currentItem));
+                PlayerUtils.pickaxeAbilityReady = false;
+            }
         }
         if (currentDamage > 100) {
             KeyBinding.setKeyBindState(lc.getKeyCode(), false);
@@ -80,7 +82,7 @@ public class MithrilMacro {
             RenderUtils.drawPixelBox(vec, Color.RED, 0.01, event.partialTicks);
         }
         if (blockPos != null) {
-            RenderUtils.drawBlockBox(blockPos, Color.CYAN, true, event.partialTicks);
+            RenderUtils.drawBlockBox(blockPos, Color.CYAN, Main.configFile.lineWidth, event.partialTicks);
         }
     }
 
diff --git a/src/main/java/rosegoldaddons/features/MithrilNuker.java b/src/main/java/rosegoldaddons/features/MithrilNuker.java
index 2e7a36a..9667eed 100644
--- a/src/main/java/rosegoldaddons/features/MithrilNuker.java
+++ b/src/main/java/rosegoldaddons/features/MithrilNuker.java
@@ -33,7 +33,10 @@ public class MithrilNuker {
         }
         if (event.phase == TickEvent.Phase.END) {
             if(PlayerUtils.pickaxeAbilityReady && Main.mc.playerController != null) {
-                Main.mc.playerController.sendUseItem(Main.mc.thePlayer, Main.mc.theWorld, Main.mc.thePlayer.inventory.getStackInSlot(Main.mc.thePlayer.inventory.currentItem));
+                if(Main.mc.thePlayer.inventory.getStackInSlot(Main.mc.thePlayer.inventory.currentItem) != null) {
+                    Main.mc.playerController.sendUseItem(Main.mc.thePlayer, Main.mc.theWorld, Main.mc.thePlayer.inventory.getStackInSlot(Main.mc.thePlayer.inventory.currentItem));
+                    PlayerUtils.pickaxeAbilityReady = false;
+                }
             }
             if(currentDamage > 100) {
                 currentDamage = 0;
@@ -72,9 +75,9 @@ public class MithrilNuker {
         if (blockPos != null) {
             IBlockState blockState = Main.mc.theWorld.getBlockState(blockPos);
             if(blockState.getBlock() == Blocks.stone) {
-                RenderUtils.drawBlockBox(blockPos, Color.WHITE, true, event.partialTicks);
+                RenderUtils.drawBlockBox(blockPos, Color.WHITE, Main.configFile.lineWidth, event.partialTicks);
             } else {
-                RenderUtils.drawBlockBox(blockPos, Color.BLUE, true, event.partialTicks);
+                RenderUtils.drawBlockBox(blockPos, Color.BLUE, Main.configFile.lineWidth, event.partialTicks);
             }
         }
     }
diff --git a/src/main/java/rosegoldaddons/features/NecronAimbot.java b/src/main/java/rosegoldaddons/features/NecronAimbot.java
index b491951..c1669c1 100644
--- a/src/main/java/rosegoldaddons/features/NecronAimbot.java
+++ b/src/main/java/rosegoldaddons/features/NecronAimbot.java
@@ -19,7 +19,7 @@ public class NecronAimbot {
         if (!Main.necronAimbot) return;
         Entity necron = getClosestWither();
         if (necron == null) return;
-        RenderUtils.drawEntityBox(necron, Color.RED, true, event.partialTicks);
+        RenderUtils.drawEntityBox(necron, Color.RED, Main.configFile.lineWidth, event.partialTicks);
         RotationUtils.faceEntity(necron);
     }
 
diff --git a/src/main/java/rosegoldaddons/features/PinglessMining.java b/src/main/java/rosegoldaddons/features/PinglessMining.java
index c617ae4..7ad3fec 100644
--- a/src/main/java/rosegoldaddons/features/PinglessMining.java
+++ b/src/main/java/rosegoldaddons/features/PinglessMining.java
@@ -81,7 +81,7 @@ public class PinglessMining {
         }
         block = closestBlock(event);
         if (block != null) {
-            RenderUtils.drawBlockBox(block, new Color(255, 0, 0), true, event.partialTicks);
+            RenderUtils.drawBlockBox(block, new Color(255, 0, 0), Main.configFile.lineWidth, event.partialTicks);
         }
     }
 
diff --git a/src/main/java/rosegoldaddons/features/PowderMacro.java b/src/main/java/rosegoldaddons/features/PowderMacro.java
index 61555a3..d23b27b 100644
--- a/src/main/java/rosegoldaddons/features/PowderMacro.java
+++ b/src/main/java/rosegoldaddons/features/PowderMacro.java
@@ -46,7 +46,7 @@ public class PowderMacro {
         if (!Main.powderMacro) return;
         closestChest = closestChest();
         if (closestChest != null) {
-            RenderUtils.drawBlockBox(new BlockPos(closestChest.xCoord, closestChest.yCoord, closestChest.zCoord), new Color(255, 128, 0), true, event.partialTicks);
+            RenderUtils.drawBlockBox(new BlockPos(closestChest.xCoord, closestChest.yCoord, closestChest.zCoord), new Color(255, 128, 0), Main.configFile.lineWidth, event.partialTicks);
         }
     }