Merge pull request #19 from Myuui/1.18.2

French Translation by @Myuui

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

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

.gitignore

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

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.2-SNAPSHOT'
+	id 'fabric-loom' version '0.11-SNAPSHOT'
 	id 'maven-publish'
 }
 

gradle.properties

@@ -3,17 +3,18 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.20.2
+	minecraft_version=1.18.2
-	yarn_mappings=1.20.2+build.4
+	yarn_mappings=1.18.2+build.1
-	loader_version=0.14.24
+	loader_version=0.12.11
 
 # Mod Properties
-	mod_version=1.4.1
+	mod_version = 1.2.0
-	maven_group=com.lizistired
+	maven_group = com.lizistired
-	archives_base_name=cave_dust
+	archives_base_name = cave_dust
 
 # Dependencies
-	fabric_version=0.90.7+1.20.2
+	fabric_version=0.47.8+1.18.2
-    clothconfig_version=12.0.10
+    clothconfig_version = 6.1.48
-	modmenu_version=8.0.0-beta.2
+	modmenu_version = 3.0.1
-	kirin_version=1.16.0+1.20.2
+	minelp_version=4.4.0-beta.2
+	kirin_version=1.10.0-beta.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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}»,
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
+#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #

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

@@ -1,11 +1,11 @@
 package net.lizistired.cavedust;
 
 //minecraft imports
-import net.minecraft.block.Blocks;
+import net.lizistired.cavedust.mixin.ClientWorldAccessor;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.particle.ParticleTypes;
-import net.minecraft.registry.Registries;
 import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
+import net.minecraft.util.Util;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 //other imports
@@ -25,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() {
@@ -35,14 +35,11 @@ public class CaveDust implements ClientModInitializer {
 		instance = this;
 	}
 	//config assignment
-	private static net.lizistired.cavedust.CaveDustConfig config;
+	private static CaveDustConfig config;
-	public net.lizistired.cavedust.CaveDustConfig getConfig() {
+	public CaveDustConfig getConfig() {
 		return config;
 	}
 
-	public static int WHITE_ASH_ID = Registries.PARTICLE_TYPE.getRawId(ParticleTypes.WHITE_ASH);
-	public static int PARTICLE_AMOUNT = 0;
-
 
 	@Override
 	public void onInitializeClient() {
@@ -60,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
@@ -74,24 +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.getDimensionsX() * -1, config.getDimensionsX()));
+				double x = client.player.getPos().getX() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxX());
-				int y = (int) (client.player.getPos().getY() + (int) generateRandomDouble(config.getDimensionsY() * -1, config.getDimensionsY()));
+				double y = client.player.getPos().getY() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxY());
-				int z = (int) (client.player.getPos().getZ() + (int) generateRandomDouble(config.getDimensionsZ() * -1, config.getDimensionsZ()));
+				double z = client.player.getPos().getZ() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxZ());
 				BlockPos particlePos = new BlockPos(x, y, z);
 
-				if (shouldParticlesSpawn(client, config, particlePos)) {
+				if (!shouldParticlesSpawn(client, config, particlePos)){return;}
-					if (client.world.getBlockState(particlePos).isAir()) {
+
-						world.addParticle(config.getParticle(), x, y, z, config.getVelocityRandomnessRandom(), config.getVelocityRandomnessRandom(), config.getVelocityRandomnessRandom());
+
-					}
+				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");
 			}
 		}
 	}

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

@@ -1,76 +1,111 @@
 package net.lizistired.cavedust;
 
 import net.lizistired.cavedust.utils.JsonFile;
