reorganize registration

yurisuika · Dec 27, 2024 · 7331179 · 7331179
1 parent bc6d611
commit 7331179
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 44 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "fabric-loom" version "1.7-SNAPSHOT"
+    id "fabric-loom" version "1.9-SNAPSHOT"
     id "maven-publish"
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -11,4 +11,4 @@ maven_group = dev.yurisuika.raised
 archives_base_name = raised
 
 fabric_version = 0.97.1+1.20.4
-loader_version = 0.16.7
+loader_version = 0.16.9
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/dev/yurisuika/raised/Raised.java b/src/main/java/dev/yurisuika/raised/Raised.java
@@ -5,41 +5,39 @@
 import dev.yurisuika.raised.client.gui.screens.RaisedScreen;
 import dev.yurisuika.raised.util.config.Config;
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.network.chat.Component;
 
-public class Raised implements ClientModInitializer {
+public class Raised {
 
-    @Environment(EnvType.CLIENT)
-    public static void registerClientTickEvents() {
-        ClientTickEvents.END_CLIENT_TICK.register(minecraft -> {
-            while (RaisedOptions.options.consumeClick()) {
-                minecraft.setScreen(new RaisedScreen(Component.translatable("options.raised.title")));
-            }
-        });
-    }
+    public static class Client implements ClientModInitializer {
 
-    @Environment(EnvType.CLIENT)
-    public static void registerCommands() {
-        ClientCommandRegistrationCallback.EVENT.register(RaisedCommand::register);
-    }
+        public static void registerKeyMappings() {
+            KeyBindingHelper.registerKeyBinding(RaisedOptions.options);
+        }
 
-    @Environment(EnvType.CLIENT)
-    public static void registerKeyBindings() {
-        KeyBindingHelper.registerKeyBinding(RaisedOptions.options);
-    }
+        public static void registerInputEvents() {
+            ClientTickEvents.END_CLIENT_TICK.register(minecraft -> {
+                while (RaisedOptions.options.consumeClick()) {
+                    minecraft.setScreen(new RaisedScreen(Component.translatable("options.raised.title")));
+                }
+            });
+        }
+
+        public static void registerCommands() {
+            ClientCommandRegistrationCallback.EVENT.register(RaisedCommand::register);
+        }
+
+        public void onInitializeClient() {
+            Config.loadConfig();
 
-    @Override
-    public void onInitializeClient() {
-        Config.loadConfig();
+            registerKeyMappings();
+            registerInputEvents();
+            registerCommands();
+        }
 
-        registerClientTickEvents();
-        registerCommands();
-        registerKeyBindings();
     }
 
 }
diff --git a/src/main/java/dev/yurisuika/raised/client/gui/components/IconToggleButton.java b/src/main/java/dev/yurisuika/raised/client/gui/components/IconToggleButton.java
@@ -33,7 +33,6 @@ public boolean isToggled() {
         return toggled;
     }
 
-    @Override
     public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) {
         if (texture != null) {
             RenderSystem.disableDepthTest();
@@ -43,7 +42,6 @@ public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float
         }
     }
 
-    @Override
     public void renderString(GuiGraphics guiGraphics, Font font, int color) {}
 
     public static class Builder {

diff --git a/src/main/java/dev/yurisuika/raised/client/gui/screens/RaisedScreen.java b/src/main/java/dev/yurisuika/raised/client/gui/screens/RaisedScreen.java
@@ -57,7 +57,6 @@ public RaisedScreen(Component title) {
         super(title);
     }
 
-    @Override
     public void init() {
         title = new StringWidget(Component.translatable("options.raised.title"), font);
         page = new StringWidget(Component.translatable(element.getKey()), font);
@@ -155,7 +154,6 @@ public void setIconToggleButton(IconToggleButton widget) {
         widget.active = !widget.toggled;
     }
 
-    @Override
     public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) {
         super.render(guiGraphics, mouseX, mouseY, partialTick);
 
@@ -331,12 +329,10 @@ public static ResourceLocation getSignal(float percent) {
         return resourceLocation;
     }
 
-    @Override
     public void renderBackground(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) {
         renderTransparentBackground(guiGraphics);
     }
 
-    @Override
     public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
         super.keyPressed(keyCode, scanCode, modifiers);
         if (RaisedOptions.options.matches(keyCode, scanCode)) {

diff --git a/src/main/java/dev/yurisuika/raised/util/properties/Element.java b/src/main/java/dev/yurisuika/raised/util/properties/Element.java
@@ -32,7 +32,6 @@ public int getId() {
         return id;
     }
 
-    @Override
     public String getKey() {
         return key;
     }
@@ -45,7 +44,6 @@ public static Element byId(int id) {
         return VALUES[Mth.abs(id % VALUES.length)];
     }
 
-    @Override
     public String getSerializedName() {
         return name().toLowerCase();
     }

diff --git a/src/main/java/dev/yurisuika/raised/util/properties/Position.java b/src/main/java/dev/yurisuika/raised/util/properties/Position.java
@@ -36,7 +36,6 @@ public int getId() {
         return id;
     }
 
-    @Override
     public String getKey() {
         return key;
     }
@@ -49,7 +48,6 @@ public static Position byId(int id) {
         return VALUES[Mth.abs(id % VALUES.length)];
     }
 
-    @Override
     public String getSerializedName() {
         return name().toLowerCase();
     }

diff --git a/src/main/java/dev/yurisuika/raised/util/properties/Sync.java b/src/main/java/dev/yurisuika/raised/util/properties/Sync.java
@@ -33,7 +33,6 @@ public int getId() {
         return id;
     }
 
-    @Override
     public String getKey() {
         return key;
     }
@@ -46,7 +45,6 @@ public static Sync byId(int id) {
         return VALUES[Mth.abs(id % VALUES.length)];
     }
 
-    @Override
     public String getSerializedName() {
         return name().toLowerCase();
     }

diff --git a/src/main/java/dev/yurisuika/raised/util/resources/Texture.java b/src/main/java/dev/yurisuika/raised/util/resources/Texture.java
@@ -28,7 +28,6 @@ public int getId() {
         return id;
     }
 
-    @Override
     public String getKey() {
         return key;
     }
@@ -41,7 +40,6 @@ public static Texture byId(int id) {
         return VALUES[Mth.abs(id % VALUES.length)];
     }
 
-    @Override
     public String getSerializedName() {
         return name().toLowerCase();
     }

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -22,7 +22,7 @@
   "environment": "client",
   "entrypoints": {
     "client": [
-      "dev.yurisuika.raised.Raised"
+      "dev.yurisuika.raised.Raised\$Client"
     ]
   },
   "mixins": [

diff --git a/src/main/resources/raised.accesswidener b/src/main/resources/raised.accesswidener
@@ -1 +1 @@
-accessWidener v1 named
+accessWidener v2 named