Fully update to 1.19.4

Other small code changes too

Author: theRookieCoder

README.md

@@ -14,14 +14,14 @@ You can install SnowyLeavesPlus by downloading it from any of the following:
 [![GitHub Releases](https://img.shields.io/github/downloads/theRookieCoder/SnowyLeavesPlus/total?color=B2BEB5&style=for-the-badge&logo=github)](https://github.com/theRookieCoder/SnowyLeavesPlus/releases)
 [![CurseForge](https://cf.way2muchnoise.eu/full_snowyleavesplus_downloads.svg?badge_style=for_the_badge)](https://www.curseforge.com/minecraft/mc-mods/snowyleavesplus)
 
-You will also need Fabric API. Put the mod files in your `mods` folder, and load Minecraft using [Fabric](https://fabricmc.net/use/installer) or [Quilt](https://quiltmc.org/en/install).
+You will also need (Quilted) Fabric API. Put the mod files in your `mods` folder, and load Minecraft using [Fabric](https://fabricmc.net/use/installer) or [Quilt](https://quiltmc.org/en/install).
 
 You can also use a mod manager like [GDLauncher](https://gdlauncher.com), [Prism Launcher](https://prismlauncher.org), or my own [ferium](https://github.com/gorilla-devs/ferium).
 
 ## Compiling from Source
 
 Prerequisites: JDK 17
 
-1. Clone this repository by running `git clone https://github.com/theRookieCoder/SnowyLeavesPlus` or `gh repo clone theRookieCoder/SnowyLeavesPlus`
+1. Clone this repository by running `git clone https://github.com/theRookieCoder/SnowyLeavesPlus.git` or `gh repo clone theRookieCoder/SnowyLeavesPlus`
 2. Build the project by running `./gradlew build`
 3. The mod jar file can be found at `build/libs/`

build.gradle

@@ -41,9 +41,6 @@ java {
     withSourcesJar()
 }
 
-// TODO: Update this every release
-def changelog = "Backport to 1.18.2"
-
 import com.modrinth.minotaur.dependencies.ModDependency
 modrinth {
     token = System.getenv("MODRINTH_TOKEN")
@@ -52,32 +49,24 @@ modrinth {
     projectId = "of7wIinq"
     uploadFile = remapJar
     versionType = "beta"
-    changelog
     loaders = ["fabric", "quilt"]
-    gameVersions = ["1.19", "1.19.1", "1.19.2", "1.19.3"]
+    gameVersions = ["1.19.4"]
     syncBodyFrom = rootProject.file("README.md").text
-    // Required dependency Fabric API
-    dependencies = [new ModDependency("P7dR8mSH", "required")]
+    dependencies = [new ModDependency("fabric-api", "required")]
 }
 
 curseforge {
     apiKey = System.getenv("CURSEFORGE_TOKEN")
     project {
         id = "611998"
         releaseType = "beta"
-        addGameVersion("1.19")
-        addGameVersion("1.19.1")
-        addGameVersion("1.19.2")
-        addGameVersion("1.19.3")
+        addGameVersion("1.19.4")
         addGameVersion("Fabric")
         addGameVersion("Quilt")
         mainArtifact(remapJar) {
             changelogType = "markdown"
-            changelog
             displayName = "SnowyLeavesPlus ${version}"
         }
-        relations {
-            requiredDependency("fabric-api")
-        }
+        relations { requiredDependency("fabric-api") }
     }
 }

gradle.properties

@@ -1,10 +1,10 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties (https://fabricmc.net/develop)
-minecraft_version=1.19.4-pre3
-yarn_mappings=1.19.4-pre3+build.1
+minecraft_version=1.19.4
+yarn_mappings=1.19.4+build.1
 loader_version=0.14.17
-fabric_version=0.75.2+1.19.4
+fabric_version=0.75.3+1.19.4
 
 # Mod Properties
 mod_version=0.1.5

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/io/github/therookiecoder/snowyleavesplus/Snowiness.java

@@ -10,7 +10,8 @@ public enum Snowiness implements StringIdentifiable {
     high,
     full;
 
-    public static final EnumProperty<Snowiness> SNOWINESS = EnumProperty.of("snowiness", Snowiness.class);
+    public static final EnumProperty<Snowiness> SNOWINESS =
+        EnumProperty.of("snowiness", Snowiness.class);
 
     @Override
     public String asString() {

src/main/java/io/github/therookiecoder/snowyleavesplus/SnowyLeavesPlusClient.java

@@ -19,31 +19,29 @@ public void onInitializeClient() {
                 // Get the block's default colour
                 int colour = getLeafBlockColour(state.getBlock(), world, pos);
                 try {
-                    return whiten(colour, switch (state.get(SNOWINESS)) {
-                        case none -> 0;
-                        case low -> 0.25;
-                        case medium -> 0.5;
-                        case high -> 0.75;
-                        case full -> 1;
-                    });
+                    return whiten(colour,
+                        (double) state.get(SNOWINESS).ordinal() / Snowiness.values().length);
                 // If there is any error, return the default colour
                 } catch(Exception e) {
                     return colour;
                 }
             },
-            Blocks.ACACIA_LEAVES,
-            Blocks.AZALEA_LEAVES,
+            Blocks.OAK_LEAVES,
+            Blocks.SPRUCE_LEAVES,
             Blocks.BIRCH_LEAVES,
             Blocks.JUNGLE_LEAVES,
-            Blocks.OAK_LEAVES,
+            Blocks.ACACIA_LEAVES,
+            Blocks.CHERRY_LEAVES,
             Blocks.DARK_OAK_LEAVES,
-            Blocks.FLOWERING_AZALEA_LEAVES,
-            Blocks.SPRUCE_LEAVES
+            Blocks.MANGROVE_LEAVES,
+            Blocks.AZALEA_LEAVES,
+            Blocks.FLOWERING_AZALEA_LEAVES
         );
     }
 
     /**
-     * Derived from the colour providers registered by Minecraft
+     * Based on code from Minecraft's registered colour providers.
+     * @see net.minecraft.client.color.block.BlockColors
      * @param block The block to get the colour of
      * @param world The current world
      * @param pos The position of the block
@@ -54,8 +52,16 @@ private int getLeafBlockColour(Block block, BlockRenderView world, BlockPos pos)
             return FoliageColors.getBirchColor();
         } else if (block == Blocks.SPRUCE_LEAVES) {
             return FoliageColors.getSpruceColor();
+        } else if (
+            block == Blocks.OAK_LEAVES
+                || block == Blocks.JUNGLE_LEAVES
+                || block == Blocks.ACACIA_LEAVES
+                || block == Blocks.DARK_OAK_LEAVES
+                || block == Blocks.MANGROVE_LEAVES) {
+            return world != null && pos != null ? BiomeColors.getFoliageColor(world, pos) : FoliageColors.getDefaultColor();
         } else {
-            return world != null ? BiomeColors.getFoliageColor(world, pos) : FoliageColors.getDefaultColor();
+            // TODO: Actually get the default colour
+            return world != null && pos != null ? BiomeColors.getFoliageColor(world, pos) : FoliageColors.getDefaultColor();
         }
     }
 

src/main/java/io/github/therookiecoder/snowyleavesplus/mixin/LeavesBlockMixin.java

@@ -66,7 +66,7 @@ private void randomTickInject(
             world.isRaining()
             && world.getBiome(pos).value().getPrecipitation(pos) == Biome.Precipitation.SNOW
         ) {
-            // And the block is at least somewhat exposed to the sky
+            // And the block is (somewhat) exposed to the sky
             if (world.getLightLevel(LightType.SKY, pos) > 10) {
                 // Make it more snowy
                 world.setBlockState(pos, state.with(SNOWINESS, currentSnowiness.increaseSnowiness()));

src/main/resources/fabric.mod.json

@@ -12,16 +12,14 @@
   },
   "license": "MPL-2.0",
   "icon": "assets/snowyleavesplus/icon.png",
-  "environment": "*",
+  "environment": "client",
   "entrypoints": {
-    "client": [
-      "io.github.therookiecoder.snowyleavesplus.SnowyLeavesPlusClient"
-    ]
+    "client": ["io.github.therookiecoder.snowyleavesplus.SnowyLeavesPlusClient"]
   },
-  "mixins": ["SnowyLeavesPlus.mixins.json"],
+  "mixins": ["snowyleavesplus.mixins.json"],
   "depends": {
     "fabricloader": "*",
     "fabric-api": "*",
-    "minecraft": "~1.19"
+    "minecraft": "1.19.4"
   }
 }

src/main/resources/quilt.mod.json

@@ -12,7 +12,7 @@
       "fabric-api",
       {
         "id": "minecraft",
-        "versions": "~1.19"
+        "versions": "1.19.4"
       }
     ],
     "intermediate_mappings": "net.fabricmc:intermediary",
@@ -31,8 +31,8 @@
       "icon": "assets/snowyleavesplus/icon.png"
     }
   },
-  "mixin": "SnowyLeavesPlus.mixins.json",
+  "mixin": "snowyleavesplus.mixins.json",
   "minecraft": {
-    "environment": "*"
+    "environment": "client"
   }
 }

src/main/resources/SnowyLeavesPlus.mixins.json renamed to src/main/resources/snowyleavesplus.mixins.json

@@ -3,7 +3,7 @@
   "minVersion": "0.8",
   "package": "io.github.therookiecoder.snowyleavesplus.mixin",
   "compatibilityLevel": "JAVA_17",
-  "mixins": [
+  "client": [
     "BlockInvoker",
     "LeavesBlockMixin"
   ],