diff --git a/build.gradle b/build.gradle index c5e30e4..1d3009f 100644 --- a/build.gradle +++ b/build.gradle @@ -26,18 +26,6 @@ repositories { } } -loom { - splitEnvironmentSourceSets() - - mods { - "dense-flowers" { - 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/denseflowers/DenseFlowersClient.java b/src/client/java/tobinio/denseflowers/DenseFlowersClient.java deleted file mode 100644 index 2868322..0000000 --- a/src/client/java/tobinio/denseflowers/DenseFlowersClient.java +++ /dev/null @@ -1,10 +0,0 @@ -package tobinio.denseflowers; - -import net.fabricmc.api.ClientModInitializer; - -public class DenseFlowersClient 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/resources/dense-flowers.client.mixins.json b/src/client/resources/dense-flowers.client.mixins.json deleted file mode 100644 index 5c88318..0000000 --- a/src/client/resources/dense-flowers.client.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "package": "tobinio.denseflowers.mixin.client", - "compatibilityLevel": "JAVA_21", - "client": [ - "AbstractBlockAccessor", - "SectionBuilderMixin", - "sodium.ChunkBuilderMeshingTaskMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "mixins": [ - "sodium.BlockRenderContextAccessor" - ] -} \ No newline at end of file diff --git a/src/main/java/tobinio/denseflowers/DenseFlowers.java b/src/main/java/tobinio/denseflowers/DenseFlowers.java index 3a48270..b342ed0 100644 --- a/src/main/java/tobinio/denseflowers/DenseFlowers.java +++ b/src/main/java/tobinio/denseflowers/DenseFlowers.java @@ -1,22 +1,16 @@ package tobinio.denseflowers; +import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.ModInitializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class DenseFlowers implements ModInitializer { - // This logger is used to write text to the console and the log file. - // It is considered best practice to use your mod id as the logger's name. - // That way, it's clear which mod wrote info, warnings, and errors. +public class DenseFlowers implements ClientModInitializer { public static final Logger LOGGER = LoggerFactory.getLogger("dense-flowers"); - @Override - public void onInitialize() { - // This code runs as soon as Minecraft is in a mod-load-ready state. - // However, some things (like resources) may still be uninitialized. - // Proceed with mild caution. + @Override + public void onInitializeClient() { - LOGGER.info("Hello Fabric world!"); - } + } } \ No newline at end of file diff --git a/src/client/java/tobinio/denseflowers/OffsetGenerator.java b/src/main/java/tobinio/denseflowers/OffsetGenerator.java similarity index 96% rename from src/client/java/tobinio/denseflowers/OffsetGenerator.java rename to src/main/java/tobinio/denseflowers/OffsetGenerator.java index 14bf282..b8754a2 100644 --- a/src/client/java/tobinio/denseflowers/OffsetGenerator.java +++ b/src/main/java/tobinio/denseflowers/OffsetGenerator.java @@ -6,7 +6,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; import net.minecraft.world.BlockView; -import tobinio.denseflowers.mixin.client.AbstractBlockAccessor; +import tobinio.denseflowers.mixin.AbstractBlockAccessor; import java.util.ArrayList; import java.util.List; diff --git a/src/client/java/tobinio/denseflowers/mixin/client/AbstractBlockAccessor.java b/src/main/java/tobinio/denseflowers/mixin/AbstractBlockAccessor.java similarity index 88% rename from src/client/java/tobinio/denseflowers/mixin/client/AbstractBlockAccessor.java rename to src/main/java/tobinio/denseflowers/mixin/AbstractBlockAccessor.java index b1179b8..41e622c 100644 --- a/src/client/java/tobinio/denseflowers/mixin/client/AbstractBlockAccessor.java +++ b/src/main/java/tobinio/denseflowers/mixin/AbstractBlockAccessor.java @@ -1,4 +1,4 @@ -package tobinio.denseflowers.mixin.client; +package tobinio.denseflowers.mixin; import net.minecraft.block.AbstractBlock; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/tobinio/denseflowers/mixin/ExampleMixin.java b/src/main/java/tobinio/denseflowers/mixin/ExampleMixin.java deleted file mode 100644 index cfbe497..0000000 --- a/src/main/java/tobinio/denseflowers/mixin/ExampleMixin.java +++ /dev/null @@ -1,15 +0,0 @@ -package tobinio.denseflowers.mixin; - -import net.minecraft.server.MinecraftServer; -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(MinecraftServer.class) -public class ExampleMixin { - @Inject(at = @At("HEAD"), method = "loadWorld") - private void init(CallbackInfo info) { - // This code is injected into the start of MinecraftServer.loadWorld()V - } -} \ No newline at end of file diff --git a/src/client/java/tobinio/denseflowers/mixin/client/SectionBuilderMixin.java b/src/main/java/tobinio/denseflowers/mixin/SectionBuilderMixin.java similarity index 98% rename from src/client/java/tobinio/denseflowers/mixin/client/SectionBuilderMixin.java rename to src/main/java/tobinio/denseflowers/mixin/SectionBuilderMixin.java index 6ee15d8..4a278c4 100644 --- a/src/client/java/tobinio/denseflowers/mixin/client/SectionBuilderMixin.java +++ b/src/main/java/tobinio/denseflowers/mixin/SectionBuilderMixin.java @@ -1,4 +1,4 @@ -package tobinio.denseflowers.mixin.client; +package tobinio.denseflowers.mixin; import com.llamalad7.mixinextras.sugar.Local; import com.mojang.blaze3d.systems.VertexSorter; diff --git a/src/client/java/tobinio/denseflowers/mixin/client/sodium/BlockRenderContextAccessor.java b/src/main/java/tobinio/denseflowers/mixin/sodium/BlockRenderContextAccessor.java similarity index 90% rename from src/client/java/tobinio/denseflowers/mixin/client/sodium/BlockRenderContextAccessor.java rename to src/main/java/tobinio/denseflowers/mixin/sodium/BlockRenderContextAccessor.java index d964133..fcaabcf 100644 --- a/src/client/java/tobinio/denseflowers/mixin/client/sodium/BlockRenderContextAccessor.java +++ b/src/main/java/tobinio/denseflowers/mixin/sodium/BlockRenderContextAccessor.java @@ -1,4 +1,4 @@ -package tobinio.denseflowers.mixin.client.sodium; +package tobinio.denseflowers.mixin.sodium; import me.jellysquid.mods.sodium.client.render.chunk.compile.pipeline.BlockRenderContext; import org.joml.Vector3f; diff --git a/src/client/java/tobinio/denseflowers/mixin/client/sodium/ChunkBuilderMeshingTaskMixin.java b/src/main/java/tobinio/denseflowers/mixin/sodium/ChunkBuilderMeshingTaskMixin.java similarity index 98% rename from src/client/java/tobinio/denseflowers/mixin/client/sodium/ChunkBuilderMeshingTaskMixin.java rename to src/main/java/tobinio/denseflowers/mixin/sodium/ChunkBuilderMeshingTaskMixin.java index c77fde0..10656fb 100644 --- a/src/client/java/tobinio/denseflowers/mixin/client/sodium/ChunkBuilderMeshingTaskMixin.java +++ b/src/main/java/tobinio/denseflowers/mixin/sodium/ChunkBuilderMeshingTaskMixin.java @@ -1,4 +1,4 @@ -package tobinio.denseflowers.mixin.client.sodium; +package tobinio.denseflowers.mixin.sodium; import com.llamalad7.mixinextras.sugar.Local; import me.jellysquid.mods.sodium.client.render.chunk.compile.ChunkBuildBuffers; diff --git a/src/main/resources/dense-flowers.mixins.json b/src/main/resources/dense-flowers.mixins.json index b39a7be..0ccf3cd 100644 --- a/src/main/resources/dense-flowers.mixins.json +++ b/src/main/resources/dense-flowers.mixins.json @@ -2,10 +2,15 @@ "required": true, "package": "tobinio.denseflowers.mixin", "compatibilityLevel": "JAVA_21", - "mixins": [ - "ExampleMixin" + "client": [ + "AbstractBlockAccessor", + "SectionBuilderMixin", + "sodium.ChunkBuilderMeshingTaskMixin" ], "injectors": { "defaultRequire": 1 - } + }, + "mixins": [ + "sodium.BlockRenderContextAccessor" + ] } \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index f38d98f..c09cefe 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -15,21 +15,14 @@ }, "license": "MIT", "icon": "assets/dense-flowers/icon.png", - "environment": "*", + "environment": "client", "entrypoints": { - "main": [ - "tobinio.denseflowers.DenseFlowers" - ], "client": [ - "tobinio.denseflowers.DenseFlowersClient" + "tobinio.denseflowers.DenseFlowers" ] }, "mixins": [ - "dense-flowers.mixins.json", - { - "config": "dense-flowers.client.mixins.json", - "environment": "client" - } + "dense-flowers.mixins.json" ], "depends": { "fabricloader": ">=${loader_version}",