Merge pull request #19 from Myuui/1.18.2

French Translation by @Myuui
Merge pull request #20 from arunsathiya/1.18.2
2024-01-21 01:59:17 +00:00 · 2024-01-21 01:57:17 +00:00 · 2024-01-11 21:22:27 -08:00 · 2023-12-17 23:58:18 +01:00 · 2023-05-21 07:43:40 +01:00
26 changed files with 297 additions and 451 deletions
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -33,10 +33,29 @@ jobs:
        run: ./gradlew build --stacktrace

      - name: Upload artifacts to Modrinth, Curseforge and GitHub
-        uses: Kir-Antipov/mc-publish@v3.3
+        uses: Kir-Antipov/mc-publish@v2.0
        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
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,12 +24,12 @@ jobs:
      - name: Extract current branch name
        shell: bash
        # bash pattern expansion to grab branch name without slashes
-        run: ref="${GITHUB_REF#refs/heads/}" && echo "::set-output name=branch::${ref////-}"
+        run: ref="${GITHUB_REF#refs/heads/}" && echo "branch=${ref////-}" >> $GITHUB_OUTPUT
        id: ref

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

--- a/.gitignore
+++ b/.gitignore
@@ -31,4 +31,3 @@ bin/
 # fabric

 run/
-BackupSrc/
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.6-SNAPSHOT'
+	id 'fabric-loom' version '0.11-SNAPSHOT'
 	id 'maven-publish'
 }

--- a/gradle.properties
+++ b/gradle.properties
@@ -3,17 +3,18 @@ org.gradle.jvmargs=-Xmx1G

 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.20.1
-	yarn_mappings=1.20.1+build.10
-	loader_version=0.15.11
+	minecraft_version=1.18.2
+	yarn_mappings=1.18.2+build.1
+	loader_version=0.12.11

 # Mod Properties
-	mod_version=3.0.1
-	maven_group=com.lizistired
-	archives_base_name=cave_dust
+	mod_version = 1.2.0
+	maven_group = com.lizistired
+	archives_base_name = cave_dust

 # Dependencies
-	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
+	fabric_version=0.47.8+1.18.2
+    clothconfig_version = 6.1.48
+	modmenu_version = 3.0.1
+	minelp_version=4.4.0-beta.2
+	kirin_version=1.10.0-beta.2
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
-networkTimeout=10000
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/35
+++ b/35
@@ -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.
@@ -32,10 +32,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}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/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/.
@@ -80,11 +80,14 @@ do
    esac
 done

-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# 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

@@ -140,16 +143,12 @@ fi
 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=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=SC3045
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@@ -194,10 +193,6 @@ 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, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -210,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.
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@@ -25,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%

@@ -41,7 +40,7 @@ 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.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -76,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
--- a/src/main/java/net/lizistired/cavedust/CaveDust.java
+++ b/src/main/java/net/lizistired/cavedust/CaveDust.java
@@ -1,14 +1,11 @@
 package net.lizistired.cavedust;

 //minecraft imports
-import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
-import net.minecraft.block.Blocks;
+import net.lizistired.cavedust.mixin.ClientWorldAccessor;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.particle.ParticleEffect;
-import net.minecraft.particle.ParticleTypes;
-import net.minecraft.registry.Registries;
 import net.minecraft.text.Text;
