2.5.1

6 files changed, 82 insertions, 20 deletions

diff --git a/build.gradle b/build.gradle
index 6998696..5737142 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id "org.spongepowered.mixin" version "0.6-SNAPSHOT"
 }
 
-version = "2.5.1-pre1"
+version = "2.5.1"
 group = "rosegoldaddons"
 archivesBaseName = "RoseGoldAddons"
 
diff --git a/src/main/java/rosegoldaddons/Config.java b/src/main/java/rosegoldaddons/Config.java
index 7470c7d..bee9391 100644
--- a/src/main/java/rosegoldaddons/Config.java
+++ b/src/main/java/rosegoldaddons/Config.java
@@ -11,10 +11,6 @@ import java.util.Comparator;
 public class Config extends Vigilant {
     public static Config INSTANCE = new Config();
 
-    @Property(type = PropertyType.SWITCH, name = "Gui Lag", description = "trole",
-            category = "RoseGoldAddons", subcategory = "General")
-    public boolean guilag = true;
-
     @Property(type = PropertyType.SWITCH, name = "Auto Start Dungeon + Ready", description = "Automatically starts the dungeon and gets ready.",
             category = "Dungeons", subcategory = "General")
     public boolean AutoReady = true;
@@ -117,10 +113,14 @@ public class Config extends Vigilant {
             category = "Mining", subcategory = "General")
     public boolean mithrilLook = false;
 
-    @Property(type = PropertyType.SWITCH, name = "Skip Titanium", description = "Mithril nuker will now ignore titanium",
+    @Property(type = PropertyType.SWITCH, name = "Skip Titanium", description = "Mithril nuker will ignore titanium",
             category = "Mining", subcategory = "General")
     public boolean ignoreTitanium = false;
 
+    @Property(type = PropertyType.SWITCH, name = "Include Ores", description = "Hardstone Nuker will also nuke ores",
+            category = "Mining", subcategory = "General")
+    public boolean includeOres = false;
+
     @Property(type = PropertyType.SWITCH, name = "Auto Slayer", description = "Automatically use batphone",
             category = "RoseGoldAddons", subcategory = "General")
     public boolean autoSlayer = false;
@@ -133,10 +133,18 @@ public class Config extends Vigilant {
             category = "RoseGoldAddons", subcategory = "General", options = {"None", "Zombie 3", "Zombie 4", "Zombie 5", "Spider 3", "Spider 4", "Sven 3", "Sven 4", "Enderman 2", "Enderman 3", "Enderman 4"})
     public int slayerTypeIndex = 0;
 
-    @Property(type = PropertyType.SWITCH, name = "Hilarity", description = "",
+    @Property(type = PropertyType.SWITCH, name = "Potato Mode", description = "This brings back memories...",
+            category = "RoseGoldAddons", subcategory = "General")
+    public boolean guilag = false;
+
+    @Property(type = PropertyType.SWITCH, name = "Hilarity", description = "Those pesky admins!",
             category = "RoseGoldAddons", subcategory = "General")
     public boolean funnyStuff = true;
 
+    @Property(type = PropertyType.SWITCH, name = "Nucleus ESP", description = "ESP for rare items dropped from nucleus",
+            category = "ESP", subcategory = "General")
+    public boolean nucleusESP = false;
+
     public Config() {
         super(new File("./config/rosegoldaddons/config.toml"), "RoseGoldAddons", new JVMAnnotationPropertyCollector(), new ConfigSorting());
         initialize();
diff --git a/src/main/java/rosegoldaddons/Main.java b/src/main/java/rosegoldaddons/Main.java
index ff89b94..6ca7fc0 100644
--- a/src/main/java/rosegoldaddons/Main.java
+++ b/src/main/java/rosegoldaddons/Main.java
@@ -96,6 +96,7 @@ public class Main {
         MinecraftForge.EVENT_BUS.register(new AutoSlayer());
         MinecraftForge.EVENT_BUS.register(new PlayerUtils());
         MinecraftForge.EVENT_BUS.register(new CanePlanter());
+        MinecraftForge.EVENT_BUS.register(new ArmorStandESPs());
         configFile.initialize();
         ClientCommandHandler.instance.registerCommand(new OpenSettings());
         ClientCommandHandler.instance.registerCommand(new Rosedrobe());
@@ -184,9 +185,14 @@ public class Main {
                     msg1.setChatStyle(ChatUtils.createClickStyle(ClickEvent.Action.OPEN_URL, "https://cheatersgetbanned.me"));
                     ChatComponentText msg2 = new ChatComponentText("§0§7Thanks to Harry282 (SBClient):§b https://github.com/Harry282/Skyblock-Client");
                     msg2.setChatStyle(ChatUtils.createClickStyle(ClickEvent.Action.OPEN_URL, "https://github.com/Harry282/Skyblock-Client"));
-                    ChatUtils.sendMessage("§0§7Thanks to pizza boy (Pizza Client)");
+                    ChatComponentText msg3 = new ChatComponentText("§0§7Thanks to pizza boy (Pizza Client): https://github.com/PizzaboiBestLegit/Pizza-Client");
+                    msg3.setChatStyle(ChatUtils.createClickStyle(ClickEvent.Action.OPEN_URL, "https://github.com/PizzaboiBestLegit/Pizza-Client"));
+                    ChatComponentText msg4 = new ChatComponentText("§0§7Check out the RoseGoldAddons Discord Server!");
+                    msg4.setChatStyle(ChatUtils.createClickStyle(ClickEvent.Action.OPEN_URL, "https://discord.gg/Tmk2hwzdxm"));
                     Minecraft.getMinecraft().thePlayer.addChatMessage(msg1);
                     Minecraft.getMinecraft().thePlayer.addChatMessage(msg2);
+                    Minecraft.getMinecraft().thePlayer.addChatMessage(msg3);
+                    Minecraft.getMinecraft().thePlayer.addChatMessage(msg4);
                     firstLoginThisSession = false;
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -197,7 +203,7 @@ public class Main {
 
     @SubscribeEvent
     public void onWorldChange(WorldEvent.Unload event) {
-        if(forageOnIsland) {
+        if(forageOnIsland || nukeWood || nukeCrops || mithrilNuker || gemNukeToggle) {
             ChatUtils.sendMessage("§cDetected World Change, Stopping All Macros");
             forageOnIsland = false;
             nukeWood = false;
@@ -211,7 +217,7 @@ public class Main {
     public void tick(TickEvent.ClientTickEvent event) {
         if (event.phase != TickEvent.Phase.START) return;
         if(Minecraft.getMinecraft().gameSettings.limitFramerate == 1) {
-            Minecraft.getMinecraft().gameSettings.setOptionFloatValue(GameSettings.Options.FRAMERATE_LIMIT, 240);
+            Minecraft.getMinecraft().gameSettings.setOptionFloatValue(GameSettings.Options.FRAMERATE_LIMIT, 260.0F);
         }
         if (display != null) {
             try {
diff --git a/src/main/java/rosegoldaddons/features/ArmorStandESPs.java b/src/main/java/rosegoldaddons/features/ArmorStandESPs.java
new file mode 100644
index 0000000..c0958bb
--- /dev/null
+++ b/src/main/java/rosegoldaddons/features/ArmorStandESPs.java
@@ -0,0 +1,52 @@
+package rosegoldaddons.features;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.boss.EntityWither;
+import net.minecraft.entity.item.EntityArmorStand;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.item.EntityXPOrb;
+import net.minecraft.item.ItemSkull;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.client.event.RenderWorldLastEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import rosegoldaddons.Main;
+import rosegoldaddons.utils.RenderUtils;
+
+import java.awt.*;
+import java.util.ArrayList;
+
+public class ArmorStandESPs {
+
+    @SubscribeEvent
+    public void renderWorld(RenderWorldLastEvent event) {
+        if (Main.configFile.nucleusESP) {
+            ArrayList<Entity> entities = getAllEntitiesInRange();
+            for (Entity entity : entities) {
+                if (entity instanceof EntityArmorStand) {
+                    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);
+                        } else if (itemStack.serializeNBT().getCompoundTag("tag").getCompoundTag("SkullOwner").getCompoundTag("Properties").toString().contains("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGRhNDE0ZDI5Y2M5ZWJiZmMxY2JkY2QyMTFlZWU0NzI2ZDA2NzZiZTI2MmU5Y2I4ZWVmZmFmZDFmYzM4MGIxNCJ9fX0=")) {
+                            RenderUtils.drawEntityBox(entity, Color.YELLOW, true, event.partialTicks);
+                        } else if (itemStack.serializeNBT().getCompoundTag("tag").getCompoundTag("SkullOwner").getCompoundTag("Properties").toString().contains("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjMxMmE1YTEyZWNiMjRkNjg1MmRiMzg4ZTZhMzQ3MjFjYzY3ZjUyMmNjZGU3ZTgyNGI5Zjc1ZTk1MDM2YWM5MyJ9fX0=")) {
+                            RenderUtils.drawEntityBox(entity, Color.WHITE, true, event.partialTicks);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private static ArrayList<Entity> getAllEntitiesInRange() {
+        ArrayList<Entity> entities = new ArrayList<>();
+        for (Entity entity1 : (Minecraft.getMinecraft().theWorld.loadedEntityList)) {
+            if (!(entity1 instanceof EntityItem) && !(entity1 instanceof EntityXPOrb) &&!(entity1 instanceof EntityWither) && !(entity1 instanceof EntityPlayerSP)) {
+                entities.add(entity1);
+            }
+        }
+        return entities;
+    }
+}
diff --git a/src/main/java/rosegoldaddons/features/EntityReach.java b/src/main/java/rosegoldaddons/features/EntityReach.java
index 66715fe..f59c37a 100644
--- a/src/main/java/rosegoldaddons/features/EntityReach.java
+++ b/src/main/java/rosegoldaddons/features/EntityReach.java
@@ -85,15 +85,6 @@ public class EntityReach {
                             RenderUtils.drawEntityBox(entity, Color.MAGENTA, true, event.partialTicks);
                         }
                     }
-                    else if(itemStack.serializeNBT().getCompoundTag("tag").getCompoundTag("SkullOwner").getCompoundTag("Properties").toString().contains("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODZhZGRiZDVkZWRhZDQwOTk5NDczYmU0YTdmNDhmNjIzNmE3OWEwZGNlOTcxYjVkYmQ3MzcyMDE0YWUzOTRkIn19fQ==")) {
-                        RenderUtils.drawEntityBox(entity, Color.GREEN, true, event.partialTicks);
-                    }
-                    else if(itemStack.serializeNBT().getCompoundTag("tag").getCompoundTag("SkullOwner").getCompoundTag("Properties").toString().contains("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGRhNDE0ZDI5Y2M5ZWJiZmMxY2JkY2QyMTFlZWU0NzI2ZDA2NzZiZTI2MmU5Y2I4ZWVmZmFmZDFmYzM4MGIxNCJ9fX0=")) {
-                        RenderUtils.drawEntityBox(entity, Color.YELLOW, true, event.partialTicks);
-                    }
-                    else if(itemStack.serializeNBT().getCompoundTag("tag").getCompoundTag("SkullOwner").getCompoundTag("Properties").toString().contains("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjMxMmE1YTEyZWNiMjRkNjg1MmRiMzg4ZTZhMzQ3MjFjYzY3ZjUyMmNjZGU3ZTgyNGI5Zjc1ZTk1MDM2YWM5MyJ9fX0=")) {
-                        RenderUtils.drawEntityBox(entity, Color.WHITE, true, event.partialTicks);
-                    }
                 }
             }
         }
@@ -121,7 +112,7 @@ public class EntityReach {
         Vec3 position = new Vec3(Minecraft.getMinecraft().thePlayer.posX, (Minecraft.getMinecraft().thePlayer.posY + Minecraft.getMinecraft().thePlayer.getEyeHeight()), Minecraft.getMinecraft().thePlayer.posZ);
         Vec3 look = Minecraft.getMinecraft().thePlayer.getLook(event.partialTicks);
         look = scaleVec(look, 0.2F);
-        for (int i = 0; i < 200; i++) {
+        for (int i = 0; i < 320; i++) {
             if (aabb.minX <= position.xCoord && aabb.maxX >= position.xCoord && aabb.minY <= position.yCoord && aabb.maxY >= position.yCoord && aabb.minZ <= position.zCoord && aabb.maxZ >= position.zCoord) {
                 return true;
             }
diff --git a/src/main/java/rosegoldaddons/features/HardstoneAura.java b/src/main/java/rosegoldaddons/features/HardstoneAura.java
index ff4ee3c..da76ff2 100644
--- a/src/main/java/rosegoldaddons/features/HardstoneAura.java
+++ b/src/main/java/rosegoldaddons/features/HardstoneAura.java
@@ -139,6 +139,11 @@ public class HardstoneAura {
                 if (blockState.getBlock() == Blocks.stone && !broken.contains(blockPos)) {
                     stones.add(new Vec3(blockPos.getX() + 0.5, blockPos.getY(), blockPos.getZ() + 0.5));
                 }
+                if(Main.configFile.includeOres) {
+                    if (blockState.getBlock() == Blocks.coal_ore || blockState.getBlock() == Blocks.diamond_ore || blockState.getBlock() == Blocks.gold_ore || blockState.getBlock() == Blocks.redstone_ore || blockState.getBlock() == Blocks.iron_ore || blockState.getBlock() == Blocks.lapis_ore || blockState.getBlock() == Blocks.emerald_ore || blockState.getBlock() == Blocks.netherrack && !broken.contains(blockPos)) {
+                        stones.add(new Vec3(blockPos.getX() + 0.5, blockPos.getY(), blockPos.getZ() + 0.5));
+                    }
+                }
             }
         }
         double smallest = 9999;