Port to Minecraft 1.21.11

Create ru_ru.json

.github/workflows/build-release.yml

@@ -33,29 +33,10 @@ jobs:
         run: ./gradlew build --stacktrace
 
       - name: Upload artifacts to Modrinth, Curseforge and GitHub
-        uses: Kir-Antipov/mc-publish@v2.0
+        uses: Kir-Antipov/mc-publish@v3.3
         with:
           modrinth-id: jawg7zT1
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
 
           curseforge-id: 594750
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
-
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-          files: build/libs/!(*-@(dev|sources|all)).jar
-
-          version-type: release
-
-          loaders: fabric
-
-          java: 17
-
-          dependencies: |
-           fabric | depends | 0.46.0
-           P7dR8mSH | depends | 0.46.0
-           kirin | includes | 1.10.0-beta.2
-           modmenu | recommends | *
-           mOgUt4GM | recommends | *
-           
-          version-resolver: latest # Defaults to selecting the latest compatible version of Minecraft, using the tag from the fabric.mod.json

.gitignore

@@ -31,3 +31,4 @@ bin/
 # fabric
 
 run/
+BackupSrc/

build.gradle

@@ -1,12 +1,12 @@
 plugins {
-	id 'fabric-loom' version '0.11-SNAPSHOT'
+	id 'fabric-loom' version '1.14.7'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
+base {
-targetCompatibility = JavaVersion.VERSION_17
+	archivesName = project.archives_base_name
+}
 
-archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
@@ -19,7 +19,7 @@ repositories {
 		}
 	}
 	maven {
-		url = "https://maven.terraformersmc.com"
+		url = "https://maven.terraformersmc.com/releases"
 	}
 	maven {
 		name = 'minelp'
@@ -61,7 +61,7 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
 	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	it.options.release = 17
+	it.options.release = 21
 }
 
 java {
@@ -69,11 +69,13 @@ java {
 	// if it is present.
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {
 	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}"}
+		rename { "${it}_${project.archives_base_name}" }
 	}
 }
 

gradle.properties

@@ -2,19 +2,17 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-	# check these on https://fabricmc.net/develop
+	minecraft_version=1.21.11
-	minecraft_version=1.18.2
+	yarn_mappings=1.21.11+build.3
-	yarn_mappings=1.18.2+build.1
+	loader_version=0.18.4
-	loader_version=0.12.11
+	loom_version=1.14-SNAPSHOT
 
 # Mod Properties
-	mod_version = 1.2.0
+	mod_version=1.0.0
-	maven_group = com.lizistired
+	maven_group=com.straice
-	archives_base_name = cave_dust
+	archives_base_name=cave_dust_reforged
 
 # Dependencies
-	fabric_version=0.47.8+1.18.2
+	fabric_version=0.140.2+1.21.11
-    clothconfig_version = 6.1.48
+	modmenu_version=17.0.0-beta.1
-	modmenu_version = 3.0.1
+	kirin_version=1.21.4+1.21.11
-	minelp_version=4.4.0-beta.2
-	kirin_version=1.10.0-beta.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -32,10 +34,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
+#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,12 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# This is normally unused
-
+# shellcheck disable=SC2034
-APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
-
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +134,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
+
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-#     shell script including quotes and variable substitutions, so put them in
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-#     double quotes to make sure that they get re-expanded; and
+
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -205,6 +217,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -13,8 +13,10 @@
 @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
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

src/main/java/net/lizistired/cavedust/CaveDust.java

@@ -1,92 +1,128 @@
 package net.lizistired.cavedust;
 
-//minecraft imports
+// minecraft imports
-import net.lizistired.cavedust.mixin.ClientWorldAccessor;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
-import net.minecraft.util.Util;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-//other imports
-import com.minelittlepony.common.util.GamePaths;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.particle.ParticleEffect;
+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;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-//java imports
-import java.nio.file.Path;
-//static imports
-import static net.lizistired.cavedust.utils.MathHelper.*;
-import static net.lizistired.cavedust.utils.MathHelper.generateRandomDouble;
-import static net.lizistired.cavedust.utils.ParticleSpawnUtil.shouldParticlesSpawn;
-import static net.lizistired.cavedust.utils.KeybindingHelper.*;
 
