port to forge

2024-05-31 09:47:31 +01:00
32 changed files with 688 additions and 784 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,12 +24,12 @@ jobs:
      - name: Extract current branch name
        shell: bash
        # bash pattern expansion to grab branch name without slashes
-        run: ref="${GITHUB_REF#refs/heads/}" && echo "branch=${ref////-}" >> $GITHUB_OUTPUT
+        run: ref="${GITHUB_REF#refs/heads/}" && echo "::set-output name=branch::${ref////-}"
        id: ref

      - name: Set outputs
        id: vars
-        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
      - name: Check outputs
        run: echo ${{ steps.vars.outputs.sha_short }}

--- a/build.gradle
+++ b/build.gradle
@@ -1,97 +1,71 @@
 plugins {
-	id 'fabric-loom' version '1.14.7'
-	id 'maven-publish'
+    id 'dev.architectury.loom' version '1.6-SNAPSHOT'
+    id 'maven-publish'
 }

+group = project.maven_group
+version = project.mod_version
+
 base {
-	archivesName = project.archives_base_name
+    archivesName = project.archives_name
 }

-version = project.mod_version
-group = project.maven_group
+loom {
+    forge {
+        mixinConfig 'cavedust.mixins.json'
+    }
+}

 repositories {
-	maven {
-		name = "Modrinth"
-		url = "https://api.modrinth.com/maven"
-		content {
-			includeGroup "maven.modrinth"
-		}
-	}
-	maven {
-		url = "https://maven.terraformersmc.com/releases"
-	}
-	maven {
-		name = 'minelp'
-		url = 'https://repo.minelittlepony-mod.com/maven/snapshot'
-	}
-	maven {
-		name = 'minelp-release'
-		url = 'https://repo.minelittlepony-mod.com/maven/release'
-	}
-	// Add repositories to retrieve artifacts from in here.
-	// You should only use this when depending on other mods because
-	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
-	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
-	// for more information about repositories.
+    // Add repositories to retrieve artifacts from in here.
+    // You should only use this when depending on other mods because
+    // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
+    // See https://docs.gradle.org/current/userguide/declaring_repositories.html
+    // for more information about repositories.
 }

 dependencies {
-	// To change the versions see the gradle.properties file
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-	// Fabric API. This is technically optional, but you probably want it anyway.
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-	modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
-	modApi "com.minelittlepony:kirin:${project.kirin_version}"
-	include "com.minelittlepony:kirin:${project.kirin_version}"
-
-	modCompileOnly("com.terraformersmc:modmenu:${project.modmenu_version}")
+    minecraft "net.minecraft:minecraft:$project.minecraft_version"
+    mappings "net.fabricmc:yarn:$project.yarn_mappings:v2"
+    forge "net.minecraftforge:forge:$project.forge_version"
+    modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}"
 }

 processResources {
-	inputs.property "version", project.version
+    inputs.property 'version', project.version

-	filesMatching("fabric.mod.json") {
-		expand "version": project.version
-	}
-}
-
-tasks.withType(JavaCompile).configureEach {
-	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	it.options.release = 21
+    filesMatching('META-INF/mods.toml') {
+        expand version: project.version
+    }
 }

 java {
-	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-	// if it is present.
-	// If you remove this line, sources will not be generated.
-	withSourcesJar()
-	sourceCompatibility = JavaVersion.VERSION_21
-	targetCompatibility = JavaVersion.VERSION_21
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+    // if it is present.
+    // If you remove this line, sources will not be generated.
+    withSourcesJar()
+
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }

-jar {
-	from("LICENSE") {
-		rename { "${it}_${project.archives_base_name}" }
-	}
+tasks.withType(JavaCompile).configureEach {
+    it.options.release = 17
 }

-// configure the maven publication
+// Configure Maven publishing.
 publishing {
-	publications {
-		mavenJava(MavenPublication) {
-			from components.java
-		}
-	}
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+        }
+    }

-	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-	repositories {
-		// Add repositories to publish to here.
-		// Notice: This block does NOT have the same function as the block in the top level.
-		// The repositories here will be used for publishing your artifact, not for
-		// retrieving dependencies.
-	}
+    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+    repositories {
+        // Add repositories to publish to here.
+        // Notice: This block does NOT have the same function as the block in the top level.
+        // The repositories here will be used for publishing your artifact, not for
+        // retrieving dependencies.
+    }
 }
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,18 +1,16 @@
-# Done to increase the memory available to gradle.
+# Done to increase the memory available to Gradle.
 org.gradle.jvmargs=-Xmx1G
+loom.platform = forge

-# Fabric Properties
-	minecraft_version=1.21.11
-	yarn_mappings=1.21.11+build.3
-	loader_version=0.18.4
-	loom_version=1.14-SNAPSHOT
+# Mod properties
+mod_version = 3.0.0
+maven_group = net.lizistired
+archives_name = cavedust

-# Mod Properties
-	mod_version=1.0.0
-	maven_group=com.straice
-	archives_base_name=cave_dust_reforged
+# Minecraft properties
+minecraft_version = 1.20.4
+yarn_mappings = 1.20.4+build.1

 # Dependencies
-	fabric_version=0.140.2+1.21.11
-	modmenu_version=17.0.0-beta.1
-	kirin_version=1.21.4+1.21.11
+forge_version = 1.20.4-49.0.50
+architectury_version=11.1.17
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
--- a/7
+++ b/7
@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#

 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -86,8 +84,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,8 +13,6 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@@ -45,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute

-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.

 goto fail

@@ -59,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

 if exist "%JAVA_EXE%" goto execute

-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.

 goto fail

--- a/settings.gradle
+++ b/settings.gradle
@@ -1,10 +1,10 @@
 pluginManagement {
    repositories {
-        maven {
-            name = 'Fabric'
-            url = 'https://maven.fabricmc.net/'
-        }
-        mavenCentral()
+        maven { url "https://maven.fabricmc.net/" }
+        maven { url "https://maven.architectury.dev/" }
+        maven { url "https://files.minecraftforge.net/maven/" }
        gradlePluginPortal()
    }
 }
+
+rootProject.name = 'cavedust'
--- a/src/main/java/net/lizistired/cavedust/ButtonWidgetMine.java
+++ b/src/main/java/net/lizistired/cavedust/ButtonWidgetMine.java
@@ -0,0 +1,10 @@
+package net.lizistired.cavedust;
+
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.text.Text;
+
+public class ButtonWidgetMine extends ButtonWidget {
+    protected ButtonWidgetMine(int x, int y, int width, int height, Text message, PressAction onPress, NarrationSupplier narrationSupplier) {
+        super(x, y, width, height, message, onPress, narrationSupplier);
+    }
+}
--- a/src/main/java/net/lizistired/cavedust/CaveDust.java
+++ b/src/main/java/net/lizistired/cavedust/CaveDust.java
@@ -1,129 +1,109 @@
 package net.lizistired.cavedust;

-// minecraft imports
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
+//minecraft imports
+import dev.architectury.event.events.client.ClientTickEvent;
+import net.lizistired.cavedust.utils.ParticleRegistry;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.particle.ParticleEffect;
+import net.minecraft.client.particle.Particle;
+import net.minecraft.particle.DefaultParticleType;
+import net.minecraft.particle.ParticleType;
+import net.minecraft.particle.ParticleTypes;
 import net.minecraft.registry.Registries;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-
-// other imports
-import com.minelittlepony.common.util.GamePaths;
+//other imports
+import net.minecraftforge.client.ConfigScreenHandler;
+import net.minecraftforge.client.event.RegisterParticleProvidersEvent;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.fml.ModLoadingContext;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.config.ModConfig;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.fml.loading.FMLPaths;
+import net.minecraftforge.registries.DeferredRegister;
+import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.RegistryObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-// java imports
+//java imports
 import java.nio.file.Path;
-
-// static imports
-import static net.lizistired.cavedust.utils.KeybindingHelper.*;
+//static imports
+import static net.lizistired.cavedust.CaveDust.MOD_ID;
+import static net.lizistired.cavedust.utils.MathHelper.*;
 import static net.lizistired.cavedust.utils.MathHelper.generateRandomDouble;
-import static net.lizistired.cavedust.utils.MathHelper.normalize;
+import static net.lizistired.cavedust.utils.ParticleRegistry.CAVE_DUST;
 import static net.lizistired.cavedust.utils.ParticleSpawnUtil.shouldParticlesSpawn;