-import net.minecraft.util.Identifier;
+import net.minecraft.text.TranslatableText;
+import net.minecraft.util.Util;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 //other imports
@@ -28,7 +25,7 @@ import static net.lizistired.cavedust.utils.KeybindingHelper.*;

 public class CaveDust implements ClientModInitializer {
 	//logger
-	public static final Logger LOGGER = LoggerFactory.getLogger("cavedust");
+	public static final Logger LOGGER = LoggerFactory.getLogger("caveDust");
 	//make class static
 	private static CaveDust instance;
 	public static CaveDust getInstance() {
@@ -38,12 +35,10 @@ public class CaveDust implements ClientModInitializer {
 		instance = this;
 	}
 	//config assignment
-	private static net.lizistired.cavedust.CaveDustConfig config;
-	public net.lizistired.cavedust.CaveDustConfig getConfig() {
+	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
@@ -53,7 +48,7 @@ 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);
 	}
@@ -62,12 +57,12 @@ public class CaveDust implements ClientModInitializer {
 		if (keyBinding1.wasPressed()){
 			getConfig().toggleCaveDust();
 			LOGGER.info("Toggled dust");
-			client.player.sendMessage(Text.translatable("debug.cavedust.toggle." + config.getCaveDustEnabled()), false);
+			client.player.sendSystemMessage(new TranslatableText("debug.cavedust.toggle." + config.getCaveDustEnabled()), Util.NIL_UUID);
 		}
 		if (keyBinding2.wasPressed()){
 			getConfig().load();
 			LOGGER.info("Reloaded config");
-			client.player.sendMessage(Text.translatable("debug.cavedust.reload"), false);
+			client.player.sendSystemMessage(new TranslatableText("debug.cavedust.reload"), Util.NIL_UUID);
 		}

 		//ensure world is not null
@@ -76,27 +71,22 @@ public class CaveDust implements ClientModInitializer {
 		//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++) {
+		for (int i = 0; i < probabilityNormalized * config.getParticleMultiplier() * 10; 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());
+				double x = client.player.getPos().getX() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxX());
+				double y = client.player.getPos().getY() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxY());
+				double z = client.player.getPos().getZ() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxZ());
 				BlockPos particlePos = new BlockPos(x, y, z);

-				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);
-					}
-				}
+				if (!shouldParticlesSpawn(client, config, particlePos)){return;}
+
+
+				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);
+				getConfig().setParticle("minecraft:white_ash");
 			}
 		}
 	}
--- a/src/main/java/net/lizistired/cavedust/CaveDustConfig.java
+++ b/src/main/java/net/lizistired/cavedust/CaveDustConfig.java
@@ -1,74 +1,111 @@
 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 net.lizistired.cavedust.CaveDust CaveDust;
+    private transient final CaveDust CaveDust;


-    private int width = 10;
-    private int height = 10;
-    private int velocityRandomness = 0;
+    private int dimensionMaxX = 5;
+    private int dimensionMaxY = 5;
+    private int dimensionMaxZ = 5;
+    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;

