change: Fix block breaking and break particles

Author: FlashyReese

build.gradle.kts

@@ -3,19 +3,19 @@ plugins {
     id("fabric-loom") version ("1.11-SNAPSHOT") apply (false)
 }
 
-val MINECRAFT_VERSION by extra { "1.21.9" }
-val NEOFORGE_VERSION by extra { "21.9.11-beta" }
-val FABRIC_LOADER_VERSION by extra { "0.17.2" }
-val FABRIC_API_VERSION by extra { "0.134.0+1.21.9" }
+val MINECRAFT_VERSION by extra { "1.21.10" }
+val NEOFORGE_VERSION by extra { "21.10.47-beta" }
+val FABRIC_LOADER_VERSION by extra { "0.17.3" }
+val FABRIC_API_VERSION by extra { "0.138.0+1.21.10" }
 
 // This value can be set to null to disable Parchment.
 val PARCHMENT_VERSION by extra { null }
 
 // https://semver.org/
 val MAVEN_GROUP by extra { "me.flashyreese.mods" }
 val ARCHIVE_NAME by extra { "sodium-extra" }
-val MOD_VERSION by extra { "0.7.0" }
-val SODIUM_VERSION by extra { "mc1.21.9-0.7.0" }
+val MOD_VERSION by extra { "0.7.1" }
+val SODIUM_VERSION by extra { "mc1.21.10-0.7.2" }
 
 allprojects {
     apply(plugin = "java")

common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/particle/MixinClientLevel.java

@@ -0,0 +1,28 @@
+package me.flashyreese.mods.sodiumextra.mixin.particle;
+
+import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.state.BlockState;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(ClientLevel.class)
+public class MixinClientLevel {
+    @Inject(method = "addDestroyBlockEffect", at = @At(value = "HEAD"), cancellable = true)
+    public void addBlockBreakParticles(BlockPos blockPos, BlockState blockState, CallbackInfo ci) {
+        if (!SodiumExtraClientMod.options().particleSettings.particles || !SodiumExtraClientMod.options().particleSettings.blockBreak) {
+            ci.cancel();
+        }
+    }
+
+    @Inject(method = "addBreakingBlockEffect", at = @At(value = "HEAD"), cancellable = true)
+    public void addBlockBreakingParticles(BlockPos blockPos, Direction direction, CallbackInfo ci) {
+        if (!SodiumExtraClientMod.options().particleSettings.particles || !SodiumExtraClientMod.options().particleSettings.blockBreaking) {
+            ci.cancel();
+        }
+    }
+}

common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/particle/MixinParticleEngine.java

@@ -17,21 +17,6 @@
 
 @Mixin(ParticleEngine.class)
 public class MixinParticleEngine {
-    //Todo:
-    /*@Inject(method = "destroy", at = @At(value = "HEAD"), cancellable = true)
-    public void addBlockBreakParticles(BlockPos pos, BlockState state, CallbackInfo ci) {
-        if (!SodiumExtraClientMod.options().particleSettings.particles || !SodiumExtraClientMod.options().particleSettings.blockBreak) {
-            ci.cancel();
-        }
-    }
-
-    @Inject(method = "crack", at = @At(value = "HEAD"), cancellable = true)
-    public void addBlockBreakingParticles(BlockPos pos, Direction direction, CallbackInfo ci) {
-        if (!SodiumExtraClientMod.options().particleSettings.particles || !SodiumExtraClientMod.options().particleSettings.blockBreaking) {
-            ci.cancel();
-        }
-    }*/
-
     @Inject(method = "createParticle", at = @At(value = "HEAD"), cancellable = true)
     public void addParticle(ParticleOptions particleOptions, double d, double e, double f, double g, double h, double i, CallbackInfoReturnable<Particle> cir) {
         if (SodiumExtraClientMod.options().particleSettings.particles) {

common/src/main/resources/sodium-extra.mixins.json

@@ -22,6 +22,7 @@
     "optimizations.beacon_beam_rendering.LevelRendererAccessor",
     "optimizations.beacon_beam_rendering.MixinBeaconRenderer",
     "optimizations.beacon_beam_rendering.MixinVertexSerializerRegistryImpl",
+    "particle.MixinClientLevel",
     "particle.MixinFireworkParticle",
     "particle.MixinLevelRenderer",
     "particle.MixinParticleEngine",

neoforge/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("idea")
-    id("net.neoforged.moddev") version "2.0.110"
+    id("net.neoforged.moddev") version "2.0.116"
     id("java-library")
 }
 
@@ -17,13 +17,6 @@ base {
 }
 
 repositories {
-    maven("https://maven.pkg.github.com/ims212/FRAPI-Testing") {
-        credentials {
-            username = "IMS212"
-            // Read only token
-            password = "ghp_" + "DEuGv0Z56vnSOYKLCXdsS9svK4nb9K39C1Hn"
-        }
-    }
     maven("https://maven.su5ed.dev/releases")
     maven("https://maven.neoforged.net/releases/")
 

neoforge/src/main/java/net/caffeinemc/caffeineconfig/CaffeineConfigNeoForge.java

@@ -8,7 +8,7 @@
 public class CaffeineConfigNeoForge implements CaffeineConfigPlatform {
     @Override
     public void applyModOverrides(CaffeineConfig config, String jsonKey) {
-        for (ModInfo meta : FMLLoader.getLoadingModList().getMods()) {
+        for (ModInfo meta : FMLLoader.getCurrent().getLoadingModList().getMods()) {
             meta.getConfigElement(jsonKey).ifPresent(override -> {
                 if (override instanceof Map<?, ?> overrides && overrides.keySet().stream().allMatch(key -> key instanceof String)) {
                     overrides.forEach((key, value) -> {