From 53d22b214bf62a655cf5626b518a4acb71c200cb Mon Sep 17 00:00:00 2001 From: Craemon <121398546+Craemon@users.noreply.github.com> Date: Sat, 16 Nov 2024 13:33:14 +0100 Subject: [PATCH 1/4] Update to 1.21.3 --- build.gradle | 8 ++++---- gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- .../mixin/AbstractMinecartEntityMixin.java | 6 +++--- src/main/resources/fabric.mod.json | 4 ++-- src/main/resources/scripts-chunk-loaders.mixins.json | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index cd3dc04..3246521 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ plugins { - id 'fabric-loom' version '1.6-SNAPSHOT' + id 'fabric-loom' version '1.8-SNAPSHOT' id 'maven-publish' } -sourceCompatibility = JavaVersion.VERSION_17 -targetCompatibility = JavaVersion.VERSION_17 +sourceCompatibility = JavaVersion.VERSION_21 +targetCompatibility = JavaVersion.VERSION_21 archivesBaseName = project.archives_base_name version = "mc${project.minecraft_version}-${project.mod_version}" @@ -54,7 +54,7 @@ processResources { } tasks.withType(JavaCompile).configureEach { - it.options.release = 17 + it.options.release = 21 } java { diff --git a/gradle.properties b/gradle.properties index 5d69586..be9cb51 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21 -yarn_mappings=1.21+build.2 -loader_version=0.15.11 +minecraft_version=1.21.3 +yarn_mappings=1.21.3+build.2 +loader_version=0.16.9 # Mod Properties # x-release-please-start-version -mod_version=0.3.1 +mod_version=0.3.3 # x-release-please-end maven_group=io.nihlen.scriptschunkloaders archives_base_name=scripts-chunk-loaders # Dependencies -fabric_version=0.100.1+1.21 +fabric_version=0.107.0+1.21.3 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22c..9355b41 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartEntityMixin.java b/src/main/java/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartEntityMixin.java index bad0ac1..e83d2d7 100644 --- a/src/main/java/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartEntityMixin.java +++ b/src/main/java/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartEntityMixin.java @@ -23,7 +23,6 @@ @Mixin(AbstractMinecartEntity.class) public abstract class AbstractMinecartEntityMixin extends Entity implements MinecartEntityExt { - @Shadow public abstract AbstractMinecartEntity.Type getMinecartType(); @Unique private boolean isChunkLoader = false; @@ -58,8 +57,9 @@ private void injectConstructor(CallbackInfo callbackInfo) { } public void scripts_chunk_loaders$setChunkLoaderNameFromInventory() { - var minecartType = this.getMinecartType(); - if (minecartType == AbstractMinecartEntity.Type.CHEST) { + EntityType minecartType = this.getType(); + + if (minecartType == EntityType.CHEST_MINECART) { //noinspection DataFlowIssue - We're sure this is a chest because of the if statement. var entity = (ChestMinecartEntity)(Object)this; var firstSlot = entity.getInventory().get(0); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 9431364..4314518 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,8 +23,8 @@ "scripts-chunk-loaders.mixins.json" ], "depends": { - "fabricloader": ">=0.15.11", - "minecraft": "1.21", + "fabricloader": ">=0.16.9", + "minecraft": "1.21.3", "java": ">=21", "fabric-api": "*" } diff --git a/src/main/resources/scripts-chunk-loaders.mixins.json b/src/main/resources/scripts-chunk-loaders.mixins.json index 1705c82..56d2bf9 100644 --- a/src/main/resources/scripts-chunk-loaders.mixins.json +++ b/src/main/resources/scripts-chunk-loaders.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "io.nihlen.scriptschunkloaders.mixin", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ ], "client": [ From 0f8bb39f8a30a8f6ccb3daec11cff4fa30bab50b Mon Sep 17 00:00:00 2001 From: Craemon <121398546+Craemon@users.noreply.github.com> Date: Wed, 4 Dec 2024 23:54:38 +0100 Subject: [PATCH 2/4] Updated to 1.21.4 --- build.gradle | 2 +- gradle.properties | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/resources/fabric.mod.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 3246521..feddb9f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.8-SNAPSHOT' + id 'fabric-loom' version '1.9-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index be9cb51..0b2daf5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.3 -yarn_mappings=1.21.3+build.2 +minecraft_version=1.21.4 +yarn_mappings=1.21.4+build.1 loader_version=0.16.9 # Mod Properties # x-release-please-start-version -mod_version=0.3.3 +mod_version=0.3.4 # x-release-please-end maven_group=io.nihlen.scriptschunkloaders archives_base_name=scripts-chunk-loaders # Dependencies -fabric_version=0.107.0+1.21.3 +fabric_version=0.110.5+1.21.4 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b41..94113f2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 4314518..98ffff1 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,7 +24,7 @@ ], "depends": { "fabricloader": ">=0.16.9", - "minecraft": "1.21.3", + "minecraft": "1.21.4", "java": ">=21", "fabric-api": "*" } From 0f983469faffc63beb55b0ca2ba12caaa5455f3a Mon Sep 17 00:00:00 2001 From: Craemon <121398546+Craemon@users.noreply.github.com> Date: Sat, 21 Dec 2024 00:52:35 +0100 Subject: [PATCH 3/4] Upgrade to yarn mappings build.2 and most recent "fabric_version" --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0b2daf5..cb5ff5f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop minecraft_version=1.21.4 -yarn_mappings=1.21.4+build.1 +yarn_mappings=1.21.4+build.2 loader_version=0.16.9 # Mod Properties @@ -16,4 +16,4 @@ maven_group=io.nihlen.scriptschunkloaders archives_base_name=scripts-chunk-loaders # Dependencies -fabric_version=0.110.5+1.21.4 +fabric_version=0.112.2+1.21.4 From fa97c061a3e560d0775ad6e1ccefe876e70e7f52 Mon Sep 17 00:00:00 2001 From: Craemon <121398546+Craemon@users.noreply.github.com> Date: Thu, 27 Mar 2025 13:36:06 +0100 Subject: [PATCH 4/4] - Version bumps for 1.21.5 and Fabric 0.16.10 - Added ".orElse(false)" to fix error with Optional, now defaults to false --- build.gradle | 2 +- gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- .../mixin/AbstractMinecartEntityMixin.java | 2 +- src/main/resources/fabric.mod.json | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index feddb9f..53a8b23 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.9-SNAPSHOT' + id 'fabric-loom' version '1.10-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index cb5ff5f..5129e85 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.4 -yarn_mappings=1.21.4+build.2 -loader_version=0.16.9 +minecraft_version=1.21.5 +yarn_mappings=1.21.5+build.1 +loader_version=0.16.10 # Mod Properties # x-release-please-start-version -mod_version=0.3.4 +mod_version=0.3.5 # x-release-please-end maven_group=io.nihlen.scriptschunkloaders archives_base_name=scripts-chunk-loaders # Dependencies -fabric_version=0.112.2+1.21.4 +fabric_version=0.119.5+1.21.5 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 94113f2..cea7a79 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartEntityMixin.java b/src/main/java/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartEntityMixin.java index e83d2d7..939c069 100644 --- a/src/main/java/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartEntityMixin.java +++ b/src/main/java/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartEntityMixin.java @@ -103,7 +103,7 @@ public void writeCustomDataToNbt(NbtCompound nbt, CallbackInfo ci) { @Inject(method = "readCustomDataFromNbt", at = @At("RETURN")) public void readCustomDataFromNbt(NbtCompound nbt, CallbackInfo ci) { - this.isChunkLoader = nbt.getBoolean("chunkLoader"); + this.isChunkLoader = nbt.getBoolean("chunkLoader").orElse(false); } @Inject(method = "tick", at = @At("TAIL")) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 98ffff1..b7c561a 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,8 +23,8 @@ "scripts-chunk-loaders.mixins.json" ], "depends": { - "fabricloader": ">=0.16.9", - "minecraft": "1.21.4", + "fabricloader": ">=0.16.10", + "minecraft": "1.21.5", "java": ">=21", "fabric-api": "*" }