-    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) {
+    public CaveDustConfig(Path file, CaveDust caveDust) {
        super(file);
        this.CaveDust = caveDust;
    }

-    public float setDimensionWidth(float size){
-        if (this.width != size) {
-            this.width = (int)size;
+    public float setDimensionsMinX(float size){
+        if (this.dimensionMinX != size) {
+            this.dimensionMinX = (int)size;
            save();
        }
-        return getDimensionWidth();
+        return getDimensionsMinX();
    }

-    public float setDimensionHeight(float size){
-        if (this.height != size) {
-            this.height = (int)size;
+    public float setDimensionsMinY(float size){
+        if (this.dimensionMinY != size) {
+            this.dimensionMinY = (int)size;
            save();
        }
-        return getDimensionHeight();
+        return getDimensionsMinY();
    }

-    public float getDimensionWidth(){
-        return width;
+    public float setDimensionsMinZ(float size){
+        if (this.dimensionMinZ != size) {
+            this.dimensionMinZ = (int)size;
+            save();
+        }
+        return getDimensionsMinZ();
    }

-    public float getDimensionHeight(){
-        return height;
+    public float getDimensionsMinX(){
+        return dimensionMinX;
+    }
+
+    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){
@@ -113,16 +150,6 @@ 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();
@@ -133,32 +160,20 @@ public class CaveDustConfig extends JsonFile {
        return caveDustEnabled;
    }

-    //todo
-    //public Identifier 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();
-    //    }
-    //}
+    public ParticleEffect setParticle(String particleType){
+        particleName = particleType;
+        save();
+        return getParticle();
+    }

    public ParticleEffect getParticle(){
-        try{
-            return (ParticleEffect) Registries.PARTICLE_TYPE.get(newId);
-        }
-        catch (ClassCastException e){
-            iterateParticle();
-            return getParticle();
+        try {
+            return (ParticleEffect) Registry.PARTICLE_TYPE.get(new Identifier(particleName.toLowerCase()));
+        } 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\".");
+            particleName = "minecraft:white_ash";
+            save();
+            return ParticleTypes.WHITE_ASH;
        }
    }

@@ -197,36 +212,33 @@ 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;
-        }
-        save();
+    /*public boolean getEnhancedDetection(){
+        return enhancedDetection;
    }

-    public ParticleEffect getParticleID(){
-        return getParticle();
-    }
+    public boolean setEnhancedDetection(){
+        enhancedDetection = !enhancedDetection;
+        save();
+        return getEnhancedDetection();
+    }*/

    public void resetConfig(){
-        width = 10;
-        height = 10;
+        dimensionMinX = -5;
+        dimensionMinY = -5;
+        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();
    }
 }
--- a/src/main/java/net/lizistired/cavedust/CaveDustParticleFactory.java
+++ b/src/main/java/net/lizistired/cavedust/CaveDustParticleFactory.java
@@ -1,57 +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.particle.*;
-import net.minecraft.client.world.ClientWorld;
-import net.minecraft.particle.DefaultParticleType;
-import net.minecraft.particle.ParticleEffect;
-import org.jetbrains.annotations.Nullable;
-
-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.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<DefaultParticleType> {
-        private final SpriteProvider spriteProvider;
-
-        public Factory(SpriteProvider spriteProvider) {
-            this.spriteProvider = 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);
-        }
-    }
-}
--- a/src/main/java/net/lizistired/cavedust/CaveDustServer.java
+++ b/src/main/java/net/lizistired/cavedust/CaveDustServer.java
@@ -1,20 +0,0 @@
-package net.lizistired.cavedust;
-
-import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.particle.v1.FabricParticleTypes;
-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 DefaultParticleType CAVE_DUST = FabricParticleTypes.simple();
-    /**
-     * Runs the mod initializer.
-     */
-    @Override
-    public void onInitialize() {
-        Registry.register(Registries.PARTICLE_TYPE, new Identifier("cavedust", "cave_dust"), CAVE_DUST);
-    }
-}
--- a/src/main/java/net/lizistired/cavedust/ModMenuConfigScreen.java
+++ b/src/main/java/net/lizistired/cavedust/ModMenuConfigScreen.java
@@ -3,19 +3,15 @@ package net.lizistired.cavedust;
 import com.minelittlepony.common.client.gui.GameGui;
 import com.minelittlepony.common.client.gui.element.*;
 import net.lizistired.cavedust.utils.TranslatableTextHelper;
-import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.particle.ParticleType;
-import net.minecraft.registry.Registries;
-import net.minecraft.text.Text;
-import net.minecraft.util.Identifier;
-import org.jetbrains.annotations.Nullable;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.TranslatableText;

-import java.util.NoSuchElementException;
+import javax.annotation.Nullable;

 public class ModMenuConfigScreen extends GameGui {
    public ModMenuConfigScreen(@Nullable Screen parent) {
-        super(Text.translatable("menu.cavedust.title"), parent);
+        super(new TranslatableText("menu.cavedust.title"), parent);
    }

    @Override
@@ -24,100 +20,95 @@ 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 += -110, row += -60).onClick(sender -> {
-            sender.getStyle().setText("menu.cavedust.global." + config.toggleCaveDust()).setTooltip(Text.translatable("menu.cavedust.global.tooltip." + config.getCaveDustEnabled()));
+        addButton(new Button(left, row += -60).onClick(sender -> {
+            sender.getStyle().setText("menu.cavedust.global." + config.toggleCaveDust()).setTooltip(new TranslatableText("menu.cavedust.global.tooltip." + config.getCaveDustEnabled()));
        })).getStyle()
                .setText("menu.cavedust.global." + config.getCaveDustEnabled())
-                .setTooltip(Text.translatable("menu.cavedust.global.tooltip." + config.getCaveDustEnabled()));
+                .setTooltip(new TranslatableText("menu.cavedust.global.tooltip." + config.getCaveDustEnabled()));

        /*addButton(new Button(left, row += 24).onClick(sender -> {
-            sender.getStyle().setText("menu.cavedust.enhanceddetection." + config.setEnhancedDetection()).setTooltip(Text.translatable("menu.cavedust.enhanceddetection.tooltip"));
+            sender.getStyle().setText("menu.cavedust.enhanceddetection." + config.setEnhancedDetection()).setTooltip(new TranslatableText("menu.cavedust.enhanceddetection.tooltip"));
        })).getStyle()
                .setText("menu.cavedust.enhanceddetection." + config.getEnhancedDetection())
-                .setTooltip(Text.translatable("menu.cavedust.enhanceddetection.tooltip"));*/
+                .setTooltip(new TranslatableText("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"));
+            sender.getStyle().setText("menu.cavedust.superflatstatus." + config.setSuperFlatStatus()).setTooltip(new TranslatableText("menu.cavedust.superflatstatus.tooltip"));
        })).getStyle()
                .setText("menu.cavedust.superflatstatus." + config.getSuperFlatStatus())
