update

BakaBotTeam · Aug 14, 2024 · 8d4964a · 8d4964a
1 parent a31db01
commit 8d4964a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/src/main/java/win/cuteguimc/zombieshelper/mixin/EntityRendererMixin.java b/src/main/java/win/cuteguimc/zombieshelper/mixin/EntityRendererMixin.java
@@ -19,6 +19,7 @@
 
 import java.awt.*;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Mixin(EntityRenderer.class)
@@ -31,9 +32,12 @@ private void renderWorldPass(int pass, float partialTicks, long finishTimeNano,
                 Color color = new Color(255, 43, 28);
                 float[] colors = new float[]{(float) color.getRed(), color.getGreen(), color.getBlue()};
                 for (Entity entity : Minecraft.getMinecraft().theWorld.getLoadedEntityList()) {
-                    if (entity instanceof IAnimals && !(entity instanceof EntityVillager) && Minecraft.getMinecraft().thePlayer.getDistanceToEntity(entity) <= ZombiesHelperConfig.espRange) {
+                    if (Utils.isTarget(entity) && Minecraft.getMinecraft().thePlayer.getDistanceToEntity(entity) <= ZombiesHelperConfig.espRange) {
                         RenderUtils.drawEntityBox(entity, (Minecraft.getMinecraft().thePlayer.getDistanceToEntity(entity) <= 8) ? color : targetcolor);
                     }
+                    if (Utils.isPowerUP(entity)) {
+                        RenderUtils.drawEntityBox(entity, Objects.requireNonNull(Utils.getPowerUPColor(entity)));
+                    }
                 }
 
                 for (Entity entity : Minecraft.getMinecraft().theWorld.loadedEntityList.stream().filter(entity -> Utils.isTarget(entity) && Minecraft.getMinecraft().thePlayer.getDistanceToEntity(entity) <= 8).collect(Collectors.toList())) {

diff --git a/src/main/java/win/cuteguimc/zombieshelper/utils/Utils.java b/src/main/java/win/cuteguimc/zombieshelper/utils/Utils.java
@@ -1,12 +1,35 @@
 package win.cuteguimc.zombieshelper.utils;
 
+import kotlin.text.Regex;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityArmorStand;
 import net.minecraft.entity.monster.IMob;
 import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.entity.passive.IAnimals;
 
+import java.awt.*;
+import java.util.Locale;
+
 public class Utils {
+    private static Regex regex = new Regex("(?:§.)*(SHOPPING SPREE|DOUBLE GOLD|MAX AMMO|INSTA KILL|CARPENTER|BONUS GOLD)");
+
     public static boolean isTarget(Entity entity) {
         return entity instanceof IAnimals && !(entity instanceof EntityVillager);
     }
+
+    public static boolean isPowerUP(Entity entity) {
+        return entity instanceof EntityArmorStand && regex.containsMatchIn(entity.getName());
+    }
+
+    public static Color getPowerUPColor(Entity entity) {
+        Color color = Color.WHITE;
+        if (!(entity instanceof EntityArmorStand)) return null;
+        String name = entity.getName().toLowerCase(Locale.ROOT);
+        if (name.contains("shopping")) color = new Color(106, 0, 255);
+        else if (name.contains("double")) color = new Color(255, 217, 0);
+        else if (name.contains("max ammo")) color = Color.BLUE;
+        else if (name.contains("carpenter")) color = Color.GREEN;
+        else if (name.contains("bonus")) color = new Color(255, 128, 0);
+        return color;
+    }
 }