Fix issues on fabric

JulianVennen · JulianVennen · commit 0e3f612e9d7c · 2025-03-17T23:12:29.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,2 +1,4 @@
-## v3.0.5
-- Prevent issues while migrating old config fields
+## v3.0.6
+- Fix logging on bukkit and bungeecord
+- Fix error with night config on fabric
+- Fix loading problems on fabric
diff --git a/common/src/main/java/gs/mclo/MclogsCommon.java b/common/src/main/java/gs/mclo/MclogsCommon.java
@@ -81,9 +81,9 @@ > Collection<Command<ComponentType, StyleType, ClickEventType>> getCommands(
             IComponentFactory<ComponentType, StyleType, ClickEventType> componentFactory
     ) {
         return List.of(
-                new MclogsCommand<>(apiClient, componentFactory),
-                new MclogsListCommand<>(apiClient, componentFactory),
-                new MclogsShareCommand<>(apiClient, componentFactory)
+                new MclogsCommand<>(this, componentFactory),
+                new MclogsListCommand<>(this, componentFactory),
+                new MclogsShareCommand<>(this, componentFactory)
         );
     }
 
@@ -104,4 +104,8 @@ > void registerCommands(
             dispatcher.register(command.build(context, builder));
         }
     }
+
+    public MclogsClient getApiClient() {
+        return apiClient;
+    }
 }
diff --git a/common/src/main/java/gs/mclo/commands/Command.java b/common/src/main/java/gs/mclo/commands/Command.java
@@ -3,7 +3,7 @@
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import gs.mclo.Constants;
-import gs.mclo.api.MclogsClient;
+import gs.mclo.MclogsCommon;
 import gs.mclo.components.ClickEventAction;
 import gs.mclo.components.IComponent;
 import gs.mclo.components.IComponentFactory;
@@ -26,22 +26,22 @@ public abstract class Command<
     /**
      * The Mclogs API client
      */
-    protected final MclogsClient apiClient;
+    protected final MclogsCommon common;
     /**
      * A component factory
      */
     protected final IComponentFactory<ComponentType, StyleType, ClickEventType> componentFactory;
 
     /**
      * Create a new command
-     * @param apiClient The Mclogs API client
+     * @param common Common mod/plugin instance
      * @param componentFactory A component factory
      */
     public Command(
-            MclogsClient apiClient,
+            MclogsCommon common,
             IComponentFactory<ComponentType, StyleType, ClickEventType> componentFactory
     ) {
-        this.apiClient = apiClient;
+        this.common = common;
         this.componentFactory = componentFactory;
     }
 
