diff --git a/build.gradle b/build.gradle index 377d943..8e88607 100644 --- a/build.gradle +++ b/build.gradle @@ -30,17 +30,6 @@ repositories { } } -loom { - splitEnvironmentSourceSets() - - mods { - "better-snow-coverage" { - sourceSet sourceSets.main - sourceSet sourceSets.client - } - } -} - dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" diff --git a/src/client/java/tobinio/bettersnowcoverage/BetterSnowCoverageClient.java b/src/client/java/tobinio/bettersnowcoverage/BetterSnowCoverageClient.java deleted file mode 100644 index 1684801..0000000 --- a/src/client/java/tobinio/bettersnowcoverage/BetterSnowCoverageClient.java +++ /dev/null @@ -1,12 +0,0 @@ -package tobinio.bettersnowcoverage; - -import net.fabricmc.api.ClientModInitializer; -import tobinio.bettersnowcoverage.config.Config; - -public class BetterSnowCoverageClient implements ClientModInitializer { - @Override - public void onInitializeClient() { - Config.HANDLER.load(); - Config.update(); - } -} \ No newline at end of file diff --git a/src/client/resources/better-snow-coverage.client.mixins.json b/src/client/resources/better-snow-coverage.client.mixins.json deleted file mode 100644 index f682b10..0000000 --- a/src/client/resources/better-snow-coverage.client.mixins.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "required": true, - "package": "tobinio.bettersnowcoverage.mixin.client", - "compatibilityLevel": "JAVA_21", - "client": [ - "SectionBuilderMixin", - "sodium.ChunkBuilderMeshingTaskMixin" - ], - "injectors": { - "defaultRequire": 1 - } -} \ No newline at end of file diff --git a/src/client/java/tobinio/bettersnowcoverage/BetterSnowChecker.java b/src/main/java/tobinio/bettersnowcoverage/BetterSnowChecker.java similarity index 100% rename from src/client/java/tobinio/bettersnowcoverage/BetterSnowChecker.java rename to src/main/java/tobinio/bettersnowcoverage/BetterSnowChecker.java diff --git a/src/main/java/tobinio/bettersnowcoverage/BetterSnowCoverage.java b/src/main/java/tobinio/bettersnowcoverage/BetterSnowCoverage.java index 13a63b5..ac6be16 100644 --- a/src/main/java/tobinio/bettersnowcoverage/BetterSnowCoverage.java +++ b/src/main/java/tobinio/bettersnowcoverage/BetterSnowCoverage.java @@ -1,12 +1,12 @@ package tobinio.bettersnowcoverage; -import net.fabricmc.api.ModInitializer; - +import net.fabricmc.api.ClientModInitializer; import net.minecraft.util.Identifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import tobinio.bettersnowcoverage.config.Config; -public class BetterSnowCoverage implements ModInitializer { +public class BetterSnowCoverage implements ClientModInitializer { public static final String MOD_ID = "better-snow-coverage"; public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); @@ -14,8 +14,9 @@ public class BetterSnowCoverage implements ModInitializer { return Identifier.of(MOD_ID, path); } - @Override - public void onInitialize() { + public void onInitializeClient() { + Config.HANDLER.load(); + Config.update(); } } \ No newline at end of file diff --git a/src/client/java/tobinio/bettersnowcoverage/config/Config.java b/src/main/java/tobinio/bettersnowcoverage/config/Config.java similarity index 94% rename from src/client/java/tobinio/bettersnowcoverage/config/Config.java rename to src/main/java/tobinio/bettersnowcoverage/config/Config.java index 024dcd3..ad33c27 100644 --- a/src/client/java/tobinio/bettersnowcoverage/config/Config.java +++ b/src/main/java/tobinio/bettersnowcoverage/config/Config.java @@ -14,7 +14,9 @@ import net.minecraft.util.Identifier; import java.util.ArrayList; import java.util.List; -import static tobinio.bettersnowcoverage.BetterSnowCoverage.*; +import static com.mojang.text2speech.Narrator.LOGGER; +import static tobinio.bettersnowcoverage.BetterSnowCoverage.MOD_ID; +import static tobinio.bettersnowcoverage.BetterSnowCoverage.id; /** * Created: 02.08.24 diff --git a/src/client/java/tobinio/bettersnowcoverage/config/ConfigMenu.java b/src/main/java/tobinio/bettersnowcoverage/config/ConfigMenu.java similarity index 100% rename from src/client/java/tobinio/bettersnowcoverage/config/ConfigMenu.java rename to src/main/java/tobinio/bettersnowcoverage/config/ConfigMenu.java diff --git a/src/client/java/tobinio/bettersnowcoverage/mixin/client/SectionBuilderMixin.java b/src/main/java/tobinio/bettersnowcoverage/mixin/SectionBuilderMixin.java similarity index 96% rename from src/client/java/tobinio/bettersnowcoverage/mixin/client/SectionBuilderMixin.java rename to src/main/java/tobinio/bettersnowcoverage/mixin/SectionBuilderMixin.java index 348ebcf..63e4e89 100644 --- a/src/client/java/tobinio/bettersnowcoverage/mixin/client/SectionBuilderMixin.java +++ b/src/main/java/tobinio/bettersnowcoverage/mixin/SectionBuilderMixin.java @@ -1,4 +1,4 @@ -package tobinio.bettersnowcoverage.mixin.client; +package tobinio.bettersnowcoverage.mixin; import com.llamalad7.mixinextras.sugar.Local; import com.mojang.blaze3d.systems.VertexSorter; @@ -16,7 +16,6 @@ import net.minecraft.util.math.random.Random; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.ModifyVariable; diff --git a/src/client/java/tobinio/bettersnowcoverage/mixin/client/sodium/ChunkBuilderMeshingTaskMixin.java b/src/main/java/tobinio/bettersnowcoverage/mixin/sodium/ChunkBuilderMeshingTaskMixin.java similarity index 97% rename from src/client/java/tobinio/bettersnowcoverage/mixin/client/sodium/ChunkBuilderMeshingTaskMixin.java rename to src/main/java/tobinio/bettersnowcoverage/mixin/sodium/ChunkBuilderMeshingTaskMixin.java index 8007c53..3d6cefd 100644 --- a/src/client/java/tobinio/bettersnowcoverage/mixin/client/sodium/ChunkBuilderMeshingTaskMixin.java +++ b/src/main/java/tobinio/bettersnowcoverage/mixin/sodium/ChunkBuilderMeshingTaskMixin.java @@ -1,4 +1,4 @@ -package tobinio.bettersnowcoverage.mixin.client.sodium; +package tobinio.bettersnowcoverage.mixin.sodium; import com.llamalad7.mixinextras.sugar.Local; import me.jellysquid.mods.sodium.client.render.chunk.compile.ChunkBuildBuffers; @@ -12,7 +12,6 @@ import me.jellysquid.mods.sodium.client.world.WorldSlice; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; -import org.joml.Vector3fc; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/resources/better-snow-coverage.mixins.json b/src/main/resources/better-snow-coverage.mixins.json index c89938c..59dfbdb 100644 --- a/src/main/resources/better-snow-coverage.mixins.json +++ b/src/main/resources/better-snow-coverage.mixins.json @@ -2,7 +2,9 @@ "required": true, "package": "tobinio.bettersnowcoverage.mixin", "compatibilityLevel": "JAVA_21", - "mixins": [ + "client": [ + "SectionBuilderMixin", + "sodium.ChunkBuilderMeshingTaskMixin" ], "injectors": { "defaultRequire": 1 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 5d68d90..d0f7bdd 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -15,24 +15,17 @@ }, "license": "MIT", "icon": "assets/better-snow-coverage/icon.png", - "environment": "*", + "environment": "client", "entrypoints": { - "main": [ - "tobinio.bettersnowcoverage.BetterSnowCoverage" - ], "client": [ - "tobinio.bettersnowcoverage.BetterSnowCoverageClient" + "tobinio.bettersnowcoverage.BetterSnowCoverage" ], "modmenu": [ "tobinio.bettersnowcoverage.config.ConfigMenu" ] }, "mixins": [ - "better-snow-coverage.mixins.json", - { - "config": "better-snow-coverage.client.mixins.json", - "environment": "client" - } + "better-snow-coverage.mixins.json" ], "depends": { "fabricloader": ">=${loader_version}",