Removed dubious ghost pickaxe feature as it could be considered a cheat

Improved custom chroma text to detect bold characters

Author: Ownwn

src/main/java/com/ownwn/ownwnaddons/OwnwnAddons.java

@@ -56,7 +56,6 @@ public void onFMLInitialization(net.minecraftforge.fml.common.event.FMLInitializ
         MinecraftForge.EVENT_BUS.register(new DungeonsMimicAlert());
         MinecraftForge.EVENT_BUS.register(new OwaDevMode());
         MinecraftForge.EVENT_BUS.register(new ThirdPersonFOV());
-        //MinecraftForge.EVENT_BUS.register(new LoreCustomiser());
         MinecraftForge.EVENT_BUS.register(new SecretStuff());
         MinecraftForge.EVENT_BUS.register(new GardenMilestoneMsg());
         MinecraftForge.EVENT_BUS.register(new TickUtils());

src/main/java/com/ownwn/ownwnaddons/features/dungeons/CreateGhostPick.java

@@ -7,7 +7,7 @@
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
 @Mixin(FontRenderer.class)
-public class MinecraftMixin {
+public class DrawStringMixin {
     @ModifyVariable(method = "drawString(Ljava/lang/String;FFIZ)I", at = @At(value = "HEAD"), argsOnly = true) // https://github.com/Cephetir/SkySkipped/blob/kotlin/src/main/java/me/cephetir/skyskipped/mixins/render/MixinFontRenderer.java
     public String drawText(String text) {
 

…wn/ownwnaddons/mixin/MinecraftMixin.java …n/ownwnaddons/mixin/DrawStringMixin.javasrc/main/java/com/ownwn/ownwnaddons/mixin/MinecraftMixin.java renamed to src/main/java/com/ownwn/ownwnaddons/mixin/DrawStringMixin.java src/main/java/com/ownwn/ownwnaddons/mixin/MinecraftMixin.java renamed to src/main/java/com/ownwn/ownwnaddons/mixin/DrawStringMixin.java

@@ -84,23 +84,32 @@ public static String replacePlayerName(String text) {
     }
 
     public static String replaceChromaMessages(String text) {
+
+
+
         if (Minecraft.getMinecraft().thePlayer == null) {
             return text;
         }
         if (NewConfig.CHROMA_TEXT_REPLACE.equals("")) {
             return text;
         }
-        String newColour;
+        String newColour = "§"; // no im not using a stringbuilder
 
         if (NewConfig.CHROMA_TYPE) {
-            newColour = ColourUtils.getColour();
+            newColour += ColourUtils.getColour();
         } else {
-            newColour = "z";
+            newColour += "z";
         }
 
         for (String replacementText: NewConfig.CHROMA_TEXT_REPLACE.replace("&&", "§").split(", ")) {
-            text = text.replace(replacementText, "§" + newColour + replacementText + "§r");
+            if (replacementText.startsWith("§l") || replacementText.startsWith("§l", 2)) {
+                newColour = newColour.replace("§l", "") + "§l";
+            } else {
+                newColour = newColour.replace("§l", "");
+            }
+            text = text.replace(replacementText, newColour + Utils.stripFormatting(replacementText) + "§r");
         }
+
         return text;
     }
 }

src/main/java/com/ownwn/ownwnaddons/utils/ColourUtils.java

@@ -3,16 +3,13 @@
 import cc.polyfrost.oneconfig.config.Config;
 import cc.polyfrost.oneconfig.config.annotations.Number;
 import cc.polyfrost.oneconfig.config.annotations.*;
-import cc.polyfrost.oneconfig.config.core.OneKeyBind;
 import cc.polyfrost.oneconfig.config.data.InfoType;
 import cc.polyfrost.oneconfig.config.data.Mod;
 import cc.polyfrost.oneconfig.config.data.ModType;
-import cc.polyfrost.oneconfig.libs.universal.UKeyboard;
 import com.ownwn.ownwnaddons.OwnwnAddons;
-import com.ownwn.ownwnaddons.features.dungeons.CreateGhostPick;
-import com.ownwn.ownwnaddons.features.dungeons.DungeonsTerminalDisplay;
 import com.ownwn.ownwnaddons.features.TrevorCooldown;
 import com.ownwn.ownwnaddons.features.TrevorLootTracker;
+import com.ownwn.ownwnaddons.features.dungeons.DungeonsTerminalDisplay;
 
 public class NewConfig extends Config {
 
@@ -37,14 +34,6 @@ public class NewConfig extends Config {
     )
     public static boolean CHECK_FOR_UPDATES = true;
 
-    @KeyBind(
-            name = "Create Ghost Pickaxe",
-            description = "Duplicates your current pickaxe client-side",
-            category = "Features",
-            subcategory = "Dungeons"
-    )
-    public static OneKeyBind GHOST_PICK_KEY = new OneKeyBind(UKeyboard.KEY_NONE);
-
     @Switch(
             name = "Mimic Alert",
             description = "Alerts you when a mimic spawns in dungeons.",
@@ -81,15 +70,6 @@ public class NewConfig extends Config {
     )
     public static float SECRET_CLICK_PITCH = 10f;
 
-//    @Text(
-//            name = "Lore Customiser",
-//            description = "Allows you to customise how the lore looks on items",
-//            multiline = true,
-//            category = "Features",
-//            subcategory = "Items"
-//    )
-//    public static String CUSTOM_TEXT_LORE = "";
-
     @Switch(
             name = "Debug Mode",
             description = "Should the mod write things like HTTP responses to the log?"
@@ -339,7 +319,6 @@ public NewConfig() {
         super(new Mod(OwnwnAddons.NAME, ModType.UTIL_QOL), OwnwnAddons.MODID + ".json");
 
         initialize();
-        registerKeyBind(GHOST_PICK_KEY, () -> CreateGhostPick.runnable.run());
 
         addDependency("CUSTOM_RANK_EDITOR", "CUSTOM_NAME_MODE", () -> CUSTOM_NAME_MODE == 0);
         addDependency("CUSTOM_NAME_EDITOR", "CUSTOM_NAME_MODE", () -> CUSTOM_NAME_MODE == 0);

src/main/java/com/ownwn/ownwnaddons/utils/NewConfig.java

@@ -7,7 +7,7 @@
     "maxShiftBy": 5
   },
   "client": [
-    "MinecraftMixin"
+    "DrawStringMixin"
   ],
   "verbose": true
 }