-public class CaveDust implements ClientModInitializer {
-    // logger
-    public static final Logger LOGGER = LoggerFactory.getLogger("cavedust");
+@Mod(MOD_ID)
+public class CaveDust {
+	//logger
+	public static final String MOD_ID = "cavedust";
+	public static final Logger LOGGER = LoggerFactory.getLogger("cavedust");
+	//make class static
+	//config assignment

-    // make class static
-    private static CaveDust instance;

-    public static CaveDust getInstance() {
-        return instance;
-    }
+	public static int PARTICLE_AMOUNT = 0;

-    public CaveDust() {
-        instance = this;
-    }
+	public static int WHITE_ASH_ID;

-    // config assignment
-    private static CaveDustConfig config;
+	public CaveDust() {

-    public CaveDustConfig getConfig() {
-        return config;
-    }
+		IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();

-    public static ParticleEffect WHITE_ASH_ID =
-            (ParticleEffect) Registries.PARTICLE_TYPE.get(Identifier.of("cavedust", "cave_dust"));
+		ParticleRegistry.register(eventBus);

-    public static int PARTICLE_AMOUNT = 0;
+		eventBus.addListener(this::clientSetup);

-    @Override
-    public void onInitializeClient() {
-        // config path and loading
-        Path caveDustFolder = GamePaths.getConfigDirectory().resolve("cavedust");
-        config = new CaveDustConfig(caveDustFolder.getParent().resolve("cavedust.json"), this);
-        config.load();
+		ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ConfigForge.SPEC, "cavedust.toml");
+		ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> new ConfigScreenHandler.ConfigScreenFactory((mc, screen) -> new CaveDustConfigScreen(Text.of("Cave Dust Config"), screen)));
+		//register end client tick to create cave dust function, using end client tick for async

-        registerKeyBindings();

-        ParticleFactoryRegistry.getInstance().register(CaveDustServer.CAVE_DUST, CaveDustParticleFactory.Factory::new);
+		System.out.println(FMLPaths.CONFIGDIR.get().toAbsolutePath().normalize().toString());
+		ClientTickEvent.CLIENT_POST.register(CaveDust::createCaveDust);

-        // register end client tick to create cave dust function, using end client tick for async
-        ClientTickEvents.END_CLIENT_TICK.register(this::createCaveDust);
-    }
+		MinecraftForge.EVENT_BUS.register(this);
+	}

-    private void createCaveDust(MinecraftClient client) {
-        if (client.player == null) return;
+	private void clientSetup(final FMLClientSetupEvent event) {
+		WHITE_ASH_ID = Registries.PARTICLE_TYPE.getRawId(CAVE_DUST.get());
+	}

-        if (keyBinding1.wasPressed()) {
-            getConfig().toggleCaveDust();
-            LOGGER.info("Toggled dust");
-            client.player.sendMessage(
-                    Text.translatable("debug.cavedust.toggle." + config.getCaveDustEnabled()),
-                    false
-            );
-        }
+	private static void createCaveDust(MinecraftClient client) {

-        if (keyBinding2.wasPressed()) {
-            getConfig().load();
-            LOGGER.info("Reloaded config");
-            client.player.sendMessage(Text.translatable("debug.cavedust.reload"), false);
-        }
+		//ensure world is not null
+		if (client.world == null) return;
+		World world = client.world;
+		//LOGGER.info(String.valueOf(((ClientWorldAccessor) client.world.getLevelProperties()).getFlatWorld()));
+		// )
+		double probabilityNormalized = normalize(ConfigForge.LOWER_LIMIT.get(), ConfigForge.UPPER_LIMIT.get(), client.player.getBlockY());
+		PARTICLE_AMOUNT = (int) (probabilityNormalized * ConfigForge.PARTICLE_MULTIPLIER.get() * ConfigForge.PARTICLE_MULTIPLIER_MULTIPLIER.get());

-        // ensure world is not null
-        if (client.world == null) return;
-        World world = client.world;
+		for (int i = 0; i < PARTICLE_AMOUNT; i++) {
+			try {
+				int x = (int) (client.player.getPos().getX() + (int) generateRandomDouble(ConfigForge.DIMENSION_WIDTH.get() *-1, ConfigForge.DIMENSION_WIDTH.get()));
+				int y = (int) (client.player.getEyePos().getY() + (int) generateRandomDouble(ConfigForge.DIMENSION_HEIGHT.get() *-1, ConfigForge.DIMENSION_HEIGHT.get()));
+				int z = (int) (client.player.getPos().getZ() + (int) generateRandomDouble(ConfigForge.DIMENSION_WIDTH.get() *-1, ConfigForge.DIMENSION_WIDTH.get()));
+				double miniX = (x + Math.random());
+				double miniY = (y + Math.random());
+				double miniZ = (z + Math.random());
+				BlockPos particlePos = new BlockPos(x, y, z);

-        double probabilityNormalized =
-                normalize(config.getLowerLimit(), config.getUpperLimit(), client.player.getBlockY());
-
-        PARTICLE_AMOUNT = (int) (probabilityNormalized
-                * config.getParticleMultiplier()
-                * config.getParticleMultiplierMultiplier());
-
-        for (int i = 0; i < PARTICLE_AMOUNT; i++) {
-            int x = (int) (client.player.getX()
-                    + generateRandomDouble(-config.getDimensionWidth(), config.getDimensionWidth()));
-
-            int y = (int) (client.player.getEyeY()
-                    + generateRandomDouble(-config.getDimensionHeight(), config.getDimensionHeight()));
-
-            int z = (int) (client.player.getZ()
-                    + generateRandomDouble(-config.getDimensionWidth(), config.getDimensionWidth()));
-
-            double miniX = x + Math.random();
-            double miniY = y + Math.random();
-            double miniZ = z + Math.random();
-
-            BlockPos particlePos = new BlockPos(x, y, z);
-
-            if (shouldParticlesSpawn(client, config, particlePos)) {
-                if (client.world.getBlockState(particlePos).isAir()) {
-                    world.addParticleClient(
-                            getConfig().getParticle(),
-                            miniX, miniY, miniZ,
-                            config.getVelocityRandomnessRandom() * 0.01,
-                            config.getVelocityRandomnessRandom() * 0.01,
-                            config.getVelocityRandomnessRandom() * 0.01
-                    );
-                }
-            }
-        }
-    }
+				if (shouldParticlesSpawn(client, particlePos)) {
+					if (client.world.getBlockState(particlePos).isAir()) {
+						world.addParticle(CaveDustConfigScreen.getParticle(), miniX, miniY, miniZ, 0, 0, 0);
+					}
+				}
+			}
+			catch (NullPointerException e) {
+				LOGGER.error(String.valueOf(e));
+				//getConfig().setParticleID(WHITE_ASH_ID);
+			}
+		}
+	}
 }
--- a/src/main/java/net/lizistired/cavedust/CaveDustConfig.java
+++ b/src/main/java/net/lizistired/cavedust/CaveDustConfig.java
@@ -1,23 +1,16 @@
 package net.lizistired.cavedust;

-import com.google.common.collect.ImmutableList;
 import net.lizistired.cavedust.utils.JsonFile;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.RenderLayer;
 import net.minecraft.particle.ParticleEffect;
-import net.minecraft.particle.ParticleType;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.registry.Registries;
-import net.minecraft.registry.Registry;
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.registry.RegistryKeys;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import static net.lizistired.cavedust.CaveDust.*;
 import static net.lizistired.cavedust.utils.MathHelper.*;

 import java.nio.file.Path;