-                .setTooltip(Text.translatable("menu.cavedust.superflatstatus.tooltip"));
+                .setTooltip(new TranslatableText("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 += 48, -64, 319, config.getUpperLimit()))
+        addButton(new Slider(left, row += 24, -50, 0, config.getDimensionsMinZ()))
+                .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(Text.translatable("menu.cavedust.upperlimit.tooltip"));
+                .getStyle().setTooltip(new TranslatableText("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"));*/
+                .getStyle().setTooltip(new TranslatableText("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"));
+                .getStyle().setTooltip(new TranslatableText("menu.cavedust.particlemultiplier.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"));
+                .getStyle().setTooltip(new TranslatableText("menu.cavedust.velocityrandomness.tooltip"));


-        addButton(new Button(left -= 110, row += 120).onClick(sender -> {
+        addButton(new Button(left, row += 24).onClick(sender -> {
            config.resetConfig();
            finish();
-            client.setScreen(new ModMenuConfigScreen(parent));
-        })).getStyle().setText(Text.translatable("menu.cavedust.reset")).setTooltip(Text.translatable("menu.cavedust.reset.tooltip"));
+        })).getStyle().setText(new TranslatableText("menu.cavedust.reset")).setTooltip(new TranslatableText("menu.cavedust.reset.tooltip"));

-        addButton(new Button(left, row += 24)
+        addButton(new Button(left, row += 60)
                .onClick(sender -> finish())).getStyle()
                .setText("gui.done");
-
    }


    @Override
-    public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) {
-        renderBackground(context);
-        super.render(context, mouseX, mouseY, partialTicks);
-    }
-
-    private Identifier getNameOfParticle(){
-        CaveDustConfig config = CaveDust.getInstance().getConfig();
-        config.load();
-        try {
-            return Registries.PARTICLE_TYPE.getId((ParticleType<?>) config.getParticleID());
-        } catch (NoSuchElementException e) {
-            CaveDust.LOGGER.error(String.valueOf(e));
-            return null;
-        }
+    public void render(MatrixStack matrices, int mouseX, int mouseY, float partialTicks) {
+        renderBackground(matrices);
+        super.render(matrices, mouseX, mouseY, partialTicks);
    }
 }
--- a/src/main/java/net/lizistired/cavedust/mixin/MixinDebugScreenOverlay.java
+++ b/src/main/java/net/lizistired/cavedust/mixin/MixinDebugScreenOverlay.java
@@ -1,24 +1,48 @@
 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.lang.management.ManagementFactory;
 import java.util.List;
-
-import static net.lizistired.cavedust.CaveDust.PARTICLE_AMOUNT;
+import java.util.Objects;
+import static net.lizistired.cavedust.utils.MathHelper.*;
 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
+    private static final BufferPoolMXBean directPool;
+
+    static {
+        BufferPoolMXBean found = null;
+
+        for (BufferPoolMXBean pool : pools) {
+            if (pool.getName().equals("direct")) {
+                found = pool;
+                break;
+            }
+        }
+
+        directPool = Objects.requireNonNull(found);
+    }
    @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("");
-        messages.add("Particle amount evaluated: " + PARTICLE_AMOUNT);
+        messages.add("Should particles spawn: " + shouldParticlesSpawn);
        messages.add("");
    }
 }
--- a/src/main/java/net/lizistired/cavedust/utils/KeybindingHelper.java
+++ b/src/main/java/net/lizistired/cavedust/utils/KeybindingHelper.java
@@ -2,6 +2,7 @@ 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 org.lwjgl.glfw.GLFW;

--- a/src/main/java/net/lizistired/cavedust/utils/MathHelper.java
+++ b/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;
-        }
    }
 }
--- a/src/main/java/net/lizistired/cavedust/utils/ParticleSpawnUtil.java
+++ b/src/main/java/net/lizistired/cavedust/utils/ParticleSpawnUtil.java
@@ -7,6 +7,7 @@ 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;

