Update to 1.20.6

.github/workflows/gradle_build.yml

@@ -9,7 +9,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [ 17, 21 ]
+        java: [ 21 ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/maven_publish.yml

@@ -12,10 +12,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v3

.github/workflows/release.yml

@@ -12,10 +12,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v3

README.md

@@ -1,7 +1,7 @@
 # LambDynamicLights
 
 <!-- modrinth_exclude.start -->
-![Java 17](https://img.shields.io/badge/language-Java%2017-9B599A.svg?style=flat-square) <!-- modrinth_exclude.end -->
+[![Java 21](https://img.shields.io/badge/language-Java%2021-9B599A.svg?style=flat-square)](https://adoptium.net/temurin/releases/?os=any&arch=x64&package=jdk&version=21) <!-- modrinth_exclude.end -->
 [![GitHub license](https://img.shields.io/github/license/LambdAurora/LambDynamicLights?style=flat-square)](https://raw.githubusercontent.com/LambdAurora/LambDynamicLights/1.19/LICENSE)
 ![Environment: Client](https://img.shields.io/badge/environment-client-1976d2?style=flat-square)
 [![Mod loader: Fabric]][fabric] <!-- modrinth_exclude.start -->

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.4.+'
+	id 'fabric-loom' version '1.6.+'
 	id 'dev.yumi.gradle.licenser' version '1.1.+'
 	id 'java-library'
 	id 'maven-publish'
@@ -16,7 +16,7 @@ version = "${project.mod_version}+${project.minecraft_version}"
 base.archivesName = project.archives_base_name
 
 // This field defines the Java version your mod target.
-def targetJavaVersion = 17
+def targetJavaVersion = 21
 
 if (!(System.getenv("CURSEFORGE_TOKEN") || System.getenv("MODRINTH_TOKEN"))) {
 	version += "-local"
@@ -231,7 +231,7 @@ tasks.register('curseforge', TaskPublishCurseForge) {
 	mainFile.releaseType = this.getVersionType()
 	mainFile.addGameVersion(project.minecraft_version)
 	mainFile.addModLoader("Fabric", "Quilt")
-	mainFile.addJavaVersion("Java 17", "Java 18")
+	mainFile.addJavaVersion("Java 21")
 
 	mainFile.displayName = "LambDynamicLights ${project.mod_version} (${project.minecraft_version})"
 	mainFile.addRequirement("fabric-api")

gradle.properties

@@ -3,11 +3,10 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 # check these on https://fabricmc.net/use
-minecraft_version=1.20.4
-quilt_mappings=2
-loader_version=0.15.3
-# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_api_version=0.91.3+1.20.4
+minecraft_version=1.20.6
+quilt_mappings=6
+loader_version=0.15.11
+fabric_api_version=0.98.0+1.20.6
 
 # Mod Properties
 mod_version = 2.3.4
@@ -17,8 +16,8 @@ modrinth_id=yBW8D80W
 curseforge_id=393442
 
 # Dependencies
-# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
+#TODO spruceui_version=5.0.4+1.20.6
 spruceui_version=5.0.3+1.20.2
 pridelib_version=1.2.0+1.19.4
-modmenu_version=9.0.0
-sodium_version=mc1.20.3-0.5.5
+modmenu_version=10.0.0-beta.1
+sodium_version=mc1.20.6-0.5.8

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/dev/lambdaurora/lambdynlights/LambDynLights.java

@@ -458,7 +458,7 @@ public static int getLivingEntityLuminanceFromItems(LivingEntity entity) {
 		boolean submergedInFluid = isEyeSubmergedInFluid(entity);
 		int luminance = 0;
 
-		for (var equipped : entity.getItemsEquipped()) {
+		for (var equipped : entity.getEquippedItems()) {
 			if (!equipped.isEmpty())
 				luminance = Math.max(luminance, LambDynLights.getLuminanceFromItemStack(equipped, submergedInFluid));
 		}

src/main/java/dev/lambdaurora/lambdynlights/api/DynamicLightHandler.java

@@ -76,7 +76,7 @@ public boolean isWaterSensitive(T lightSource) {
 	static <T extends LivingEntity> @NotNull DynamicLightHandler<T> makeLivingEntityHandler(@NotNull DynamicLightHandler<T> handler) {
 		return entity -> {
 			int luminance = 0;
-			for (var equipped : entity.getItemsEquipped()) {
+			for (var equipped : entity.getEquippedItems()) {
 				luminance = Math.max(luminance, LambDynLights.getLuminanceFromItemStack(equipped, entity.isSubmergedInWater()));
 			}
 			return Math.max(luminance, handler.getLuminance(entity));

src/main/java/dev/lambdaurora/lambdynlights/api/item/ItemLightSource.java

@@ -13,6 +13,7 @@
 import dev.lambdaurora.lambdynlights.LambDynLights;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -162,17 +163,19 @@ public int getLuminance(ItemStack stack) {
 		}
 
 		static int getLuminance(ItemStack stack, BlockState state) {
-			var nbt = stack.getNbt();
+			var nbt = stack.getComponents();
 
 			if (nbt != null) {
-				var blockStateTag = nbt.getCompound("BlockStateTag");
+				var blockStateTag = nbt.get(DataComponentTypes.BLOCK_STATE);
 				var stateManager = state.getBlock().getStateManager();
 
-				for (var key : blockStateTag.getKeys()) {
-					var property = stateManager.getProperty(key);
-					if (property != null) {
-						var value = blockStateTag.get(key).asString();
-						state = with(state, property, value);
+				if (blockStateTag != null) {
+					for (var key : blockStateTag.properties().keySet()) {
+						var property = stateManager.getProperty(key);
+						if (property != null) {
+							var value = blockStateTag.properties().get(key);
+							state = with(state, property, value);
+						}
 					}
 				}
 			}

src/main/java/dev/lambdaurora/lambdynlights/mixin/ScreenMixin.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright © 2020 LambdAurora <[email protected]>
+ *
+ * This file is part of LambDynamicLights.
+ *
+ * Licensed under the MIT license. For more information,
+ * see the LICENSE file.
+ */
+
+package dev.lambdaurora.lambdynlights.mixin;
+
+import dev.lambdaurora.spruceui.Tooltip;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.option.VideoOptionsScreen;
+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(Screen.class)
+public class ScreenMixin {
+
+    @Inject(method = "render", at = @At("TAIL"))
+    private void onRender(GuiGraphics graphics, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+        Tooltip.renderAll(graphics);
+    }
+}

src/main/java/dev/lambdaurora/lambdynlights/mixin/VideoOptionsScreenMixin.java

@@ -10,8 +10,6 @@
 package dev.lambdaurora.lambdynlights.mixin;
 
 import dev.lambdaurora.lambdynlights.gui.DynamicLightsOptionsOption;
-import dev.lambdaurora.spruceui.Tooltip;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.option.GameOptionsScreen;
 import net.minecraft.client.gui.screen.option.VideoOptionsScreen;
@@ -53,9 +51,4 @@ private Option<?>[] addOptionButton(Option<?>[] old) {
 		options[options.length - 1] = this.lambdynlights$option;
 		return options;
 	}
-
-	@Inject(method = "render", at = @At("TAIL"))
-	private void onRender(GuiGraphics graphics, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-		Tooltip.renderAll(graphics);
-	}
 }

src/main/resources/fabric.mod.json

@@ -29,14 +29,14 @@
     "lambdynlights.lightsource.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.14.20",
-    "fabric-api": ">=0.91.3+1.20.4",
-    "minecraft": "~1.20.4",
+    "fabricloader": ">=0.15.11",
+    "fabric-api": ">=0.98.0+1.20.6",
+    "minecraft": "~1.20.6",
     "spruceui": ">=5.0.3",
-    "java": ">=17"
+    "java": ">=21"
   },
   "recommends": {
-    "modmenu": ">=8.0.0"
+    "modmenu": "*"
   },
   "suggests": {
     "ears": "*",

src/main/resources/lambdynlights.lightsource.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "dev.lambdaurora.lambdynlights.mixin.lightsource",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "client": [
     "AbstractDecorationEntityMixin",
     "AbstractMinecartEntityMixin",

src/main/resources/lambdynlights.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "package": "dev.lambdaurora.lambdynlights.mixin",
   "plugin": "dev.lambdaurora.lambdynlights.LambDynLightsMixinPlugin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "client": [
     "BlockEntityTypeMixin",
     "ClientWorldMixin",
@@ -12,6 +12,7 @@
     "EntityTypeMixin",
     "MinecraftClientMixin",
     "VideoOptionsScreenMixin",
+    "ScreenMixin",
     "WorldMixin",
     "ltr.LilTaterBlockEntityMixin",
     "ltr.LilTaterBlocksMixin",