Merge pull request #466 from UnicacityAddon/feature/faction-colored-hitboxes

feature/faction-colored-hitboxes

Author: rettichlp

build.gradle.kts

@@ -96,6 +96,7 @@ loom {
     runs {
         named("client") {
             property("devauth.enabled", "1")
+            property("mixin.debug.export", "true")
         }
     }
 }

src/main/java/de/rettichlp/ucutils/common/models/Faction.java

@@ -3,32 +3,27 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.minecraft.ChatFormatting;
-import net.minecraft.network.chat.Component;
-import org.jetbrains.annotations.NotNull;
 
-import java.util.Optional;
+import java.awt.Color;
 
-import static java.util.Arrays.stream;
 import static net.minecraft.ChatFormatting.BLUE;
 import static net.minecraft.ChatFormatting.DARK_AQUA;
 import static net.minecraft.ChatFormatting.DARK_BLUE;
-import static net.minecraft.ChatFormatting.DARK_GRAY;
 import static net.minecraft.ChatFormatting.DARK_PURPLE;
 import static net.minecraft.ChatFormatting.DARK_RED;
 import static net.minecraft.ChatFormatting.GOLD;
 import static net.minecraft.ChatFormatting.GRAY;
 import static net.minecraft.ChatFormatting.GREEN;
 import static net.minecraft.ChatFormatting.LIGHT_PURPLE;
 import static net.minecraft.ChatFormatting.RED;
+import static net.minecraft.ChatFormatting.WHITE;
 import static net.minecraft.ChatFormatting.YELLOW;
-import static net.minecraft.network.chat.Component.empty;
-import static net.minecraft.network.chat.Component.literal;
 
 @Getter
 @AllArgsConstructor
 public enum Faction {
 
-    NULL("", "", false, GRAY, ""),
+    NULL("", "", false, WHITE, ""),
     FBI("FBI", "fbi", false, DARK_BLUE, "✯"),
     POLIZEI("Polizei", "police", false, BLUE, "✯"),
     RETTUNGSDIENST("Rettungsdienst", "medic", false, DARK_RED, "✚"),
@@ -49,18 +44,7 @@ public enum Faction {
     private final ChatFormatting color;
     private final String icon;
 
-    public Component getNameTagSuffix() {
-        return this != NULL
-                ? empty()
-                .append(literal("⌜").withStyle(DARK_GRAY))
-                .append(literal(this.icon).withStyle(this.color))
-                .append(literal("⌟").withStyle(DARK_GRAY))
-                : empty();
-    }
-
-    public static @NotNull Optional<Faction> fromDisplayName(String displayName) {
-        return stream(values())
-                .filter(faction -> faction.getDisplayName().equals(displayName))
-                .findFirst();
+    public Color getAwtColor() {
+        return this.color.getColor() != null ? new Color(this.color.getColor()) : Color.WHITE;
     }
 }

src/main/java/de/rettichlp/ucutils/mixin/EntityHitboxDebugRendererMixin.java

@@ -0,0 +1,40 @@
+package de.rettichlp.ucutils.mixin;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import de.rettichlp.ucutils.common.models.Faction;
+import net.minecraft.client.renderer.debug.EntityHitboxDebugRenderer;
+import net.minecraft.gizmos.GizmoStyle;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+import static de.rettichlp.ucutils.UCUtils.storage;
+import static java.util.Optional.ofNullable;
+import static net.minecraft.gizmos.GizmoStyle.stroke;
+
+@Mixin(EntityHitboxDebugRenderer.class)
+public abstract class EntityHitboxDebugRendererMixin {
+
+    @ModifyArg(method = "showHitboxes",
+               at = @At(value = "INVOKE",
+                        target = "Lnet/minecraft/gizmos/Gizmos;cuboid(Lnet/minecraft/world/phys/AABB;Lnet/minecraft/gizmos/GizmoStyle;)Lnet/minecraft/gizmos/GizmoProperties;",
+                        ordinal = 0),
+               index = 1)
+    private GizmoStyle ucutils$showHitboxesInvoke(GizmoStyle style,
+                                                  @Local(name = "entity", argsOnly = true) Entity entity,
+                                                  @Local(name = "isServerEntity", argsOnly = true) boolean isServerEntity) {
+        if (!storage.isUnicaCity()) {
+            return style;
+        }
+
+        if (!(entity instanceof Player player) || isServerEntity) {
+            return style;
+        }
+
+        String playerName = player.getPlainTextName();
+        Faction faction = ofNullable(storage.getPlayerFactionCache().get(playerName)).orElseGet(() -> storage.getFaction(playerName));
+        return stroke(faction.getAwtColor().getRGB());
+    }
+}

src/main/resources/ucutils.mixins.json

@@ -19,6 +19,7 @@
     "ChatScreenMixin",
     "ClientPacketListenerMixin",
     "ClientPlayNetworkHandlerMixin",
+    "EntityHitboxDebugRendererMixin",
     "EntityRendererMixin",
     "GuiMixin",
     "LivingEntityMixin",