Bump to 1.4.0

Particles can no longer spawn under the world.
Particles no longer spawn in blocks, instead spawning in air.
Fixed bug present since 1.2.0, which meant particle amount was dependant on blocks around player.
New particle multiplier allowing greater control of particle amount.
New F3 screen text, allows user to debug particle amount.
Removed upper and lower limit buttons.

.github/workflows/build-release.yml

@@ -39,4 +39,6 @@ jobs:
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
 
           curseforge-id: 594750
-          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.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 }}
 

build.gradle

@@ -1,8 +1,11 @@
 plugins {
-	id 'fabric-loom' version '1.10-SNAPSHOT'
+	id 'fabric-loom' version '1.2-SNAPSHOT'
 	id 'maven-publish'
 }
 
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
+
 archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
@@ -58,7 +61,7 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
 	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	it.options.release = 21
+	it.options.release = 17
 }
 
 java {
@@ -66,8 +69,6 @@ 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 {

gradle.properties

@@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.21.5
-	yarn_mappings=1.21.5+build.1
-	loader_version=0.16.14
+	minecraft_version=1.19.3
+	yarn_mappings=1.19.3+build.5
+	loader_version=0.14.13
 
 # Mod Properties
-	mod_version=3.0.1
-	maven_group=com.lizistired
-	archives_base_name=cave_dust
+	mod_version = 1.4.0
+	maven_group = com.lizistired
+	archives_base_name = cave_dust
 
 # Dependencies
-	fabric_version=0.121.0+1.21.5
-    clothconfig_version=18.0.145
-	modmenu_version=14.0.0-rc.2
-	kirin_version=1.20.5+1.21.5
+	fabric_version=0.72.0+1.19.3
+    clothconfig_version =9.0.94
+	modmenu_version =5.1.0-beta.3
+	kirin_version=1.13.2

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -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/master/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/.
@@ -82,12 +80,13 @@ do
     esac
 done
 
-# This is normally unused
-# shellcheck disable=SC2034
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
 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
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -134,29 +133,22 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    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.
+    which java >/dev/null 2>&1 || 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
@@ -201,15 +193,11 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# 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.
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -217,12 +205,6 @@ 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,10 +13,8 @@
 @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
@@ -27,8 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -43,13 +40,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "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 +56,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
 
@@ -78,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="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!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

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

@@ -1,13 +1,11 @@
 package net.lizistired.cavedust;
 
 //minecraft imports
-import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
+import net.minecraft.block.Blocks;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.particle.ParticleEffect;
+import net.minecraft.particle.ParticleTypes;
 import net.minecraft.registry.Registries;
-import net.minecraft.registry.Registry;
 import net.minecraft.text.Text;
-import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 //other imports
@@ -42,12 +40,10 @@ public class CaveDust implements ClientModInitializer {
 		return config;
 	}
 
-	public static ParticleEffect WHITE_ASH_ID = (ParticleEffect) Registries.PARTICLE_TYPE.get(Identifier.of("cavedust", "cave_dust"));
+	public static int WHITE_ASH_ID = Registries.PARTICLE_TYPE.getRawId(ParticleTypes.WHITE_ASH);
 	public static int PARTICLE_AMOUNT = 0;
 
 
-
-
 	@Override
 	public void onInitializeClient() {
 		//config path and loading
@@ -55,7 +51,6 @@ public class CaveDust implements ClientModInitializer {
 		config = new CaveDustConfig(CaveDustFolder.getParent().resolve("cavedust.json"), this);
 		config.load();
 		registerKeyBindings();
-		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);
@@ -76,26 +71,28 @@ public class CaveDust implements ClientModInitializer {
 		//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());
 		PARTICLE_AMOUNT = (int) (probabilityNormalized * config.getParticleMultiplier() * config.getParticleMultiplierMultiplier());
 
 		for (int i = 0; i < PARTICLE_AMOUNT; i++) {
-				int x = (int) (client.player.getPos().getX() + (int) generateRandomDouble(config.getDimensionWidth() *-1, config.getDimensionWidth()));
-				int y = (int) (client.player.getEyePos().getY() + (int) generateRandomDouble(config.getDimensionHeight() *-1, config.getDimensionHeight()));
-				int z = (int) (client.player.getPos().getZ() + (int) generateRandomDouble(config.getDimensionWidth() *-1, config.getDimensionWidth()));
-				double miniX = (x + Math.random());
-				double miniY = (y + Math.random());
-				double miniZ = (z + Math.random());
+			try {
+				double x = client.player.getPos().getX() + generateRandomDouble(config.getDimensionsX() * -1, config.getDimensionsX());
+				double y = client.player.getPos().getY() + generateRandomDouble(config.getDimensionsY() * -1, config.getDimensionsY());
+				double z = client.player.getPos().getZ() + generateRandomDouble(config.getDimensionsZ() * -1, config.getDimensionsZ());
 				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);
+						world.addParticle(config.getParticle(), x, y, z, config.getVelocityRandomnessRandom(), config.getVelocityRandomnessRandom(), config.getVelocityRandomnessRandom());
 					}
 				}
 			}
+			catch (NullPointerException e) {
+				LOGGER.error(String.valueOf(e));
+				getConfig().setParticleID(WHITE_ASH_ID);
+			}
 		}
 	}