@@ -26,7 +27,7 @@ public class ParticleSpawnUtil {
        if (!config.getCaveDustEnabled()
                || client.isPaused()
                || client.world == null
-                || !client.world.getDimension().bedWorks()
+                || !client.world.getDimension().isBedWorking()
                || Objects.requireNonNull(client.player).isSubmergedInWater()
                || client.world.getBiome(Objects.requireNonNull(client.player.getBlockPos())).matchesKey(LUSH_CAVES))
        {
@@ -65,8 +66,8 @@ public class ParticleSpawnUtil {
        if (!config.getCaveDustEnabled()
                || client.isPaused()
                || client.world == null
-                || !client.world.getDimension().bedWorks()
-                || (client.world.getBottomY() > pos.getY())
+                || !client.world.getDimension().isBedWorking()
+                || Objects.requireNonNull(client.player).isSubmergedInWater()
                || client.world.getBiome(Objects.requireNonNull(pos)).matchesKey(LUSH_CAVES))

        {
--- a/src/main/java/net/lizistired/cavedust/utils/TranslatableTextHelper.java
+++ b/src/main/java/net/lizistired/cavedust/utils/TranslatableTextHelper.java
@@ -2,38 +2,37 @@ package net.lizistired.cavedust.utils;

 import com.minelittlepony.common.client.gui.element.AbstractSlider;
 import net.minecraft.text.Text;
-
-import javax.swing.*;
+import net.minecraft.text.TranslatableText;

 public class TranslatableTextHelper {
+    public Text formatMinX(AbstractSlider<Float> slider) {
+        return new TranslatableText("menu.cavedust.minX", (int)Math.floor(slider.getValue()));
+    }
+    public Text formatMinY(AbstractSlider<Float> slider) {
+        return new TranslatableText("menu.cavedust.minY", (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 Text.translatable("menu.cavedust.width", (int)Math.floor(slider.getValue()));
+        return new TranslatableText("menu.cavedust.maxX", (int)Math.floor(slider.getValue()));
    }
    public Text formatMaxY(AbstractSlider<Float> slider) {
-        return Text.translatable("menu.cavedust.height", (int)Math.floor(slider.getValue()));
+        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 Text.translatable("menu.cavedust.upperlimit", (int)Math.floor(slider.getValue()));
+        return new TranslatableText("menu.cavedust.upperlimit", (int)Math.floor(slider.getValue()));
    }
    public Text formatLowerLimit(AbstractSlider<Float> slider) {
-        return Text.translatable("menu.cavedust.lowerlimit", (int)Math.floor(slider.getValue()));
+        return new TranslatableText("menu.cavedust.lowerlimit", (int)Math.floor(slider.getValue()));
    }
    public Text formatParticleMultiplier(AbstractSlider<Float> slider) {
-        return Text.translatable("menu.cavedust.particlemultiplier", (int)Math.floor(slider.getValue()));
-    }
-
-    public Text formatParticleMultiplierMultiplier(AbstractSlider<Float> slider) {
-        return Text.translatable("menu.cavedust.particlemultipliermultiplier", (int)Math.floor(slider.getValue()));
+        return new TranslatableText("menu.cavedust.particlemultiplier", (int)Math.floor(slider.getValue()));
    }
    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()));
+        return new TranslatableText("menu.cavedust.velocityrandomness", (int)Math.floor(slider.getValue()));
    }
 }
--- a/src/main/resources/assets/cavedust/lang/zh_cn.json
+++ b/src/main/resources/assets/cavedust/lang/zh_cn.json
@@ -1,41 +0,0 @@
-{
-  "menu.cavedust.title": "洞穴尘埃",
-  "menu.cavedust.global.false": "洞穴尘埃: 功能启用",
-  "menu.cavedust.global.true": "洞穴尘埃: 功能禁用",
-  "menu.cavedust.global.tooltip.false": "启用洞穴尘埃粒子效果?",
-  "menu.cavedust.global.tooltip.true": "禁用洞穴尘埃粒子效果?",
-  "menu.cavedust.width": "边界宽度: %s",
-  "menu.cavedust.height": "边界高度: %s",
-  "menu.cavedust.width.tooltip": "生成粒子效果的最大宽度.",
-  "menu.cavedust.height.tooltip": "生成粒子效果的最大高度.",
-  "menu.cavedust.upperlimit": "最大高度限制: %s",
-  "menu.cavedust.lowerlimit": "最低高度限制: %s",
-  "menu.cavedust.upperlimit.tooltip": "粒子效果消失的高度 (读取玩家所在的 y 轴).",
-  "menu.cavedust.lowerlimit.tooltip": "粒子效果出现最多的高度 (读取玩家所在的 y 轴).",
-  "menu.cavedust.reset": "重置所有设置",
-  "menu.cavedust.reset.tooltip": "你确定要这么做吗?",
-  "menu.cavedust.particlemultiplier": "粒子数量: %s",
-  "menu.cavedust.particlemultiplier.tooltip": "指定深度生成的粒子效果数量.",
-  "menu.cavedust.particlemultipliermultiplier": "粒子效果倍率: %s",
-  "menu.cavedust.particlemultipliermultiplier.tooltip": "粒子效果的生成倍率.",
-  "menu.cavedust.velocityrandomness": "速度随机性: %s",
-  "menu.cavedust.velocityrandomness.tooltip": "粒子效果的速度随机程度.",
-  "menu.cavedust.enhanceddetection.true": "强化检测: 功能启用",
-  "menu.cavedust.enhanceddetection.false": "强化检测: 功能禁用",
-  "menu.cavedust.enhanceddetection.tooltip": "强化检测会使用粒子效果而非玩家的位置进行更精确的检测\n               对性能略有影响.",
-  "menu.cavedust.superflatstatus.true": "超平坦粒子: 功能启用",
-  "menu.cavedust.superflatstatus.false": "超平坦粒子: 功能禁用",
-  "menu.cavedust.superflatstatus.tooltip": "是否允许超平坦世界生成洞穴尘埃?",
-  "menu.cavedust.particle": "粒子效果: ",
-  "menu.cavedust.particle.tooltip": "生成的粒子效果名称, 点击切换.",
-
-  "key.cavedust.reload": "重载配置",
-  "key.cavedust.toggle": "切换粒子",
-  "category.cavedust.spook": "洞穴尘埃",
-
-  "debug.cavedust.toggle.true": "(洞穴尘埃) 粒子效果已启用",
-  "debug.cavedust.toggle.false": "(洞穴尘埃) 粒子效果已禁用",
-  "debug.cavedust.reload": "(洞穴尘埃) 配置已重载",
-  "debug.cavedust.particleerror": "(洞穴尘埃) 设置当前粒子效果时出现问题, 已自动切换至下一个粒子效果!"
-
-}
--- a/src/main/resources/assets/cavedust/particles/cave_dust.json
+++ b/src/main/resources/assets/cavedust/particles/cave_dust.json
@@ -1,5 +0,0 @@
-{
-  "textures": [
-    "minecraft:generic_0"
-  ]
-}
--- a/src/main/resources/assets/cavedust/icon.png
+++ b/src/main/resources/assets/cavedust/icon.png
--- a/src/main/resources/assets/cavedust/lang/en_us.json
+++ b/src/main/resources/assets/cavedust/lang/en_us.json
@@ -4,20 +4,26 @@
  "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.upperlimit": "Upper limit height: %s",
-  "menu.cavedust.lowerlimit": "Lower limit height: %s",
+  "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": "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 amount: %s",
-  "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.particlemultiplier": "Particle multiplier: %s",
+  "menu.cavedust.particlemultiplier.tooltip": "Multiplies the amount of particles at any given depth.",
  "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",
@@ -26,12 +32,6 @@
  "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.",
-  "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,7 +39,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"

 }
--- a/src/main/resources/assets/modid/lang/ru_ru.json
+++ b/src/main/resources/assets/modid/lang/ru_ru.json
@@ -1,44 +0,0 @@
-{
-  "menu.cavedust.title": "Пещерная пыль",
-  "menu.cavedust.global.false": "Пещерная пыль: отключена",
-  "menu.cavedust.global.true": "Пещерная пыль: включена",
-  "menu.cavedust.global.tooltip.false": "Включить частицы пещерной пыли?",
-  "menu.cavedust.global.tooltip.true": "Отключить частицы пещерной пыли?",
-  "menu.cavedust.minX": "Минимум по X: %s",
-  "menu.cavedust.minY": "Минимум по Y: %s",
-  "menu.cavedust.minZ": "Минимум по Z: %s",
-  "menu.cavedust.maxX": "Максимум по X: %s",
-  "menu.cavedust.maxY": "Максимум по Y: %s",
-  "menu.cavedust.maxZ": "Максимум по Z: %s",
-  "menu.cavedust.minX.tooltip": "Минимум по X: %s",
-  "menu.cavedust.minY.tooltip": "Минимум по Y: %s",
-  "menu.cavedust.minZ.tooltip": "Минимум по Z: %s",
-  "menu.cavedust.maxX.tooltip": "Максимум по X: %s",
-  "menu.cavedust.maxY.tooltip": "Максимум по Y: %s",
-  "menu.cavedust.maxZ.tooltip": "Максимум по Z: %s",
-  "menu.cavedust.upperlimit": "Верхний предел: %s",
-  "menu.cavedust.lowerlimit": "Нижний предел: %s",
-  "menu.cavedust.upperlimit.tooltip": "Высота, на которой частицы будут исчезать и перестанут появляться (испольует координату Y игрока).",
-  "menu.cavedust.lowerlimit.tooltip": "The height where particles spawn the most (испольует координату Y игрока).",
-  "menu.cavedust.reset": "Сброс настроек",
-  "menu.cavedust.reset.tooltip": "Вы уверены, что хотите сбросить все настройки?",
-  "menu.cavedust.particlemultiplier": "Множитель частиц: %s",
-  "menu.cavedust.particlemultiplier.tooltip": "Увеличивает количество частиц на любой заданной глубине.",
-  "menu.cavedust.velocityrandomness": "Случайность скорости: %s",
-  "menu.cavedust.velocityrandomness.tooltip": "Случайность скорости движения частиц.",
-  "menu.cavedust.enhanceddetection.true": "Улучшенное обнаружение: включено",
-  "menu.cavedust.enhanceddetection.false": "Улучшенное обнаружение: отключено",
-  "menu.cavedust.enhanceddetection.tooltip": "Улучшенное обнаружение позволяет проводить более точные проверки, используя положение частиц\nвместо положения игрока, что оказывает некоторое влияние на производительность.",
-  "menu.cavedust.superflatstatus.true": "Частицы в суперплоскости: включены",
-  "menu.cavedust.superflatstatus.false": "Частицы в суперплоскости: отключены",
-  "menu.cavedust.superflatstatus.tooltip": "Должны ли частицы появляться в суперплоских мирах?",
-
-  "key.cavedust.reload": "Перезагрузить конфигурацию",
-  "key.cavedust.toggle": "Переключить частицы",
-  "category.cavedust.spook": "Пещерная пыль",
-
-  "debug.cavedust.toggle.true": "[Пещерная пыль] Включенные частицы",
-  "debug.cavedust.toggle.false": "[Пещерная пыль] Отключенные частицы",
-  "debug.cavedust.reload": "[Пещерная пыль] Конфигурация перезагружена"
-
-}
--- a/src/main/resources/cavedust.mixins.json
+++ b/src/main/resources/cavedust.mixins.json
@@ -4,8 +4,7 @@
  "package": "net.lizistired.cavedust.mixin",
  "compatibilityLevel": "JAVA_16",
  "mixins": [
-    "ClientWorldAccessor",
-    "MixinDebugScreenOverlay"
+    "ClientWorldAccessor"
  ],
  "client": [
  ],
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -12,26 +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",
+    "fabricloader": ">=0.12.11",
    "fabric": "*",
-    "minecraft": "1.20.1",
+    "minecraft": "1.18.2",
    "java": ">=17"
  },
  "suggests": {
Author	SHA1	Message	Date
Liz Graham	e35fdaa8ce	Merge pull request #19 from Myuui/1.18.2 French Translation by @Myuui	2024-01-21 01:59:17 +00:00
Liz Graham	a0aef4a5ef	Merge pull request #20 from arunsathiya/1.18.2 ci: Use GITHUB_OUTPUT envvar instead of set-output command	2024-01-21 01:57:17 +00:00
Arun	22928e4885	ci: Use GITHUB_OUTPUT envvar instead of set-output command	2024-01-11 21:22:27 -08:00
Myuui	8cb6407f8b	French Translation by Myuui	2023-12-17 23:58:18 +01:00
Liz Graham	1a097e6daf	Update README.md	2023-05-21 07:43:40 +01:00