From 643a06ab1cea570ff12364b0c589e6fca26bb4cd Mon Sep 17 00:00:00 2001 From: Jared Date: Mon, 18 Apr 2022 02:49:05 +0200 Subject: [PATCH] Code cleanup. Prefix mixins like good modders --- .../com/blamejared/tipthescales/Constants.java | 1 + .../com/blamejared/tipthescales/ScaleHelper.java | 5 ++++- .../mixin/MixinVideoSettingsScreen.java | 16 ++++++++-------- .../tipthescales/mixin/OptionAccessor.java | 4 ++-- .../mixin/VideoSettingsScreenAccessor.java | 4 ++-- gradle.properties | 2 +- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/Common/src/main/java/com/blamejared/tipthescales/Constants.java b/Common/src/main/java/com/blamejared/tipthescales/Constants.java index e1766b4..2ef17c9 100644 --- a/Common/src/main/java/com/blamejared/tipthescales/Constants.java +++ b/Common/src/main/java/com/blamejared/tipthescales/Constants.java @@ -4,4 +4,5 @@ public class Constants { public static final String MOD_ID = "tipthescales"; public static final String MOD_NAME = "Tip The Scales"; + } diff --git a/Common/src/main/java/com/blamejared/tipthescales/ScaleHelper.java b/Common/src/main/java/com/blamejared/tipthescales/ScaleHelper.java index a0ec575..e42b27f 100644 --- a/Common/src/main/java/com/blamejared/tipthescales/ScaleHelper.java +++ b/Common/src/main/java/com/blamejared/tipthescales/ScaleHelper.java @@ -6,9 +6,12 @@ import net.minecraft.network.chat.TranslatableComponent; public class ScaleHelper { + public static int guiScale; public static Component genericValueLabel(Option option, Component args) { - return new TranslatableComponent("options.generic_value", ((OptionAccessor)option).getCaption(), args); + + return new TranslatableComponent("options.generic_value", ((OptionAccessor) option).tipTheScales$getCaption(), args); } + } diff --git a/Common/src/main/java/com/blamejared/tipthescales/mixin/MixinVideoSettingsScreen.java b/Common/src/main/java/com/blamejared/tipthescales/mixin/MixinVideoSettingsScreen.java index a6b0f95..05be3de 100644 --- a/Common/src/main/java/com/blamejared/tipthescales/mixin/MixinVideoSettingsScreen.java +++ b/Common/src/main/java/com/blamejared/tipthescales/mixin/MixinVideoSettingsScreen.java @@ -24,9 +24,9 @@ public MixinVideoSettingsScreen(Screen param0, Options param1, Component param2) } @Inject(method = "init", at = @At("HEAD")) - public void init(CallbackInfo ci) { + public void tipTheScales$init(CallbackInfo ci) { - Option[] options = VideoSettingsScreenAccessor.getOPTIONS(); + Option[] options = VideoSettingsScreenAccessor.tipTheScales$getOPTIONS(); for(int i = 0; i < options.length; i++) { Option option = options[i]; if(option.equals(Option.GUI_SCALE)) { @@ -34,8 +34,8 @@ public void init(CallbackInfo ci) { CycleOption cycleOption = (CycleOption) option; OptionAccessor accessOption = (OptionAccessor) cycleOption; - String captionKey = accessOption.getCaption().getContents(); - if(accessOption.getCaption() instanceof TranslatableComponent transComp) { + String captionKey = accessOption.tipTheScales$getCaption().getContents(); + if(accessOption.tipTheScales$getCaption() instanceof TranslatableComponent transComp) { captionKey = transComp.getKey(); } @@ -55,18 +55,18 @@ public void init(CallbackInfo ci) { } @Inject(method = "mouseClicked", at = @At(value = "HEAD")) - public void mouseClickedHead(double mouseX, double mouseY, int button, CallbackInfoReturnable cir) { + public void tipTheScales$mouseClickedHead(double mouseX, double mouseY, int button, CallbackInfoReturnable cir) { ScaleHelper.guiScale = this.options.guiScale; } @Redirect(method = "mouseClicked", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;resizeDisplay()V")) - public void mouseClickedResize(Minecraft instance) {} + public void tipTheScales$mouseClickedResize(Minecraft instance) {} @Inject(method = "mouseReleased", at = @At(value = "HEAD")) - public void mouseReleasedHead(double mouseX, double mouseY, int button, CallbackInfoReturnable cir) { + public void tipTheScales$mouseReleasedHead(double mouseX, double mouseY, int button, CallbackInfoReturnable cir) { if(this.options.guiScale != ScaleHelper.guiScale) { this.minecraft.resizeDisplay(); @@ -75,7 +75,7 @@ public void mouseReleasedHead(double mouseX, double mouseY, int button, Callback } @Redirect(method = "mouseReleased", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;resizeDisplay()V")) - public void mouseReleasedResize(Minecraft instance) {} + public void tipTheScales$mouseReleasedResize(Minecraft instance) {} } diff --git a/Common/src/main/java/com/blamejared/tipthescales/mixin/OptionAccessor.java b/Common/src/main/java/com/blamejared/tipthescales/mixin/OptionAccessor.java index abf3b92..17754df 100644 --- a/Common/src/main/java/com/blamejared/tipthescales/mixin/OptionAccessor.java +++ b/Common/src/main/java/com/blamejared/tipthescales/mixin/OptionAccessor.java @@ -8,7 +8,7 @@ @Mixin(Option.class) public interface OptionAccessor { - @Accessor - Component getCaption(); + @Accessor("caption") + Component tipTheScales$getCaption(); } diff --git a/Common/src/main/java/com/blamejared/tipthescales/mixin/VideoSettingsScreenAccessor.java b/Common/src/main/java/com/blamejared/tipthescales/mixin/VideoSettingsScreenAccessor.java index f642bae..a7269e1 100644 --- a/Common/src/main/java/com/blamejared/tipthescales/mixin/VideoSettingsScreenAccessor.java +++ b/Common/src/main/java/com/blamejared/tipthescales/mixin/VideoSettingsScreenAccessor.java @@ -8,8 +8,8 @@ @Mixin(VideoSettingsScreen.class) public interface VideoSettingsScreenAccessor { - @Accessor - static Option[] getOPTIONS() { + @Accessor("OPTIONS") + static Option[] tipTheScales$getOPTIONS() { throw new UnsupportedOperationException(); } diff --git a/gradle.properties b/gradle.properties index e0a848b..1b20310 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ fabricLoaderVersion=0.13.3 # Mod options modName=TipTheScales -modAuthor=Jaredlll08 +modAuthor=Jared modId=tipthescales modAvatar=https://media.forgecdn.net/avatars/131/501/636467873539016713.png curseProjectId=282313