Fix conflict with BetterMap (SCC 1.2.1)

more accurately, fix issue with ourselves??? idk this was a weird crash

build.gradle.kts

@@ -57,7 +57,7 @@ loom {
     if (project.platform.isLegacyForge) {
         runConfigs {
             "client" {
-                programArgs("--tweakClass", "co.skyclient.scc.hooks.ReplacedModRemover")
+                programArgs("--tweakClass", "cc.polyfrost.oneconfig.loader.stage0.LaunchWrapperTweaker")
                 property("mixin.debug.export", "true")
             }
         }
@@ -192,7 +192,7 @@ tasks {
                     "ForceLoadAsMod" to true, // We want to load this jar as a mod, so we force Forge to do so.
                     "TweakOrder" to "0", // Makes sure that the OneConfig launch wrapper is loaded as soon as possible.
                     "MixinConfigs" to "mixins.scc.json", // We want to use our mixin configuration, so we specify it here.
-                    "TweakClass" to "co.skyclient.scc.hooks.ReplacedModRemover" // Loads the OneConfig launch wrapper.
+                    "TweakClass" to "cc.polyfrost.oneconfig.loader.stage0.LaunchWrapperTweaker" // Loads the OneConfig launch wrapper.
             )
         }
         dependsOn(shadowJar)

gradle.properties

@@ -1,6 +1,6 @@
 mod_id=skyclientcosmetics
 mod_name=SkyClientCosmetics
-mod_version=1.2.0
+mod_version=1.2.1
 mod_archives_name=SkyClientCosmetics
 
 # Gradle Configuration -- DO NOT TOUCH THESE VALUES.

src/main/java/co/skyclient/scc/SkyclientCosmetics.java

@@ -90,7 +90,7 @@ public void onPreInit(FMLPreInitializationEvent event) {
 
         Files.setup();
 
-        progress.step("Loading Vigilance");
+        progress.step("Loading config");
 
         config = new Settings();
         config.preload();

src/main/java/co/skyclient/scc/hooks/GuiPlayerTabOverlayHook.java

@@ -0,0 +1,23 @@
+package co.skyclient.scc.hooks;
+
+import cc.polyfrost.oneconfig.utils.hypixel.HypixelUtils;
+import co.skyclient.scc.SkyclientCosmetics;
+import co.skyclient.scc.config.Settings;
+import co.skyclient.scc.cosmetics.Tag;
+import net.minecraft.client.network.NetworkPlayerInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+public class GuiPlayerTabOverlayHook {
+    public static void iHateMixinZeroPointSeven(NetworkPlayerInfo networkPlayerInfoIn, CallbackInfoReturnable<String> cir) {
+        if (SkyclientCosmetics.config.enabled) {
+            if (Settings.showTags) {
+                if (HypixelUtils.INSTANCE.isHypixel()) {
+                    Tag tag = ((NetworkPlayerInfoHook) networkPlayerInfoIn).scc$getTag();
+                    if (tag != null) {
+                        cir.setReturnValue(tag.getTag() + " " + cir.getReturnValue());
+                    }
+                }
+            }
+        }
+    }
+}

src/main/java/co/skyclient/scc/listeners/TagListeners.java

@@ -48,7 +48,7 @@ public class TagListeners {
     private static final HashMap<String, String> filteredPotentialRanks = new HashMap<>(50);
     public static Map<String, String> nametags = new HashMap<>(400);
 
-    @SubscribeEvent
+    @SubscribeEvent(priority = EventPriority.LOWEST)
     public void onChatMsgTags(ClientChatReceivedEvent event) {
         if (SkyclientCosmetics.config.enabled && Settings.showTags && HypixelUtils.INSTANCE.isHypixel()) {
             try {
@@ -72,7 +72,7 @@ public void onChatMsgTags(ClientChatReceivedEvent event) {
         }
     }
 
-    @SubscribeEvent
+    @SubscribeEvent(priority = EventPriority.LOWEST)
     public void onTooltip(ItemTooltipEvent event) {
         if (SkyclientCosmetics.config.enabled && Settings.showTags && HypixelUtils.INSTANCE.isHypixel()) {
             for (int i = 0; i < event.toolTip.size(); i++) {
@@ -87,7 +87,7 @@ public void onTooltip(ItemTooltipEvent event) {
         }
     }
 
-    @SubscribeEvent(priority = EventPriority.LOW)
+    @SubscribeEvent(priority = EventPriority.LOWEST)
     public void onRenderLiving(RenderLivingEvent.Specials.Pre<EntityLivingBase> event) {
         if (SkyclientCosmetics.config.enabled && Settings.showTags && HypixelUtils.INSTANCE.isHypixel()) {
             Entity entity = event.entity;
@@ -115,7 +115,7 @@ public void onRenderLiving(RenderLivingEvent.Specials.Pre<EntityLivingBase> even
         }
     }
 
-    @SubscribeEvent
+    @SubscribeEvent(priority = EventPriority.LOWEST)
     public void onWorldChange(WorldEvent.Load event) {
         nametags.clear();
     }

src/main/java/co/skyclient/scc/mixins/GuiPlayerTabOverlayMixin.java

@@ -1,10 +1,6 @@
 package co.skyclient.scc.mixins;
 
-import cc.polyfrost.oneconfig.utils.hypixel.HypixelUtils;
-import co.skyclient.scc.SkyclientCosmetics;
-import co.skyclient.scc.config.Settings;
-import co.skyclient.scc.cosmetics.Tag;
-import co.skyclient.scc.hooks.NetworkPlayerInfoHook;
+import co.skyclient.scc.hooks.GuiPlayerTabOverlayHook;
 import net.minecraft.client.gui.GuiPlayerTabOverlay;
 import net.minecraft.client.network.NetworkPlayerInfo;
 import org.spongepowered.asm.mixin.Mixin;
@@ -16,11 +12,6 @@
 public class GuiPlayerTabOverlayMixin {
     @Inject(method = "getPlayerName", at = @At("RETURN"), cancellable = true)
     private void getPlayerName(NetworkPlayerInfo networkPlayerInfoIn, CallbackInfoReturnable<String> cir) {
-        if (SkyclientCosmetics.config.enabled && Settings.showTags && HypixelUtils.INSTANCE.isHypixel()) {
-            Tag tag = ((NetworkPlayerInfoHook) networkPlayerInfoIn).scc$getTag();
-            if (tag != null) {
-                cir.setReturnValue(tag.getTag() + " " + cir.getReturnValue());
-            }
-        }
+        GuiPlayerTabOverlayHook.iHateMixinZeroPointSeven(networkPlayerInfoIn, cir);
     }
 }