refactor: combined Bulldozer and YouInjectButton mixin into one mixin each

Signed-off-by: moonleay <contact@moonleay.net>

src/main/java/net/moonleay/gimbal/mixin/BulldozerMixin.java

@@ -20,9 +20,13 @@ package net.moonleay.gimbal.mixin;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.network.ClientPlayerInteractionManager;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import net.moonleay.gimbal.client.editor.ClientEditor;
 import net.moonleay.gimbal.editor.state.mode.Capability;
 import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -32,14 +36,15 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.Objects;
 
-@Mixin(MinecraftClient.class)
 public abstract class BulldozerMixin {
 
-    @Shadow protected int attackCooldown;
+    @Mixin(MinecraftClient.class)
-
+    public static abstract class MinecraftClientMixin {
         @Shadow
         @Nullable
         public ClientPlayerEntity player;
+        @Shadow
+        protected int attackCooldown;
 
         @Inject(method = "doAttack", at = @At(value = "HEAD"))
         private void func(CallbackInfoReturnable<Boolean> cir) {
@@ -56,6 +61,24 @@ public abstract class BulldozerMixin {
             }
             this.attackCooldown = 0;
         }
+    }
 
+    @Mixin(ClientPlayerInteractionManager.class)
+    public static abstract class ClientPlayerInteractionManagerMixin {
 
+        @Shadow
+        private int blockBreakingCooldown;
+
+        @Shadow
+        @Final
+        private MinecraftClient client;
+
+        @Inject(method = "updateBlockBreakingProgress", at = @At("HEAD"))
+        private void func(BlockPos pos, Direction direction, CallbackInfoReturnable<Boolean> cir) {
+            if (!ClientEditor.INSTANCE.shouldClient(Capability.BULLDOZER) || !Objects.requireNonNull(this.client.player).isCreative()) {
+                return;
+            }
+            this.blockBreakingCooldown = 0;
+        }
+    }
 }

src/main/java/net/moonleay/gimbal/mixin/BulldozerMixin2.java

