Merge pull request #19 from Myuui/1.18.2

French Translation by @Myuui

.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 '0.12-SNAPSHOT'
+	id 'fabric-loom' version '0.11-SNAPSHOT'
 	id 'maven-publish'
 }
 

gradle.properties

@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.19.2
-	yarn_mappings=1.19.2+build.4
-	loader_version=0.14.9
+	minecraft_version=1.18.2
+	yarn_mappings=1.18.2+build.1
+	loader_version=0.12.11
 
 # Mod Properties
 	mod_version = 1.2.0
@@ -13,7 +13,8 @@ org.gradle.jvmargs=-Xmx1G
 	archives_base_name = cave_dust
 
 # Dependencies
-	fabric_version=0.59.0+1.19.2
-    clothconfig_version = 8.0.75
-	modmenu_version = 4.0.6
-	kirin_version=1.11.1-beta.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

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

@@ -1,8 +1,11 @@
 package net.lizistired.cavedust;
 
 //minecraft imports
+import net.lizistired.cavedust.mixin.ClientWorldAccessor;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
+import net.minecraft.util.Util;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 //other imports
@@ -22,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() {
@@ -32,8 +35,8 @@ 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;
 	}
 
@@ -54,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

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

@@ -11,7 +11,7 @@ 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 dimensionMaxX = 5;
@@ -31,7 +31,7 @@ public class CaveDustConfig extends JsonFile {
     private float lowerLimit = -64;
     private int particleMultiplier = 1;
 
-    public CaveDustConfig(Path file, net.lizistired.cavedust.CaveDust caveDust) {
+    public CaveDustConfig(Path file, CaveDust caveDust) {
         super(file);
         this.CaveDust = caveDust;
     }

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

@@ -5,13 +5,13 @@ import com.minelittlepony.common.client.gui.element.*;
 import net.lizistired.cavedust.utils.TranslatableTextHelper;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
 
 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
@@ -20,85 +20,85 @@ public class ModMenuConfigScreen extends GameGui {
         int row = height / 4 + 14;
 
         CaveDustConfig config = CaveDust.getInstance().getConfig();
-        TranslatableTextHelper transText = new TranslatableTextHelper();;
+        TranslatableTextHelper transText = new TranslatableTextHelper();
         config.load();
 
         addButton(new Label(width / 2, 30)).setCentered().getStyle()
                 .setText(getTitle());
 
         addButton(new Button(left, row += -60).onClick(sender -> {
-            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(Text.translatable("menu.cavedust.minX.tooltip"));
+                .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(Text.translatable("menu.cavedust.minY.tooltip"));
+                .getStyle().setTooltip(new TranslatableText("menu.cavedust.minY.tooltip"));
 
         addButton(new Slider(left, row += 24, -50, 0, config.getDimensionsMinZ()))
                 .onChange(config::setDimensionsMinZ)
                 .setTextFormat(transText::formatMinZ)
-                .getStyle().setTooltip(Text.translatable("menu.cavedust.minZ.tooltip"));
+                .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(Text.translatable("menu.cavedust.maxX.tooltip"));
+                .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(Text.translatable("menu.cavedust.maxY.tooltip"));
+                .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(Text.translatable("menu.cavedust.maxZ.tooltip"));
+                .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, 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, 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 += 60)
                 .onClick(sender -> finish())).getStyle()

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

@@ -1,16 +1,42 @@
 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.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();

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,7 +66,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(pos)).matchesKey(LUSH_CAVES))
 

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

@@ -2,36 +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;
 
 public class TranslatableTextHelper {
     public Text formatMinX(AbstractSlider<Float> slider) {
-        return Text.translatable("menu.cavedust.minX", (int)Math.floor(slider.getValue()));
+        return new TranslatableText("menu.cavedust.minX", (int)Math.floor(slider.getValue()));
     }
     public Text formatMinY(AbstractSlider<Float> slider) {
-        return Text.translatable("menu.cavedust.minY", (int)Math.floor(slider.getValue()));
+        return new TranslatableText("menu.cavedust.minY", (int)Math.floor(slider.getValue()));
     }
     public Text formatMinZ(AbstractSlider<Float> slider) {
-        return Text.translatable("menu.cavedust.minZ", (int)Math.floor(slider.getValue()));
+        return new TranslatableText("menu.cavedust.minZ", (int)Math.floor(slider.getValue()));
     }
     public Text formatMaxX(AbstractSlider<Float> slider) {
-        return Text.translatable("menu.cavedust.maxX", (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.maxY", (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.maxZ", (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 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/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/fabric.mod.json

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