+}

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

@@ -1,31 +1,25 @@
 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;
 
 
-    private int width = 10;
-    private int height = 10;
-    private int velocityRandomness = 0;
+    private int dimensionX = 5;
+    private int dimensionY = 5;
+    private int dimensionZ = 5;
+    private int velocityRandomness = 1;
 
     private boolean caveDustEnabled = true;
     private boolean seaLevelCheck = true;
@@ -34,41 +28,49 @@ 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);
         this.CaveDust = caveDust;
     }
 
-    public float setDimensionWidth(float size){
-        if (this.width != size) {
-            this.width = (int)size;
+    public float setDimensionsX(float size){
+        if (this.dimensionX != size) {
+            this.dimensionX = (int)size;
             save();
         }
-        return getDimensionWidth();
+        return getDimensionsX();
     }
 
-    public float setDimensionHeight(float size){
-        if (this.height != size) {
-            this.height = (int)size;
+    public float setDimensionsY(float size){
+        if (this.dimensionY != size) {
+            this.dimensionY = (int)size;
             save();
         }
-        return getDimensionHeight();
+        return getDimensionsY();
     }
 
-    public float getDimensionWidth(){
-        return width;
+    public float setDimensionsZ(float size){
+        if (this.dimensionZ != size) {
+            this.dimensionZ = (int)size;
+            save();
+        }
+        return getDimensionsZ();
     }
 
-    public float getDimensionHeight(){
-        return height;
+    public float getDimensionsX(){
+        return dimensionX;
+    }
+
+    public float getDimensionsY(){
+        return dimensionY;
+    }
+
+    public float getDimensionsZ(){
+        return dimensionZ;
     }
 
     public float setUpperLimit(float upperLimit){
@@ -133,32 +135,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){
-            iterateParticle();
-            return getParticle();
+        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.literal("Issue loading particle, defaulting to white ash particle!"), false);
+            setParticleID(WHITE_ASH_ID);
+            save();
+            return ParticleTypes.WHITE_ASH;
         }
     }
 
@@ -197,36 +187,42 @@ 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(){
-        width = 10;
-        height = 10;
+        dimensionX = 5;
+        dimensionY = 5;
+        dimensionZ = 5;
 
         upperLimit = 64;
         lowerLimit = -64;
 
         particleMultiplier = 1;
         particleMultiplierMultiplier = 10;
-        velocityRandomness = 0;
-
-        newId = Identifier.of("cavedust", "cave_dust");
 
         seaLevelCheck = true;
         caveDustEnabled = true;
+        particleID = WHITE_ASH_ID;
         save();
     }
 }

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

@@ -1,54 +0,0 @@
-package net.lizistired.cavedust;
-
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.client.particle.*;
-import net.minecraft.client.world.ClientWorld;
-import net.minecraft.particle.SimpleParticleType;
-
-public class CaveDustParticleFactory extends SpriteBillboardParticle {
-    private final SpriteProvider spriteProvider;
-    CaveDustParticleFactory(ClientWorld clientWorld, double x, double y, double z, double velocityX, double velocityY, double velocityZ, SpriteProvider spriteProvider) {
-        super(clientWorld, x, y, z);
-        this.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; //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; //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.alpha < 0.0f){
-            this.markDead();
-        }
-        this.alpha -= 0.005f;
-    }
-
-    @Override
-    public ParticleTextureSheet getType() {
-        return ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT;
-    }
-
-    @Environment(EnvType.CLIENT)
-    public static class Factory implements ParticleFactory<SimpleParticleType> {
-        private final SpriteProvider spriteProvider;
-
-        public Factory(SpriteProvider spriteProvider) {
-            this.spriteProvider = spriteProvider;
-        }
-
-
-        public Particle createParticle(SimpleParticleType 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);
-        }
-    }
-}

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);
-    }
-}

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

