chore: mixin cleanup

quiteboring · quiteboring · commit be5c03b830b5 · 2026-02-14T09:52:43.000-05:00
diff --git a/.editorconfig b/.editorconfig
@@ -1,5 +1,3 @@
-# Thank you Twiston for this superb file!
-
 root = true
 
 [*]
diff --git a/src/main/java/org/cobalt/init/MixinAutoDiscover.java b/src/main/java/org/cobalt/init/MixinAutoDiscover.java
@@ -41,8 +41,7 @@ public void onLoad(String mixinPackage) {
         }
       }
     } catch (IOException | URISyntaxException e) {
-      System.err.println("Failed to auto-discover mixins: " + e.getMessage());
-      e.printStackTrace();
+      throw new RuntimeException(e);
     }
   }
 
diff --git a/src/main/java/org/cobalt/mixin/client/AddonList_CrashReportMixin.java b/src/main/java/org/cobalt/mixin/client/AddonList_CrashReportMixin.java
@@ -8,14 +8,11 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-/**
- * Superb mixin by oblongboot!
- */
 @Mixin(CrashReport.class)
 public abstract class AddonList_CrashReportMixin {
 
   @Inject(method = "getDetails(Ljava/lang/StringBuilder;)V", at = @At("HEAD"))
-  private void addAddonInfo(StringBuilder crashReportBuilder, CallbackInfo ci) {
+  private void addAddonInfo(StringBuilder crashReportBuilder, CallbackInfo callbackInfo) {
     String addons = AddonLoader.INSTANCE.getAddons().stream()
       .map(info -> info.getFirst().getName() + " v" + info.getFirst().getVersion())
       .collect(Collectors.joining(", "));
@@ -24,12 +21,10 @@ private void addAddonInfo(StringBuilder crashReportBuilder, CallbackInfo ci) {
       addons = "None";
     }
 
-    int count = AddonLoader.INSTANCE.getAddons().size();
-
     crashReportBuilder
       .append("\n========================================")
       .append("\nCobalt Addons (")
-      .append(count)
+      .append(AddonLoader.INSTANCE.getAddons().size())
       .append("): ")
       .append(addons)
       .append("\n========================================\n");
diff --git a/src/main/java/org/cobalt/mixin/client/BlockChangeEvent_ClientPlayerInteractionManagerMixin.java b/src/main/java/org/cobalt/mixin/client/BlockChangeEvent_ClientPlayerInteractionManagerMixin.java
@@ -11,18 +11,18 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(Level.class)
-abstract class BlockBreak_ClientPlayerInteractionManagerMixin {
+abstract class BlockChangeEvent_ClientPlayerInteractionManagerMixin {
 
   @Inject(method = "setBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;II)Z", at = @At("HEAD"))
-  private void onBlockChange(BlockPos pos, BlockState newState, int flags, int maxUpdateDepth, CallbackInfoReturnable<Boolean> cir) {
+  private void onBlockChange(BlockPos blockPos, BlockState newBlockState, int flags, int maxUpdateDepth, CallbackInfoReturnable<Boolean> callbackInfoReturnable) {
     if (Minecraft.getInstance().level != (Object) this) {
       return;
     }
 
-    BlockState oldBlock = ((Level) (Object) this).getBlockState(pos);
+    BlockState oldBlockState = ((Level) (Object) this).getBlockState(blockPos);
 
-    if (oldBlock.getBlock() != newState.getBlock()) {
-      new BlockChangeEvent(pos.immutable(), oldBlock, newState).post();
+    if (oldBlockState.getBlock() != newBlockState.getBlock()) {
+      new BlockChangeEvent(blockPos.immutable(), oldBlockState, newBlockState).post();
     }
   }
 
diff --git a/src/main/java/org/cobalt/mixin/client/MouseEvent_MouseHandlerMixin.java b/src/main/java/org/cobalt/mixin/client/MouseEvent_MouseHandlerMixin.java
@@ -0,0 +1,34 @@
+package org.cobalt.mixin.client;
+
+import net.minecraft.client.MouseHandler;
+import net.minecraft.client.input.MouseButtonInfo;
+import org.cobalt.api.event.impl.client.MouseEvent;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(MouseHandler.class)
+public class MouseEvent_MouseHandlerMixin {
+
+  @Inject(method = "onButton", at = @At("HEAD"), cancellable = true)
+  private void onMouseButton(long window, MouseButtonInfo input, int action, CallbackInfo ci) {
+    MouseEvent event = cobalt$createMouseEvent(input.button(), action == 1);
+
+    if (event != null && event.post()) {
+      ci.cancel();
+    }
+  }
+
+  @Unique
+  private MouseEvent cobalt$createMouseEvent(int button, boolean isDown) {
+    return switch (button) {
+      case 0 -> isDown ? new MouseEvent.LeftClick(button) : new MouseEvent.LeftRelease(button);
+      case 1 -> isDown ? new MouseEvent.RightClick(button) : new MouseEvent.RightRelease(button);
+      case 2 -> isDown ? new MouseEvent.MiddleClick(button) : new MouseEvent.MiddleRelease(button);
+      default -> null;
+    };
+  }
+
+}
diff --git a/src/main/java/org/cobalt/mixin/client/MouseHandlerEvent_MouseHandlerMixin.java b/src/main/java/org/cobalt/mixin/client/MouseHandlerEvent_MouseHandlerMixin.java
diff --git a/src/main/java/org/cobalt/mixin/client/TickEvent_MinecraftMixin.java b/src/main/java/org/cobalt/mixin/client/TickEvent_MinecraftMixin.java
@@ -11,13 +11,15 @@
 public class TickEvent_MinecraftMixin {
 
   @Inject(at = @At("HEAD"), method = "tick")
-  private void onStartTick(CallbackInfo info) {
-    new TickEvent.Start().post();
+  private void onStartTick(CallbackInfo callbackInfo) {
+    TickEvent.Start startTickEvent = new TickEvent.Start();
+    startTickEvent.post();
   }
 
   @Inject(at = @At("RETURN"), method = "tick")
-  private void onEndTick(CallbackInfo info) {
-    new TickEvent.End().post();
+  private void onEndTick(CallbackInfo callbackInfo) {
+    TickEvent.End endTickEvent = new TickEvent.End();
+    endTickEvent.post();
   }
 
 }
diff --git a/src/main/java/org/cobalt/mixin/client/UnloadAddons_MinecraftMixin.java b/src/main/java/org/cobalt/mixin/client/UnloadAddons_MinecraftMixin.java
@@ -1,18 +1,24 @@
 package org.cobalt.mixin.client;
 
+import kotlin.Pair;
 import net.minecraft.client.Minecraft;
+import org.cobalt.api.addon.Addon;
+import org.cobalt.api.addon.AddonMetadata;
 import org.cobalt.internal.loader.AddonLoader;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import java.util.List;
 
 @Mixin(Minecraft.class)
 public class UnloadAddons_MinecraftMixin {
 
   @Inject(method = "close", at = @At("HEAD"))
-  public void onClose(CallbackInfo ci) {
-    AddonLoader.INSTANCE.getAddons().forEach((addon) -> {
+  public void onClose(CallbackInfo callbackInfo) {
+    List<Pair<AddonMetadata, Addon>> addonsList = AddonLoader.INSTANCE.getAddons();
+
+    addonsList.forEach((addon) -> {
       addon.getSecond().onUnload();
     });
   }
diff --git a/src/main/java/org/cobalt/mixin/network/PacketEvent_ConnectionMixin.java b/src/main/java/org/cobalt/mixin/network/PacketEvent_ConnectionMixin.java
@@ -19,12 +19,11 @@
 public class PacketEvent_ConnectionMixin {
 
   @Inject(method = "genericsFtw", at = @At("HEAD"), cancellable = true)
-  private static void onPacketReceived(Packet<?> packet, PacketListener listener, CallbackInfo ci) {
-    PacketEvent.Incoming event = new PacketEvent.Incoming(packet);
-    event.post();
+  private static void onPacketReceived(Packet<?> packet, PacketListener listener, CallbackInfo callbackInfo) {
+    PacketEvent.Incoming incomingPacketEvent = new PacketEvent.Incoming(packet);
 
-    if (event.isCancelled()) {
-      ci.cancel();
+    if (incomingPacketEvent.post()) {
+      callbackInfo.cancel();
       return;
     }
 
@@ -33,13 +32,12 @@ private static void onPacketReceived(Packet<?> packet, PacketListener listener,
     }
   }
 
-  @Inject(method = "sendPacket", at = @At("HEAD"))
-  private void onPacketSent(Packet<?> packet, ChannelFutureListener listener, boolean flush, CallbackInfo ci) {
-    PacketEvent.Outgoing event = new PacketEvent.Outgoing(packet);
-    event.post();
+  @Inject(method = "sendPacket", at = @At("HEAD"), cancellable = true)
+  private void onPacketSent(Packet<?> packet, ChannelFutureListener listener, boolean flush, CallbackInfo callbackInfo) {
+    PacketEvent.Outgoing outgoingPacketEvent = new PacketEvent.Outgoing(packet);
 
-    if (event.isCancelled()) {
-      ci.cancel();
+    if (outgoingPacketEvent.post()) {
+      callbackInfo.cancel();
       return;
     }
 
diff --git a/src/main/java/org/cobalt/mixin/player/LookLock_MouseHandlerMixin.java b/src/main/java/org/cobalt/mixin/player/LookLock_MouseHandlerMixin.java
@@ -20,28 +20,27 @@ public abstract class LookLock_MouseHandlerMixin {
   public abstract void releaseMouse();
 
   @Inject(method = "turnPlayer", at = @At("HEAD"), cancellable = true)
-  private void onUpdateMouse(CallbackInfo ci) {
+  private void onUpdateMouse(CallbackInfo callbackInfo) {
     if (MovementManager.isLookLocked) {
-      ci.cancel();
+      callbackInfo.cancel();
     }
   }
 
-  // might as well fit in ungrab mouse here as well
   @Inject(method = "isMouseGrabbed", at = @At("HEAD"), cancellable = true)
-  private void onIsCursorLocked(CallbackInfoReturnable<Boolean> cir) {
+  private void onIsCursorLocked(CallbackInfoReturnable<Boolean> callbackInfoReturnable) {
     if (MouseUtils.isMouseUngrabbed()) {
       if (this.mouseGrabbed) {
         this.releaseMouse();
       }
 
-      cir.setReturnValue(false);
+      callbackInfoReturnable.setReturnValue(false);
     }
   }
 
   @Inject(method = "grabMouse", at = @At("HEAD"), cancellable = true)
-  private void onLockCursor(CallbackInfo ci) {
+  private void onLockCursor(CallbackInfo callbackInfo) {
     if (MouseUtils.isMouseUngrabbed()) {
-      ci.cancel();
+      callbackInfo.cancel();
     }
   }
 
diff --git a/src/main/java/org/cobalt/mixin/render/NvgEvent_GameRendererMixin.java b/src/main/java/org/cobalt/mixin/render/NvgEvent_GameRendererMixin.java
@@ -11,8 +11,8 @@
 @Mixin(GameRenderer.class)
 public class NvgEvent_GameRendererMixin {
 
-  @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/render/GuiRenderer;incrementFrameNumber()V", shift = At.Shift.AFTER), cancellable = true)
-  public void renderNvg(DeltaTracker counter, boolean tick, CallbackInfo ci) {
+  @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/render/GuiRenderer;incrementFrameNumber()V", shift = At.Shift.AFTER))
+  public void renderNvg(DeltaTracker counter, boolean tick, CallbackInfo callbackInfo) {
     new NvgEvent().post();
   }
 
diff --git a/src/main/java/org/cobalt/mixin/render/TextureTracking_GlStateManagerMixin.java b/src/main/java/org/cobalt/mixin/render/TextureTracking_GlStateManagerMixin.java
@@ -17,12 +17,12 @@
 public class TextureTracking_GlStateManagerMixin {
 
   @Inject(method = "_bindTexture", at = @At("HEAD"), remap = false)
-  private static void onBindTexture(int texture, CallbackInfo ci) {
+  private static void onBindTexture(int texture, CallbackInfo callbackInfo) {
     TextureTracker.setPrevBoundTexture(texture);
   }
 
   @Inject(method = "_activeTexture", at = @At("HEAD"), remap = false)
-  private static void onActiveTexture(int texture, CallbackInfo ci) {
+  private static void onActiveTexture(int texture, CallbackInfo callbackInfo) {
     TextureTracker.setPrevActiveTexture(texture);
   }
 
diff --git a/src/main/java/org/cobalt/mixin/render/WorldContext_LevelRendererMixin.java b/src/main/java/org/cobalt/mixin/render/WorldContext_LevelRendererMixin.java
@@ -35,7 +35,7 @@ public class WorldContext_LevelRendererMixin {
   private RenderBuffers renderBuffers;
 
   @Inject(method = "renderLevel", at = @At("HEAD"))
-  private void render(GraphicsResourceAllocator allocator, DeltaTracker tickCounter, boolean renderBlockOutline, Camera camera, Matrix4f positionMatrix, Matrix4f matrix4f, Matrix4f projectionMatrix, GpuBufferSlice fogBuffer, Vector4f fogColor, boolean renderSky, CallbackInfo ci) {
+  private void render(GraphicsResourceAllocator allocator, DeltaTracker tickCounter, boolean renderBlockOutline, Camera camera, Matrix4f positionMatrix, Matrix4f matrix4f, Matrix4f projectionMatrix, GpuBufferSlice fogBuffer, Vector4f fogColor, boolean renderSky, CallbackInfo callbackInfo) {
     ctx.setConsumers(renderBuffers.bufferSource());
     ctx.setCamera(camera);
     new WorldRenderEvent.Start(ctx).post();
@@ -49,7 +49,7 @@ private Frustum onSetupFrustum(Frustum frustum) {
   }
 
   @Inject(method = "method_62214", at = @At("RETURN"))
-  private void postRender(GpuBufferSlice gpuBufferSlice, LevelRenderState levelRenderState, ProfilerFiller profilerFiller, Matrix4f matrix4f, ResourceHandle resourceHandle, ResourceHandle resourceHandle2, boolean bl, ResourceHandle resourceHandle3, ResourceHandle resourceHandle4, CallbackInfo ci) {
+  private void postRender(GpuBufferSlice gpuBufferSlice, LevelRenderState levelRenderState, ProfilerFiller profilerFiller, Matrix4f matrix4f, ResourceHandle resourceHandle, ResourceHandle resourceHandle2, boolean bl, ResourceHandle resourceHandle3, ResourceHandle resourceHandle4, CallbackInfo callbackInfo) {
     new WorldRenderEvent.Last(ctx).post();
   }
 
diff --git a/src/main/java/org/cobalt/mixin/rsa/RSANuker_YggdrasilServicesKeyInfoMixin.java b/src/main/java/org/cobalt/mixin/rsa/RSANuker_YggdrasilServicesKeyInfoMixin.java
@@ -6,9 +6,6 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-/**
- * Thank you Twiston for this superb class
- */
 @Mixin(value = YggdrasilServicesKeyInfo.class, remap = false)
 public class RSANuker_YggdrasilServicesKeyInfoMixin {
 
diff --git a/src/main/kotlin/org/cobalt/api/rotation/EasingType.kt b/src/main/kotlin/org/cobalt/api/rotation/EasingType.kt
@@ -2,9 +2,6 @@ package org.cobalt.api.rotation
 
 import kotlin.math.*
 
-/**
- * Thank you oblongboot for this superb enum!
- */
 enum class EasingType(val ease: (Float) -> Float) {
 
   LINEAR({ it }),

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# Thank you Twiston for this superb file!`
`2`		`-`
`3`	`1`	`root = true`
`4`	`2`
`5`	`3`	`[*]`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,7 @@ public void onLoad(String mixinPackage) {`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`} catch (IOException \| URISyntaxException e) {`
`44`		`- System.err.println("Failed to auto-discover mixins: " + e.getMessage());`
`45`		`- e.printStackTrace();`
	`44`	`+ throw new RuntimeException(e);`
`46`	`45`	`}`
`47`	`46`	`}`
`48`	`47`
Original file line number	Diff line number	Diff line change
`@@ -11,18 +11,18 @@`
`11`	`11`	`import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;`
`12`	`12`
`13`	`13`	`@Mixin(Level.class)`
`14`		`-abstract class BlockBreak_ClientPlayerInteractionManagerMixin {`
	`14`	`+abstract class BlockChangeEvent_ClientPlayerInteractionManagerMixin {`
`15`	`15`
`16`	`16`	`@Inject(method = "setBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;II)Z", at = @At("HEAD"))`
`17`		`- private void onBlockChange(BlockPos pos, BlockState newState, int flags, int maxUpdateDepth, CallbackInfoReturnable<Boolean> cir) {`
	`17`	`+ private void onBlockChange(BlockPos blockPos, BlockState newBlockState, int flags, int maxUpdateDepth, CallbackInfoReturnable<Boolean> callbackInfoReturnable) {`
`18`	`18`	`if (Minecraft.getInstance().level != (Object) this) {`
`19`	`19`	`return;`
`20`	`20`	`}`
`21`	`21`
`22`		`- BlockState oldBlock = ((Level) (Object) this).getBlockState(pos);`
	`22`	`+ BlockState oldBlockState = ((Level) (Object) this).getBlockState(blockPos);`
`23`	`23`
`24`		`- if (oldBlock.getBlock() != newState.getBlock()) {`
`25`		`- new BlockChangeEvent(pos.immutable(), oldBlock, newState).post();`
	`24`	`+ if (oldBlockState.getBlock() != newBlockState.getBlock()) {`
	`25`	`+ new BlockChangeEvent(blockPos.immutable(), oldBlockState, newBlockState).post();`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,15 @@`
`11`	`11`	`public class TickEvent_MinecraftMixin {`
`12`	`12`
`13`	`13`	`@Inject(at = @At("HEAD"), method = "tick")`
`14`		`- private void onStartTick(CallbackInfo info) {`
`15`		`- new TickEvent.Start().post();`
	`14`	`+ private void onStartTick(CallbackInfo callbackInfo) {`
	`15`	`+ TickEvent.Start startTickEvent = new TickEvent.Start();`
	`16`	`+ startTickEvent.post();`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`@Inject(at = @At("RETURN"), method = "tick")`
`19`		`- private void onEndTick(CallbackInfo info) {`
`20`		`- new TickEvent.End().post();`
	`20`	`+ private void onEndTick(CallbackInfo callbackInfo) {`
	`21`	`+ TickEvent.End endTickEvent = new TickEvent.End();`
	`22`	`+ endTickEvent.post();`
`21`	`23`	`}`
`22`	`24`
`23`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,28 +20,27 @@ public abstract class LookLock_MouseHandlerMixin {`
`20`	`20`	`public abstract void releaseMouse();`
`21`	`21`
`22`	`22`	`@Inject(method = "turnPlayer", at = @At("HEAD"), cancellable = true)`
`23`		`- private void onUpdateMouse(CallbackInfo ci) {`
	`23`	`+ private void onUpdateMouse(CallbackInfo callbackInfo) {`
`24`	`24`	`if (MovementManager.isLookLocked) {`
`25`		`- ci.cancel();`
	`25`	`+ callbackInfo.cancel();`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`- // might as well fit in ungrab mouse here as well`
`30`	`29`	`@Inject(method = "isMouseGrabbed", at = @At("HEAD"), cancellable = true)`
`31`		`- private void onIsCursorLocked(CallbackInfoReturnable<Boolean> cir) {`
	`30`	`+ private void onIsCursorLocked(CallbackInfoReturnable<Boolean> callbackInfoReturnable) {`
`32`	`31`	`if (MouseUtils.isMouseUngrabbed()) {`
`33`	`32`	`if (this.mouseGrabbed) {`
`34`	`33`	`this.releaseMouse();`
`35`	`34`	`}`
`36`	`35`
`37`		`- cir.setReturnValue(false);`
	`36`	`+ callbackInfoReturnable.setReturnValue(false);`
`38`	`37`	`}`
`39`	`38`	`}`
`40`	`39`
`41`	`40`	`@Inject(method = "grabMouse", at = @At("HEAD"), cancellable = true)`
`42`		`- private void onLockCursor(CallbackInfo ci) {`
	`41`	`+ private void onLockCursor(CallbackInfo callbackInfo) {`
`43`	`42`	`if (MouseUtils.isMouseUngrabbed()) {`
`44`		`- ci.cancel();`
	`43`	`+ callbackInfo.cancel();`
`45`	`44`	`}`
`46`	`45`	`}`
`47`	`46`