backport from 1.21.3

.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,9 +1,11 @@
 plugins {
-	id 'fabric-loom' version '1.11-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
-    id 'org.jetbrains.kotlin.jvm'
 }
 
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
+
 archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
@@ -27,8 +29,7 @@ repositories {
 		name = 'minelp-release'
 		url = 'https://repo.minelittlepony-mod.com/maven/release'
 	}
-    mavenCentral()
-    // Add repositories to retrieve artifacts from in here.
+	// Add repositories to retrieve artifacts from in here.
 	// You should only use this when depending on other mods because
 	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
 	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
@@ -48,7 +49,6 @@ dependencies {
 	include "com.minelittlepony:kirin:${project.kirin_version}"
 
 	modCompileOnly("com.terraformersmc:modmenu:${project.modmenu_version}")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
 }
 
 processResources {
@@ -61,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 {
@@ -93,6 +93,3 @@ publishing {
 		// retrieving dependencies.
 	}
 }
-kotlin {
-    jvmToolchain(21)
-}

gradle.properties

@@ -3,19 +3,17 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.21.8
-	yarn_mappings=1.21.8+build.1
-	loader_version=0.17.2
-	loom_version=1.11-SNAPSHOT
+	minecraft_version=1.20.1
+	yarn_mappings=1.20.1+build.10
+	loader_version=0.15.11
 
 # Mod Properties
-	mod_version=4.0.0
+	mod_version=3.0.1
 	maven_group=com.lizistired
 	archives_base_name=cave_dust
 
 # Dependencies
-	fabric_version=0.133.0+1.21.8
-    clothconfig_version=19.0.147
-	modmenu_version=15.0.0
-	kirin_version=1.21.0-beta.5+1.21.7
-
+	fabric_version=0.92.2+1.20.1
+    clothconfig_version=11.1.118
+	modmenu_version=7.2.2
+	kirin_version=1.15.6+1.20.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
-validateDistributionUrl=true
 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/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -85,9 +83,7 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -134,13 +130,10 @@ 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.
@@ -148,7 +141,7 @@ 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
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -156,7 +149,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,11 +198,11 @@ 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" \

gradlew.bat

@@ -13,8 +13,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -45,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
@@ -59,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 

settings.gradle

@@ -7,10 +7,4 @@ pluginManagement {
         mavenCentral()
         gradlePluginPortal()
     }
-    plugins {
-        id 'org.jetbrains.kotlin.jvm' version '2.2.0'
-    }
-}
-plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
 }

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

@@ -2,30 +2,19 @@ package net.lizistired.cavedust;
 
 //minecraft imports
 import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
-import net.fabricmc.fabric.api.client.particle.v1.ParticleRenderEvents;
-import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
-import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
-import net.lizistired.cavedust.utils.CubeCreator;
-import net.minecraft.block.Block;
+import net.minecraft.block.Blocks;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.particle.ParticleEffect;
-import net.minecraft.particle.ParticleType;
-import net.minecraft.particle.ParticleUtil;
+import net.minecraft.particle.ParticleTypes;
 import net.minecraft.registry.Registries;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.shape.VoxelShape;
 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.minecraft.world.event.GameEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 //java imports
