Update 1.3

Changelog.md

@@ -1,4 +1,4 @@
-# Changelog v1.2
+# Changelog v1.3
 
-## Changes
-- Particles now change color by biome
+## Additions
+- Added falling leaf particles for pale oak leaves

gradle.properties

@@ -4,14 +4,14 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.2
-yarn_mappings=1.21.2+build.1
+minecraft_version=1.21.3
+yarn_mappings=1.21.3+build.2
 loader_version=0.16.7
 
 # Mod Properties
-mod_version=1.2
+mod_version=1.3
 maven_group=com.nemonotfound
 archives_base_name=nemos-ambience
 
 # Dependencies
-fabric_version=0.106.1+1.21.2
+fabric_version=0.106.1+1.21.3

src/main/java/com/nemonotfound/nemosambience/NemosAmbienceClient.java

@@ -12,13 +12,8 @@ public class NemosAmbienceClient implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
-        registerParticle(OAK_LEAVES_Particle);
-        registerParticle(DARK_OAK_LEAVES_Particle);
-        registerParticle(BIRCH_LEAVES_Particle);
-        registerParticle(SPRUCE_LEAVES_Particle);
-        registerParticle(JUNGLE_LEAVES_Particle);
-        registerParticle(MANGROVE_LEAVES_Particle);
-        registerParticle(ACACIA_LEAVES_Particle);
+        registerParticle(FALLING_LEAVES_PARTICLE);
+        registerParticle(PALE_OAK_FALLING_LEAVES_PARTICLE);
     }
 
     private void registerParticle(SimpleParticleType particleType) {

src/main/java/com/nemonotfound/nemosambience/client/particle/LeavesParticle.java

@@ -37,31 +37,32 @@ public LeavesParticle(ClientWorld world, double x, double y, double z, SpritePro
     }
 
     private void setParticleColor(ClientWorld world) {
-        int color = getFoliageColor(world);
+        BlockPos pos = BlockPos.ofFloored(x, y, z);
+        Block leavesBlock = world.getBlockState(pos.up()).getBlock();
+        String leavesName = Registries.BLOCK.getId(leavesBlock).getPath();
 
-        float red = ((color >> 16) & 0xFF) / 255.0f;
-        float green = ((color >> 8) & 0xFF) / 255.0f;
-        float blue = (color & 0xFF) / 255.0f;
+        if (!leavesName.equals("pale_oak_leaves")) {
+            int color = getFoliageColor(world, pos, leavesName);
 
-        this.setColor(red, green, blue);
+            float red = ((color >> 16) & 0xFF) / 255.0f;
+            float green = ((color >> 8) & 0xFF) / 255.0f;
+            float blue = (color & 0xFF) / 255.0f;
+
+            this.setColor(red, green, blue);
+        }
     }
 
-    private int getFoliageColor(ClientWorld world) {
+    private int getFoliageColor(ClientWorld world, BlockPos pos, String leavesName) {
         if (world == null) {
             return FoliageColors.getDefaultColor();
         }
 
-        BlockPos pos = BlockPos.ofFloored(x, y, z);
-        Block leavesBlock = world.getBlockState(pos.up()).getBlock();
-        String leavesName = Registries.BLOCK.getId(leavesBlock).getPath();
-
-        if (leavesName.equals("birch_leaves")) {
-            return FoliageColors.getBirchColor();
-        } else if (leavesName.equals("spruce_leaves")) {
-            return FoliageColors.getSpruceColor();
-        }
+        return switch (leavesName) {
+            case "birch_leaves" -> FoliageColors.getBirchColor();
+            case "spruce_leaves" -> FoliageColors.getSpruceColor();
+            default -> BiomeColors.getFoliageColor(world, pos);
+        };
 
-        return BiomeColors.getFoliageColor(world, pos);
     }
 
     @Override

src/main/java/com/nemonotfound/nemosambience/client/particle/ModParticles.java

@@ -11,13 +11,8 @@
 
 public class ModParticles {
 
-    public static final SimpleParticleType OAK_LEAVES_Particle = registerParticle("oak_leaves", FabricParticleTypes.simple());
-    public static final SimpleParticleType DARK_OAK_LEAVES_Particle = registerParticle("dark_oak_leaves", FabricParticleTypes.simple());
-    public static final SimpleParticleType BIRCH_LEAVES_Particle = registerParticle("birch_leaves", FabricParticleTypes.simple());
-    public static final SimpleParticleType SPRUCE_LEAVES_Particle = registerParticle("spruce_leaves", FabricParticleTypes.simple());
-    public static final SimpleParticleType JUNGLE_LEAVES_Particle = registerParticle("jungle_leaves", FabricParticleTypes.simple());
-    public static final SimpleParticleType MANGROVE_LEAVES_Particle = registerParticle("mangrove_leaves", FabricParticleTypes.simple());
-    public static final SimpleParticleType ACACIA_LEAVES_Particle = registerParticle("acacia_leaves", FabricParticleTypes.simple());
+    public static final SimpleParticleType FALLING_LEAVES_PARTICLE = registerParticle("falling_leaves", FabricParticleTypes.simple());
+    public static final SimpleParticleType PALE_OAK_FALLING_LEAVES_PARTICLE = registerParticle("pale_oak_falling_leaves", FabricParticleTypes.simple());
 
     public static void registerParticles() {
         log.info("Register Nemo's particles");

src/main/java/com/nemonotfound/nemosambience/mixin/LeavesBlockMixin.java

@@ -35,24 +35,22 @@ private void init(BlockState state, World world, BlockPos pos, Random random, Ca
 	@Unique
 	private void generateLeafParticles(World world, BlockPos pos, Random random, String leavesName) {
 		switch (leavesName) {
-			case "oak_leaves" -> generateParticles(world, pos, random, OAK_LEAVES_Particle);
-			case "dark_oak_leaves" -> generateParticles(world, pos, random, DARK_OAK_LEAVES_Particle);
-			case "birch_leaves" -> generateParticles(world, pos, random, BIRCH_LEAVES_Particle);
-			case "spruce_leaves" -> generateParticles(world, pos, random, SPRUCE_LEAVES_Particle);
-			case "jungle_leaves" -> generateParticles(world, pos, random, JUNGLE_LEAVES_Particle);
-			case "mangrove_leaves" -> generateParticles(world, pos, random, MANGROVE_LEAVES_Particle);
-			case "acacia_leaves" -> generateParticles(world, pos, random, ACACIA_LEAVES_Particle);
-		}
+			case "oak_leaves", "dark_oak_leaves", "birch_leaves", "spruce_leaves", "jungle_leaves", "mangrove_leaves",
+                 "acacia_leaves" -> generateParticles(world, pos, random, FALLING_LEAVES_PARTICLE);
+			case "pale_oak_leaves" -> generateParticles(world, pos, random, PALE_OAK_FALLING_LEAVES_PARTICLE);
+        }
 	}
 
 	@Unique
 	private void generateParticles(World world, BlockPos pos, Random random, SimpleParticleType particleType) {
 		if (random.nextInt(20) == 0) {
 			BlockPos blockPos = pos.down();
 			BlockState blockState = world.getBlockState(blockPos);
+
 			if (LeavesBlock.isFaceFullSquare(blockState.getCollisionShape(world, blockPos), Direction.UP)) {
 				return;
 			}
+
 			ParticleUtil.spawnParticle(world, pos, random, particleType);
 		}
 	}

src/main/resources/assets/nemos-ambience/particles/falling_leaves.json

@@ -0,0 +1,16 @@
+{
+  "textures": [
+    "nemos-ambience:falling_leaf_0",
+    "nemos-ambience:falling_leaf_1",
+    "nemos-ambience:falling_leaf_2",
+    "nemos-ambience:falling_leaf_3",
+    "nemos-ambience:falling_leaf_4",
+    "nemos-ambience:falling_leaf_5",
+    "nemos-ambience:falling_leaf_6",
+    "nemos-ambience:falling_leaf_7",
+    "nemos-ambience:falling_leaf_8",
+    "nemos-ambience:falling_leaf_9",
+    "nemos-ambience:falling_leaf_10",
+    "nemos-ambience:falling_leaf_11"
+  ]
+}

src/main/resources/assets/nemos-ambience/particles/pale_oak_falling_leaves.json

@@ -0,0 +1,16 @@
+{
+  "textures": [
+    "nemos-ambience:pale_oak_falling_leaf_0",
+    "nemos-ambience:pale_oak_falling_leaf_1",
+    "nemos-ambience:pale_oak_falling_leaf_2",
+    "nemos-ambience:pale_oak_falling_leaf_3",
+    "nemos-ambience:pale_oak_falling_leaf_4",
+    "nemos-ambience:pale_oak_falling_leaf_5",
+    "nemos-ambience:pale_oak_falling_leaf_6",
+    "nemos-ambience:pale_oak_falling_leaf_7",
+    "nemos-ambience:pale_oak_falling_leaf_8",
+    "nemos-ambience:pale_oak_falling_leaf_9",
+    "nemos-ambience:pale_oak_falling_leaf_10",
+    "nemos-ambience:pale_oak_falling_leaf_11"
+  ]
+}

src/main/resources/fabric.mod.json

@@ -29,6 +29,7 @@
 	"depends": {
 		"fabricloader": ">=0.16.7",
 		"minecraft": [
+			"~1.21.3",
 			"~1.21.2"
 		],
 		"java": ">=21",