@@ -3,15 +3,13 @@ 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.client.util.math.MatrixStack;
+import net.minecraft.particle.ParticleEffect;
 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);
@@ -74,15 +72,20 @@ public class ModMenuConfigScreen extends GameGui {
         })).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 += 220, row -= 96, 1, 50, config.getDimensionsX()))
+                .onChange(config::setDimensionsX)
+                .setTextFormat(transText::formatMaxX)
+                .getStyle().setTooltip(Text.translatable("menu.cavedust.X.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, 1, 50, config.getDimensionsY()))
+                .onChange(config::setDimensionsY)
+                .setTextFormat(transText::formatMaxY)
+                .getStyle().setTooltip(Text.translatable("menu.cavedust.Y.tooltip"));
+
+        addButton(new Slider(left, row += 24, 1, 50, config.getDimensionsZ()))
+                .onChange(config::setDimensionsZ)
+                .setTextFormat(transText::formatMaxZ)
+                .getStyle().setTooltip(Text.translatable("menu.cavedust.Z.tooltip"));
 
         addButton(new Slider(left, row += 24, 0, 10, config.getVelocityRandomness()))
                 .onChange(config::setVelocityRandomness)
@@ -90,10 +93,9 @@ public class ModMenuConfigScreen extends GameGui {
                 .getStyle().setTooltip(Text.translatable("menu.cavedust.velocityrandomness.tooltip"));
 
 
-        addButton(new Button(left -= 110, row += 120).onClick(sender -> {
+        addButton(new Button(left -= 110, row += 60).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)
@@ -104,19 +106,13 @@ public class ModMenuConfigScreen extends GameGui {
 
 
     @Override
-    public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) {
-        renderBackground(context, mouseX, mouseY, partialTicks);
-        super.render(context, mouseX, mouseY, partialTicks);
+    public void render(MatrixStack matrices, int mouseX, int mouseY, float partialTicks) {
+        renderBackground(matrices);
+        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";
-        }
+        return Registries.PARTICLE_TYPE.getEntry(config.getParticleID()).get().getKey().get().getValue().toString();
     }
 }

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

@@ -14,7 +14,7 @@ import static net.lizistired.cavedust.utils.ParticleSpawnUtil.shouldParticlesSpa
 @Mixin(DebugHud.class)
 public abstract class MixinDebugScreenOverlay {
     @Inject(method = "getRightText", at = @At("RETURN"))
-    private void appendDebugText(CallbackInfoReturnable<List<String>> cir) {
+    private void appendShaderPackText(CallbackInfoReturnable<List<String>> cir) {
         List<String> messages = cir.getReturnValue();
 
         messages.add("");

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

@@ -35,10 +35,6 @@ 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;
-        }
+        return ThreadLocalRandom.current().nextDouble(min, max);
     }
 }

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

@@ -14,7 +14,6 @@ public class ParticleSpawnUtil {
     private static float timer;
     public static boolean shouldParticlesSpawn;
 
-
     /**
      * Returns true if particles should spawn.
      * @param client MinecraftClient
@@ -68,7 +67,6 @@ public class ParticleSpawnUtil {
                 || client.world == null
                 || !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))
 
         {

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

@@ -3,12 +3,17 @@ package net.lizistired.cavedust.utils;
 import com.minelittlepony.common.client.gui.element.AbstractSlider;
 import net.minecraft.text.Text;
 
+import javax.swing.*;
+
 public class TranslatableTextHelper {
-    public Text formatMaxWidth(AbstractSlider<Float> slider) {
-        return Text.translatable("menu.cavedust.width", (int)Math.floor(slider.getValue()));
+    public Text formatMaxX(AbstractSlider<Float> slider) {
+        return Text.translatable("menu.cavedust.X", (int)Math.floor(slider.getValue()));
     }
-    public Text formatMaxHeight(AbstractSlider<Float> slider) {
-        return Text.translatable("menu.cavedust.height", (int)Math.floor(slider.getValue()));
+    public Text formatMaxY(AbstractSlider<Float> slider) {
+        return Text.translatable("menu.cavedust.Y", (int)Math.floor(slider.getValue()));
+    }
+    public Text formatMaxZ(AbstractSlider<Float> slider) {
+        return Text.translatable("menu.cavedust.Z", (int)Math.floor(slider.getValue()));
     }
     public Text formatUpperLimit(AbstractSlider<Float> slider) {
         return Text.translatable("menu.cavedust.upperlimit", (int)Math.floor(slider.getValue()));

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"
-
-}

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

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

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

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

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

@@ -4,10 +4,12 @@
   "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.tooltip": "Maximum width to spawn particle.",
-  "menu.cavedust.height.tooltip": "Maximum height to spawn particle.",
+  "menu.cavedust.X": "X bounds: %s",
+  "menu.cavedust.Y": "Y bounds: %s",
+  "menu.cavedust.Z": "Z bounds: %s",
+  "menu.cavedust.X.tooltip": "X axis bounds for particle spawning.",
+  "menu.cavedust.Y.tooltip": "Y axis bounds for particle spawning.",
+  "menu.cavedust.Z.tooltip": "Z axis bounds for particle spawning.",
   "menu.cavedust.upperlimit": "Upper limit height: %s",
   "menu.cavedust.lowerlimit": "Lower limit height: %s",
   "menu.cavedust.upperlimit.tooltip": "The height where particles will fade out and stop spawning (uses player y).",
@@ -35,7 +37,6 @@
 
   "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.particleerror": "(Cave Dust) Error setting particle, skipping to next particle!"
+  "debug.cavedust.reload": "(Cave Dust) Reloaded config"
 
 }

src/main/resources/fabric.mod.json

@@ -12,25 +12,23 @@
     "sources": "https://github.com/LizIsTired/dust"
   },
   "license": "MPL-2.0",
-  "icon": "assets/cavedust/icon.png",
+  "icon": "assets/modid/icon.png",
   "environment": "*",
   "entrypoints": {
     "client": [
       "net.lizistired.cavedust.CaveDust"
     ],
-    "main": [
-      "net.lizistired.cavedust.CaveDustServer"],
     "modmenu": [
       "net.lizistired.cavedust.CaveDustModMenuFactory"
     ]
   },
   "mixins": [
-    "cavedust.mixins.json"
+    "dust.mixins.json"
   ],
   "depends": {
     "fabricloader": ">=0.14.5",
     "fabric": "*",
-    "minecraft": "1.21.5",
+    "minecraft": ">=1.19-beta.5",
     "java": ">=17"
   },
   "suggests": {