-import java.util.*;

 public class CaveDustConfig extends JsonFile {
    private transient final net.lizistired.cavedust.CaveDust CaveDust;
@@ -34,13 +27,9 @@ public class CaveDustConfig extends JsonFile {
    private float lowerLimit = -64;
    private int particleMultiplier = 1;

-    int listNumber = 0;
-
    private int particleMultiplierMultiplier = 10;

-    List<Identifier> list = List.of(Registries.PARTICLE_TYPE.getIds().toArray(new Identifier[0]));
-
-    Identifier newId = Identifier.of("cavedust", "cave_dust");
+    private int particleID = WHITE_ASH_ID;

    public CaveDustConfig(Path file, net.lizistired.cavedust.CaveDust caveDust) {
        super(file);
@@ -133,31 +122,20 @@ public class CaveDustConfig extends JsonFile {
        return caveDustEnabled;
    }

-    //todo
-    //public Identifier setParticle(String particleType){
+    public ParticleEffect setParticle(String particleType){
        //particleName = particleType;
-        //save();
-        //return getParticle().get().getKey().get().getValue();
-   //}
-
-    //public ParticleEffect getParticle(){
-    //    try {
-    //        return Registries.PARTICLE_TYPE.getOptional(Identifier.of(Registries.PARTICLE_TYPE.getOptional(getParticleID()).get().getKey().get().getValue().toString().toLowerCase()));
-    //    } catch (ClassCastException e) {
-    //        MinecraftClient.getInstance().player.sendMessage(Text.translatable("debug.cavedust.particleerror"), true);
-    //        LOGGER.error("Cannot spawn particle, check config.");
-    //        iterateParticle();
-    //        save();
-    //        return getParticle();
-    //    }
-    //}
+        save();
+        return getParticle();
+    }

    public ParticleEffect getParticle(){
-        try{
-            return (ParticleEffect) Registries.PARTICLE_TYPE.get(newId);
-        }
-        catch (ClassCastException e){
+        try {
+            return (ParticleEffect) Registries.PARTICLE_TYPE.get(new Identifier(Registries.PARTICLE_TYPE.getEntry(getParticleID()).get().getKey().get().getValue().toString().toLowerCase()));
+        } catch (ClassCastException e) {
+            MinecraftClient.getInstance().player.sendMessage(Text.translatable("debug.cavedust.particleerror"), true);
+            LOGGER.error("Cannot spawn particle, check config.");
            iterateParticle();
+            save();
            return getParticle();
        }
    }
@@ -197,19 +175,26 @@ public class CaveDustConfig extends JsonFile {
        return getSuperFlatStatus();
    }

-    public void iterateParticle() {
-        try {
-            listNumber = listNumber + 1;
-            newId = list.get(listNumber);
-        } catch (IndexOutOfBoundsException e){
-            newId = list.get(0);
-            listNumber = 0;
+    public void iterateParticle(){
+        if(getParticleID() > Registries.PARTICLE_TYPE.size() - 2) {
+            particleID = 1;
+            save();
+        } else {
+            particleID = getParticleID() + 1;
+            save();
        }
+    }
+
+    public void setParticleID(int particleID){
+        this.particleID = particleID;
        save();
    }

-    public ParticleEffect getParticleID(){
-        return getParticle();
+    public int getParticleID(){
+        if ((!Registries.PARTICLE_TYPE.getEntry(particleID).isPresent())) {
+            setParticleID(WHITE_ASH_ID);
+        }
+        return particleID;
    }

    public void resetConfig(){
@@ -223,10 +208,9 @@ public class CaveDustConfig extends JsonFile {
        particleMultiplierMultiplier = 10;
        velocityRandomness = 0;

-        newId = Identifier.of("cavedust", "cave_dust");
-
        seaLevelCheck = true;
        caveDustEnabled = true;
+        particleID = WHITE_ASH_ID;
        save();
    }
 }
--- a/src/main/java/net/lizistired/cavedust/CaveDustConfigScreen.java
+++ b/src/main/java/net/lizistired/cavedust/CaveDustConfigScreen.java
@@ -0,0 +1,235 @@
+package net.lizistired.cavedust;
+
+import com.google.common.collect.Lists;
+import net.lizistired.cavedust.utils.ParticleRegistry;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.particle.ParticleEffect;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.registry.Registries;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+import net.minecraftforge.fml.IExtensionPoint;
+
+import java.util.List;
+import java.util.function.Supplier;
+
+public class CaveDustConfigScreen extends Screen implements IExtensionPoint {
+    private final Screen previous;
+    private final List<ButtonWidget> buttons = Lists.newArrayList();
+
+    private static final Text EXAMPLE_BUTTON = Text.translatable("menu.cavedust.examplebutton");
+
+    private final int imagewidth, imageheight;
+    private int leftpos, toppos;
+
+    private Element optionsArray[] = new Element[9];
+    public static final Identifier OPTIONS_BACKGROUND_TEXTURE = new Identifier("textures/gui/demo_background.png");
+
+
+
+    private int buttonWidth;
+
+
+
+
+    protected CaveDustConfigScreen(Text title, Screen previous) {
+        super(Text.translatable("menu.cavedust.title"));
+        this.imagewidth = 176;
+        this.imageheight = 166;
+        this.previous = previous;
+    }
+    @Override
+    public final void init(){
+        super.init();
+        this.leftpos = width / 2 - 100;
+        this.toppos = height / 4 + 14;
+        var mouseX = 0;
+        var mouseY = 0;
+
+        addDrawableChild(
+                ButtonWidget.builder(
+                        Text.translatable("menu.cavedust.global." + ConfigForge.CAVE_DUST_ENABLED.get()),
+                        btn -> {
+                            ConfigForge.CAVE_DUST_ENABLED.set(!ConfigForge.CAVE_DUST_ENABLED.get());
+                            btn.setMessage(Text.translatable("menu.cavedust.global." + ConfigForge.CAVE_DUST_ENABLED.get()));
+                        }
+                ).dimensions(leftpos, toppos += -60, 200, 20).build()
+        );
+        addDrawableChild(
+                ButtonWidget.builder(
+                        Text.translatable("menu.cavedust.superflatstatus." + ConfigForge.SUPERFLAT_STATUS.get()),
+                        btn -> {
+                            ConfigForge.SUPERFLAT_STATUS.set(!ConfigForge.SUPERFLAT_STATUS.get());
+                            btn.setMessage(Text.translatable("menu.cavedust.superflatstatus." + ConfigForge.SUPERFLAT_STATUS.get()));
+                        }
+                ).dimensions(leftpos, toppos += 24, 200, 20).build()
+        );
+        optionsArray[0] = addDrawableChild(
+                new ForgeSliderButMine(
+                        leftpos,
+                        toppos += 24,
+                        200,
+                        20,
+                        Text.translatable("menu.cavedust.particlemultiplier"),
+                        Text.of(""),
+                        1,
+                        100,
+                        ConfigForge.PARTICLE_MULTIPLIER.get(),
+                        1,
+                        0,
+                        true,
+                        ConfigForge.PARTICLE_MULTIPLIER
+                )
+        );
+        optionsArray[1] = addDrawableChild(
+                new ForgeSliderButMine(
+                        leftpos,
+                        toppos += 24,
+                        200,
+                        20,
+                        Text.translatable("menu.cavedust.particlemultipliermultiplier"),
+                        Text.of(""),
+                        1,
+                        100,
+                        ConfigForge.PARTICLE_MULTIPLIER_MULTIPLIER.get(),
+                        1,
+                        0,
+                        true,
+                        ConfigForge.PARTICLE_MULTIPLIER_MULTIPLIER
+                )
+        );
+        addDrawableChild(
+                ButtonWidget.builder(
+                        Text.translatable("menu.cavedust.particle").append(Text.literal(getNameOfParticle())),
+                        btn -> {
+                            if (ConfigForge.PARTICLE_ID.get() == Registries.PARTICLE_TYPE.size() - 1) {
+                                ConfigForge.PARTICLE_ID.set(1);
+                                btn.setMessage(Text.translatable("menu.cavedust.particle").append(Text.literal(getNameOfParticle())));
+                            } else {
+                                ConfigForge.PARTICLE_ID.set(ConfigForge.PARTICLE_ID.get() + 1);
+                                btn.setMessage(Text.translatable("menu.cavedust.particle").append(Text.literal(getNameOfParticle())));
+                            }
+                        }
+                ).dimensions(leftpos, toppos  += 24, 200, 20).build()
+        );
+        optionsArray[2] = addDrawableChild(
+                new ForgeSliderButMine(
+                        leftpos,
+                        toppos += 24,
+                        200,
+                        20,
+                        Text.translatable("menu.cavedust.height"),
+                        Text.of(""),
+                        1,
+                        50,
+                        ConfigForge.DIMENSION_HEIGHT.get(),
+                        1,
+                        0,
+                        true,
+                        ConfigForge.DIMENSION_HEIGHT
+                )
+        );
+        optionsArray[3] = addDrawableChild(
+                new ForgeSliderButMine(
+                        leftpos,
+                        toppos += 24,
+                        200,
+                        20,
+                        Text.translatable("menu.cavedust.width"),
+                        Text.of(""),
+                        1,
+                        50,
+                        ConfigForge.DIMENSION_WIDTH.get(),
+                        1,
+                        0,
+                        true,
+                        ConfigForge.DIMENSION_WIDTH
+                )
+        );
+        addDrawableChild(
+                ButtonWidget.builder(
+                        Text.translatable("menu.cavedust.reset"),
+                        btn -> resetSettings()
+                ).dimensions(leftpos, toppos += 120, 200, 20).build()
+        );
+        addDrawableChild(
+                ButtonWidget.builder(
+                        Text.translatable("menu.cavedust.apply"),
+                        btn -> {
+                            applyValue(optionsArray);
+                        }
+                ).dimensions(leftpos, toppos += 24, 200, 20).build()
+        );
+        addDrawableChild(
+                ButtonWidget.builder(
+                        Text.translatable("gui.done"),
+                        btn -> {
+                            client.setScreen(this.previous);
+                            applyValue(optionsArray);
+                        }
+                ).dimensions(leftpos, toppos += 24, 200, 20).build()
+        );
+    }
+    @Override
+    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+        this.renderBackground(context, mouseX, mouseY, delta);
+        context.drawCenteredTextWithShadow(this.textRenderer, this.title, this.width / 2, 20, 16777215);
+        super.render(context, mouseX, mouseY, delta);
+    }
+
+    //@Override
+    //public void renderBackgroundTexture(DrawContext context){
+    //    context.setShaderColor(0.25F, 0.25F, 0.25F, 1.0F);
+    //    context.drawTexture(OPTIONS_BACKGROUND_TEXTURE, 0, 0, 0, 0.0F, 0.0F, this.width, this.height, 32, 32);
+    //    context.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+    //}
+
+    private String getNameOfParticle(){
+        return Registries.PARTICLE_TYPE.getEntry(ConfigForge.PARTICLE_ID.get()).get().getKey().get().getValue().toString();
+    }
+
+    public static ParticleEffect getParticle(){
+        try {
+            return (ParticleEffect) Registries.PARTICLE_TYPE.get(new Identifier(Registries.PARTICLE_TYPE.getEntry(ConfigForge.PARTICLE_ID.get()).get().getKey().get().getValue().toString().toLowerCase()));
+        } catch (ClassCastException e) {
+            MinecraftClient.getInstance().player.sendMessage(Text.literal("Issue loading particle, defaulting to white ash particle!"), false);
+            return ParticleTypes.WHITE_ASH;
+        }
+    }
+
+    private void applyValue(Element[] optionsArray) {
+        for (Element element : optionsArray) {
+            if (element instanceof ForgeSliderButMine) {
+                ((ForgeSliderButMine) element).doTheThing();
+            }
+        }
+    }
+
+    private void resetSettings() {
+        ConfigForge.CAVE_DUST_ENABLED.set(ConfigForge.CAVE_DUST_ENABLED.getDefault());
+        ConfigForge.SUPERFLAT_STATUS.set(ConfigForge.SUPERFLAT_STATUS.getDefault());
+        ConfigForge.UPPER_LIMIT.set(ConfigForge.UPPER_LIMIT.getDefault());
+        ConfigForge.LOWER_LIMIT.set(ConfigForge.LOWER_LIMIT.getDefault());
+        ConfigForge.PARTICLE_MULTIPLIER.set(ConfigForge.PARTICLE_MULTIPLIER.getDefault());
+        ConfigForge.PARTICLE_MULTIPLIER_MULTIPLIER.set(ConfigForge.PARTICLE_MULTIPLIER_MULTIPLIER.getDefault());
+        ConfigForge.DIMENSION_WIDTH.set(ConfigForge.DIMENSION_WIDTH.getDefault());
+        ConfigForge.DIMENSION_HEIGHT.set(ConfigForge.DIMENSION_HEIGHT.getDefault());
+        ConfigForge.PARTICLE_ID.set(Registries.PARTICLE_TYPE.getRawId(ParticleRegistry.CAVE_DUST.get()));
+        this.client.setScreen(this.previous);
+    }
+
+    @Override
+    public void close() {
+        this.client.setScreen(this.previous);
+    }
+
+    private ButtonWidget createButton(Text message, Supplier<Screen> screenSupplier) {
+        return ButtonWidget.builder(message, (button) -> {
+            this.client.setScreen((Screen)screenSupplier.get());
+        }).build();
+    }
+}
--- a/src/main/java/net/lizistired/cavedust/CaveDustModMenuFactory.java
+++ b/src/main/java/net/lizistired/cavedust/CaveDustModMenuFactory.java
@@ -1,11 +0,0 @@
-package net.lizistired.cavedust;
-
-import com.terraformersmc.modmenu.api.ConfigScreenFactory;
-import com.terraformersmc.modmenu.api.ModMenuApi;
-
-public class CaveDustModMenuFactory implements ModMenuApi {
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return ModMenuConfigScreen::new;
-    }
-}
--- a/src/main/java/net/lizistired/cavedust/CaveDustParticleFactory.java
+++ b/src/main/java/net/lizistired/cavedust/CaveDustParticleFactory.java
@@ -1,82 +1,53 @@
 package net.lizistired.cavedust;

-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.client.particle.BillboardParticle;
-import net.minecraft.client.particle.Particle;
-import net.minecraft.client.particle.ParticleFactory;
-import net.minecraft.client.particle.SpriteProvider;
+import net.minecraft.client.particle.*;
 import net.minecraft.client.world.ClientWorld;
-import net.minecraft.particle.SimpleParticleType;
-import net.minecraft.util.math.random.Random;
+import net.minecraft.particle.DefaultParticleType;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;

-@Environment(EnvType.CLIENT)
-public class CaveDustParticleFactory extends BillboardParticle {
-    private final SpriteProvider spriteProvider;
-
-    CaveDustParticleFactory(
-            ClientWorld world,
-            double x, double y, double z,
-            double velocityX, double velocityY, double velocityZ,
-            SpriteProvider spriteProvider
-    ) {
-        // En 1.21.9+ BillboardParticle puede recibir sprite inicial
-        super(world, x, y, z, velocityX, velocityY, velocityZ, spriteProvider.getFirst());
-
-        this.spriteProvider = spriteProvider;
-
-        this.maxAge = 200; // 20 ticks = 1s
+public class CaveDustParticleFactory extends SpriteBillboardParticle {
+    public static SpriteProvider spriteProvider;
+    public CaveDustParticleFactory(ClientWorld clientWorld, double x, double y, double z, double velocityX, double velocityY, double velocityZ, SpriteProvider spriteProvider) {
+        super(clientWorld, x, y, z);
+        CaveDustParticleFactory.spriteProvider = spriteProvider; //Sets the sprite provider from above to the sprite provider in the constructor method
+        this.maxAge = 200; //20 ticks = 1 second
        this.scale = 0.1f;
-
-        this.velocityX = velocityX;
-        this.velocityY = -0.007f;
+        this.velocityX = velocityX; //The velX from the constructor parameters
+        this.velocityY = -0.007f; //Allows the particle to slowly fall
        this.velocityZ = velocityZ;
-
+        this.x = x; //The x from the constructor parameters
+        this.y = y;
+        this.z = z;
        this.collidesWithWorld = true;
-        this.alpha = 1.0f;
-
-        // Selecciona el sprite correcto según edad/maxAge (equivalente a setSpriteForAge)
-        this.updateSprite(spriteProvider);
-    }
-
-    @Override
-    protected BillboardParticle.RenderType getRenderType() {
-        return BillboardParticle.RenderType.PARTICLE_ATLAS_TRANSLUCENT;
+        this.alpha = 1.0f; //Setting the alpha to 1.0f means there will be no opacity change until the alpha value is changed
+        this.setSpriteForAge(spriteProvider); //Required
    }

    @Override
    public void tick() {
        super.tick();
-
-        if (!this.isAlive()) {
-            return;
-        }
-
-        this.alpha -= 0.005f;
-        if (this.alpha <= 0.0f) {
+        if(this.alpha < 0.0f){
            this.markDead();
-            return;
        }
-
-        this.updateSprite(this.spriteProvider);
+        this.alpha -= 0.005f;
    }

-    @Environment(EnvType.CLIENT)
-    public static class Factory implements ParticleFactory<SimpleParticleType> {
+    @Override
+    public ParticleTextureSheet getType() {
+        return ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT;
+    }
+
+    @OnlyIn(Dist.CLIENT)
+    public static class Factory implements ParticleFactory<DefaultParticleType> {
        private final SpriteProvider spriteProvider;

        public Factory(SpriteProvider spriteProvider) {
            this.spriteProvider = spriteProvider;
        }

-        @Override
-        public Particle createParticle(
-                SimpleParticleType type,
-                ClientWorld world,
-                double x, double y, double z,
-                double velocityX, double velocityY, double velocityZ,
-                Random random
-        ) {
+
+        public Particle createParticle(DefaultParticleType type, ClientWorld world, double x, double y, double z, double velocityX, double velocityY, double velocityZ) {
            return new CaveDustParticleFactory(world, x, y, z, velocityX, velocityY, velocityZ, this.spriteProvider);
        }
    }
--- a/src/main/java/net/lizistired/cavedust/CaveDustServer.java
+++ b/src/main/java/net/lizistired/cavedust/CaveDustServer.java
@@ -1,19 +0,0 @@
-package net.lizistired.cavedust;
-
-import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.particle.v1.FabricParticleTypes;
-import net.minecraft.particle.SimpleParticleType;
-import net.minecraft.registry.Registries;
-import net.minecraft.registry.Registry;
-import net.minecraft.util.Identifier;
-
-public class CaveDustServer  implements ModInitializer {
-    public static final SimpleParticleType CAVE_DUST = FabricParticleTypes.simple();
-    /**
-     * Runs the mod initializer.
-     */
-    @Override
-    public void onInitialize() {
-        Registry.register(Registries.PARTICLE_TYPE, Identifier.of("cavedust", "cave_dust"), CAVE_DUST);
-    }
-}
--- a/src/main/java/net/lizistired/cavedust/ConfigForge.java
+++ b/src/main/java/net/lizistired/cavedust/ConfigForge.java
@@ -0,0 +1,76 @@
+package net.lizistired.cavedust;
+
+import net.minecraft.registry.Registries;
+import net.minecraft.text.Text;
+import net.minecraftforge.common.ForgeConfigSpec;
+
+import static net.lizistired.cavedust.CaveDust.WHITE_ASH_ID;
+
+public class ConfigForge {
+    public static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder();
+    public static ForgeConfigSpec SPEC;
+
+    public static final ForgeConfigSpec.ConfigValue<Integer> DIMENSION_WIDTH;
+    public static final ForgeConfigSpec.ConfigValue<Integer> DIMENSION_HEIGHT;
+
+    public static final ForgeConfigSpec.BooleanValue CAVE_DUST_ENABLED;
+    public static final ForgeConfigSpec.BooleanValue SEA_LEVEL_CHECK;
+    public static final ForgeConfigSpec.BooleanValue SUPERFLAT_STATUS;
+
+    public static final ForgeConfigSpec.ConfigValue<Integer> UPPER_LIMIT;
+    public static final ForgeConfigSpec.ConfigValue<Integer> LOWER_LIMIT;
+    public static final ForgeConfigSpec.ConfigValue<Integer> PARTICLE_MULTIPLIER;
+    public static final ForgeConfigSpec.ConfigValue<Integer> PARTICLE_MULTIPLIER_MULTIPLIER;
+    public static final ForgeConfigSpec.ConfigValue<Integer> PARTICLE_ID;
+
+    //public static final ForgeConfigSpec.ConfigValue<Integer> VELOCITY_RANDOMNESS;
+    //public static final ForgeConfigSpec.ConfigValue<Double> VELOCITY_RANDOMNESS_RANDOMNESS;
+
+    static {
+        BUILDER.push("Config for Cave Dust");
+
+        //private int dimensionX = 5;
+        DIMENSION_WIDTH = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.X.tooltip")))
+                .defineInRange("dimensionX", 5, 1, 50);
+        DIMENSION_HEIGHT = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.Y.tooltip")))
+                .defineInRange("dimensionX", 5, 1, 50);
+        CAVE_DUST_ENABLED = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.enabled.tooltip")))
+                .define("caveDustEnabled", true);
+
+        SEA_LEVEL_CHECK = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.sealevelcheck.tooltip")))
+                .define("seaLevelCheck", true);
+
+        SUPERFLAT_STATUS = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.superflatstatus.tooltip")))
+                .define("superFlatStatus", false);
+
+        UPPER_LIMIT = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.upperlimit.tooltip")))
+                .defineInRange("upperLimit", 64, 0, 255);
+
+        LOWER_LIMIT = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.lowerlimit.tooltip")))
+                        .defineInRange("lowerLimit", -64, -255, 0);
+
+
+        PARTICLE_MULTIPLIER = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.particlemultiplier.tooltip")))
+                .defineInRange("particleMultiplier", 1, 1, 100);
+
+        PARTICLE_MULTIPLIER_MULTIPLIER = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.particlemultiplier.tooltip")))
+                .defineInRange("particleMultiplierMultiplier", 10, 1, 100);
+
+        PARTICLE_ID = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.particle.tooltip")))
+                .defineInRange("particleID", WHITE_ASH_ID, 0, Registries.PARTICLE_TYPE.size());
+
+        //VELOCITY_RANDOMNESS = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.velocityrandomness.tooltip")))
+        //        .defineInRange("velocityRandomness", 1, 0, 10);
+//
+        //VELOCITY_RANDOMNESS_RANDOMNESS = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.velocityrandomness.tooltip")))
+        //        .defineInRange("velocityRandomness", generateRandomDouble(-VELOCITY_RANDOMNESS.get(), VELOCITY_RANDOMNESS.get()), 0.0d, 10.0d);
+
+
+
+
+
+        BUILDER.pop();
+        SPEC = BUILDER.build();
+    }
+
+}
--- a/src/main/java/net/lizistired/cavedust/ForgeSliderButMine.java
+++ b/src/main/java/net/lizistired/cavedust/ForgeSliderButMine.java
@@ -0,0 +1,49 @@
+package net.lizistired.cavedust;
+
+import net.minecraft.text.Text;
+import net.minecraftforge.client.gui.widget.ForgeSlider;
+import net.minecraftforge.common.ForgeConfigSpec;
+
+public class ForgeSliderButMine extends ForgeSlider {
+    long startTime = System.currentTimeMillis();
+    private int timer = 0;
+    final ForgeConfigSpec.ConfigValue<Integer> configOption;
+
+    /**
+     * @param x            x position of upper left corner
+     * @param y            y position of upper left corner
+     * @param width        Width of the widget
+     * @param height       Height of the widget
+     * @param prefix       {@link Text} displayed before the value string
+     * @param suffix       {@link Text} displayed after the value string
+     * @param minValue     Minimum (left) value of slider
+     * @param maxValue     Maximum (right) value of slider
+     * @param currentValue Starting value when widget is first displayed
+     * @param stepSize     Size of step used. Precision will automatically be calculated based on this value if this value is not 0.
+     * @param precision    Only used when {@code stepSize} is 0. Limited to a maximum of 4 (inclusive).
+     * @param drawString   Should text be displayed on the widget
+     * @param configOption
+     */
+    public ForgeSliderButMine(int x, int y, int width, int height, Text prefix, Text suffix, double minValue, double maxValue, double currentValue, double stepSize, int precision, boolean drawString, ForgeConfigSpec.ConfigValue<Integer> configOption) {
+        super(x, y, width, height, prefix, suffix, minValue, maxValue, currentValue, stepSize, precision, drawString);
+        this.configOption = configOption;
+    }
+
+    @Override
+    protected void updateMessage() {
+            setMessage(Text.literal(prefix.getString() + getValueString()));
+    }
+    @Override
+    public void applyValue(){
+
+    }
+
+    /**
+     * @deprecated bad code ignore this
+     */
+    @Deprecated
+    public void doTheThing(){
+        configOption.set((int) getValue());
+    }
+
+}
--- a/src/main/java/net/lizistired/cavedust/ModMenuConfigScreen.java
+++ b/src/main/java/net/lizistired/cavedust/ModMenuConfigScreen.java
@@ -1,121 +0,0 @@
-package net.lizistired.cavedust;
-
-import com.minelittlepony.common.client.gui.GameGui;
-import com.minelittlepony.common.client.gui.element.*;
-import net.lizistired.cavedust.utils.TranslatableTextHelper;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.particle.ParticleType;
-import net.minecraft.registry.Registries;
-import net.minecraft.text.Text;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.NoSuchElementException;
-
-public class ModMenuConfigScreen extends GameGui {
-    public ModMenuConfigScreen(@Nullable Screen parent) {
-        super(Text.translatable("menu.cavedust.title"), parent);
-    }
-
-    @Override
-    public void init() {
-        int left = width / 2 - 100;
-        int row = height / 4 + 14;
-
-        CaveDustConfig config = CaveDust.getInstance().getConfig();
-        TranslatableTextHelper transText = new TranslatableTextHelper();;
-        config.load();
-
-        addButton(new Label(width / 2, 30)).setCentered().getStyle()
-                .setText(getTitle());
-
-        addButton(new Button(left += -110, row += -60).onClick(sender -> {
-            sender.getStyle().setText("menu.cavedust.global." + config.toggleCaveDust()).setTooltip(Text.translatable("menu.cavedust.global.tooltip." + config.getCaveDustEnabled()));
-        })).getStyle()
-                .setText("menu.cavedust.global." + config.getCaveDustEnabled())
-                .setTooltip(Text.translatable("menu.cavedust.global.tooltip." + config.getCaveDustEnabled()));
-
-        /*addButton(new Button(left, row += 24).onClick(sender -> {
-            sender.getStyle().setText("menu.cavedust.enhanceddetection." + config.setEnhancedDetection()).setTooltip(Text.translatable("menu.cavedust.enhanceddetection.tooltip"));
-        })).getStyle()
-                .setText("menu.cavedust.enhanceddetection." + config.getEnhancedDetection())
-                .setTooltip(Text.translatable("menu.cavedust.enhanceddetection.tooltip"));*/
-
-        addButton(new Button(left, row += 24).onClick(sender -> {
-            sender.getStyle().setText("menu.cavedust.superflatstatus." + config.setSuperFlatStatus()).setTooltip(Text.translatable("menu.cavedust.superflatstatus.tooltip"));
-        })).getStyle()
-                .setText("menu.cavedust.superflatstatus." + config.getSuperFlatStatus())
-                .setTooltip(Text.translatable("menu.cavedust.superflatstatus.tooltip"));
-
-
-
-        /*addButton(new Slider(left, row += 48, -64, 319, config.getUpperLimit()))
-                .onChange(config::setUpperLimit)
-                .setTextFormat(transText::formatUpperLimit)
-                .getStyle().setTooltip(Text.translatable("menu.cavedust.upperlimit.tooltip"));
-
-        addButton(new Slider(left, row += 24, -64, 319, config.getLowerLimit()))
-                .onChange(config::setLowerLimit)
-                .setTextFormat(transText::formatLowerLimit)
-                .getStyle().setTooltip(Text.translatable("menu.cavedust.lowerlimit.tooltip"));*/
-
-        addButton(new Slider(left, row += 24, 1, 100, config.getParticleMultiplier()))
-                .onChange(config::setParticleMultiplier)
-                .setTextFormat(transText::formatParticleMultiplier)
-                .getStyle().setTooltip(Text.translatable("menu.cavedust.particlemultiplier.tooltip"));
-
-        addButton(new Slider(left, row += 24, 1, 100, config.getParticleMultiplierMultiplier()))
-                .onChange(config::setParticleMultiplierMultiplier)
-                .setTextFormat(transText::formatParticleMultiplierMultiplier)
-                .getStyle().setTooltip(Text.translatable("menu.cavedust.particlemultipliermultiplier.tooltip"));
-        addButton(new Button(left, row += 24).onClick(sender ->{
-            config.iterateParticle();
-            sender.getStyle().setText("Particle: " + (getNameOfParticle()));
-        })).getStyle().setText("Particle: " + (getNameOfParticle()))
-                .setTooltip(Text.translatable("menu.cavedust.particle.tooltip"));
-
-        addButton(new Slider(left += 220, row -= 96, 1, 50, config.getDimensionWidth()))
-                .onChange(config::setDimensionWidth)
-                .setTextFormat(transText::formatMaxWidth)
-                .getStyle().setTooltip(Text.translatable("menu.cavedust.width.tooltip"));
-
-        addButton(new Slider(left, row += 24, 1, 50, config.getDimensionHeight()))
-                .onChange(config::setDimensionHeight)
-                .setTextFormat(transText::formatMaxHeight)
-                .getStyle().setTooltip(Text.translatable("menu.cavedust.height.tooltip"));
-
-        addButton(new Slider(left, row += 24, 0, 10, config.getVelocityRandomness()))
-                .onChange(config::setVelocityRandomness)
-                .setTextFormat(transText::formatVelocityRandomness)
-                .getStyle().setTooltip(Text.translatable("menu.cavedust.velocityrandomness.tooltip"));
-
-
-        addButton(new Button(left -= 110, row += 120).onClick(sender -> {
-            config.resetConfig();
-            finish();
-            client.setScreen(new ModMenuConfigScreen(parent));
-        })).getStyle().setText(Text.translatable("menu.cavedust.reset")).setTooltip(Text.translatable("menu.cavedust.reset.tooltip"));
-
-        addButton(new Button(left, row += 24)
-                .onClick(sender -> finish())).getStyle()
-                .setText("gui.done");
-
-    }
-
-
-    @Override
-    public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) {
-        super.render(context, mouseX, mouseY, partialTicks);
-    }
-
-    private String getNameOfParticle(){
-        CaveDustConfig config = CaveDust.getInstance().getConfig();
-        config.load();
-        try {
-            return Registries.PARTICLE_TYPE.getEntry((ParticleType<?>) config.getParticleID()).getIdAsString();
-        } catch (NoSuchElementException e){
-            CaveDust.LOGGER.error(String.valueOf(e));
-            return "null";
-        }
-    }
-}
--- a/src/main/java/net/lizistired/cavedust/mixin/MixinDebugScreenOverlay.java
+++ b/src/main/java/net/lizistired/cavedust/mixin/MixinDebugScreenOverlay.java
@@ -6,31 +6,19 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

-import java.util.ArrayList;
 import java.util.List;

 import static net.lizistired.cavedust.CaveDust.PARTICLE_AMOUNT;
+import static net.lizistired.cavedust.utils.ParticleSpawnUtil.shouldParticlesSpawn;

@Mixin(DebugHud.class)
 public abstract class MixinDebugScreenOverlay {
-
-    @Inject(
-            method = "getRightText()Ljava/util/List;",
-            at = @At("RETURN"),
-            cancellable = true,
-            require = 0
-    )
+    @Inject(method = "getRightText", at = @At("RETURN"))
    private void appendDebugText(CallbackInfoReturnable<List<String>> cir) {
        List<String> messages = cir.getReturnValue();
-        if (messages == null) return;

-        // Evita modificar una lista inmutable/compartida
-        List<String> out = new ArrayList<>(messages);
-
-        out.add("");
-        out.add("Particle amount evaluated: " + PARTICLE_AMOUNT);
-        out.add("");
-
-        cir.setReturnValue(out);
+        messages.add("");
+        messages.add("Particle amount evaluated: " + PARTICLE_AMOUNT);
+        messages.add("");
    }
-}
+}
--- a/src/main/java/net/lizistired/cavedust/utils/KeybindingHelper.java
+++ b/src/main/java/net/lizistired/cavedust/utils/KeybindingHelper.java
@@ -1,33 +0,0 @@
-package net.lizistired.cavedust.utils;
-
-import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
-import net.minecraft.client.option.KeyBinding;
-import net.minecraft.client.util.InputUtil;
-import net.minecraft.util.Identifier;
-import org.lwjgl.glfw.GLFW;
-
-public class KeybindingHelper {
-
-    public static KeyBinding keyBinding1;
-    public static KeyBinding keyBinding2;
-
-    // 1.21.9+ requiere Category (no String)
-    private static final KeyBinding.Category CATEGORY =
-            KeyBinding.Category.create(Identifier.of("cavedust", "spook"));
-
-    public static void registerKeyBindings() {
-        keyBinding1 = KeyBindingHelper.registerKeyBinding(new KeyBinding(
-                "key.cavedust.toggle",
-                InputUtil.Type.KEYSYM,
-                GLFW.GLFW_KEY_KP_ADD,
-                CATEGORY
-        ));
-
-        keyBinding2 = KeyBindingHelper.registerKeyBinding(new KeyBinding(
-                "key.cavedust.reload",
-                InputUtil.Type.KEYSYM,
-                GLFW.GLFW_KEY_KP_ENTER,
-                CATEGORY
-        ));
-    }
-}
--- a/src/main/java/net/lizistired/cavedust/utils/ParticleRegistry.java
+++ b/src/main/java/net/lizistired/cavedust/utils/ParticleRegistry.java
@@ -0,0 +1,22 @@
+package net.lizistired.cavedust.utils;
+
+import net.minecraft.particle.DefaultParticleType;
+import net.minecraft.particle.ParticleType;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.registries.DeferredRegister;
+import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.RegistryObject;
+
+import static net.lizistired.cavedust.CaveDust.MOD_ID;
+import static net.minecraftforge.registries.ForgeRegistries.Keys.PARTICLE_TYPES;
+
+public class ParticleRegistry {
+    private final static DeferredRegister<ParticleType<?>> PARTICLES = DeferredRegister.create(ForgeRegistries.PARTICLE_TYPES, MOD_ID);
+    public final static RegistryObject<DefaultParticleType> CAVE_DUST = PARTICLES.register("cave_dust", () -> new DefaultParticleType(false));
+
+    public static void register(IEventBus eventBus) {
+        PARTICLES.register(eventBus);
+    }
+}
--- a/src/main/java/net/lizistired/cavedust/utils/ParticleSpawnUtil.java
+++ b/src/main/java/net/lizistired/cavedust/utils/ParticleSpawnUtil.java
@@ -1,6 +1,7 @@
 package net.lizistired.cavedust.utils;

 import net.lizistired.cavedust.CaveDustConfig;
+import net.lizistired.cavedust.ConfigForge;
 import net.lizistired.cavedust.mixin.ClientWorldAccessor;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.util.math.BlockPos;
@@ -14,82 +15,29 @@ public class ParticleSpawnUtil {
    private static float timer;
    public static boolean shouldParticlesSpawn;

-    /**
-     * Returns true if particles should spawn.
-     * @param client MinecraftClient
-     * @param config CaveDustConfig
-     * @return boolean
-     */
-    public static boolean shouldParticlesSpawn(MinecraftClient client, CaveDustConfig config) {
-
-        if (client.player == null) {
-            timer = 0;
-            shouldParticlesSpawn = false;
-            return false;
-        }
-
-        // checks if the config is enabled, if the game isn't paused, if the world is valid,
-        // only in overworld, and if the player isn't in a lush caves biome
-        if (!config.getCaveDustEnabled()
-                || client.isPaused()
-                || client.world == null
-                || !client.world.getRegistryKey().equals(World.OVERWORLD)
-                || client.player.isSubmergedInWater()
-                || client.world.getBiome(client.player.getBlockPos()).matchesKey(LUSH_CAVES)) {
-
-            timer = 0;
-            shouldParticlesSpawn = false;
-            return false;
-        }
-
-        World world = client.world;
-        int seaLevel = world.getSeaLevel();
-
-        if (!world.isSkyVisible(client.player.getBlockPos())) {
-            if (client.player.getBlockPos().getY() + 2 < seaLevel) {
-                timer = timer + 1;
-                if (timer > 10) {
-                    timer = 10;
-                    shouldParticlesSpawn = true;
-                    return true;
-                }
-            }
-        }
-
-        shouldParticlesSpawn = false;
-        return false;
-    }
-
    /**
     * Returns true if particles should spawn (uses particle position instead of player).
     * @param client MinecraftClient
-     * @param config CaveDustConfig
     * @param pos BlockPos
     * @return boolean
     */
-    public static boolean shouldParticlesSpawn(MinecraftClient client, CaveDustConfig config, BlockPos pos) {
+    public static boolean shouldParticlesSpawn(MinecraftClient client, BlockPos pos) {

-        // checks if the config is enabled, if the game isn't paused, if the world is valid,
-        // only in overworld, and if the particle position isn't in lush caves
-        if (!config.getCaveDustEnabled()
+        //checks if the config is enabled, if the game isn't paused, if the world is valid, if the particle is valid and if the player isn't in a lush caves biome
+        if (!ConfigForge.CAVE_DUST_ENABLED.get()
                || client.isPaused()
                || client.world == null
-                || !client.world.getRegistryKey().equals(World.OVERWORLD)
+                || !client.world.getDimension().bedWorks()
                || (client.world.getBottomY() > pos.getY())
-                || client.world.getBiome(Objects.requireNonNull(pos)).matchesKey(LUSH_CAVES)) {
+                //|| client.world.getBiome(Objects.requireNonNull(pos)).matchesKey(LUSH_CAVES))
+                || client.world.getBiome(Objects.requireNonNull(pos)).matchesKey(LUSH_CAVES))

+        {
            timer = 0;
            shouldParticlesSpawn = false;
            return false;
        }
-
-        if (client.player == null) {
-            timer = 0;
-            shouldParticlesSpawn = false;
-            return false;
-        }
-
-        if (!config.getSuperFlatStatus()) {
+        if(!ConfigForge.SUPERFLAT_STATUS.get()) {
            if (((ClientWorldAccessor) client.world.getLevelProperties()).getFlatWorld()) {
                return false;
            }
@@ -98,17 +46,16 @@ public class ParticleSpawnUtil {
        World world = client.world;
        int seaLevel = world.getSeaLevel();

-        if (!world.isSkyVisible(pos)) {
-            if (pos.getY() + 2 < seaLevel) {
+        if (!client.player.clientWorld.isSkyVisible(pos)) {
+            if (pos.getY() + 2 < seaLevel){
                timer = timer + 1;
-                if (timer > 10) {
+                if (timer > 10){
                    timer = 10;
                    shouldParticlesSpawn = true;
                    return true;
                }
            }
        }
-
        shouldParticlesSpawn = false;
        return false;
    }
--- a/src/main/java/net/lizistired/cavedust/utils/TranslatableTextHelper.java
+++ b/src/main/java/net/lizistired/cavedust/utils/TranslatableTextHelper.java
@@ -1,29 +0,0 @@
-package net.lizistired.cavedust.utils;
-
-import com.minelittlepony.common.client.gui.element.AbstractSlider;
-import net.minecraft.text.Text;
-
-public class TranslatableTextHelper {
-    public Text formatMaxWidth(AbstractSlider<Float> slider) {
-        return Text.translatable("menu.cavedust.width", (int)Math.floor(slider.getValue()));
-    }
-    public Text formatMaxHeight(AbstractSlider<Float> slider) {
-        return Text.translatable("menu.cavedust.height", (int)Math.floor(slider.getValue()));
-    }
-    public Text formatUpperLimit(AbstractSlider<Float> slider) {
-        return Text.translatable("menu.cavedust.upperlimit", (int)Math.floor(slider.getValue()));
-    }
-    public Text formatLowerLimit(AbstractSlider<Float> slider) {
-        return Text.translatable("menu.cavedust.lowerlimit", (int)Math.floor(slider.getValue()));
-    }
-    public Text formatParticleMultiplier(AbstractSlider<Float> slider) {
-        return Text.translatable("menu.cavedust.particlemultiplier", (int)Math.floor(slider.getValue()));
-    }
-
-    public Text formatParticleMultiplierMultiplier(AbstractSlider<Float> slider) {
-        return Text.translatable("menu.cavedust.particlemultipliermultiplier", (int)Math.floor(slider.getValue()));
-    }
-    public Text formatVelocityRandomness(AbstractSlider<Float> slider) {
-        return Text.translatable("menu.cavedust.velocityrandomness", (int) Math.floor(slider.getValue()));
-    }
-}
--- a/src/main/java/net/lizistired/cavedust/utils/event/EventBusEvents.java
+++ b/src/main/java/net/lizistired/cavedust/utils/event/EventBusEvents.java
@@ -0,0 +1,18 @@
+package net.lizistired.cavedust.utils.event;
+
+import net.lizistired.cavedust.CaveDust;
+import net.lizistired.cavedust.CaveDustParticleFactory;
+import net.lizistired.cavedust.utils.ParticleRegistry;
+import net.minecraft.client.MinecraftClient;
+import net.minecraftforge.client.event.RegisterParticleProvidersEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.registries.RegisterEvent;
+
+@Mod.EventBusSubscriber(modid = "cavedust", bus = Mod.EventBusSubscriber.Bus.MOD)
+public class EventBusEvents {
+    @SubscribeEvent
+    public static void registerParticleTypes(final RegisterParticleProvidersEvent event) {
+        MinecraftClient.getInstance().particleManager.registerFactory(ParticleRegistry.CAVE_DUST.get(), CaveDustParticleFactory.Factory::new);
+    }
+}
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -0,0 +1,35 @@
+modLoader = "javafml"
+loaderVersion = "[49,)"
+#issueTrackerURL = ""
+license = "Mozilla Public License Version 2.0"
+
+[[mods]]
+modId = "cavedust"
+version = "${version}"
+displayName = "Cave Dust"
+authors = "LizCannotEven"
+description = '''
+This mod adds cave dust to caves!
+'''
+#logoFile = ""
+
+[[dependencies.cavedust]]
+modId = "forge"
+mandatory = true
+versionRange = "[49,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.cavedust]]
+modId = "minecraft"
+mandatory = true
+versionRange = "[1.20.4,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.cavedust]]
+modId = "architectury"
+mandatory = true
+versionRange = "[11,)"
+ordering = "NONE"
+side = "BOTH"
--- a/src/main/resources/assets/cavedust/icon.png
+++ b/src/main/resources/assets/cavedust/icon.png
--- a/src/main/resources/assets/cavedust/lang/en_us.json
+++ b/src/main/resources/assets/cavedust/lang/en_us.json
@@ -4,21 +4,21 @@
  "menu.cavedust.global.true": "Cave Dust: Enabled",
  "menu.cavedust.global.tooltip.false": "Enable cave dust particles?",
  "menu.cavedust.global.tooltip.true": "Disable cave dust particles?",
-  "menu.cavedust.width": "Width bounds: %s",
-  "menu.cavedust.height": "Height bounds: %s",
+  "menu.cavedust.width": "Width bounds: ",
+  "menu.cavedust.height": "Height bounds: ",
  "menu.cavedust.width.tooltip": "Maximum width to spawn particle.",
  "menu.cavedust.height.tooltip": "Maximum height to spawn particle.",
-  "menu.cavedust.upperlimit": "Upper limit height: %s",
-  "menu.cavedust.lowerlimit": "Lower limit height: %s",
+  "menu.cavedust.upperlimit": "Upper limit height: ",
+  "menu.cavedust.lowerlimit": "Lower limit height: ",
  "menu.cavedust.upperlimit.tooltip": "The height where particles will fade out and stop spawning (uses player y).",
  "menu.cavedust.lowerlimit.tooltip": "The height where particles spawn the most (uses player y).",
  "menu.cavedust.reset": "Reset settings",
  "menu.cavedust.reset.tooltip": "Are you sure you want to reset all settings?",
-  "menu.cavedust.particlemultiplier": "Particle amount: %s",
+  "menu.cavedust.particlemultiplier": "Particle amount: ",
  "menu.cavedust.particlemultiplier.tooltip": "Amount of particles to spawn at any given depth.",
-  "menu.cavedust.particlemultipliermultiplier": "Particle multiplier: %s",
+  "menu.cavedust.particlemultipliermultiplier": "Particle multiplier: ",
  "menu.cavedust.particlemultipliermultiplier.tooltip": "Multiplies particle amount.",
-  "menu.cavedust.velocityrandomness": "Velocity randomness: %s",
+  "menu.cavedust.velocityrandomness": "Velocity randomness: ",
  "menu.cavedust.velocityrandomness.tooltip": "The randomness of the velocity of the particles.",
  "menu.cavedust.enhanceddetection.true": "Enhanced detection: Enabled",
  "menu.cavedust.enhanceddetection.false": "Enhanced detection: Disabled",
@@ -28,6 +28,7 @@
  "menu.cavedust.superflatstatus.tooltip": "Should particles spawn on superflat worlds?",
  "menu.cavedust.particle": "Particle: ",
  "menu.cavedust.particle.tooltip": "Particle to spawn. Click to cycle.",
+  "menu.cavedust.apply": "Apply",

  "key.cavedust.reload": "Reload Config",
  "key.cavedust.toggle": "Toggle Particles",
--- a/src/main/resources/assets/cavedust/lang/fr_fr.json
+++ b/src/main/resources/assets/cavedust/lang/fr_fr.json
@@ -1,44 +0,0 @@
-{
-  "menu.cavedust.title": "Cave Dust",
-  "menu.cavedust.global.false": "Cave Dust: Désactivée",
-  "menu.cavedust.global.true": "Cave Dust: Activée",
-  "menu.cavedust.global.tooltip.false": "Activer les particules de poussière de grotte ?",
-  "menu.cavedust.global.tooltip.true": "Désactiver les particules de poussière de grotte ?",
-  "menu.cavedust.minX": "Minimum X: %s",
-  "menu.cavedust.minY": "Minimum Y: %s",
-  "menu.cavedust.minZ": "Minimum Z: %s",
-  "menu.cavedust.maxX": "Maximum X: %s",
-  "menu.cavedust.maxY": "Maximum Y: %s",
-  "menu.cavedust.maxZ": "Maximum Z: %s",
-  "menu.cavedust.minX.tooltip": "Minimum X: %s",
-  "menu.cavedust.minY.tooltip": "Minimum Y: %s",
-  "menu.cavedust.minZ.tooltip": "Minimum Z: %s",
-  "menu.cavedust.maxX.tooltip": "Maximum X: %s",
-  "menu.cavedust.maxY.tooltip": "Maximum Y: %s",
-  "menu.cavedust.maxZ.tooltip": "Maximum Z: %s",
-  "menu.cavedust.upperlimit": "Limite supérieure : %s",
-  "menu.cavedust.lowerlimit": "Limite inférieure : %s",
-  "menu.cavedust.upperlimit.tooltip": "La hauteur à laquelle les particules s'estompent et cessent de spawner (utilise l'axe Y du joueur).",
-  "menu.cavedust.lowerlimit.tooltip": "La hauteur où les particules apparaissent le plus (utilise l'axe Y du joueur).",
-  "menu.cavedust.reset": "Réinitialiser les paramètres",
-  "menu.cavedust.reset.tooltip": "Êtes-vous sûr de vouloir réinitialiser tous les paramètres ?",
-  "menu.cavedust.particlemultiplier": "Multiplicateur de particules : %s",
-  "menu.cavedust.particlemultiplier.tooltip": "Multiplie la quantité de particules à une profondeur donnée.",
-  "menu.cavedust.velocityrandomness": "Aléatoire de la vélocité : %s",
-  "menu.cavedust.velocityrandomness.tooltip": "Le niveau d'aléatoire de la vélocité des particules.",
-  "menu.cavedust.enhanceddetection.true": "Détection améliorée : Activée",
-  "menu.cavedust.enhanceddetection.false": "Détection améliorée : Désactivée",
-  "menu.cavedust.enhanceddetection.tooltip": "La détection améliorée permet des vérifications plus précises en utilisant la position des particules\n               plutôt que celle du joueur, mais impacte les performances.",
-  "menu.cavedust.superflatstatus.true": "Particules sur monde Superflat : Activées",
-  "menu.cavedust.superflatstatus.false": "Particules sur monde Superflat : Désactivées",
-  "menu.cavedust.superflatstatus.tooltip": "Les particules doivent-elles apparaître sur les mondes Superflat ?",
-
-  "key.cavedust.reload": "Recharger la configuration",
-  "key.cavedust.toggle": "Activer/Désactiver les particules",
-  "category.cavedust.spook": "Cave Dust",
-
-  "debug.cavedust.toggle.true": "(Cave Dust) Particules activées",
-  "debug.cavedust.toggle.false": "(Cave Dust) Particules désactivées",
-  "debug.cavedust.reload": "(Cave Dust) Configuration rechargée"
-
-}
--- a/src/main/resources/assets/cavedust/lang/ru_ru.json
+++ b/src/main/resources/assets/cavedust/lang/ru_ru.json
@@ -1,44 +0,0 @@
-{
-  "menu.cavedust.title": "Пещерная пыль",
-  "menu.cavedust.global.false": "Пещерная пыль: отключена",
-  "menu.cavedust.global.true": "Пещерная пыль: включена",
-  "menu.cavedust.global.tooltip.false": "Включить частицы пещерной пыли?",
-  "menu.cavedust.global.tooltip.true": "Отключить частицы пещерной пыли?",
-  "menu.cavedust.minX": "Минимум по X: %s",
-  "menu.cavedust.minY": "Минимум по Y: %s",
-  "menu.cavedust.minZ": "Минимум по Z: %s",
-  "menu.cavedust.maxX": "Максимум по X: %s",
-  "menu.cavedust.maxY": "Максимум по Y: %s",
-  "menu.cavedust.maxZ": "Максимум по Z: %s",
-  "menu.cavedust.minX.tooltip": "Минимум по X: %s",
-  "menu.cavedust.minY.tooltip": "Минимум по Y: %s",
-  "menu.cavedust.minZ.tooltip": "Минимум по Z: %s",
-  "menu.cavedust.maxX.tooltip": "Максимум по X: %s",
-  "menu.cavedust.maxY.tooltip": "Максимум по Y: %s",
-  "menu.cavedust.maxZ.tooltip": "Максимум по Z: %s",
-  "menu.cavedust.upperlimit": "Верхний предел: %s",
-  "menu.cavedust.lowerlimit": "Нижний предел: %s",
-  "menu.cavedust.upperlimit.tooltip": "Высота, на которой частицы будут исчезать и перестанут появляться (испольует координату Y игрока).",
-  "menu.cavedust.lowerlimit.tooltip": "The height where particles spawn the most (испольует координату Y игрока).",
-  "menu.cavedust.reset": "Сброс настроек",
-  "menu.cavedust.reset.tooltip": "Вы уверены, что хотите сбросить все настройки?",
-  "menu.cavedust.particlemultiplier": "Множитель частиц: %s",
-  "menu.cavedust.particlemultiplier.tooltip": "Увеличивает количество частиц на любой заданной глубине.",
-  "menu.cavedust.velocityrandomness": "Случайность скорости: %s",
-  "menu.cavedust.velocityrandomness.tooltip": "Случайность скорости движения частиц.",
-  "menu.cavedust.enhanceddetection.true": "Улучшенное обнаружение: включено",
-  "menu.cavedust.enhanceddetection.false": "Улучшенное обнаружение: отключено",
-  "menu.cavedust.enhanceddetection.tooltip": "Улучшенное обнаружение позволяет проводить более точные проверки, используя положение частиц\nвместо положения игрока, что оказывает некоторое влияние на производительность.",
-  "menu.cavedust.superflatstatus.true": "Частицы в суперплоскости: включены",
-  "menu.cavedust.superflatstatus.false": "Частицы в суперплоскости: отключены",
-  "menu.cavedust.superflatstatus.tooltip": "Должны ли частицы появляться в суперплоских мирах?",
-
-  "key.cavedust.reload": "Перезагрузить конфигурацию",
-  "key.cavedust.toggle": "Переключить частицы",
-  "category.cavedust.spook": "Пещерная пыль",
-
-  "debug.cavedust.toggle.true": "[Пещерная пыль] Включенные частицы",
-  "debug.cavedust.toggle.false": "[Пещерная пыль] Отключенные частицы",
-  "debug.cavedust.reload": "[Пещерная пыль] Конфигурация перезагружена"
-
-}
--- a/src/main/resources/assets/cavedust/lang/zh_cn.json
+++ b/src/main/resources/assets/cavedust/lang/zh_cn.json
@@ -1,41 +0,0 @@
-{
-  "menu.cavedust.title": "洞穴尘埃",
-  "menu.cavedust.global.false": "洞穴尘埃: 功能启用",
-  "menu.cavedust.global.true": "洞穴尘埃: 功能禁用",
-  "menu.cavedust.global.tooltip.false": "启用洞穴尘埃粒子效果?",
-  "menu.cavedust.global.tooltip.true": "禁用洞穴尘埃粒子效果?",
-  "menu.cavedust.width": "边界宽度: %s",
-  "menu.cavedust.height": "边界高度: %s",
-  "menu.cavedust.width.tooltip": "生成粒子效果的最大宽度.",
-  "menu.cavedust.height.tooltip": "生成粒子效果的最大高度.",
-  "menu.cavedust.upperlimit": "最大高度限制: %s",
-  "menu.cavedust.lowerlimit": "最低高度限制: %s",
-  "menu.cavedust.upperlimit.tooltip": "粒子效果消失的高度 (读取玩家所在的 y 轴).",
-  "menu.cavedust.lowerlimit.tooltip": "粒子效果出现最多的高度 (读取玩家所在的 y 轴).",
-  "menu.cavedust.reset": "重置所有设置",
-  "menu.cavedust.reset.tooltip": "你确定要这么做吗?",
-  "menu.cavedust.particlemultiplier": "粒子数量: %s",
-  "menu.cavedust.particlemultiplier.tooltip": "指定深度生成的粒子效果数量.",
-  "menu.cavedust.particlemultipliermultiplier": "粒子效果倍率: %s",
-  "menu.cavedust.particlemultipliermultiplier.tooltip": "粒子效果的生成倍率.",
-  "menu.cavedust.velocityrandomness": "速度随机性: %s",
-  "menu.cavedust.velocityrandomness.tooltip": "粒子效果的速度随机程度.",
-  "menu.cavedust.enhanceddetection.true": "强化检测: 功能启用",
-  "menu.cavedust.enhanceddetection.false": "强化检测: 功能禁用",
-  "menu.cavedust.enhanceddetection.tooltip": "强化检测会使用粒子效果而非玩家的位置进行更精确的检测\n               对性能略有影响.",
-  "menu.cavedust.superflatstatus.true": "超平坦粒子: 功能启用",
-  "menu.cavedust.superflatstatus.false": "超平坦粒子: 功能禁用",
-  "menu.cavedust.superflatstatus.tooltip": "是否允许超平坦世界生成洞穴尘埃?",
-  "menu.cavedust.particle": "粒子效果: ",
-  "menu.cavedust.particle.tooltip": "生成的粒子效果名称, 点击切换.",
-
-  "key.cavedust.reload": "重载配置",
-  "key.cavedust.toggle": "切换粒子",
-  "category.cavedust.spook": "洞穴尘埃",
-
-  "debug.cavedust.toggle.true": "(洞穴尘埃) 粒子效果已启用",
-  "debug.cavedust.toggle.false": "(洞穴尘埃) 粒子效果已禁用",
-  "debug.cavedust.reload": "(洞穴尘埃) 配置已重载",
-  "debug.cavedust.particleerror": "(洞穴尘埃) 设置当前粒子效果时出现问题, 已自动切换至下一个粒子效果!"
-
-}
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -1,43 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "cavedustreforged",
-  "version": "${version}",
-  "name": "Cave Dust Reforged",
-  "description": "Makes dust underground that scales with depth!",
-  "authors": [
-    "DekinDev"
-  ],
-  "contributors": [
-  "LizIsTired (Original mod)"
-  ],
-  "contact": {
-    "issues": "https://git.straice.com/DekinDev/cave_dust_reforged/issues",
-    "sources": "https://git.straice.com/DekinDev/cave_dust_reforged",
-    "homepage": "https://modrinth.com/project/cave-dust-reforged"
-  },
-  "license": "MPL-2.0",
-  "icon": "assets/cavedust/icon.png",
-  "environment": "*",
-  "entrypoints": {
-    "client": [
-      "net.lizistired.cavedust.CaveDust"
-    ],
-    "main": [
-      "net.lizistired.cavedust.CaveDustServer"],
-    "modmenu": [
-      "net.lizistired.cavedust.CaveDustModMenuFactory"
-    ]
-  },
-  "mixins": [
-    "cavedust.mixins.json"
-  ],
-  "depends": {
-    "fabricloader": ">=0.17.2",
-    "fabric": "*",
-    "minecraft": "1.21.11",
-    "java": ">=17"
-  },
-  "suggests": {
-    "modmenu": ">=3.0.1"
-  }
-}
--- a/src/main/resources/pack.mcmeta
+++ b/src/main/resources/pack.mcmeta
@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "description": "Cave Dust",
+    "pack_format": 22
+  }
+}