Release: 1.3.1 for Minecraft 1.20.6

- Fix block id compatibility.
- Fix cherry leaves settings not being added to config file in Minecraft 1.19.4.
- Block and item color now returns neon pink when tint is missing.
- Add the ability to get specific version of mod by index (E.g. "1.2.3+4.5.6", index 0: 1.2.3, index 1: 4.5.6).
- Improve mod patching.
- Add the ability to apply snow layer logic to manually added blocks from config file (May work, depends on the mod).

Author: ishikyoo

README.md

@@ -7,7 +7,7 @@ In Bedrock Edition, there is an exclusive feature that turns some of the leaves
 - Jungle leaves now have cocoa pods ([Podded Jungle Leaves](https://github.com/ishikyoo/podded-jungle-leaves)).
 - Fully customisable, snow coverage, leaves colors and more can be tweaked.
 
-This branch support `Minecraft` versions from `1.21` and `1.21.1`.
+This branch support `Minecraft` versions from `1.19.4` to `1.20.6`.
 
 ## Installation
 You can install `Leavesly` by downloading it from the following:
@@ -16,7 +16,7 @@ You can install `Leavesly` by downloading it from the following:
 [![Modrinth Downloads](https://img.shields.io/modrinth/dt/leavesly?style=for-the-badge&logo=modrinth&color=00AD5B)](https://modrinth.com/mod/leavesly)
 [![CurseForge Downloads](https://img.shields.io/curseforge/dt/1109585?style=for-the-badge&logo=curseforge&color=F16436&)](https://www.curseforge.com/minecraft/mc-mods/leavesly)
 
-Simply place the mod file `leavesly-1.3.0+1.21.1.jar` in your `.minecraft\mods` folder, and load Minecraft using [Fabric](https://fabricmc.net/use/installer) or [Quilt](https://quiltmc.org/en/install).
+Simply place the mod file `leavesly-1.3.1+1.20.6.jar` in your `.minecraft\mods` folder, and load Minecraft using [Fabric](https://fabricmc.net/use/installer) or [Quilt](https://quiltmc.org/en/install).
 You will need Fabric API or Quilted Fabric API.
 
 You can also install it using [Prism Launcher](https://prismlauncher.org), or any other mod manager you like.

build.gradle

@@ -38,14 +38,14 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 21
+	it.options.release = 17
 }
 
 java {
 	withSourcesJar()
 
-	sourceCompatibility = JavaVersion.VERSION_21
-	targetCompatibility = JavaVersion.VERSION_21
+	sourceCompatibility = JavaVersion.VERSION_17
+	targetCompatibility = JavaVersion.VERSION_17
 }
 
 jar {

gradle.properties

@@ -4,14 +4,14 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.1
-yarn_mappings=1.21.1+build.3
+minecraft_version=1.20.6
+yarn_mappings=1.20.6+build.3
 loader_version=0.16.10
 
 # Mod Properties
-mod_version=1.3.0+1.21.1
+mod_version=1.3.1+1.20.6
 maven_group=com.ishikyoo.leavesly
 archives_base_name=leavesly
 
 # Dependencies
-fabric_version=0.115.3+1.21.1
+fabric_version=0.100.8+1.20.6

src/main/java/com/ishikyoo/leavesly/LeaveslyColorProvider.java

@@ -3,8 +3,6 @@
 import com.ishikyoo.leavesly.block.Blocks;
 import com.ishikyoo.leavesly.settings.*;
 import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
-import net.fabricmc.loader.api.FabricLoader;
-import net.fabricmc.loader.api.ModContainer;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.MinecraftClient;
@@ -31,46 +29,55 @@ public class LeaveslyColorProvider {
     private static final HashMap<Identifier, Tint> modPatchBlockTintHashMap = new HashMap<>();
 
     public static void initialize() {
-        HashMap<Identifier, BlockData> blocks = LeaveslySettings.getSettings().getBlocks();
-        for(Map.Entry<Identifier, BlockData> entry : blocks.entrySet()) {
-            Identifier id = entry.getKey();
-            register(id);
-        }
+        registerBlockAndItemsColors();
         applyModPatch();
     }
 
     public static void register(Identifier id) {
-        if (Blocks.isRegisteredBlockId(id)) {
+        if (Blocks.isSupportedBlockId(id)) {
             BlockData blockData = LeaveslySettings.getSettings().getBlock(id);
             Tint tint = blockData.getTint();
             if (!registeredBlockIds.contains(id)) {
                 Block block = Blocks.getBlock(id);
                 ColorProviderRegistry.BLOCK.register(LeaveslyColorProvider::getColorProviderBlockColor, block);
                 ColorProviderRegistry.ITEM.register(LeaveslyColorProvider::getColorProviderItemColor, block);
-                LOG.info("Registered block and item color (Id: {}, Tint: {}).", id, tint.getColorType().toString().toLowerCase());
+                LOG.info("Registered block and item colors (Id: {}, Tint: {}).", id, tint.getColorType().toString().toLowerCase());
                 registeredBlockIds.add(id);
             } else {
-                LOG.error("Trying to register a already registered block color (Id: {}, Tint: {}).", id, tint.getColorType().toString().toLowerCase());
+                LOG.error("Trying to register a already registered block and item colors (Id: {}, Tint: {}).", id, tint.getColorType().toString().toLowerCase());
             }
         } else {
-            LOG.error("Trying to register a block and item color for a unregistered block (Id: {}).", id);
+            LOG.error("Trying to register a block and item colors for a unregistered block (Id: {}).", id);
+        }
+    }
+
+    private static void registerBlockAndItemsColors() {
+        HashMap<Identifier, BlockData> blocks = LeaveslySettings.getSettings().getBlocks();
+        for(Map.Entry<Identifier, BlockData> entry : blocks.entrySet()) {
+            Identifier id = entry.getKey();
+            register(id);
         }
     }
 
     private static void applyModPatch() {
-        LOG.info("Applying mod patch...");
+        LOG.info("Registering mod patches...");
         //Clutter
-        Optional<ModContainer> cutterMc = FabricLoader.getInstance().getModContainer("clutter");
-        if (cutterMc.isPresent()) {
-            modPatchBlockTintHashMap.put(Identifier.of("clutter:redwood_leaves"), Tint.FOLIAGE);
-            modPatchBlockTintHashMap.put(Identifier.of("clutter:giant_fern"), Tint.GRASS);
-            LOG.info("Applied mod patch for (modid: clutter).");
+        String clutterId = "clutter";
+        registerModBlockPatch(Identifier.of(clutterId, "redwood_leaves"), Tint.FOLIAGE);
+        registerModBlockPatch(Identifier.of(clutterId, "giant_fern"), Tint.GRASS);
+    }
+
+    private static void registerModBlockPatch(Identifier blockId, Tint tint) {
+        LeaveslySettingsData settings = LeaveslySettings.getSettings();
+        if (!settings.isRegisteredBlockId(blockId) && Blocks.isRegisteredBlockId(blockId)) {
+            modPatchBlockTintHashMap.put(blockId, tint);
+            LOG.info("Registered block and item colors mod patch (Id: {}, Tint: {}).", blockId, tint.getColorType().toString().toLowerCase());
         }
     }
 
     private static int getColorProviderBlockColor(BlockState state, BlockRenderView world, BlockPos position, int index) {
         Block block = state.getBlock();
-        if (Blocks.isRegisteredBlock(block)) {
+        if (Blocks.isSupportedBlock(block)) {
             int snowLayer = state.get(SNOW_LAYER);
             int blockColor = getBlockColor(state, world, position);
             LeaveslySettingsData settings = LeaveslySettings.getSettings();
@@ -88,18 +95,18 @@ private static int getColorProviderBlockColor(BlockState state, BlockRenderView
         } else {
             if (isModPatchBlock(block))
                 return getModPatchBlockColor(block, world, position);
-            return 0;
+            return Tint.NEON_PINK.getColorValue();
         }
     }
 
     private static int getColorProviderItemColor(ItemStack stack, int index) {
         Block block = Block.getBlockFromItem(stack.getItem());
-        if (Blocks.isRegisteredBlock(block)) {
+        if (Blocks.isSupportedBlock(block)) {
             return getItemColor(block);
         } else {
             if (isModPatchBlock(block))
                 return getModPatchItemColor(block);
-            return 0;
+            return Tint.NEON_PINK.getColorValue();
         }
     }
 
@@ -108,24 +115,24 @@ private static int getBlockColor(BlockState state, BlockRenderView world, BlockP
         BlockData blockData = LeaveslySettings.getSettings().getBlock(Blocks.getBlockId(block));
         Tint tint = blockData.getTint();
         switch (tint.getColorType()) {
-            case ColorType.STATIC:
+            case STATIC:
                 return tint.getColorValue();
-            case ColorType.FOLIAGE:
+            case FOLIAGE:
                 switch (tint.getColorBlend()) {
-                    case ColorBlend.MULTIPLY:
+                    case MULTIPLY:
                         return getMultiplyColor(BiomeColors.getFoliageColor(world, position), tint.getColorValue());
-                    case ColorBlend.SCREEN:
+                    case SCREEN:
                         return getScreenColor(BiomeColors.getFoliageColor(world, position), tint.getColorValue());
                 }
-            case ColorType.GRASS:
+            case GRASS:
                 switch (tint.getColorBlend()) {
-                    case ColorBlend.MULTIPLY:
+                    case MULTIPLY:
                         return getMultiplyColor(BiomeColors.getGrassColor(world, position), tint.getColorValue());
-                    case ColorBlend.SCREEN:
+                    case SCREEN:
                         return getScreenColor(BiomeColors.getGrassColor(world, position), tint.getColorValue());
                 }
             default:
-                return 0;
+                return Tint.NEON_PINK.getColorValue();
         }
     }
 
@@ -150,7 +157,7 @@ private static int getItemColor(Block block) {
                         return getScreenColor(Tint.DEFAULT_GRASS.getColorValue(), tint.getColorValue());
                 }
             default:
-                return 0;
+                return Tint.NEON_PINK.getColorValue();
         }
     }
 
@@ -174,7 +181,7 @@ private static int getModPatchBlockColor(Block block, BlockRenderView world, Blo
                         return getScreenColor(BiomeColors.getGrassColor(world, position), tint.getColorValue());
                 }
             default:
-                return 0;
+                return Tint.NEON_PINK.getColorValue();
         }
     }
 

src/main/java/com/ishikyoo/leavesly/LeaveslyPreLaunch.java

@@ -1,12 +1,14 @@
 package com.ishikyoo.leavesly;
 
+import com.ishikyoo.leavesly.block.Blocks;
 import com.ishikyoo.leavesly.settings.LeaveslySettings;
 import com.ishikyoo.leavesly.support.Deobfuscator;
 import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
 
 public class LeaveslyPreLaunch implements PreLaunchEntrypoint  {
     @Override
     public void onPreLaunch() {
+        Blocks.preInitialize();
         Deobfuscator.initialize();
         LeaveslySettings.preInitialize();
     }

src/main/java/com/ishikyoo/leavesly/SnowLayerLogic.java

@@ -118,13 +118,11 @@ public static void randomTick(BlockState state, ServerWorld world, BlockPos pos,
     }
 
     public static void setDefaultState(Block block, StateManager<Block, BlockState> stateManager) {
-        if (Blocks.isSupportedVanillaBlockClassName(block.getClass().getName()))
-            stateManager.getDefaultState().with(SNOW_LAYER, 0);
+        stateManager.getDefaultState().with(SNOW_LAYER, 0);
     }
 
     public static void appendProperties(Block block, StateManager.Builder<Block, BlockState> builder) {
-        if (Blocks.isSupportedVanillaBlockClassName(block.getClass().getName()))
-            builder.add(SNOW_LAYER);
+        builder.add(SNOW_LAYER);
     }
 
     private static double getNeighboursInfluence(ServerWorld world, BlockPos pos, int range) {
@@ -200,7 +198,7 @@ else if (Math.abs(z) > currentValue)
     }
 
     private static boolean isSnowLayerBlock(BlockState state) {
-        return Blocks.isRegisteredBlock(state.getBlock());
+        return Blocks.isSupportedBlock(state.getBlock());
     }
 
     private  static void setBlockState(ServerWorld world, BlockPos pos, BlockState state, int value) {