@@ -86,7 +86,7 @@ public <T> int share(CommandContext<T> context, BuildContext<T, ComponentType> b
 
         Constants.LOG.info("Sharing {}", source.getRootDirectory().relativize(path));
 
-        apiClient.uploadLog(path).thenAccept(response -> {
+        common.getApiClient().uploadLog(path).thenAccept(response -> {
             if (response.isSuccess()) {
                 var link = componentFactory.literal(response.getUrl()).style(openUrlStyle(response.getUrl()));
                 var message = componentFactory.literal("Your log has been uploaded: ").append(link);
diff --git a/common/src/main/java/gs/mclo/commands/MclogsCommand.java b/common/src/main/java/gs/mclo/commands/MclogsCommand.java
@@ -2,7 +2,7 @@
 
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
-import gs.mclo.api.MclogsClient;
+import gs.mclo.MclogsCommon;
 import gs.mclo.components.IComponent;
 import gs.mclo.components.IComponentFactory;
 import gs.mclo.components.IStyle;
@@ -13,10 +13,10 @@ public class MclogsCommand<
         ClickEventType
         > extends Command<ComponentType, StyleType, ClickEventType> {
     public MclogsCommand(
-            MclogsClient apiClient,
+            MclogsCommon common,
             IComponentFactory<ComponentType, StyleType, ClickEventType> componentFactory
     ) {
-        super(apiClient, componentFactory);
+        super(common, componentFactory);
     }
 
     @Override
diff --git a/common/src/main/java/gs/mclo/commands/MclogsListCommand.java b/common/src/main/java/gs/mclo/commands/MclogsListCommand.java
@@ -3,7 +3,7 @@
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import gs.mclo.Constants;
-import gs.mclo.api.MclogsClient;
+import gs.mclo.MclogsCommon;
 import gs.mclo.api.Util;
 import gs.mclo.components.ClickEventAction;
 import gs.mclo.components.IComponent;
@@ -16,10 +16,10 @@ public class MclogsListCommand<
         ClickEventType
         > extends Command<ComponentType, StyleType, ClickEventType> {
     public MclogsListCommand(
-            MclogsClient apiClient,
+            MclogsCommon common,
             IComponentFactory<ComponentType, StyleType, ClickEventType> componentFactory
     ) {
-        super(apiClient, componentFactory);
+        super(common, componentFactory);
     }
 
     @Override
diff --git a/common/src/main/java/gs/mclo/commands/MclogsShareCommand.java b/common/src/main/java/gs/mclo/commands/MclogsShareCommand.java
@@ -7,7 +7,7 @@
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import gs.mclo.Constants;
-import gs.mclo.api.MclogsClient;
+import gs.mclo.MclogsCommon;
 import gs.mclo.api.Util;
 import gs.mclo.components.IComponent;
 import gs.mclo.components.IComponentFactory;
@@ -23,10 +23,10 @@ public class MclogsShareCommand<
     private static final String ARGUMENT_NAME = "filename";
 
     public MclogsShareCommand(
-            MclogsClient apiClient,
+            MclogsCommon common,
             IComponentFactory<ComponentType, StyleType, ClickEventType> componentFactory
     ) {
-        super(apiClient, componentFactory);
+        super(common, componentFactory);
     }
 
     @Override
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -20,6 +20,7 @@ dependencies {
     include(libs.mclogs.api)
     implementation(libs.nightconfig.toml)
     include(libs.nightconfig.toml)
+    include(libs.nightconfig.core)
 }
 
 loom {
diff --git a/fabric/src/main/java/gs/mclo/FabricClientInitializer.java b/fabric/src/main/java/gs/mclo/FabricClientInitializer.java
@@ -0,0 +1,17 @@
+package gs.mclo;
+
+import gs.mclo.command.FabricClientCommandBuildContext;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
+
+public class FabricClientInitializer implements ClientModInitializer {
+    @Override
+    public void onInitializeClient() {
+        ClientCommandRegistrationCallback.EVENT.register((
+                dispatcher,
+                dedicated
+        ) -> MclogsFabric.INSTANCE.registerCommandsOnDedicatedServer(
+                dispatcher, new FabricClientCommandBuildContext()
+        ));
+    }
+}
diff --git a/fabric/src/main/java/gs/mclo/FabricInitializer.java b/fabric/src/main/java/gs/mclo/FabricInitializer.java
@@ -0,0 +1,10 @@
+package gs.mclo;
+
+import net.fabricmc.api.ModInitializer;
+
+public class FabricInitializer implements ModInitializer {
+    @Override
+    public void onInitialize() {
+        MclogsFabric.INSTANCE.init();
+    }
+}
diff --git a/fabric/src/main/java/gs/mclo/FabricServerInitializer.java b/fabric/src/main/java/gs/mclo/FabricServerInitializer.java
@@ -0,0 +1,15 @@
+package gs.mclo;
+
+import net.fabricmc.api.DedicatedServerModInitializer;
+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
+
+public class FabricServerInitializer implements DedicatedServerModInitializer {
+    @Override
+    public void onInitializeServer() {
+        CommandRegistrationCallback.EVENT.register(((
+                dispatcher,
+                registryAccess,
+                environment
+        ) -> MclogsFabric.INSTANCE.registerCommandsOnDedicatedServer(dispatcher)));
+    }
+}
diff --git a/fabric/src/main/java/gs/mclo/MclogsFabric.java b/fabric/src/main/java/gs/mclo/MclogsFabric.java
@@ -1,30 +1,5 @@
 package gs.mclo;
 
-import gs.mclo.command.FabricClientCommandBuildContext;
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.api.DedicatedServerModInitializer;
-import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
-import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
-
-public class MclogsFabric extends MclogsCommonMc implements ModInitializer, DedicatedServerModInitializer, ClientModInitializer {
-    
-    @Override
-    public void onInitialize() {
-        this.init();
-    }
-
-    @Override
-    public void onInitializeClient() {
-        ClientCommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> {
-            registerCommandsOnDedicatedServer(dispatcher, new FabricClientCommandBuildContext());
-        });
-    }
-
-    @Override
-    public void onInitializeServer() {
-        CommandRegistrationCallback.EVENT.register(((dispatcher, registryAccess, environment) -> {
-            registerCommandsOnDedicatedServer(dispatcher);
-        }));
-    }
+public class MclogsFabric extends MclogsCommonMc {
+    public static final MclogsFabric INSTANCE = new MclogsFabric();
 }
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -17,13 +17,13 @@
     "environment": "*",
     "entrypoints": {
         "main": [
-            "gs.mclo.MclogsFabric"
+            "gs.mclo.FabricInitializer"
         ],
         "server": [
-            "gs.mclo.MclogsFabric"
+            "gs.mclo.FabricServerInitializer"
         ],
         "client": [
-            "gs.mclo.MclogsFabric"
+            "gs.mclo.FabricClientInitializer"
         ]
     },
     "depends": {
diff --git a/gradle.properties b/gradle.properties
@@ -33,7 +33,7 @@ parchment_version=2025.01.19
 # Fabric
 # https://fabricmc.net/develop/
 fabric_version=0.116.1+1.21.4
-fabric_loader_version=0.15.11
+fabric_loader_version=0.16.9
 
 # Forge
 # https://files.minecraftforge.net/

Original file line number	Diff line number	Diff line change
`@@ -81,9 +81,9 @@ > Collection<Command<ComponentType, StyleType, ClickEventType>> getCommands(`
`81`	`81`	`IComponentFactory<ComponentType, StyleType, ClickEventType> componentFactory`
`82`	`82`	`) {`
`83`	`83`	`return List.of(`
`84`		`- new MclogsCommand<>(apiClient, componentFactory),`
`85`		`- new MclogsListCommand<>(apiClient, componentFactory),`
`86`		`- new MclogsShareCommand<>(apiClient, componentFactory)`
	`84`	`+ new MclogsCommand<>(this, componentFactory),`
	`85`	`+ new MclogsListCommand<>(this, componentFactory),`
	`86`	`+ new MclogsShareCommand<>(this, componentFactory)`
`87`	`87`	`);`
`88`	`88`	`}`
`89`	`89`
`@@ -104,4 +104,8 @@ > void registerCommands(`
`104`	`104`	`dispatcher.register(command.build(context, builder));`
`105`	`105`	`}`
`106`	`106`	`}`
	`107`	`+`
	`108`	`+ public MclogsClient getApiClient() {`
	`109`	`+ return apiClient;`
	`110`	`+ }`
`107`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ dependencies {`
`20`	`20`	`include(libs.mclogs.api)`
`21`	`21`	`implementation(libs.nightconfig.toml)`
`22`	`22`	`include(libs.nightconfig.toml)`
	`23`	`+ include(libs.nightconfig.core)`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`loom {`