Release 1.6.6

Minion Aura
JackTYM · Jun 11, 2022 · 1b656a9 · 1b656a9
1 parent bbd1b04
commit 1b656a9
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id "net.minecraftforge.gradle.forge" version "6f53277"
 }
 
-version = "1.6.5-release"
+version = "1.6.6-release"
 group = "me.jacktym.aiom"
 
 compileJava.options.encoding = 'UTF-8'

diff --git a/currentVersion.txt b/currentVersion.txt
@@ -1 +1 @@
-1.6.5
+1.6.6
diff --git a/src/main/java/me/jacktym/aiomacro/NGGlobal.java b/src/main/java/me/jacktym/aiomacro/NGGlobal.java
@@ -4,7 +4,7 @@ public class NGGlobal {
 
     public static final String MOD_ID = "AIOM";
     public static final String MOD_NAME = "All-In-One Macro";
-    public static final String VERSION = "Release v1.6.5";
+    public static final String VERSION = "Release v1.6.6";
 
     public static final String NG_CLIENT_PROXY = "me.jacktym.aiomacro.proxy.ClientProxy";
     public static final String NG_COMMON_PROXY = "me.jacktym.aiomacro.proxy.CommonProxy";

diff --git a/src/main/java/me/jacktym/aiomacro/macros/MacroHandler.java b/src/main/java/me/jacktym/aiomacro/macros/MacroHandler.java
@@ -39,6 +39,10 @@ public static void toggleMacro() {
                 SetPlayerLook.toggled = true;
             } else if (AIOMVigilanceConfig.macroType == 3) {
                 Main.mcPlayer.sendChatMessage("/bz");
+            } else if (AIOMVigilanceConfig.macroType == 6) {
+                MinionAura.recentClickedEntity = null;
+                MinionAura.minionsToClaim.clear();
+                MinionAura.claimedMinions.clear();
             }
             Main.sendMarkedChatMessage("Macro Enabled!");
         } else if (isMacroOn) {

diff --git a/src/main/java/me/jacktym/aiomacro/macros/MinionAura.java b/src/main/java/me/jacktym/aiomacro/macros/MinionAura.java
@@ -3,16 +3,25 @@
 import me.jacktym.aiomacro.Main;
 import me.jacktym.aiomacro.config.AIOMVigilanceConfig;
 import me.jacktym.aiomacro.util.Utils;
+import net.minecraft.client.gui.inventory.GuiChest;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityArmorStand;
+import net.minecraft.inventory.ContainerChest;
+import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class MinionAura {
 
+    public static List<Entity> claimedMinions = new ArrayList<>();
+    public static List<Entity> minionsToClaim = new ArrayList<>();
+    public static Entity recentClickedEntity;
+
     @SubscribeEvent
     public void tickEvent(TickEvent.ClientTickEvent event) {
         if (Main.mcWorld != null && Main.mcPlayer != null && AIOMVigilanceConfig.macroType == 6 && MacroHandler.isMacroOn) {
@@ -21,12 +30,42 @@ public void tickEvent(TickEvent.ClientTickEvent event) {
             if (!entityList.isEmpty()) {
                 for (Entity entity : entityList) {
                     if (entity instanceof EntityArmorStand) {
-                        System.out.println(Utils.stripColor(entity.getDisplayName().getUnformattedText()));
-                        ItemStack chestStack = ((EntityArmorStand) entity).getCurrentArmor(4);
+                        ItemStack chestStack = ((EntityArmorStand) entity).getCurrentArmor(1);
 
                         if (chestStack != null) {
-                            System.out.println(chestStack.getItem().toString());
-                            //NBTTagCompound nbtTagCompound = chestStack.getSubCompound("SkullOwner", false);
+                            if (chestStack.getDisplayName().equals("Leather Pants") && !minionsToClaim.contains(entity) && !claimedMinions.contains(entity)) {
+                                minionsToClaim.add(entity);
+                            }
+                        }
+                    }
+                }
+            }
+
+            for (Entity entity : minionsToClaim) {
+                if (Main.mc.currentScreen == null) {
+                    Utils.useEntity(entity);
+                    recentClickedEntity = entity;
+                }
+            }
+        }
+    }
+
+    @SubscribeEvent
+    public void guiScreenEvent(GuiScreenEvent event) {
+        if (event.gui instanceof GuiChest && AIOMVigilanceConfig.macroType == 6 && MacroHandler.isMacroOn && recentClickedEntity != null) {
+            IInventory chest = ((ContainerChest) (((GuiChest) event.gui).inventorySlots)).getLowerChestInventory();
+
+            String chestName = chest.getDisplayName().getUnformattedText();
+
+            if (chestName.contains("Minion")) {
+                if (chest.getStackInSlot(48) != null && chest.getStackInSlot(48).getDisplayName() != null) {
+                    if (Utils.stripColor(chest.getStackInSlot(48).getDisplayName()).equals("Collect All")) {
+                        Main.mc.playerController.windowClick(Main.mcPlayer.openContainer.windowId, 48, 0, 0, Main.mcPlayer);
+                        if (chest.getStackInSlot(21) == null) {
+                            Main.mcPlayer.closeScreen();
+                            minionsToClaim.remove(recentClickedEntity);
+                            claimedMinions.add(recentClickedEntity);
+                            recentClickedEntity = null;
                         }
                     }
                 }

diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
     "modid": "aiom",
     "name": "All-In-One Macro",
     "description": "An all-in-one macro for Hypixel Skyblock!",
-    "version": "1.6.5-release",
+    "version": "1.6.6-release",
     "mcversion": "1.8.9",
     "url": "",
     "updateUrl": "",