assorted code cleanup and bug fixes

Author: Wide-Cat

src/main/java/meteordevelopment/meteorclient/commands/commands/InputCommand.java

@@ -67,7 +67,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
         }
 
         for (KeyBinding keyBinding : mc.options.hotbarKeys) {
-            builder.then(literal(keyBinding.getBoundKeyTranslationKey().substring(4))
+            builder.then(literal(keyBinding.getId().substring(4))
                 .executes(context -> {
                     press(keyBinding);
                     return SINGLE_SUCCESS;
@@ -91,7 +91,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
                 info("Active keypress handlers: ");
                 for (int i = 0; i < activeHandlers.size(); i++) {
                     KeypressHandler handler = activeHandlers.get(i);
-                    info("(highlight)%d(default) - (highlight)%s %d(default) ticks left out of (highlight)%d(default).", i, I18n.translate(handler.key.getBoundKeyTranslationKey()), handler.ticks, handler.totalTicks);
+                    info("(highlight)%d(default) - (highlight)%s %d(default) ticks left out of (highlight)%d(default).", i, I18n.translate(handler.key.getId()), handler.ticks, handler.totalTicks);
                 }
             }
             return SINGLE_SUCCESS;

src/main/java/meteordevelopment/meteorclient/commands/commands/SpectateCommand.java

@@ -10,6 +10,7 @@
 import meteordevelopment.meteorclient.commands.Command;
 import meteordevelopment.meteorclient.commands.arguments.PlayerArgumentType;
 import meteordevelopment.meteorclient.events.meteor.KeyEvent;
+import meteordevelopment.meteorclient.events.meteor.MouseButtonEvent;
 import meteordevelopment.meteorclient.utils.misc.input.Input;
 import meteordevelopment.orbit.EventHandler;
 import net.minecraft.command.CommandSource;
@@ -47,5 +48,14 @@ private void onKey(KeyEvent event) {
                 MeteorClient.EVENT_BUS.unsubscribe(this);
             }
         }
+
+        @EventHandler
+        private void onMouse(MouseButtonEvent event) {
+            if (Input.isPressed(mc.options.sneakKey)) {
+                mc.setCameraEntity(mc.player);
+                event.cancel();
+                MeteorClient.EVENT_BUS.unsubscribe(this);
+            }
+        }
     }
 }

src/main/java/meteordevelopment/meteorclient/gui/WidgetScreen.java

@@ -118,8 +118,7 @@ public void onClosed(Runnable action) {
     }
 
     @Override
-    // todo rename bl when appropriate
-    public boolean mouseClicked(Click arg, boolean bl) {
+    public boolean mouseClicked(Click arg, boolean doubled) {
         if (locked) return false;
 
         double mouseX = arg.x();
@@ -129,7 +128,7 @@ public boolean mouseClicked(Click arg, boolean bl) {
         mouseX *= s;
         mouseY *= s;
 
-        return root.mouseClicked(mouseX, mouseY, arg.button(), bl);
+        return root.mouseClicked(mouseX, mouseY, arg.button(), doubled);
     }
 
     @Override

src/main/java/meteordevelopment/meteorclient/mixin/CapeFeatureRendererMixin.java

@@ -24,7 +24,7 @@ public abstract class CapeFeatureRendererMixin {
     private AssetInfo.TextureAsset modifyCapeTexture(AssetInfo.TextureAsset original, MatrixStack matrices, OrderedRenderCommandQueue entityRenderCommandQueue, int i, PlayerEntityRenderState state, float f, float g) {
         if (((IEntityRenderState) state).meteor$getEntity() instanceof PlayerEntity player) {
             Identifier id = Capes.get(player);
-            return id == null ? original : new AssetInfo.TextureAssetInfo(id);
+            return id == null ? original : new AssetInfo.TextureAssetInfo(id, id);
         }
 
         return original;

src/main/java/meteordevelopment/meteorclient/mixin/HandledScreenMixin.java

@@ -102,7 +102,7 @@ private void onMouseDragged(Click arg, double d, double e, CallbackInfoReturnabl
 
     // Middle click open
     @Inject(method = "mouseClicked", at = @At("HEAD"), cancellable = true)
-    private void mouseClicked(Click arg, boolean bl, CallbackInfoReturnable<Boolean> cir) {
+    private void mouseClicked(Click arg, boolean doubled, CallbackInfoReturnable<Boolean> cir) {
         BetterTooltips tooltips = Modules.get().get(BetterTooltips.class);
 
         if (arg.button() == GLFW.GLFW_MOUSE_BUTTON_MIDDLE && focusedSlot != null && !focusedSlot.getStack().isEmpty() && getScreenHandler().getCursorStack().isEmpty() && tooltips.middleClickOpen()) {

src/main/java/meteordevelopment/meteorclient/mixin/KeyboardMixin.java

@@ -30,7 +30,7 @@ public abstract class KeyboardMixin {
     @Shadow @Final private MinecraftClient client;
 
     @Inject(method = "onKey", at = @At("HEAD"), cancellable = true)
-    public void onKey(long window, int action, KeyInput arg, CallbackInfo ci) { // todo verify this is correct when they update the mappings
+    public void onKey(long window, int action, KeyInput arg, CallbackInfo ci) {
         int modifiers = arg.modifiers();
         if (arg.key() != GLFW.GLFW_KEY_UNKNOWN) {
             // on Linux/X11 the modifier is not active when the key is pressed and still active when the key is released

src/main/java/meteordevelopment/meteorclient/mixin/MapRendererMixin.java

@@ -28,7 +28,7 @@ private List<MapDecoration> getIconsProxy(List<MapDecoration> original) {
     }
 
     @Inject(method = "draw", at = @At("HEAD"), cancellable = true)
-    private void onDraw(MapRenderState state, MatrixStack matrices, OrderedRenderCommandQueue queue, boolean bl, int light, CallbackInfo ci) {
+    private void onDraw(MapRenderState state, MatrixStack matrices, OrderedRenderCommandQueue queue, boolean skipRenderingDecorations, int light, CallbackInfo ci) {
         if (Modules.get().get(NoRender.class).noMapContents()) ci.cancel();
     }
 }

src/main/java/meteordevelopment/meteorclient/mixin/MultiplayerScreenMixin.java

@@ -63,8 +63,11 @@ private void onInit(CallbackInfo info) {
         );
     }
 
-    //@Inject(method = "render", at = @At("TAIL"))
-    private void onRender(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+    // todo this is probably an extremely bad way of doing it but it works for now
+    @Override
+    public void render(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
+        super.render(context, mouseX, mouseY, deltaTicks);
+
         int x = 3;
         int y = 3;
 

src/main/java/meteordevelopment/meteorclient/mixin/TitleScreenMixin.java

@@ -31,7 +31,7 @@ private void onRender(DrawContext context, int mouseX, int mouseY, float delta,
     }
 
     @Inject(method = "mouseClicked", at = @At("HEAD"), cancellable = true)
-    private void onMouseClicked(Click arg, boolean bl, CallbackInfoReturnable<Boolean> cir) {
+    private void onMouseClicked(Click arg, boolean doubled, CallbackInfoReturnable<Boolean> cir) {
         if (Config.get().titleScreenCredits.get() && arg.button() == GLFW.GLFW_MOUSE_BUTTON_LEFT) {
             if (TitleScreenCredits.onClicked(arg.x(), arg.y())) cir.setReturnValue(true);
         }

src/main/java/meteordevelopment/meteorclient/systems/hud/screens/HudEditorScreen.java

@@ -67,7 +67,7 @@ public HudEditorScreen(GuiTheme theme) {
     public void initWidgets() {}
 
     @Override
-    public boolean mouseClicked(Click arg, boolean bl) {
+    public boolean mouseClicked(Click arg, boolean doubled) {
         double s = mc.getWindow().getScaleFactor();
 
         double mouseX = arg.x();