From cfc1968ce4d8c7c2cffa3e36368b337adfe93bf1 Mon Sep 17 00:00:00 2001 From: fullgream Date: Wed, 24 Sep 2025 13:00:32 +0300 Subject: [PATCH] remove client split --- build.gradle | 12 ------------ .../java/fullgream/midcraft/MidcraftClient.java | 10 ---------- .../midcraft/mixin/client/ExampleClientMixin.java | 15 --------------- src/client/resources/midcraft.client.mixins.json | 11 ----------- .../fullgream/midcraft/MidcraftDataGenerator.java | 0 src/main/resources/fabric.mod.json | 9 +-------- 6 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 src/client/java/fullgream/midcraft/MidcraftClient.java delete mode 100644 src/client/java/fullgream/midcraft/mixin/client/ExampleClientMixin.java delete mode 100644 src/client/resources/midcraft.client.mixins.json rename src/{client => main}/java/fullgream/midcraft/MidcraftDataGenerator.java (100%) diff --git a/build.gradle b/build.gradle index c4aa2de..43f6180 100644 --- a/build.gradle +++ b/build.gradle @@ -18,18 +18,6 @@ repositories { // for more information about repositories. } -loom { - splitEnvironmentSourceSets() - - mods { - "midcraft" { - sourceSet sourceSets.main - sourceSet sourceSets.client - } - } - -} - fabricApi { configureDataGeneration { client = true diff --git a/src/client/java/fullgream/midcraft/MidcraftClient.java b/src/client/java/fullgream/midcraft/MidcraftClient.java deleted file mode 100644 index d201923..0000000 --- a/src/client/java/fullgream/midcraft/MidcraftClient.java +++ /dev/null @@ -1,10 +0,0 @@ -package fullgream.midcraft; - -import net.fabricmc.api.ClientModInitializer; - -public class MidcraftClient implements ClientModInitializer { - @Override - public void onInitializeClient() { - // This entrypoint is suitable for setting up client-specific logic, such as rendering. - } -} \ No newline at end of file diff --git a/src/client/java/fullgream/midcraft/mixin/client/ExampleClientMixin.java b/src/client/java/fullgream/midcraft/mixin/client/ExampleClientMixin.java deleted file mode 100644 index 3602cf4..0000000 --- a/src/client/java/fullgream/midcraft/mixin/client/ExampleClientMixin.java +++ /dev/null @@ -1,15 +0,0 @@ -package fullgream.midcraft.mixin.client; - -import net.minecraft.client.MinecraftClient; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(MinecraftClient.class) -public class ExampleClientMixin { - @Inject(at = @At("HEAD"), method = "run") - private void init(CallbackInfo info) { - // This code is injected into the start of MinecraftClient.run()V - } -} \ No newline at end of file diff --git a/src/client/resources/midcraft.client.mixins.json b/src/client/resources/midcraft.client.mixins.json deleted file mode 100644 index 299d2b6..0000000 --- a/src/client/resources/midcraft.client.mixins.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "required": true, - "package": "fullgream.midcraft.mixin.client", - "compatibilityLevel": "JAVA_17", - "client": [ - "ExampleClientMixin" - ], - "injectors": { - "defaultRequire": 1 - } -} \ No newline at end of file diff --git a/src/client/java/fullgream/midcraft/MidcraftDataGenerator.java b/src/main/java/fullgream/midcraft/MidcraftDataGenerator.java similarity index 100% rename from src/client/java/fullgream/midcraft/MidcraftDataGenerator.java rename to src/main/java/fullgream/midcraft/MidcraftDataGenerator.java diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 2ce6cd5..9716a46 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -18,19 +18,12 @@ "main": [ "fullgream.midcraft.Midcraft" ], - "client": [ - "fullgream.midcraft.MidcraftClient" - ], "fabric-datagen": [ "fullgream.midcraft.MidcraftDataGenerator" ] }, "mixins": [ - "midcraft.mixins.json", - { - "config": "midcraft.client.mixins.json", - "environment": "client" - } + "midcraft.mixins.json" ], "depends": { "fabricloader": ">=0.17.2",