From a4a37294489d3d4c6abcb70ca5d2d3a60ea12caa Mon Sep 17 00:00:00 2001 From: Aram Date: Fri, 3 Jan 2025 20:16:34 +0100 Subject: [PATCH] Fixed DataGen not working on Fabric? --- fabric/build.gradle | 6 ++++++ .../main/java/software/bluelib/BlueLib.java | 18 +++++++++++------- .../bluelib/datagen/DataGenerator.java | 14 ++++++++++++++ .../software/bluelib/event/ChatHandler.java | 2 ++ 4 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 fabric/src/main/java/software/bluelib/datagen/DataGenerator.java diff --git a/fabric/build.gradle b/fabric/build.gradle index ff277547..7f183fcc 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -12,6 +12,12 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" } +fabricApi { + configureDataGeneration() { + client = true + } +} + loom { def aw = project(':common').file("src/main/resources/${mod_id}.accesswidener") if (aw.exists()) { diff --git a/fabric/src/main/java/software/bluelib/BlueLib.java b/fabric/src/main/java/software/bluelib/BlueLib.java index 060e44e9..e71f0f48 100644 --- a/fabric/src/main/java/software/bluelib/BlueLib.java +++ b/fabric/src/main/java/software/bluelib/BlueLib.java @@ -2,10 +2,12 @@ package software.bluelib; +import net.fabricmc.api.EnvType; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.fabricmc.fabric.api.message.v1.ServerMessageEvents; +import net.fabricmc.loader.api.FabricLoader; import software.bluelib.event.ChatHandler; import software.bluelib.example.event.ReloadHandler; import software.bluelib.test.TestRegistry; @@ -51,13 +53,15 @@ public class BlueLib implements ModInitializer { @Override public void onInitialize() { registerModEventListeners(); - ClientTickEvents.END_CLIENT_TICK.register(client -> { - if (!hasInitialized) { - hasInitialized = true; - BlueLibCommon.init(); - TestRegistry.registerTests(); - } - }); + TestRegistry.registerTests(); + if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) { + ClientTickEvents.END_CLIENT_TICK.register(client -> { + if (!hasInitialized) { + hasInitialized = true; + BlueLibCommon.init(); + } + }); + } } /** diff --git a/fabric/src/main/java/software/bluelib/datagen/DataGenerator.java b/fabric/src/main/java/software/bluelib/datagen/DataGenerator.java new file mode 100644 index 00000000..c6335ae3 --- /dev/null +++ b/fabric/src/main/java/software/bluelib/datagen/DataGenerator.java @@ -0,0 +1,14 @@ +// Copyright (c) BlueLib. Licensed under the MIT License. + +package software.bluelib.datagen; + +import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; +import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; + +public class DataGenerator implements DataGeneratorEntrypoint { + + @Override + public void onInitializeDataGenerator(FabricDataGenerator generator) { + //FabricDataGenerator.Pack pack = generator.createPack(); + } +} diff --git a/fabric/src/main/java/software/bluelib/event/ChatHandler.java b/fabric/src/main/java/software/bluelib/event/ChatHandler.java index 44b09164..f262ebe8 100644 --- a/fabric/src/main/java/software/bluelib/event/ChatHandler.java +++ b/fabric/src/main/java/software/bluelib/event/ChatHandler.java @@ -1,3 +1,5 @@ +// Copyright (c) BlueLib. Licensed under the MIT License. + package software.bluelib.event; import java.util.Objects;