@@ -40,10 +29,6 @@ import static net.lizistired.cavedust.utils.KeybindingHelper.*;
 public class CaveDust implements ClientModInitializer {
 	//logger
 	public static final Logger LOGGER = LoggerFactory.getLogger("cavedust");
-
-	//modid
-	public static final String modid = "cave_dust";
-
 	//make class static
 	private static CaveDust instance;
 	public static CaveDust getInstance() {
@@ -57,112 +42,62 @@ public class CaveDust implements ClientModInitializer {
 	public net.lizistired.cavedust.CaveDustConfig getConfig() {
 		return config;
 	}
-
-	public static ParticleEffect WHITE_ASH_ID = (ParticleEffect) Registries.PARTICLE_TYPE.get(Identifier.of(modid, "cave_dust"));
+	public static ParticleEffect WHITE_ASH_ID = (ParticleEffect) Registries.PARTICLE_TYPE.get(Identifier.of("cavedust", "cave_dust"));
 	public static int PARTICLE_AMOUNT = 0;
-	public static int PARTICLE_RADIUS_PLUME = 50;
-	CubeCreator cubeCreator = new CubeCreator();
-	MinecraftClient client;
-
-
 
 
 	@Override
 	public void onInitializeClient() {
 		//config path and loading
-		Path CaveDustFolder = GamePaths.getConfigDirectory().resolve(modid);
-		config = new CaveDustConfig(CaveDustFolder.getParent().resolve(modid + ".json"), this);
+		Path CaveDustFolder = GamePaths.getConfigDirectory().resolve("cavedust");
+		config = new CaveDustConfig(CaveDustFolder.getParent().resolve("cavedust.json"), this);
 		config.load();
 		registerKeyBindings();
-		ParticleFactoryRegistry.getInstance().register(CaveDustServer.CAVE_DUST_MOTE, CaveDustMoteParticleFactory.Factory::new);
-		ParticleFactoryRegistry.getInstance().register(CaveDustServer.CAVE_DUST_PLUME, CaveDustPlumeParticleFactory.Factory::new);
-
+		ParticleFactoryRegistry.getInstance().register(CaveDustServer.CAVE_DUST, CaveDustParticleFactory.Factory::new);
 		//register end client tick to create cave dust function, using end client tick for async
-		WorldRenderEvents.LAST.register(this::createCaveDust);
-		ServerLifecycleEvents.SERVER_STOPPING.register(this::nullClient);
+		ClientTickEvents.END_CLIENT_TICK.register(this::createCaveDust);
 	}
 
-	private void nullClient(MinecraftServer minecraftServer) {
-		client = null;
-	}
-
-	private void createCaveDust(WorldRenderContext worldRenderContext) {
-		if(client == null) {
-			try {
-				client = worldRenderContext.gameRenderer().getClient();
-			} catch (Exception e) {
-				throw new RuntimeException(e);
-			}
-		}
-
+	private void createCaveDust(MinecraftClient client) {
 		if (keyBinding1.wasPressed()){
 			getConfig().toggleCaveDust();
 			LOGGER.info("Toggled dust");
-			client.player.sendMessage(Text.translatable("debug.cavedust.toggle." + config.getCaveDustEnabled()), true);
+			client.player.sendMessage(Text.translatable("debug.cavedust.toggle." + config.getCaveDustEnabled()), false);
 		}
 		if (keyBinding2.wasPressed()){
 			getConfig().load();
 			LOGGER.info("Reloaded config");
-			client.player.sendMessage(Text.translatable("debug.cavedust.reload"), true);
+			client.player.sendMessage(Text.translatable("debug.cavedust.reload"), false);
 		}
 
 		//ensure world is not null
 		if (client.world == null) return;
 		World world = client.world;
-
-		for (int i = 0; i < 5; i++) {
-			cubeCreator.randomSphereCreator(5, 0, 0, 0, Identifier.of(modid, "cave_dust_mote"));
-		}
-		for (int i = 0; i < 1; i++) {
-			cubeCreator.randomSphereCreator(20, 0, 0, 0, Identifier.of(modid, "cave_dust_plume"));
-		}
-
-    }
-
-	private void createCaveDust(MinecraftClient client) {
-
 		//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());
-		//		BlockPos particlePos = new BlockPos(x, y, z);
-//
-		//		if (shouldParticlesSpawn(client, config, particlePos)) {
-		//			if (client.world.getBlockState(particlePos).isAir()) {
-		//				world.addParticleClient((ParticleEffect) Registries.PARTICLE_TYPE.get(Identifier.of("cavedust", "cave_dust_mote")), miniX, miniY, miniZ, config.getVelocityRandomnessRandom() * 0.01, config.getVelocityRandomnessRandom() * 0.01, config.getVelocityRandomnessRandom() * 0.01);
-		//			}
-		//		}
-		//	}
+		for (int i = 0; i < PARTICLE_AMOUNT; i++) {
+			try {
+				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());
+				BlockPos particlePos = new BlockPos(x, y, z);
 
-	//cubeCreator.cubeCreator(50, 0, 0, 0);
-		for (int i = 0; i < 1; i++) {
-			cubeCreator.randomSphereCreator(5, 0, 0, 0, Identifier.of("cavedust", "cave_dust_mote"));
-		}
-
-
-	//Vec3d playerPos = client.player.getEyePos();
-	//int x = (int) (playerPos.getX() + (int) generateRandomDouble(generateRandomDouble(-50, -25), (generateRandomDouble(25, 50))));
-	////int y = (int) (playerPos.getY() + (int) generateRandomDouble(PARTICLE_RADIUS_PLUME *-1, PARTICLE_RADIUS_PLUME));
-	//int z = (int) (playerPos.getZ() + (int) generateRandomDouble(PARTICLE_RADIUS_PLUME *-1, PARTICLE_RADIUS_PLUME));
-	//BlockPos particlePos = new BlockPos(x, (int) playerPos.y, z);
-//
-//
-	//if (shouldParticlesSpawn(client, config, particlePos)) {
-//
-	//	if (playerPos.distanceTo(particlePos.toCenterPos()) >= 45 && playerPos.distanceTo(particlePos.toCenterPos()) <= 55) {
-	//		if (client.world.getBlockState(particlePos).isAir()) {
-	//			world.addParticleClient((ParticleEffect) Registries.PARTICLE_TYPE.get(Identifier.of("cavedust", "cave_dust_mote")), x, playerPos.y, z, 0, 0, 0);
-	//		}
-	//	}
-	//}
-//}
+				if (shouldParticlesSpawn(client, config, particlePos)) {
+					if (client.world.getBlockState(particlePos).isAir()) {
+						world.addParticle(config.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().setParticleID(WHITE_ASH_ID);
+			}
 		}
 	}
+}

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

@@ -40,7 +40,7 @@ public class CaveDustConfig extends JsonFile {
 
     List<Identifier> list = List.of(Registries.PARTICLE_TYPE.getIds().toArray(new Identifier[0]));
 
-    Identifier newId = Identifier.of("cavedust", "cave_dust_mote");
+    Identifier newId = Identifier.of("cavedust", "cave_dust");
 
     public CaveDustConfig(Path file, net.lizistired.cavedust.CaveDust caveDust) {
         super(file);

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

@@ -2,17 +2,19 @@ package net.lizistired.cavedust;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.lizistired.cavedust.utils.MathHelper;
 import net.minecraft.client.particle.*;
 import net.minecraft.client.world.ClientWorld;
-import net.minecraft.particle.SimpleParticleType;
+import net.minecraft.particle.DefaultParticleType;
+import net.minecraft.particle.ParticleEffect;
+import org.jetbrains.annotations.Nullable;
 
-public class CaveDustMoteParticleFactory extends SpriteBillboardParticle {
+public class CaveDustParticleFactory extends SpriteBillboardParticle {
     private final SpriteProvider spriteProvider;
-    CaveDustMoteParticleFactory(ClientWorld clientWorld, double x, double y, double z, double velocityX, double velocityY, double velocityZ, 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;
@@ -39,7 +41,7 @@ public class CaveDustMoteParticleFactory extends SpriteBillboardParticle {
     }
 
     @Environment(EnvType.CLIENT)
-    public static class Factory implements ParticleFactory<SimpleParticleType> {
+    public static class Factory implements ParticleFactory<DefaultParticleType> {
         private final SpriteProvider spriteProvider;
 
         public Factory(SpriteProvider spriteProvider) {
@@ -47,8 +49,9 @@ public class CaveDustMoteParticleFactory extends SpriteBillboardParticle {
         }
 
 
-        public Particle createParticle(SimpleParticleType type, ClientWorld world, double x, double y, double z, double velocityX, double velocityY, double velocityZ) {
-            return new CaveDustMoteParticleFactory(world, x, y, z, velocityX, velocityY, velocityZ, this.spriteProvider);
+        @Override
+        public @Nullable Particle createParticle(DefaultParticleType parameters, 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/CaveDustPlumeParticleFactory.java

@@ -1,65 +0,0 @@
-package net.lizistired.cavedust;
-
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.lizistired.cavedust.utils.MathHelper;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.client.particle.*;
-import net.minecraft.client.world.ClientWorld;
-import net.minecraft.particle.SimpleParticleType;
-import net.minecraft.util.math.Vec3d;
-
-public class CaveDustPlumeParticleFactory extends SpriteBillboardParticle {
-    private final SpriteProvider spriteProvider;
-    CaveDustPlumeParticleFactory(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 = 60; //20 ticks = 1 second
-        this.scale = 10f;
-        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 = false;
-        this.alpha = 0.5f; //Setting the alpha to 1.0f means there will be no opacity change until the alpha value is changed
-        this.setSprite(spriteProvider); //Required
-    }
-
-    @Override
-    public void tick() {
-        super.tick();
-        ClientPlayerEntity player = MinecraftClient.getInstance().player;
-        Vec3d particlePos = new Vec3d(this.x, this.y, this.z);
-        double distanceFromParticleToPlayer = particlePos.distanceTo(player.getEyePos());
-        this.alpha = net.minecraft.util.math.MathHelper.clamp((float) MathHelper.normalize(0, 50, distanceFromParticleToPlayer) * -1, -1, 1);
-        if(this.alpha < 0.001f){
-            this.markDead();
-        }
-        this.alpha -= 0.00005f;
-    }
-
-
-    @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 CaveDustPlumeParticleFactory(world, x, y, z, velocityX, velocityY, velocityZ, this.spriteProvider);
-        }
-    }
-}

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

@@ -2,20 +2,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.particle.DefaultParticleType;
+import net.minecraft.particle.ParticleEffect;
 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_MOTE = FabricParticleTypes.simple();
-    public static final SimpleParticleType CAVE_DUST_PLUME = FabricParticleTypes.simple();
+    public static final DefaultParticleType CAVE_DUST = FabricParticleTypes.simple();
     /**
      * Runs the mod initializer.
      */
     @Override
     public void onInitialize() {
-        Registry.register(Registries.PARTICLE_TYPE, Identifier.of("cavedust", "cave_dust_mote"), CAVE_DUST_MOTE);
-        Registry.register(Registries.PARTICLE_TYPE, Identifier.of("cavedust", "cave_dust_plume"), CAVE_DUST_PLUME);
+        Registry.register(Registries.PARTICLE_TYPE, new Identifier("cavedust", "cave_dust"), CAVE_DUST);
     }
 }

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

@@ -8,6 +8,7 @@ import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.particle.ParticleType;
 import net.minecraft.registry.Registries;
 import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.NoSuchElementException;
@@ -35,10 +36,66 @@ public class ModMenuConfigScreen extends GameGui {
                 .setText("menu.cavedust.global." + config.getCaveDustEnabled())
                 .setTooltip(Text.translatable("menu.cavedust.global.tooltip." + config.getCaveDustEnabled()));
 
-        addButton(new Button(left, row += 120)
-                .onClick(sender ->
-                        client.setScreen(new ModMenuConfigScreenAdvanced(parent)
-                        )));
+        /*addButton(new Button(left, row += 24).onClick(sender -> {
+            sender.getStyle().setText("menu.cavedust.enhanceddetection." + config.setEnhancedDetection()).setTooltip(Text.translatable("menu.cavedust.enhanceddetection.tooltip"));
+        })).getStyle()
+                .setText("menu.cavedust.enhanceddetection." + config.getEnhancedDetection())
+                .setTooltip(Text.translatable("menu.cavedust.enhanceddetection.tooltip"));*/
+
+        addButton(new Button(left, row += 24).onClick(sender -> {
+            sender.getStyle().setText("menu.cavedust.superflatstatus." + config.setSuperFlatStatus()).setTooltip(Text.translatable("menu.cavedust.superflatstatus.tooltip"));
+        })).getStyle()
+                .setText("menu.cavedust.superflatstatus." + config.getSuperFlatStatus())
+                .setTooltip(Text.translatable("menu.cavedust.superflatstatus.tooltip"));
+
+
+
+        /*addButton(new Slider(left, row += 48, -64, 319, config.getUpperLimit()))
+                .onChange(config::setUpperLimit)
+                .setTextFormat(transText::formatUpperLimit)
+                .getStyle().setTooltip(Text.translatable("menu.cavedust.upperlimit.tooltip"));
+
+        addButton(new Slider(left, row += 24, -64, 319, config.getLowerLimit()))
+                .onChange(config::setLowerLimit)
+                .setTextFormat(transText::formatLowerLimit)
+                .getStyle().setTooltip(Text.translatable("menu.cavedust.lowerlimit.tooltip"));*/
+
+        addButton(new Slider(left, row += 24, 1, 100, config.getParticleMultiplier()))
+                .onChange(config::setParticleMultiplier)
+                .setTextFormat(transText::formatParticleMultiplier)
+                .getStyle().setTooltip(Text.translatable("menu.cavedust.particlemultiplier.tooltip"));
+
+        addButton(new Slider(left, row += 24, 1, 100, config.getParticleMultiplierMultiplier()))
+                .onChange(config::setParticleMultiplierMultiplier)
+                .setTextFormat(transText::formatParticleMultiplierMultiplier)
+                .getStyle().setTooltip(Text.translatable("menu.cavedust.particlemultipliermultiplier.tooltip"));
+        addButton(new Button(left, row += 24).onClick(sender ->{
+            config.iterateParticle();
+            sender.getStyle().setText("Particle: " + (getNameOfParticle()));
+        })).getStyle().setText("Particle: " + (getNameOfParticle()))
+                .setTooltip(Text.translatable("menu.cavedust.particle.tooltip"));
+
+        addButton(new Slider(left += 220, row -= 96, 1, 50, config.getDimensionWidth()))
+                .onChange(config::setDimensionWidth)
+                .setTextFormat(transText::formatMaxX)
+                .getStyle().setTooltip(Text.translatable("menu.cavedust.X.tooltip"));
+
+        addButton(new Slider(left, row += 24, 1, 50, config.getDimensionHeight()))
+                .onChange(config::setDimensionHeight)
+                .setTextFormat(transText::formatMaxY)
+                .getStyle().setTooltip(Text.translatable("menu.cavedust.Y.tooltip"));
+
+        addButton(new Slider(left, row += 24, 0, 10, config.getVelocityRandomness()))
+                .onChange(config::setVelocityRandomness)
+                .setTextFormat(transText::formatVelocityRandomness)
+                .getStyle().setTooltip(Text.translatable("menu.cavedust.velocityrandomness.tooltip"));
+
+
+        addButton(new Button(left -= 110, row += 120).onClick(sender -> {
+            config.resetConfig();
+            finish();
+            client.setScreen(new ModMenuConfigScreen(parent));
+        })).getStyle().setText(Text.translatable("menu.cavedust.reset")).setTooltip(Text.translatable("menu.cavedust.reset.tooltip"));
 
         addButton(new Button(left, row += 24)
                 .onClick(sender -> finish())).getStyle()
@@ -49,17 +106,18 @@ public class ModMenuConfigScreen extends GameGui {
 
     @Override
     public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) {
+        renderBackground(context);
         super.render(context, mouseX, mouseY, partialTicks);
     }
 
-    private String getNameOfParticle(){
+    private Identifier getNameOfParticle(){
         CaveDustConfig config = CaveDust.getInstance().getConfig();
         config.load();
         try {
-            return Registries.PARTICLE_TYPE.getEntry((ParticleType<?>) config.getParticleID()).getIdAsString();
-        } catch (NoSuchElementException e){
+            return Registries.PARTICLE_TYPE.getId((ParticleType<?>) config.getParticleID());
+        } catch (NoSuchElementException e) {
             CaveDust.LOGGER.error(String.valueOf(e));
-            return "null";
+            return null;
         }
     }
 }

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

@@ -1,118 +0,0 @@
-package net.lizistired.cavedust;
-
-import com.minelittlepony.common.client.gui.GameGui;
-import com.minelittlepony.common.client.gui.element.Button;
-import com.minelittlepony.common.client.gui.element.Label;
-import com.minelittlepony.common.client.gui.element.Slider;
-import net.lizistired.cavedust.utils.TranslatableTextHelper;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.particle.ParticleType;
-import net.minecraft.registry.Registries;
-import net.minecraft.text.Text;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.NoSuchElementException;
-
-public class ModMenuConfigScreenAdvanced extends GameGui {
-    public ModMenuConfigScreenAdvanced(@Nullable Screen parent) {
-        super(Text.translatable("menu.cavedust.title.advanced"), parent);
-    }
-
-    @Override
-    public void init() {
-        int left = width / 2 - 100;
-        int row = height / 4 + 14;
-
-        CaveDustConfig config = CaveDust.getInstance().getConfig();
-        TranslatableTextHelper transText = new TranslatableTextHelper();;
-        config.load();
-
-        addButton(new Label(width / 2, 30)).setCentered().getStyle()
-                .setText(getTitle());
-
-
-        /*addButton(new Button(left, row += 24).onClick(sender -> {
-            sender.getStyle().setText("menu.cavedust.enhanceddetection." + config.setEnhancedDetection()).setTooltip(Text.translatable("menu.cavedust.enhanceddetection.tooltip"));
-        })).getStyle()
-                .setText("menu.cavedust.enhanceddetection." + config.getEnhancedDetection())
-                .setTooltip(Text.translatable("menu.cavedust.enhanceddetection.tooltip"));*/
-
-        addButton(new Button(left, row += 24).onClick(sender -> {
-            sender.getStyle().setText("menu.cavedust.superflatstatus." + config.setSuperFlatStatus()).setTooltip(Text.translatable("menu.cavedust.superflatstatus.tooltip"));
-        })).getStyle()
-                .setText("menu.cavedust.superflatstatus." + config.getSuperFlatStatus())
-                .setTooltip(Text.translatable("menu.cavedust.superflatstatus.tooltip"));
-
-
-
-        /*addButton(new Slider(left, row += 48, -64, 319, config.getUpperLimit()))
-                .onChange(config::setUpperLimit)
-                .setTextFormat(transText::formatUpperLimit)
-                .getStyle().setTooltip(Text.translatable("menu.cavedust.upperlimit.tooltip"));
-
-        addButton(new Slider(left, row += 24, -64, 319, config.getLowerLimit()))
-                .onChange(config::setLowerLimit)
-                .setTextFormat(transText::formatLowerLimit)
-                .getStyle().setTooltip(Text.translatable("menu.cavedust.lowerlimit.tooltip"));*/
-
-        addButton(new Slider(left, row += 24, 1, 100, config.getParticleMultiplier()))
-                .onChange(config::setParticleMultiplier)
-                .setTextFormat(transText::formatParticleMultiplier)
-                .getStyle().setTooltip(Text.translatable("menu.cavedust.particlemultiplier.tooltip"));
-
-        addButton(new Slider(left, row += 24, 1, 100, config.getParticleMultiplierMultiplier()))
-                .onChange(config::setParticleMultiplierMultiplier)
-                .setTextFormat(transText::formatParticleMultiplierMultiplier)
-                .getStyle().setTooltip(Text.translatable("menu.cavedust.particlemultipliermultiplier.tooltip"));
-        addButton(new Button(left, row += 24).onClick(sender ->{
-            config.iterateParticle();
-            sender.getStyle().setText("Particle: " + (getNameOfParticle()));
-        })).getStyle().setText("Particle: " + (getNameOfParticle()))
-                .setTooltip(Text.translatable("menu.cavedust.particle.tooltip"));
-
-        addButton(new Slider(left += 220, row -= 96, 1, 50, config.getDimensionWidth()))
-                .onChange(config::setDimensionWidth)
-                .setTextFormat(transText::formatMaxWidth)
-                .getStyle().setTooltip(Text.translatable("menu.cavedust.width.tooltip"));
-
-        addButton(new Slider(left, row += 24, 1, 50, config.getDimensionHeight()))
-                .onChange(config::setDimensionHeight)
-                .setTextFormat(transText::formatMaxHeight)
-                .getStyle().setTooltip(Text.translatable("menu.cavedust.height.tooltip"));
-
-        addButton(new Slider(left, row += 24, 0, 10, config.getVelocityRandomness()))
-                .onChange(config::setVelocityRandomness)
-                .setTextFormat(transText::formatVelocityRandomness)
-                .getStyle().setTooltip(Text.translatable("menu.cavedust.velocityrandomness.tooltip"));
-
-
-        addButton(new Button(left -= 110, row += 120).onClick(sender -> {
-            config.resetConfig();
-            finish();
-            client.setScreen(new ModMenuConfigScreenAdvanced(parent));
-        })).getStyle().setText(Text.translatable("menu.cavedust.reset")).setTooltip(Text.translatable("menu.cavedust.reset.tooltip"));
-
-        addButton(new Button(left, row += 24)
-                .onClick(sender -> finish())).getStyle()
-                .setText("gui.done");
-
-    }
-
-
-    @Override
-    public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) {
-        super.render(context, mouseX, mouseY, partialTicks);
-    }
-
-    private String getNameOfParticle(){
-        CaveDustConfig config = CaveDust.getInstance().getConfig();
-        config.load();
-        try {
-            return Registries.PARTICLE_TYPE.getEntry((ParticleType<?>) config.getParticleID()).getIdAsString();
-        } catch (NoSuchElementException e){
-            CaveDust.LOGGER.error(String.valueOf(e));
-            return "null";
-        }
-    }
-}

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

@@ -1,89 +0,0 @@
-package net.lizistired.cavedust.utils;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.particle.ParticleEffect;
-import net.minecraft.registry.Registries;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.BlockPos;
-
-import java.util.Random;
-
-public class CubeCreator {
-
-
-    // 3 nesting for loops to create a hollow border cube around the player
-    public void cubeCreator(int steps, int offsetXInitial, int offsetYInitial, int offsetZInitial, Identifier caveDust) {
-        BlockPos playerPos = MinecraftClient.getInstance().player.getBlockPos();
-
-        // Loop over the range of steps around the player
-        for (int x = -steps / 2 + offsetXInitial; x < steps / 2 + offsetXInitial; x++) {
-            for (int y = -steps / 2 + offsetYInitial; y < steps / 2 + offsetYInitial; y++) {
-                for (int z = -steps / 2 + offsetZInitial; z < steps / 2 + offsetZInitial; z++) {
-
-                    // Check if the particle is on the border of the cube
-                    boolean onBorder = x == -steps / 2 + offsetXInitial || x == steps / 2 + offsetXInitial - 1
-                            || y == -steps / 2 + offsetYInitial || y == steps / 2 + offsetYInitial - 1
-                            || z == -steps / 2 + offsetZInitial || z == steps / 2 + offsetZInitial - 1;
-
-                    // If it's on the border, spawn the particle
-                    if (onBorder) {
-                        spawnParticleClient(playerPos.getX() + x, playerPos.getY() + y, playerPos.getZ() + z, caveDust);
-                    }
-                }
-            }
-        }
-    }
-
-    // Create a hollow sphere around the player
-    public void sphereCreator(int radius, int offsetXInitial, int offsetYInitial, int offsetZInitial, Identifier caveDust) {
-        BlockPos playerPos = MinecraftClient.getInstance().player.getBlockPos();
-
-        // Loop over the range of steps around the player (we are using a cube bounding box to check)
-        for (int x = -radius; x <= radius; x++) {
-            for (int y = -radius; y <= radius; y++) {
-                for (int z = -radius; z <= radius; z++) {
-
-                    // Calculate the distance from the center (player position)
-                    double distance = Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2) + Math.pow(z, 2));
-
-                    // If the distance is close to the radius, spawn the particle (create the border)
-                    if (Math.abs(distance - radius) < 1.5) { // Threshold for thickness of the border
-                        spawnParticleClient(playerPos.getX() + x + offsetXInitial,
-                                playerPos.getY() + y + offsetYInitial,
-                                playerPos.getZ() + z + offsetZInitial,
-                                    caveDust);
-                    }
-                }
-            }
-        }
-    }
-
-    public void randomSphereCreator(int radius, int offsetXInitial, int offsetYInitial, int offsetZInitial, Identifier caveDust) {
-        Random random = new Random();  // Random number generator
-
-        // Generate random spherical angles
-        double theta = Math.acos(2 * random.nextDouble() - 1);  // Random polar angle (0 to pi)
-        double phi = 2 * Math.PI * random.nextDouble();  // Random azimuthal angle (0 to 2*pi)
-
-        // Convert spherical coordinates to Cartesian coordinates
-        double x = radius * Math.sin(theta) * Math.cos(phi);
-        double y = radius * Math.sin(theta) * Math.sin(phi);
-        double z = radius * Math.cos(theta);
-
-        // Offset the generated point to be around the player
-        BlockPos playerPos = MinecraftClient.getInstance().player.getBlockPos();
-        int spawnX = playerPos.getX() + (int) (x + offsetXInitial);
-        int spawnY = playerPos.getY() + (int) (y + offsetYInitial);
-        int spawnZ = playerPos.getZ() + (int) (z + offsetZInitial);
-
-        // Spawn a particle at the random position
-        float randomX = random.nextFloat() + spawnX;
-        float randomY = random.nextFloat() + spawnY;
-        float randomZ = random.nextFloat() + spawnZ;
-        spawnParticleClient(randomX, randomY, randomZ, caveDust);
-    }
-
-    private void spawnParticleClient(float x, float y, float z, Identifier caveDust) {
-        MinecraftClient.getInstance().world.addParticleClient((ParticleEffect) Registries.PARTICLE_TYPE.get(caveDust), x, y, z, 0.0D, 0.0D, 0.0D);
-    }
-}

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,11 +3,13 @@ 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) {
+    public Text formatMaxX(AbstractSlider<Float> slider) {
         return Text.translatable("menu.cavedust.width", (int)Math.floor(slider.getValue()));
     }
-    public Text formatMaxHeight(AbstractSlider<Float> slider) {
+    public Text formatMaxY(AbstractSlider<Float> slider) {
         return Text.translatable("menu.cavedust.height", (int)Math.floor(slider.getValue()));
     }
     public Text formatUpperLimit(AbstractSlider<Float> slider) {
@@ -26,4 +28,12 @@ public class TranslatableTextHelper {
     public Text formatVelocityRandomness(AbstractSlider<Float> slider) {
         return Text.translatable("menu.cavedust.velocityrandomness", (int) Math.floor(slider.getValue()));
     }
+
+    public Text formatScaleLower(AbstractSlider<Float> slider) {
+        return Text.translatable("menu.cavedust.scalelower", (int) Math.floor(slider.getValue()));
+    }
+
+    public Text formatScaleHigher(AbstractSlider<Float> slider) {
+        return Text.translatable("menu.cavedust.scalehigher", (int) Math.floor(slider.getValue()));
+    }
 }

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

@@ -1,6 +1,5 @@
 {
   "menu.cavedust.title": "Cave Dust",
-  "menu.cavedust.title.advanced": "Cave Dust Advanced Options",
   "menu.cavedust.global.false": "Cave Dust: Disabled",
   "menu.cavedust.global.true": "Cave Dust: Enabled",
   "menu.cavedust.global.tooltip.false": "Enable cave dust particles?",
@@ -29,6 +28,10 @@
   "menu.cavedust.superflatstatus.tooltip": "Should particles spawn on superflat worlds?",
   "menu.cavedust.particle": "Particle: ",
   "menu.cavedust.particle.tooltip": "Particle to spawn. Click to cycle.",
+  "menu.cavedust.scalelower": "Minimum scale: %s",
+  "menu.cavedust.scalelower.tooltip": "Minimum particle size to spawn.",
+  "menu.cavedust.scalehigher": "Maximum scale: %s",
+  "menu.cavedust.scalehigher.tooltip": "Maximum particle size to spawn.",
 
   "key.cavedust.reload": "Reload Config",
   "key.cavedust.toggle": "Toggle Particles",
@@ -39,5 +42,4 @@
   "debug.cavedust.reload": "(Cave Dust) Reloaded config",
   "debug.cavedust.particleerror": "(Cave Dust) Error setting particle, skipping to next particle!"
 
-
 }

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

@@ -1,16 +0,0 @@
-{
-  "textures": [
-    "minecraft:big_smoke_0",
-    "minecraft:big_smoke_1",
-    "minecraft:big_smoke_2",
-    "minecraft:big_smoke_3",
-    "minecraft:big_smoke_4",
-    "minecraft:big_smoke_5",
-    "minecraft:big_smoke_6",
-    "minecraft:big_smoke_7",
-    "minecraft:big_smoke_8",
-    "minecraft:big_smoke_9",
-    "minecraft:big_smoke_10",
-    "minecraft:big_smoke_11"
-  ]
-}

src/main/resources/fabric.mod.json

@@ -19,7 +19,8 @@
       "net.lizistired.cavedust.CaveDust"
     ],
     "main": [
-      "net.lizistired.cavedust.CaveDustServer"],
+      "net.lizistired.cavedust.CaveDustServer"
+    ],
     "modmenu": [
       "net.lizistired.cavedust.CaveDustModMenuFactory"
     ]
@@ -30,7 +31,7 @@
   "depends": {
     "fabricloader": ">=0.14.5",
     "fabric": "*",
-    "minecraft": "1.21.8",
+    "minecraft": "1.20.1",
     "java": ">=17"
   },
   "suggests": {