-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.util.registry.Registry;
 import static net.lizistired.cavedust.CaveDust.*;
 import static net.lizistired.cavedust.utils.MathHelper.*;
 
 import java.nio.file.Path;
 
 public class CaveDustConfig extends JsonFile {
-    private transient final net.lizistired.cavedust.CaveDust CaveDust;
+    private transient final CaveDust CaveDust;
 
 
-    private int dimensionX = 5;
+    private int dimensionMaxX = 5;
-    private int dimensionY = 5;
+    private int dimensionMaxY = 5;
-    private int dimensionZ = 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;
 
-    private int particleMultiplierMultiplier = 10;
+    public CaveDustConfig(Path file, CaveDust caveDust) {
-
-    private int particleID = WHITE_ASH_ID;
-
-    public CaveDustConfig(Path file, net.lizistired.cavedust.CaveDust caveDust) {
         super(file);
         this.CaveDust = caveDust;
     }
 
-    public float setDimensionsX(float size){
+    public float setDimensionsMinX(float size){
-        if (this.dimensionX != size) {
+        if (this.dimensionMinX != size) {
-            this.dimensionX = (int)size;
+            this.dimensionMinX = (int)size;
             save();
         }
-        return getDimensionsX();
+        return getDimensionsMinX();
     }
 
-    public float setDimensionsY(float size){
+    public float setDimensionsMinY(float size){
-        if (this.dimensionY != size) {
+        if (this.dimensionMinY != size) {
-            this.dimensionY = (int)size;
+            this.dimensionMinY = (int)size;
             save();
         }
-        return getDimensionsY();
+        return getDimensionsMinY();
     }
 
-    public float setDimensionsZ(float size){
+    public float setDimensionsMinZ(float size){
-        if (this.dimensionZ != size) {
+        if (this.dimensionMinZ != size) {
-            this.dimensionZ = (int)size;
+            this.dimensionMinZ = (int)size;
             save();
         }
-        return getDimensionsZ();
+        return getDimensionsMinZ();
     }
 
-    public float getDimensionsX(){
+    public float getDimensionsMinX(){
-        return dimensionX;
+        return dimensionMinX;
     }
 
-    public float getDimensionsY(){
+    public float getDimensionsMinY(){
-        return dimensionY;
+        return dimensionMinY;
     }
 
-    public float getDimensionsZ(){
+    public float getDimensionsMinZ(){
-        return dimensionZ;
+        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){
@@ -115,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();
@@ -136,17 +161,17 @@ public class CaveDustConfig extends JsonFile {
     }
 
     public ParticleEffect setParticle(String particleType){
-        //particleName = particleType;
+        particleName = particleType;
         save();
         return getParticle();
     }
 
     public ParticleEffect getParticle(){
         try {
-            return (ParticleEffect) Registries.PARTICLE_TYPE.get(new Identifier(Registries.PARTICLE_TYPE.getEntry(getParticleID()).get().getKey().get().getValue().toString().toLowerCase()));
+            return (ParticleEffect) Registry.PARTICLE_TYPE.get(new Identifier(particleName.toLowerCase()));
         } catch (ClassCastException e) {
-            MinecraftClient.getInstance().player.sendMessage(Text.literal("Issue loading particle, defaulting to white ash particle!"), false);
+            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\".");
-            setParticleID(WHITE_ASH_ID);
+            particleName = "minecraft:white_ash";
             save();
             return ParticleTypes.WHITE_ASH;
         }
@@ -187,42 +212,33 @@ public class CaveDustConfig extends JsonFile {
         return getSuperFlatStatus();
     }
 
-    public void iterateParticle(){
+    /*public boolean getEnhancedDetection(){
-        if(getParticleID() > Registries.PARTICLE_TYPE.size() - 2) {
+        return enhancedDetection;
-            particleID = 1;
-            save();
-        } else {
-            particleID = getParticleID() + 1;
-            save();
-        }
     }
 
-    public void setParticleID(int particleID){
+    public boolean setEnhancedDetection(){
-        this.particleID = particleID;
+        enhancedDetection = !enhancedDetection;
         save();
-    }
+        return getEnhancedDetection();
-
+    }*/
-    public int getParticleID(){
-        if ((!Registries.PARTICLE_TYPE.getEntry(particleID).isPresent())) {
-            setParticleID(WHITE_ASH_ID);
-        }
-        return particleID;
-    }
 
     public void resetConfig(){
-        dimensionX = 5;
+        dimensionMinX = -5;
-        dimensionY = 5;
+        dimensionMinY = -5;
-        dimensionZ = 5;
+        dimensionMinZ = -5;
+
+        dimensionMaxX = 5;
+        dimensionMaxY = 5;
+        dimensionMaxZ = 5;
 
         upperLimit = 64;
         lowerLimit = -64;
 
         particleMultiplier = 1;
-        particleMultiplierMultiplier = 10;
 
         seaLevelCheck = true;
         caveDustEnabled = true;
-        particleID = WHITE_ASH_ID;
+        particleName = "minecraft:white_ash";
         save();
     }
 }

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

@@ -3,17 +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.client.util.math.MatrixStack;
-import net.minecraft.particle.ParticleEffect;
+import net.minecraft.text.TranslatableText;
-import net.minecraft.registry.Registries;
+
-import net.minecraft.text.Text;
+import javax.annotation.Nullable;
-import org.jetbrains.annotations.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
@@ -22,98 +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 -> {
+        addButton(new Button(left, row += -60).onClick(sender -> {
-            sender.getStyle().setText("menu.cavedust.global." + config.toggleCaveDust()).setTooltip(Text.translatable("menu.cavedust.global.tooltip." + config.getCaveDustEnabled()));
+            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"));
+                .getStyle().setTooltip(new TranslatableText("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.getDimensionsX()))
-                .onChange(config::setDimensionsX)
-                .setTextFormat(transText::formatMaxX)
-                .getStyle().setTooltip(Text.translatable("menu.cavedust.X.tooltip"));
-
-        addButton(new Slider(left, row += 24, 1, 50, config.getDimensionsY()))
-                .onChange(config::setDimensionsY)
-                .setTextFormat(transText::formatMaxY)
-                .getStyle().setTooltip(Text.translatable("menu.cavedust.Y.tooltip"));
-
-        addButton(new Slider(left, row += 24, 1, 50, config.getDimensionsZ()))
-                .onChange(config::setDimensionsZ)
-                .setTextFormat(transText::formatMaxZ)
-                .getStyle().setTooltip(Text.translatable("menu.cavedust.Z.tooltip"));
 
         addButton(new Slider(left, row += 24, 0, 10, config.getVelocityRandomness()))
                 .onChange(config::setVelocityRandomness)
                 .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 += 60).onClick(sender -> {
+        addButton(new Button(left, row += 24).onClick(sender -> {
             config.resetConfig();
             finish();
-        })).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) {
+    public void render(MatrixStack matrices, int mouseX, int mouseY, float partialTicks) {
-        renderBackground(context, mouseX, mouseY, partialTicks);
+        renderBackground(matrices);
-        super.render(context, mouseX, mouseY, partialTicks);
+        super.render(matrices, mouseX, mouseY, partialTicks);
-    }
-    private String getNameOfParticle(){
-        CaveDustConfig config = CaveDust.getInstance().getConfig();
-        config.load();
-        return Registries.PARTICLE_TYPE.getEntry(config.getParticleID()).get().getKey().get().getValue().toString();
     }
 }

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 java.util.Objects;
-import static net.lizistired.cavedust.CaveDust.PARTICLE_AMOUNT;
+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 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("");
     }
 }

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;
 

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.getDimension().isBedWorking()
-                || (client.world.getBottomY() > pos.getY())
+                || Objects.requireNonNull(client.player).isSubmergedInWater()
                 || client.world.getBiome(Objects.requireNonNull(pos)).matchesKey(LUSH_CAVES))
 
         {

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

@@ -2,33 +2,37 @@ package net.lizistired.cavedust.utils;
 
 import com.minelittlepony.common.client.gui.element.AbstractSlider;
 import net.minecraft.text.Text;
-
+import net.minecraft.text.TranslatableText;
-import javax.swing.*;
 
 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.X", (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.Y", (int)Math.floor(slider.getValue()));
+        return new TranslatableText("menu.cavedust.maxY", (int)Math.floor(slider.getValue()));
     }
     public Text formatMaxZ(AbstractSlider<Float> slider) {
-        return Text.translatable("menu.cavedust.Z", (int)Math.floor(slider.getValue()));
+        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()));
+        return new TranslatableText("menu.cavedust.particlemultiplier", (int)Math.floor(slider.getValue()));
-    }
-
-    public Text formatParticleMultiplierMultiplier(AbstractSlider<Float> slider) {
-        return Text.translatable("menu.cavedust.particlemultipliermultiplier", (int)Math.floor(slider.getValue()));
     }
     public Text formatVelocityRandomness(AbstractSlider<Float> slider) {
-        return Text.translatable("menu.cavedust.velocityrandomness", (int) Math.floor(slider.getValue()));
+        return new TranslatableText("menu.cavedust.velocityrandomness", (int)Math.floor(slider.getValue()));
     }
 }

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

@@ -4,22 +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.X": "X bounds: %s",
+  "menu.cavedust.minX": "Minimum X: %s",
-  "menu.cavedust.Y": "Y bounds: %s",
+  "menu.cavedust.minY": "Minimum Y: %s",
-  "menu.cavedust.Z": "Z bounds: %s",
+  "menu.cavedust.minZ": "Minimum Z: %s",
-  "menu.cavedust.X.tooltip": "X axis bounds for particle spawning.",
+  "menu.cavedust.maxX": "Maximum X: %s",
-  "menu.cavedust.Y.tooltip": "Y axis bounds for particle spawning.",
+  "menu.cavedust.maxY": "Maximum Y: %s",
-  "menu.cavedust.Z.tooltip": "Z axis bounds for particle spawning.",
+  "menu.cavedust.maxZ": "Maximum Z: %s",
-  "menu.cavedust.upperlimit": "Upper limit height: %s",
+  "menu.cavedust.minX.tooltip": "Minimum X: %s",
-  "menu.cavedust.lowerlimit": "Lower limit height: %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": "Particle multiplier: %s",
-  "menu.cavedust.particlemultiplier.tooltip": "Amount of particles to spawn at any given depth.",
+  "menu.cavedust.particlemultiplier.tooltip": "Multiplies the amount of particles at any given depth.",
-  "menu.cavedust.particlemultipliermultiplier": "Particle multiplier: %s",
-  "menu.cavedust.particlemultipliermultiplier.tooltip": "Multiplies particle amount.",
   "menu.cavedust.velocityrandomness": "Velocity randomness: %s",
   "menu.cavedust.velocityrandomness.tooltip": "The randomness of the velocity of the particles.",
   "menu.cavedust.enhanceddetection.true": "Enhanced detection: Enabled",
@@ -28,8 +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.",
 
   "key.cavedust.reload": "Reload Config",
   "key.cavedust.toggle": "Toggle Particles",

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

@@ -0,0 +1,44 @@
+{
+  "menu.cavedust.title": "Cave Dust",
+  "menu.cavedust.global.false": "Cave Dust: Désactivée",
+  "menu.cavedust.global.true": "Cave Dust: Activée",
+  "menu.cavedust.global.tooltip.false": "Activer les particules de poussière de grotte ?",
+  "menu.cavedust.global.tooltip.true": "Désactiver les particules de poussière de grotte ?",
+  "menu.cavedust.minX": "Minimum X: %s",
+  "menu.cavedust.minY": "Minimum Y: %s",
+  "menu.cavedust.minZ": "Minimum Z: %s",
+  "menu.cavedust.maxX": "Maximum X: %s",
+  "menu.cavedust.maxY": "Maximum Y: %s",
+  "menu.cavedust.maxZ": "Maximum Z: %s",
+  "menu.cavedust.minX.tooltip": "Minimum X: %s",
+  "menu.cavedust.minY.tooltip": "Minimum Y: %s",
+  "menu.cavedust.minZ.tooltip": "Minimum Z: %s",
+  "menu.cavedust.maxX.tooltip": "Maximum X: %s",
+  "menu.cavedust.maxY.tooltip": "Maximum Y: %s",
+  "menu.cavedust.maxZ.tooltip": "Maximum Z: %s",
+  "menu.cavedust.upperlimit": "Limite supérieure : %s",
+  "menu.cavedust.lowerlimit": "Limite inférieure : %s",
+  "menu.cavedust.upperlimit.tooltip": "La hauteur à laquelle les particules s'estompent et cessent de spawner (utilise l'axe Y du joueur).",
+  "menu.cavedust.lowerlimit.tooltip": "La hauteur où les particules apparaissent le plus (utilise l'axe Y du joueur).",
+  "menu.cavedust.reset": "Réinitialiser les paramètres",
+  "menu.cavedust.reset.tooltip": "Êtes-vous sûr de vouloir réinitialiser tous les paramètres ?",
+  "menu.cavedust.particlemultiplier": "Multiplicateur de particules : %s",
+  "menu.cavedust.particlemultiplier.tooltip": "Multiplie la quantité de particules à une profondeur donnée.",
+  "menu.cavedust.velocityrandomness": "Aléatoire de la vélocité : %s",
+  "menu.cavedust.velocityrandomness.tooltip": "Le niveau d'aléatoire de la vélocité des particules.",
+  "menu.cavedust.enhanceddetection.true": "Détection améliorée : Activée",
+  "menu.cavedust.enhanceddetection.false": "Détection améliorée : Désactivée",
+  "menu.cavedust.enhanceddetection.tooltip": "La détection améliorée permet des vérifications plus précises en utilisant la position des particules\n               plutôt que celle du joueur, mais impacte les performances.",
+  "menu.cavedust.superflatstatus.true": "Particules sur monde Superflat : Activées",
+  "menu.cavedust.superflatstatus.false": "Particules sur monde Superflat : Désactivées",
+  "menu.cavedust.superflatstatus.tooltip": "Les particules doivent-elles apparaître sur les mondes Superflat ?",
+
+  "key.cavedust.reload": "Recharger la configuration",
+  "key.cavedust.toggle": "Activer/Désactiver les particules",
+  "category.cavedust.spook": "Cave Dust",
+
+  "debug.cavedust.toggle.true": "(Cave Dust) Particules activées",
+  "debug.cavedust.toggle.false": "(Cave Dust) Particules désactivées",
+  "debug.cavedust.reload": "(Cave Dust) Configuration rechargée"
+
+}

src/main/resources/dust.mixins.json

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

src/main/resources/fabric.mod.json

@@ -26,9 +26,9 @@
     "dust.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.14.5",
+    "fabricloader": ">=0.12.11",
     "fabric": "*",
-    "minecraft": "1.20.2",
+    "minecraft": "1.18.2",
     "java": ">=17"
   },
   "suggests": {