Misc Cleanup

.editorconfig

@@ -9,4 +9,4 @@ ij_java_use_single_class_imports = true
 
 [*.json]
 indent_size = 2
-charset = utf-8
+charset = utf-8

.gitignore

@@ -30,4 +30,4 @@ run
 Thumbs.db
 .vscode
 
-versions/*/tmp.srg
+versions/*/tmp.srg

README.md

@@ -4,7 +4,7 @@
   <summary>Bug Fixes</summary>
 
 # Bug Fixes
-- **Keep Shaders on Perspective change** - Resolve Vanilla shaders being cleared when changing perspective. *default
+- **Keep Shaders on Perspective Change** - Resolve Vanilla shaders being cleared when changing perspective. *default
 - **Parallax Fix** - Resolve the camera being too far back, seemingly making your eyes be in the back of your head. (Currently makes the F3 crosshair disappear.) **[MC-1846](https://bugs.mojang.com/browse/MC-1846)**.
 - **Culling Fix** - Resolve false negatives in frustum culling, creating invisible chunks in some cases. (Can negatively impact performance.) **[MC-63020](https://bugs.mojang.com/browse/MC-63020)** & **[MC-70850](https://bugs.mojang.com/browse/MC-70850)**
 - **Layers In Tab** - Resolve players sometimes not having a hat layer in Tab. *default
@@ -41,9 +41,10 @@
 - **Log Optimizer** - Delete all files in the logs folder, as these can usually take up a lot of space. (These files are not recoverable once deleted)
 - **Log Optimizer Amount** - Choose how many days old a file must be before being deleted.
 - **Better Camera** - Stop tall grass, plants, reeds, etc. from affecting your FOV as done in 1.14+. *default
-- **Better F1** - Hide nametags when in F1 mode. *default
+- **Better F1** - Hide nametags when in F1 mode.
 - **Remove Screen Bobbing** - While using View Bobbing, only remove the view aspect but have the hand still bounce around.
 - **Remove Map Bobbing** - While using View Bobbing, remove the hand bobbing when holding a map.
+- **Remove Vertical Bobbing** - While using View Bobbing, remove the vertical bobbing like in 1.14+.
 - **Static Items** - Stop items from bobbing up and down when dropped on the ground.
 - **Modify Every Sound** - Open a separate GUI allowing you to mute or amplify individual sounds.
 - **Zoom Adjustment** - Scroll when using OptiFine's zoom to adjust the zoom level. *default
@@ -154,6 +155,7 @@
 - **Chat Timestamps Format** - Change the time format of Chat Timestamps.
 - **Show Seconds on Timestamps** - Show the seconds on a timestamped message.
 - **Safe Chat Clicks** - Show the command or link that is run/opened on click.
+- **Safe Chat Clicks History** - Adds commands sent from clicking chat messages to the chat history.
 - **Damage Glance** - View the damage value of the currently held item above your hotbar.
 - **Item Count Glance** - View the total amount of the currently held item above your hotbar.
 - **Enchantment Glance** - View the enchantments of the currently held item above your hotbar.

build.gradle.kts

@@ -39,7 +39,7 @@ repositories {
     maven("https://repo.spongepowered.org/repository/maven-public/")
 }
 
-val embed by configurations.creating
+val embed: Configuration by configurations.creating
 configurations.implementation.get().extendsFrom(embed)
 
 dependencies {
@@ -72,4 +72,4 @@ tasks.jar {
         "TweakOrder" to "0",
         "MixinConfigs" to "patcher.mixins.json"
     ))
-}
+}

gradle.properties

@@ -7,4 +7,4 @@ org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.configureoncommand=true
 org.gradle.parallel.threads=4
-org.gradle.jvmargs=-Xmx2G
+org.gradle.jvmargs=-Xmx2G

root.gradle.kts