@@ -1,52 +0,0 @@
-/*
- * Gimbal
- * Copyright (C) 2024 moonleay
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package net.moonleay.gimbal.mixin;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.network.ClientPlayerInteractionManager;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Direction;
-import net.moonleay.gimbal.client.editor.ClientEditor;
-import net.moonleay.gimbal.editor.state.mode.Capability;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import java.util.Objects;
-
-@Mixin(ClientPlayerInteractionManager.class)
-public class BulldozerMixin2 {
-
-    @Shadow private int blockBreakingCooldown;
-
-    @Shadow
-    @Final
-    private MinecraftClient client;
-
-    @Inject(method = "updateBlockBreakingProgress", at = @At("HEAD"))
-    private void func(BlockPos pos, Direction direction, CallbackInfoReturnable<Boolean> cir) {
-        if (!ClientEditor.INSTANCE.shouldClient(Capability.BULLDOZER) || !Objects.requireNonNull(this.client.player).isCreative()) {
-            return;
-        }
-        this.blockBreakingCooldown = 0;
-    }
-}

src/main/java/net/moonleay/gimbal/mixin/YouInjectButtonMixin.java

@@ -20,6 +20,7 @@ package net.moonleay.gimbal.mixin;
 
 import net.minecraft.client.gui.screen.GameMenuScreen;
 import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.TitleScreen;
 import net.minecraft.client.gui.widget.TexturedButtonWidget;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
@@ -33,15 +34,49 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(GameMenuScreen.class)
 // What is my purpose?
-public class YouInjectButtonMixin extends Screen {
+public class YouInjectButtonMixin {
     // Go my god.
 
+    @Mixin(TitleScreen.class)
+    public static abstract class TitleScreenMixin extends Screen {
+
         @Unique
         private static final Identifier GIMBAL_TEXTURE = new Identifier(BuildConstants.modId, "textures/gimbal_options_texture_button.png");
 
-    protected YouInjectButtonMixin(Text title) {
+        protected TitleScreenMixin(Text title) {
+            super(title);
+        }
+
+        @Inject(method = "init", at = @At(value = "RETURN"))
+        private void func(CallbackInfo ci) {
+            int l = this.height / 4 + 48;
+            this.addDrawableChild(
+                    new TexturedButtonWidget(
+                            this.width / 2 - 124 - 24,
+                            l + 72 + 12,
+                            20,
+                            20,
+                            0,
+                            0,
+                            20,
+                            GIMBAL_TEXTURE,
+                            20,
+                            40,
+                            button -> this.client.setScreen(new GimbalSettingsGui(this, ClientMain.CONFIG)),
+                            Text.translatable(TranslationKeys.Gui.Config.SCREEN_NAME)
+                    )
+            );
+        }
+    }
+
+
+    @Mixin(GameMenuScreen.class)
+    public static abstract class GameMenuScreenMixin extends Screen {
+        @Unique
+        private static final Identifier GIMBAL_TEXTURE = new Identifier(BuildConstants.modId, "textures/gimbal_options_texture_button.png");
+
+        protected GameMenuScreenMixin(Text title) {
             super(title);
         }
 
@@ -64,4 +99,6 @@ public class YouInjectButtonMixin extends Screen {
                     )
             );
         }
+    }
+
 }

src/main/java/net/moonleay/gimbal/mixin/YouInjectButtonMixin2.java

@@ -1,66 +0,0 @@
-/*
- * Gimbal
- * Copyright (C) 2024 moonleay
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package net.moonleay.gimbal.mixin;
-
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.TitleScreen;
-import net.minecraft.client.gui.widget.TexturedButtonWidget;
-import net.minecraft.text.Text;
-import net.minecraft.util.Identifier;
-import net.moonleay.gimbal.build.BuildConstants;
-import net.moonleay.gimbal.client.ClientMain;
-import net.moonleay.gimbal.client.screen.GimbalSettingsGui;
-import net.moonleay.gimbal.constants.TranslationKeys;
-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(TitleScreen.class)
-public class YouInjectButtonMixin2 extends Screen {
-
-    @Unique
-    private static final Identifier GIMBAL_TEXTURE = new Identifier(BuildConstants.modId, "textures/gimbal_options_texture_button.png");
-
-    protected YouInjectButtonMixin2(Text title) {
-        super(title);
-    }
-
-    @Inject(method = "init", at = @At(value = "RETURN"))
-    private void func(CallbackInfo ci) {
-        int l = this.height / 4 + 48;
-        this.addDrawableChild(
-                new TexturedButtonWidget(
-                        this.width / 2 - 124 - 24,
-                        l + 72 + 12,
-                        20,
-                        20,
-                        0,
-                        0,
-                        20,
-                        GIMBAL_TEXTURE,
-                        20,
-                        40,
-                        button -> this.client.setScreen(new GimbalSettingsGui(this, ClientMain.CONFIG)),
-                        Text.translatable(TranslationKeys.Gui.Config.SCREEN_NAME)
-                )
-        );
-    }
-}

src/main/resources/gimbal.mixins.json

@@ -11,13 +11,13 @@
     "ReplaceStateUpdaterMixin"
   ],
   "client": [
-    "BulldozerMixin",
+    "BulldozerMixin$ClientPlayerInteractionManagerMixin",
-    "BulldozerMixin2",
+    "BulldozerMixin$MinecraftClientMixin",
     "HudMixin",
     "NoClipCameraFixMixin",
     "NormalModeMixin",
-    "YouInjectButtonMixin",
+    "YouInjectButtonMixin$GameMenuScreenMixin",
-    "YouInjectButtonMixin2"
+    "YouInjectButtonMixin$TitleScreenMixin"
   ],
   "injectors": {
     "defaultRequire": 1