+// java imports
+import java.nio.file.Path;
+
+// static imports
+import static net.lizistired.cavedust.utils.KeybindingHelper.*;
+import static net.lizistired.cavedust.utils.MathHelper.generateRandomDouble;
+import static net.lizistired.cavedust.utils.MathHelper.normalize;
+import static net.lizistired.cavedust.utils.ParticleSpawnUtil.shouldParticlesSpawn;
 
 public class CaveDust implements ClientModInitializer {
-	//logger
+    // logger
-	public static final Logger LOGGER = LoggerFactory.getLogger("caveDust");
+    public static final Logger LOGGER = LoggerFactory.getLogger("cavedust");
-	//make class static
+
+    // make class static
     private static CaveDust instance;
+
     public static CaveDust getInstance() {
         return instance;
     }
+
     public CaveDust() {
         instance = this;
     }
-	//config assignment
+
+    // config assignment
     private static CaveDustConfig config;
+
     public CaveDustConfig getConfig() {
         return config;
     }
 
+    public static ParticleEffect WHITE_ASH_ID =
+            (ParticleEffect) Registries.PARTICLE_TYPE.get(Identifier.of("cavedust", "cave_dust"));
+
+    public static int PARTICLE_AMOUNT = 0;
 
     @Override
     public void onInitializeClient() {
-		//config path and loading
+        // config path and loading
-		Path CaveDustFolder = GamePaths.getConfigDirectory().resolve("cavedust");
+        Path caveDustFolder = GamePaths.getConfigDirectory().resolve("cavedust");
-		config = new CaveDustConfig(CaveDustFolder.getParent().resolve("cavedust.json"), this);
+        config = new CaveDustConfig(caveDustFolder.getParent().resolve("cavedust.json"), this);
         config.load();
+
         registerKeyBindings();
 
-		//register end client tick to create cave dust function, using end client tick for async
+        ParticleFactoryRegistry.getInstance().register(CaveDustServer.CAVE_DUST, CaveDustParticleFactory.Factory::new);
+
+        // register end client tick to create cave dust function, using end client tick for async
         ClientTickEvents.END_CLIENT_TICK.register(this::createCaveDust);
     }
 
     private void createCaveDust(MinecraftClient client) {
-		if (keyBinding1.wasPressed()){
+        if (client.player == null) return;
+
+        if (keyBinding1.wasPressed()) {
             getConfig().toggleCaveDust();
             LOGGER.info("Toggled dust");
-			client.player.sendSystemMessage(new TranslatableText("debug.cavedust.toggle." + config.getCaveDustEnabled()), Util.NIL_UUID);
+            client.player.sendMessage(
+                    Text.translatable("debug.cavedust.toggle." + config.getCaveDustEnabled()),
+                    false
+            );
         }
-		if (keyBinding2.wasPressed()){
+
+        if (keyBinding2.wasPressed()) {
             getConfig().load();
             LOGGER.info("Reloaded config");
-			client.player.sendSystemMessage(new TranslatableText("debug.cavedust.reload"), Util.NIL_UUID);
+            client.player.sendMessage(Text.translatable("debug.cavedust.reload"), false);
         }
 
-		//ensure world is not null
+        // 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(config.getLowerLimit(), config.getUpperLimit(), client.player.getBlockY());
 
-		for (int i = 0; i < probabilityNormalized * config.getParticleMultiplier() * 10; i++) {
+        double probabilityNormalized =
-			try {
+                normalize(config.getLowerLimit(), config.getUpperLimit(), client.player.getBlockY());
-				double x = client.player.getPos().getX() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxX());
+
-				double y = client.player.getPos().getY() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxY());
+        PARTICLE_AMOUNT = (int) (probabilityNormalized
-				double z = client.player.getPos().getZ() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxZ());
+                * 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)){return;}
+            if (shouldParticlesSpawn(client, config, particlePos)) {
-
+                if (client.world.getBlockState(particlePos).isAir()) {
-
+                    world.addParticleClient(
-				world.addParticle(config.getParticle(), x, y, z, config.getVelocityRandomnessRandom(), config.getVelocityRandomnessRandom(), config.getVelocityRandomnessRandom());
+                            getConfig().getParticle(),
+                            miniX, miniY, miniZ,
+                            config.getVelocityRandomnessRandom() * 0.01,
+                            config.getVelocityRandomnessRandom() * 0.01,
+                            config.getVelocityRandomnessRandom() * 0.01
+                    );
                 }
-			catch (NullPointerException e) {
-				LOGGER.error(String.valueOf(e));
-				getConfig().setParticle("minecraft:white_ash");
             }
         }
     }

src/main/java/net/lizistired/cavedust/CaveDustConfig.java

@@ -1,111 +1,74 @@
 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 net.minecraft.util.registry.Registry;
 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 CaveDust CaveDust;
+    private transient final net.lizistired.cavedust.CaveDust CaveDust;
 
 
-    private int dimensionMaxX = 5;
+    private int width = 10;
-    private int dimensionMaxY = 5;
+    private int height = 10;
-    private int dimensionMaxZ = 5;
+    private int velocityRandomness = 0;
-    private int dimensionMinX = -5;
-    private int dimensionMinY = -5;
-    private int dimensionMinZ = -5;
-    private int velocityRandomness = 1;
 
     private boolean caveDustEnabled = true;
-    private String particleName = "white_ash";
     private boolean seaLevelCheck = true;
     private boolean superFlatStatus = false;
-    //private boolean enhancedDetection = true;
     private float upperLimit = 64;
     private float lowerLimit = -64;
     private int particleMultiplier = 1;
 
-    public CaveDustConfig(Path file, CaveDust caveDust) {
+    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");
+
+    public CaveDustConfig(Path file, net.lizistired.cavedust.CaveDust caveDust) {
         super(file);
         this.CaveDust = caveDust;
     }
 
-    public float setDimensionsMinX(float size){
+    public float setDimensionWidth(float size){
-        if (this.dimensionMinX != size) {
+        if (this.width != size) {
-            this.dimensionMinX = (int)size;
+            this.width = (int)size;
             save();
         }
-        return getDimensionsMinX();
+        return getDimensionWidth();
     }
 
-    public float setDimensionsMinY(float size){
+    public float setDimensionHeight(float size){
-        if (this.dimensionMinY != size) {
+        if (this.height != size) {
-            this.dimensionMinY = (int)size;
+            this.height = (int)size;
             save();
         }
-        return getDimensionsMinY();
+        return getDimensionHeight();
     }
 
-    public float setDimensionsMinZ(float size){
+    public float getDimensionWidth(){
-        if (this.dimensionMinZ != size) {
+        return width;
-            this.dimensionMinZ = (int)size;
-            save();
-        }
-        return getDimensionsMinZ();
     }
 
-    public float getDimensionsMinX(){
+    public float getDimensionHeight(){
-        return dimensionMinX;
+        return height;
-    }
-
-    public float getDimensionsMinY(){
-        return dimensionMinY;
-    }
-
-    public float getDimensionsMinZ(){
-        return dimensionMinZ;
-    }
-
-    public float setDimensionsMaxX(float size){
-        if (this.dimensionMaxX != size) {
-            this.dimensionMaxX = (int)size;
-            save();
-        }
-        return getDimensionsMaxX();
-    }
-
-    public float setDimensionsMaxY(float size){
-        if (this.dimensionMaxY != size) {
-            this.dimensionMaxY = (int)size;
-            save();
-        }
-        return getDimensionsMaxY();
-    }
-
-    public float setDimensionsMaxZ(float size){
-        if (this.dimensionMaxZ != size) {
-            this.dimensionMaxZ = (int)size;
-            save();
-        }
-        return getDimensionsMaxZ();
-    }
-
-    public float getDimensionsMaxX(){
-        return dimensionMaxX;
-    }
-
-    public float getDimensionsMaxY(){
-        return dimensionMaxY;
-    }
-
-    public float getDimensionsMaxZ(){
-        return dimensionMaxZ;
     }
 
     public float setUpperLimit(float upperLimit){
@@ -150,6 +113,16 @@ public class CaveDustConfig extends JsonFile {
         return getParticleMultiplier();
     }
 
+    public int getParticleMultiplierMultiplier(){
+        return particleMultiplierMultiplier;
+    }
+
+    public float setParticleMultiplierMultiplier(float particleMultiplierMultiplier){
+        this.particleMultiplierMultiplier = (int) particleMultiplierMultiplier;
+        save();
+        return getParticleMultiplierMultiplier();
+    }
+
     public boolean toggleCaveDust(){
         caveDustEnabled = !caveDustEnabled;
         save();
@@ -160,20 +133,32 @@ public class CaveDustConfig extends JsonFile {
         return caveDustEnabled;
     }
 
-    public ParticleEffect setParticle(String particleType){
+    //todo
-        particleName = particleType;
+    //public Identifier setParticle(String particleType){
-        save();
+        //particleName = particleType;
-        return getParticle();
+        //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();
+    //    }
+    //}
 
     public ParticleEffect getParticle(){
-        try {
+        try{
-            return (ParticleEffect) Registry.PARTICLE_TYPE.get(new Identifier(particleName.toLowerCase()));
+            return (ParticleEffect) Registries.PARTICLE_TYPE.get(newId);
-        } catch (ClassCastException e) {
+        }
-            LOGGER.error(e + "\nThere was an error loading the specified particle from the config, make sure a valid particle name is specified. Falling back to \"minecraft:white_ash\".");
+        catch (ClassCastException e){
-            particleName = "minecraft:white_ash";
+            iterateParticle();
-            save();
+            return getParticle();
-            return ParticleTypes.WHITE_ASH;
         }
     }
 
@@ -212,33 +197,36 @@ public class CaveDustConfig extends JsonFile {
         return getSuperFlatStatus();
     }
 
-    /*public boolean getEnhancedDetection(){
+    public void iterateParticle() {
-        return enhancedDetection;
+        try {
+            listNumber = listNumber + 1;
+            newId = list.get(listNumber);
+        } catch (IndexOutOfBoundsException e){
+            newId = list.get(0);
+            listNumber = 0;
+        }
+        save();
     }
 
-    public boolean setEnhancedDetection(){
+    public ParticleEffect getParticleID(){
-        enhancedDetection = !enhancedDetection;
+        return getParticle();
-        save();
+    }
-        return getEnhancedDetection();
-    }*/
 
     public void resetConfig(){
-        dimensionMinX = -5;
+        width = 10;
-        dimensionMinY = -5;
+        height = 10;
-        dimensionMinZ = -5;
-
-        dimensionMaxX = 5;
-        dimensionMaxY = 5;
-        dimensionMaxZ = 5;
 
         upperLimit = 64;
         lowerLimit = -64;
 
         particleMultiplier = 1;
+        particleMultiplierMultiplier = 10;
+        velocityRandomness = 0;
+
+        newId = Identifier.of("cavedust", "cave_dust");
 
         seaLevelCheck = true;
         caveDustEnabled = true;
-        particleName = "minecraft:white_ash";
         save();
     }
 }

src/main/java/net/lizistired/cavedust/CaveDustParticleFactory.java

@@ -0,0 +1,83 @@
+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.world.ClientWorld;
+import net.minecraft.particle.SimpleParticleType;
+import net.minecraft.util.math.random.Random;
+
+@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
+        this.scale = 0.1f;
+
+        this.velocityX = velocityX;
+        this.velocityY = -0.007f;
+        this.velocityZ = velocityZ;
+
+        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;
+    }
+
+    @Override
+    public void tick() {
+        super.tick();
+
+        if (!this.isAlive()) {
+            return;
+        }
+
+        this.alpha -= 0.005f;
+        if (this.alpha <= 0.0f) {
+            this.markDead();
+            return;
+        }
+
+        this.updateSprite(this.spriteProvider);
+    }
+
+    @Environment(EnvType.CLIENT)
+    public static class Factory implements ParticleFactory<SimpleParticleType> {
+        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
+        ) {
+            return new CaveDustParticleFactory(world, x, y, z, velocityX, velocityY, velocityZ, this.spriteProvider);
+        }
+    }
+}

src/main/java/net/lizistired/cavedust/CaveDustServer.java

@@ -0,0 +1,19 @@
+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);
+    }
+}

src/main/java/net/lizistired/cavedust/ModMenuConfigScreen.java

@@ -3,15 +3,18 @@ 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.client.util.math.MatrixStack;
+import net.minecraft.particle.ParticleType;
-import net.minecraft.text.TranslatableText;
+import net.minecraft.registry.Registries;
+import net.minecraft.text.Text;
+import org.jetbrains.annotations.Nullable;
 
-import javax.annotation.Nullable;
+import java.util.NoSuchElementException;
 
 public class ModMenuConfigScreen extends GameGui {
     public ModMenuConfigScreen(@Nullable Screen parent) {
-        super(new TranslatableText("menu.cavedust.title"), parent);
+        super(Text.translatable("menu.cavedust.title"), parent);
     }
 
     @Override
@@ -20,95 +23,99 @@ public class ModMenuConfigScreen extends GameGui {
         int row = height / 4 + 14;
 
         CaveDustConfig config = CaveDust.getInstance().getConfig();
-        TranslatableTextHelper transText = new TranslatableTextHelper();
+        TranslatableTextHelper transText = new TranslatableTextHelper();;
         config.load();
 
         addButton(new Label(width / 2, 30)).setCentered().getStyle()
                 .setText(getTitle());
 
-        addButton(new Button(left, row += -60).onClick(sender -> {
+        addButton(new Button(left += -110, row += -60).onClick(sender -> {
-            sender.getStyle().setText("menu.cavedust.global." + config.toggleCaveDust()).setTooltip(new TranslatableText("menu.cavedust.global.tooltip." + config.getCaveDustEnabled()));
+            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(new TranslatableText("menu.cavedust.global.tooltip." + 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(new TranslatableText("menu.cavedust.enhanceddetection.tooltip"));
+            sender.getStyle().setText("menu.cavedust.enhanceddetection." + config.setEnhancedDetection()).setTooltip(Text.translatable("menu.cavedust.enhanceddetection.tooltip"));
         })).getStyle()
                 .setText("menu.cavedust.enhanceddetection." + config.getEnhancedDetection())
-                .setTooltip(new TranslatableText("menu.cavedust.enhanceddetection.tooltip"));*/
+                .setTooltip(Text.translatable("menu.cavedust.enhanceddetection.tooltip"));*/
 
         addButton(new Button(left, row += 24).onClick(sender -> {
-            sender.getStyle().setText("menu.cavedust.superflatstatus." + config.setSuperFlatStatus()).setTooltip(new TranslatableText("menu.cavedust.superflatstatus.tooltip"));
+            sender.getStyle().setText("menu.cavedust.superflatstatus." + config.setSuperFlatStatus()).setTooltip(Text.translatable("menu.cavedust.superflatstatus.tooltip"));
         })).getStyle()
                 .setText("menu.cavedust.superflatstatus." + config.getSuperFlatStatus())
-                .setTooltip(new TranslatableText("menu.cavedust.superflatstatus.tooltip"));
+                .setTooltip(Text.translatable("menu.cavedust.superflatstatus.tooltip"));
 
-        addButton(new Slider(left += -110, row += 24, -50, 0, config.getDimensionsMinX()))
-                .onChange(config::setDimensionsMinX)
-                .setTextFormat(transText::formatMinX)
-                .getStyle().setTooltip(new TranslatableText("menu.cavedust.minX.tooltip"));
 
-        addButton(new Slider(left, row += 24, -50, 0, config.getDimensionsMinY()))
-                .onChange(config::setDimensionsMinY)
-                .setTextFormat(transText::formatMinY)
-                .getStyle().setTooltip(new TranslatableText("menu.cavedust.minY.tooltip"));
 
-        addButton(new Slider(left, row += 24, -50, 0, config.getDimensionsMinZ()))
+        /*addButton(new Slider(left, row += 48, -64, 319, config.getUpperLimit()))
-                .onChange(config::setDimensionsMinZ)
-                .setTextFormat(transText::formatMinZ)
-                .getStyle().setTooltip(new TranslatableText("menu.cavedust.minZ.tooltip"));
-
-        addButton(new Slider(left += 220, row += -48, 0, 50, config.getDimensionsMaxX()))
-                .onChange(config::setDimensionsMaxX)
-                .setTextFormat(transText::formatMaxX)
-                .getStyle().setTooltip(new TranslatableText("menu.cavedust.maxX.tooltip"));
-
-        addButton(new Slider(left, row += 24, 0, 50, config.getDimensionsMaxY()))
-                .onChange(config::setDimensionsMaxY)
-                .setTextFormat(transText::formatMaxY)
-                .getStyle().setTooltip(new TranslatableText("menu.cavedust.maxY.tooltip"));
-
-        addButton(new Slider(left, row += 24, 0, 50, config.getDimensionsMaxZ()))
-                .onChange(config::setDimensionsMaxZ)
-                .setTextFormat(transText::formatMaxZ)
-                .getStyle().setTooltip(new TranslatableText("menu.cavedust.maxZ.tooltip"));
-
-        addButton(new Slider(left += -110, row += 24, -64, 319, config.getUpperLimit()))
                 .onChange(config::setUpperLimit)
                 .setTextFormat(transText::formatUpperLimit)
-                .getStyle().setTooltip(new TranslatableText("menu.cavedust.upperlimit.tooltip"));
+                .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(new TranslatableText("menu.cavedust.lowerlimit.tooltip"));
+                .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(new TranslatableText("menu.cavedust.particlemultiplier.tooltip"));
+                .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(new TranslatableText("menu.cavedust.velocityrandomness.tooltip"));
+                .getStyle().setTooltip(Text.translatable("menu.cavedust.velocityrandomness.tooltip"));
 
 
-        addButton(new Button(left, row += 24).onClick(sender -> {
+        addButton(new Button(left -= 110, row += 120).onClick(sender -> {
             config.resetConfig();
             finish();
-        })).getStyle().setText(new TranslatableText("menu.cavedust.reset")).setTooltip(new TranslatableText("menu.cavedust.reset.tooltip"));
+            client.setScreen(new ModMenuConfigScreen(parent));
+        })).getStyle().setText(Text.translatable("menu.cavedust.reset")).setTooltip(Text.translatable("menu.cavedust.reset.tooltip"));
 
-        addButton(new Button(left, row += 60)
+        addButton(new Button(left, row += 24)
                 .onClick(sender -> finish())).getStyle()
                 .setText("gui.done");
+
     }
 
 
     @Override
-    public void render(MatrixStack matrices, int mouseX, int mouseY, float partialTicks) {
+    public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) {
-        renderBackground(matrices);
+        super.render(context, mouseX, mouseY, partialTicks);
-        super.render(matrices, 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";
+        }
     }
 }

src/main/java/net/lizistired/cavedust/mixin/MixinDebugScreenOverlay.java

@@ -1,48 +1,36 @@
 package net.lizistired.cavedust.mixin;
 
-
-import net.lizistired.cavedust.CaveDustConfig;
 import net.minecraft.client.gui.hud.DebugHud;
 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.callback.CallbackInfoReturnable;
 
-import java.lang.management.BufferPoolMXBean;
+import java.util.ArrayList;
-import java.lang.management.ManagementFactory;
 import java.util.List;
-import java.util.Objects;
+
-import static net.lizistired.cavedust.utils.MathHelper.*;
+import static net.lizistired.cavedust.CaveDust.PARTICLE_AMOUNT;
-import static net.lizistired.cavedust.utils.ParticleSpawnUtil.shouldParticlesSpawn;
 
 @Mixin(DebugHud.class)
 public abstract class MixinDebugScreenOverlay {
-    @Unique
-    private static final List<BufferPoolMXBean> pools = ManagementFactory.getPlatformMXBeans(BufferPoolMXBean.class);
 
-    @Unique
+    @Inject(
-    private static final BufferPoolMXBean directPool;
+            method = "getRightText()Ljava/util/List;",
-
+            at = @At("RETURN"),
-    static {
+            cancellable = true,
-        BufferPoolMXBean found = null;
+            require = 0
-
+    )
-        for (BufferPoolMXBean pool : pools) {
+    private void appendDebugText(CallbackInfoReturnable<List<String>> cir) {
-            if (pool.getName().equals("direct")) {
-                found = pool;
-                break;
-            }
-        }
-
-        directPool = Objects.requireNonNull(found);
-    }
-    @Inject(method = "getRightText", at = @At("RETURN"))
-    private void appendShaderPackText(CallbackInfoReturnable<List<String>> cir) {
         List<String> messages = cir.getReturnValue();
+        if (messages == null) return;
 
-        messages.add("");
+        // Evita modificar una lista inmutable/compartida
-        messages.add("Should particles spawn: " + shouldParticlesSpawn);
+        List<String> out = new ArrayList<>(messages);
-        messages.add("");
+
+        out.add("");
+        out.add("Particle amount evaluated: " + PARTICLE_AMOUNT);
+        out.add("");
+
+        cir.setReturnValue(out);
     }
 }

src/main/java/net/lizistired/cavedust/utils/KeybindingHelper.java

@@ -2,8 +2,8 @@ package net.lizistired.cavedust.utils;
 
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.option.KeyBinding;
-import net.minecraft.client.option.StickyKeyBinding;
 import net.minecraft.client.util.InputUtil;
+import net.minecraft.util.Identifier;
 import org.lwjgl.glfw.GLFW;
 
 public class KeybindingHelper {
@@ -11,19 +11,23 @@ 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(){
+    public static void registerKeyBindings() {
         keyBinding1 = KeyBindingHelper.registerKeyBinding(new KeyBinding(
                 "key.cavedust.toggle",
-                InputUtil.Type.KEYSYM,// The translation key of the keybinding's name // The type of the keybinding, KEYSYM for keyboard, MOUSE for mouse.
+                InputUtil.Type.KEYSYM,
-                GLFW.GLFW_KEY_KP_ADD, // The keycode of the key
+                GLFW.GLFW_KEY_KP_ADD,
-                "category.cavedust.spook" // The translation key of the keybinding's category.
+                CATEGORY
         ));
+
         keyBinding2 = KeyBindingHelper.registerKeyBinding(new KeyBinding(
-                "key.cavedust.reload", // The translation key of the keybinding's name
+                "key.cavedust.reload",
-                InputUtil.Type.KEYSYM, // The type of the keybinding, KEYSYM for keyboard, MOUSE for mouse.
+                InputUtil.Type.KEYSYM,
-                GLFW.GLFW_KEY_KP_ENTER, // The keycode of the key
+                GLFW.GLFW_KEY_KP_ENTER,
-                "category.cavedust.spook" // The translation key of the keybinding's category.
+                CATEGORY
         ));
     }
 }

src/main/java/net/lizistired/cavedust/utils/MathHelper.java

@@ -35,6 +35,10 @@ public class MathHelper {
      * @return Random number (double)
      */
     public static double generateRandomDouble(double min, double max) {
+        try {
             return ThreadLocalRandom.current().nextDouble(min, max);
+        } catch (IllegalArgumentException e) {
+            return 0;
+        }
     }
 }

src/main/java/net/lizistired/cavedust/utils/ParticleSpawnUtil.java

@@ -7,7 +7,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 import java.util.Objects;
-import java.util.Optional;
 
 import static net.minecraft.world.biome.BiomeKeys.LUSH_CAVES;
 
@@ -23,14 +22,21 @@ public class ParticleSpawnUtil {
      */
     public static boolean shouldParticlesSpawn(MinecraftClient client, CaveDustConfig config) {
 
-        //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 (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.getDimension().isBedWorking()
+                || !client.world.getRegistryKey().equals(World.OVERWORLD)
-                || Objects.requireNonNull(client.player).isSubmergedInWater()
+                || client.player.isSubmergedInWater()
-                || client.world.getBiome(Objects.requireNonNull(client.player.getBlockPos())).matchesKey(LUSH_CAVES))
+                || client.world.getBiome(client.player.getBlockPos()).matchesKey(LUSH_CAVES)) {
-        {
+
             timer = 0;
             shouldParticlesSpawn = false;
             return false;
@@ -39,16 +45,17 @@ public class ParticleSpawnUtil {
         World world = client.world;
         int seaLevel = world.getSeaLevel();
 
-        if (!client.player.clientWorld.isSkyVisible(client.player.getBlockPos())) {
+        if (!world.isSkyVisible(client.player.getBlockPos())) {
-            if (client.player.getBlockPos().getY() + 2 < seaLevel){
+            if (client.player.getBlockPos().getY() + 2 < seaLevel) {
                 timer = timer + 1;
-                if (timer > 10){
+                if (timer > 10) {
                     timer = 10;
                     shouldParticlesSpawn = true;
                     return true;
                 }
             }
         }
+
         shouldParticlesSpawn = false;
         return false;
     }
@@ -62,20 +69,27 @@ public class ParticleSpawnUtil {
      */
     public static boolean shouldParticlesSpawn(MinecraftClient client, CaveDustConfig config, BlockPos pos) {
 
-        //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
+        // 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()
                 || client.isPaused()
                 || client.world == null
-                || !client.world.getDimension().isBedWorking()
+                || !client.world.getRegistryKey().equals(World.OVERWORLD)
-                || Objects.requireNonNull(client.player).isSubmergedInWater()
+                || (client.world.getBottomY() > pos.getY())
-                || 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(!config.getSuperFlatStatus()) {
+
+        if (client.player == null) {
+            timer = 0;
+            shouldParticlesSpawn = false;
+            return false;
+        }
+
+        if (!config.getSuperFlatStatus()) {
             if (((ClientWorldAccessor) client.world.getLevelProperties()).getFlatWorld()) {
                 return false;
             }
@@ -84,16 +98,17 @@ public class ParticleSpawnUtil {
         World world = client.world;
         int seaLevel = world.getSeaLevel();
 
-        if (!client.player.clientWorld.isSkyVisible(pos)) {
+        if (!world.isSkyVisible(pos)) {
-            if (pos.getY() + 2 < seaLevel){
+            if (pos.getY() + 2 < seaLevel) {
                 timer = timer + 1;
-                if (timer > 10){
+                if (timer > 10) {
                     timer = 10;
                     shouldParticlesSpawn = true;
                     return true;
                 }
             }
         }
+
         shouldParticlesSpawn = false;
         return false;
     }

src/main/java/net/lizistired/cavedust/utils/TranslatableTextHelper.java

@@ -2,37 +2,28 @@ package net.lizistired.cavedust.utils;
 
 import com.minelittlepony.common.client.gui.element.AbstractSlider;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 
 public class TranslatableTextHelper {
-    public Text formatMinX(AbstractSlider<Float> slider) {
+    public Text formatMaxWidth(AbstractSlider<Float> slider) {
-        return new TranslatableText("menu.cavedust.minX", (int)Math.floor(slider.getValue()));
+        return Text.translatable("menu.cavedust.width", (int)Math.floor(slider.getValue()));
     }
-    public Text formatMinY(AbstractSlider<Float> slider) {
+    public Text formatMaxHeight(AbstractSlider<Float> slider) {
-        return new TranslatableText("menu.cavedust.minY", (int)Math.floor(slider.getValue()));
+        return Text.translatable("menu.cavedust.height", (int)Math.floor(slider.getValue()));
-    }
-    public Text formatMinZ(AbstractSlider<Float> slider) {
-        return new TranslatableText("menu.cavedust.minZ", (int)Math.floor(slider.getValue()));
-    }
-    public Text formatMaxX(AbstractSlider<Float> slider) {
-        return new TranslatableText("menu.cavedust.maxX", (int)Math.floor(slider.getValue()));
-    }
-    public Text formatMaxY(AbstractSlider<Float> slider) {
-        return new TranslatableText("menu.cavedust.maxY", (int)Math.floor(slider.getValue()));
-    }
-    public Text formatMaxZ(AbstractSlider<Float> slider) {
-        return new TranslatableText("menu.cavedust.maxZ", (int)Math.floor(slider.getValue()));
     }
     public Text formatUpperLimit(AbstractSlider<Float> slider) {
-        return new TranslatableText("menu.cavedust.upperlimit", (int)Math.floor(slider.getValue()));
+        return Text.translatable("menu.cavedust.upperlimit", (int)Math.floor(slider.getValue()));
     }
     public Text formatLowerLimit(AbstractSlider<Float> slider) {
-        return new TranslatableText("menu.cavedust.lowerlimit", (int)Math.floor(slider.getValue()));
+        return Text.translatable("menu.cavedust.lowerlimit", (int)Math.floor(slider.getValue()));
     }
     public Text formatParticleMultiplier(AbstractSlider<Float> slider) {
-        return new TranslatableText("menu.cavedust.particlemultiplier", (int)Math.floor(slider.getValue()));
+        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 new TranslatableText("menu.cavedust.velocityrandomness", (int)Math.floor(slider.getValue()));
+        return Text.translatable("menu.cavedust.velocityrandomness", (int) Math.floor(slider.getValue()));
     }
 }

src/main/resources/assets/cavedust/lang/en_us.json

@@ -4,26 +4,20 @@
   "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.minX": "Minimum X: %s",
+  "menu.cavedust.width": "Width bounds: %s",
-  "menu.cavedust.minY": "Minimum Y: %s",
+  "menu.cavedust.height": "Height bounds: %s",
-  "menu.cavedust.minZ": "Minimum Z: %s",
+  "menu.cavedust.width.tooltip": "Maximum width to spawn particle.",
-  "menu.cavedust.maxX": "Maximum X: %s",
+  "menu.cavedust.height.tooltip": "Maximum height to spawn particle.",
-  "menu.cavedust.maxY": "Maximum Y: %s",
+  "menu.cavedust.upperlimit": "Upper limit height: %s",
-  "menu.cavedust.maxZ": "Maximum Z: %s",
+  "menu.cavedust.lowerlimit": "Lower limit height: %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": "Upper limit: %s",
-  "menu.cavedust.lowerlimit": "Lower limit: %s",
   "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 multiplier: %s",
+  "menu.cavedust.particlemultiplier": "Particle amount: %s",
-  "menu.cavedust.particlemultiplier.tooltip": "Multiplies the amount of particles at any given depth.",
+  "menu.cavedust.particlemultiplier.tooltip": "Amount of particles to spawn at any given depth.",
+  "menu.cavedust.particlemultipliermultiplier": "Particle multiplier: %s",
+  "menu.cavedust.particlemultipliermultiplier.tooltip": "Multiplies particle amount.",
   "menu.cavedust.velocityrandomness": "Velocity randomness: %s",
   "menu.cavedust.velocityrandomness.tooltip": "The randomness of the velocity of the particles.",
   "menu.cavedust.enhanceddetection.true": "Enhanced detection: Enabled",
@@ -32,6 +26,8 @@
   "menu.cavedust.superflatstatus.true": "Superflat particles: Enabled",
   "menu.cavedust.superflatstatus.false": "Superflat particles: Disabled",
   "menu.cavedust.superflatstatus.tooltip": "Should particles spawn on superflat worlds?",
+  "menu.cavedust.particle": "Particle: ",
+  "menu.cavedust.particle.tooltip": "Particle to spawn. Click to cycle.",
 
   "key.cavedust.reload": "Reload Config",
   "key.cavedust.toggle": "Toggle Particles",
@@ -39,6 +35,7 @@
 
   "debug.cavedust.toggle.true": "(Cave Dust) Enabled particles",
   "debug.cavedust.toggle.false": "(Cave Dust) Disabled particles",
-  "debug.cavedust.reload": "(Cave Dust) Reloaded config"
+  "debug.cavedust.reload": "(Cave Dust) Reloaded config",
+  "debug.cavedust.particleerror": "(Cave Dust) Error setting particle, skipping to next particle!"
 
 }

src/main/resources/assets/cavedust/lang/ru_ru.json

@@ -0,0 +1,44 @@
+{
+  "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": "[Пещерная пыль] Конфигурация перезагружена"
+
+}

src/main/resources/assets/cavedust/lang/zh_cn.json

@@ -0,0 +1,41 @@
+{
+  "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": "(洞穴尘埃) 设置当前粒子效果时出现问题, 已自动切换至下一个粒子效果!"
+
+}

src/main/resources/assets/cavedust/particles/cave_dust.json

@@ -0,0 +1,5 @@
+{
+  "textures": [
+    "minecraft:generic_0"
+  ]
+}

src/main/resources/cavedust.mixins.json

@@ -4,7 +4,8 @@
   "package": "net.lizistired.cavedust.mixin",
   "compatibilityLevel": "JAVA_16",
   "mixins": [
-    "ClientWorldAccessor"
+    "ClientWorldAccessor",
+    "MixinDebugScreenOverlay"
   ],
   "client": [
   ],

src/main/resources/fabric.mod.json

@@ -1,44 +1,43 @@
 {
   "schemaVersion": 1,
-  "id": "cavedust",
+  "id": "cavedustreforged",
   "version": "${version}",
-  "name": "Cave Dust",
+  "name": "Cave Dust Reforged",
   "description": "Makes dust underground that scales with depth!",
   "authors": [
-    "LizIsTired"
+    "DekinDev"
+  ],
+  "contributors": [
+  "LizIsTired (Original mod)"
   ],
   "contact": {
-    "issues": "https://github.com/LizIsTired/dust/issues",
+    "issues": "https://git.straice.com/DekinDev/cave_dust_reforged/issues",
-    "sources": "https://github.com/LizIsTired/dust"
+    "sources": "https://git.straice.com/DekinDev/cave_dust_reforged",
+    "homepage": "https://modrinth.com/project/cave-dust-reforged"
   },
   "license": "MPL-2.0",
-  "icon": "assets/modid/icon.png",
+  "icon": "assets/cavedust/icon.png",
   "environment": "*",
   "entrypoints": {
     "client": [
       "net.lizistired.cavedust.CaveDust"
     ],
+    "main": [
+      "net.lizistired.cavedust.CaveDustServer"],
     "modmenu": [
       "net.lizistired.cavedust.CaveDustModMenuFactory"
     ]
   },
   "mixins": [
-    "dust.mixins.json"
+    "cavedust.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.12.11",
+    "fabricloader": ">=0.17.2",
     "fabric": "*",
-    "minecraft": "1.18.2",
+    "minecraft": "1.21.11",
     "java": ">=17"
   },
   "suggests": {
     "modmenu": ">=3.0.1"
-  },
-  "custom": {
-    "modmenu": {
-      "links": {
-        "modmenu.discord": "https://discord.gg/4m6kQSX6bx"
-      }
-    }
   }
 }