@@ -1,5 +1,3 @@
-import gg.essential.gradle.util.versionFromBuildIdAndBranch
-
 plugins {
     kotlin("jvm") version "1.8.22" apply false
     id("gg.essential.multi-version.root")

src/main/java/club/sk1er/patcher/Patcher.java

@@ -1,7 +1,9 @@
 package club.sk1er.patcher;
 
 import club.sk1er.patcher.asm.render.screen.GuiChatTransformer;
-import club.sk1er.patcher.commands.*;
+import club.sk1er.patcher.commands.InventoryScaleCommand;
+import club.sk1er.patcher.commands.PatcherCommand;
+import club.sk1er.patcher.commands.PatcherSoundsCommand;
 import club.sk1er.patcher.config.PatcherConfig;
 import club.sk1er.patcher.config.PatcherSoundConfig;
 import club.sk1er.patcher.ducks.FontRendererExt;
@@ -62,8 +64,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.awt.Toolkit;
-import java.awt.datatransfer.StringSelection;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -135,7 +135,6 @@ public void onInit(FMLInitializationEvent event) {
             new AsyncScreenshots.UploadScreenshot(), new AsyncScreenshots.CopyScreenshot(),
             new AsyncScreenshots.ScreenshotsFolder()
         );
-        EssentialAPI.getCommandRegistry().registerParser(PatcherPlayer.class, new PatcherPlayerArgumentParser());
 
         registerEvents(
             this, soundHandler, dropModifier, audioSwitcher,
@@ -191,7 +190,7 @@ public void onLoadComplete(FMLLoadCompleteEvent event) {
                 this.logger.error("Failed to open Forge website.", openException);
                 notifications.push("Patcher", "Failed to open Forge website. Link is now copied to your clipboard.");
                 try {
-                    Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(updateLink), null);
+                    UDesktop.setClipboardString(updateLink);
                 } catch (Exception clipboardException) {
                     // there is no hope
                     this.logger.error("Failed to copy Forge website to clipboard.", clipboardException);
@@ -405,7 +404,7 @@ private void detectReplacements(List<ModContainer> activeModList, Notifications
 
         if (!replacements.isEmpty()) {
             for (String replacement : replacements) {
-                notifications.push("Patcher", replacement + " can be removed as it is replaced by Patcher.", 6f);
+                notifications.push("Patcher", replacement + " can be removed as it is replaced by Patcher.", 6);
             }
         }
     }

src/main/java/club/sk1er/patcher/asm/external/forge/loader/JarDiscovererTransformer.java

@@ -2,7 +2,16 @@
 
 import club.sk1er.patcher.tweaker.transform.PatcherTransformer;
 import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.*;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.FieldInsnNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.InsnNode;
+import org.objectweb.asm.tree.JumpInsnNode;
+import org.objectweb.asm.tree.LabelNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.VarInsnNode;
 
 import java.util.ListIterator;
 

src/main/java/club/sk1er/patcher/asm/external/forge/render/screen/GuiIngameForgeTransformer.java

@@ -2,7 +2,12 @@
 
 import club.sk1er.patcher.tweaker.transform.PatcherTransformer;
 import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.*;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.IntInsnNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.VarInsnNode;
 
 import java.util.ListIterator;
 

src/main/java/club/sk1er/patcher/asm/external/lwjgl/WindowsDisplayTransformer.java

@@ -2,7 +2,13 @@
 
 import club.sk1er.patcher.tweaker.transform.PatcherTransformer;
 import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.*;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.InsnNode;
+import org.objectweb.asm.tree.IntInsnNode;
+import org.objectweb.asm.tree.JumpInsnNode;
+import org.objectweb.asm.tree.MethodNode;
 
 import java.util.ListIterator;
 

src/main/java/club/sk1er/patcher/asm/external/mods/optifine/EntityRendererTransformer.java

@@ -4,7 +4,16 @@
 import club.sk1er.patcher.tweaker.transform.PatcherTransformer;
 import net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper;
 import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.*;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.FieldInsnNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.InsnNode;
+import org.objectweb.asm.tree.LocalVariableNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.TypeInsnNode;
+import org.objectweb.asm.tree.VarInsnNode;
 
 import java.util.ListIterator;
 

src/main/java/club/sk1er/patcher/asm/external/mods/optifine/OptiFineHookTransformer.java

@@ -3,7 +3,13 @@
 import club.sk1er.patcher.tweaker.ClassTransformer;
 import club.sk1er.patcher.tweaker.transform.PatcherTransformer;
 import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.*;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.FieldInsnNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.InsnNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.VarInsnNode;
 
 public class OptiFineHookTransformer implements PatcherTransformer {
     @Override

src/main/java/club/sk1er/patcher/asm/external/mods/optifine/OptifineFontRendererTransformer.java

@@ -2,7 +2,11 @@
 
 import club.sk1er.patcher.tweaker.transform.PatcherTransformer;
 import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.*;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.IntInsnNode;
+import org.objectweb.asm.tree.JumpInsnNode;
+import org.objectweb.asm.tree.MethodNode;
 
 import java.util.ListIterator;
 

src/main/java/club/sk1er/patcher/asm/external/mods/optifine/RendererLivingEntityTransformer.java

@@ -2,7 +2,18 @@
 
 import club.sk1er.patcher.tweaker.transform.CommonTransformer;
 import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.*;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.InsnNode;
+import org.objectweb.asm.tree.JumpInsnNode;
+import org.objectweb.asm.tree.LabelNode;
+import org.objectweb.asm.tree.LdcInsnNode;
+import org.objectweb.asm.tree.LocalVariableNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.TypeInsnNode;
+import org.objectweb.asm.tree.VarInsnNode;
 
 import java.util.ListIterator;
 

src/main/java/club/sk1er/patcher/asm/external/mods/optifine/reflectionoptimizations/common/ExtendedBlockStorageReflectionOptimizer.java

@@ -2,7 +2,13 @@
 
 import club.sk1er.patcher.tweaker.transform.PatcherTransformer;
 import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.*;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.TypeInsnNode;
+import org.objectweb.asm.tree.VarInsnNode;
 
 import java.util.Iterator;
 

src/main/java/club/sk1er/patcher/asm/network/NetHandlerPlayClientTransformer.java

@@ -3,7 +3,14 @@
 import club.sk1er.patcher.asm.network.packet.S0EPacketSpawnObjectTransformer;
 import club.sk1er.patcher.tweaker.transform.PatcherTransformer;
 import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.*;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.InsnNode;
+import org.objectweb.asm.tree.JumpInsnNode;
+import org.objectweb.asm.tree.LabelNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
 
 import java.util.ListIterator;
 

src/main/java/club/sk1er/patcher/asm/network/packet/S34PacketMapsTransformer.java

@@ -2,7 +2,15 @@
 
 import club.sk1er.patcher.tweaker.transform.PatcherTransformer;
 import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.*;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.FieldInsnNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.InsnNode;
+import org.objectweb.asm.tree.JumpInsnNode;
+import org.objectweb.asm.tree.LabelNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.VarInsnNode;
 
 import java.util.ListIterator;
 

src/main/java/club/sk1er/patcher/asm/render/particle/EffectRendererTransformer.java

@@ -2,7 +2,13 @@
 
 import club.sk1er.patcher.tweaker.transform.PatcherTransformer;
 import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.*;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.LdcInsnNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.VarInsnNode;
 
 import java.util.ListIterator;
 

src/main/java/club/sk1er/patcher/asm/render/screen/GuiChatTransformer.java

@@ -2,7 +2,18 @@
 
 import club.sk1er.patcher.tweaker.transform.PatcherTransformer;
 import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.*;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.FieldInsnNode;
+import org.objectweb.asm.tree.FieldNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.InsnNode;
+import org.objectweb.asm.tree.JumpInsnNode;
+import org.objectweb.asm.tree.LabelNode;
+import org.objectweb.asm.tree.LdcInsnNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.VarInsnNode;
 
 import java.util.ListIterator;
 

src/main/java/club/sk1er/patcher/asm/render/screen/GuiNewChatTransformer.java

@@ -1,10 +1,8 @@
 package club.sk1er.patcher.asm.render.screen;
 
 import club.sk1er.patcher.tweaker.transform.CommonTransformer;
-import org.objectweb.asm.tree.*;
-
-import java.util.Iterator;
-import java.util.ListIterator;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.MethodNode;
 
 public class GuiNewChatTransformer implements CommonTransformer {
     /**

src/main/java/club/sk1er/patcher/asm/render/world/RenderGlobalTransformer.java

@@ -2,7 +2,14 @@
 
 import club.sk1er.patcher.tweaker.transform.PatcherTransformer;
 import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.*;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.JumpInsnNode;
+import org.objectweb.asm.tree.LabelNode;
+import org.objectweb.asm.tree.LdcInsnNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
 
 import java.util.ListIterator;
 

src/main/java/club/sk1er/patcher/asm/render/world/entity/LayerCustomHeadTransformer.java

@@ -2,7 +2,16 @@
 
 import club.sk1er.patcher.tweaker.transform.PatcherTransformer;
 import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.*;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.FieldInsnNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.JumpInsnNode;
+import org.objectweb.asm.tree.LabelNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.TypeInsnNode;
+import org.objectweb.asm.tree.VarInsnNode;
 
 import java.util.ListIterator;
 

src/main/java/club/sk1er/patcher/commands/PatcherCommand.java

@@ -20,8 +20,6 @@
 public class PatcherCommand extends Command {
 
     private final Minecraft mc = Minecraft.getMinecraft();
-    private final int randomBound = 85673;
-    public static int randomChatMessageId;
 
     public PatcherCommand() {
         super("patcher");
@@ -64,10 +62,10 @@ public void fov(@DisplayName("amount") float amount) {
     public void scale(@Options({"help", "off", "none", "small", "normal", "large", "auto", "0", "1", "2", "3", "4", "5"}) String argument) {
         if (argument.equalsIgnoreCase("help")) {
             ChatUtilities.sendMessage("             &eInventory Scale", false);
-            ChatUtilities.sendMessage("&7Usage: /inventoryscale <scaling>", false);
+            ChatUtilities.sendMessage("&7Usage: /patcher scale <scaling>", false);
             ChatUtilities.sendMessage("&7Scaling may be a number between 1-5, or", false);
             ChatUtilities.sendMessage("&7small/normal/large/auto", false);
-            ChatUtilities.sendMessage("&7Use '/inventoryscale off' to disable scaling.", false);
+            ChatUtilities.sendMessage("&7Use '/patcher scale off' to disable scaling.", false);
             return;
         }
 
@@ -106,7 +104,7 @@ public void scale(@Options({"help", "off", "none", "small", "normal", "large", "
             return;
         }
 
-        ChatUtilities.sendNotification("Inventory Scale", "Set inventory scaling to " + scaling);
+        ChatUtilities.sendNotification("Inventory Scale", "Set inventory scaling to " + scaling + ".");
         PatcherConfig.inventoryScale = scaling;
         Patcher.instance.forceSaveConfig();
     }