diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 5db661081d..1fb36de8ed 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -60,10 +60,10 @@ jobs: mc-runtime-test: fabric fabric-api: 0.87.0 dependencies: >- - 'https://cdn.modrinth.com/data/Ha28R6CL/versions/vlhvI5Li/fabric-language-kotlin-1.10.18%2Bkotlin.1.9.22.jar' + 'https://cdn.modrinth.com/data/Ha28R6CL/versions/LcgnDDmT/fabric-language-kotlin-1.13.7%2Bkotlin.2.2.21.jar' 'https://cdn.modrinth.com/data/9s6osm5g/versions/s7VTKfLA/cloth-config-11.1.106-fabric.jar' 'https://cdn.modrinth.com/data/TZo2wHFe/versions/dabyDTwJ/paucal-0.6.0%2B1.20.1-fabric.jar' - 'https://cdn.modrinth.com/data/fin1PX4m/versions/oUAVXW1N/inline-fabric-1.20.1-1.1.1.jar' + 'https://cdn.modrinth.com/data/fin1PX4m/versions/n7VmkBLu/inline-fabric-1.20.1-1.2.2.jar' 'https://cdn.modrinth.com/data/K01OU20C/versions/HykM2Qyv/cardinal-components-api-5.2.1.jar' 'https://cdn.modrinth.com/data/nU0bVIaL/versions/Y6tuH1cn/Patchouli-1.20.1-84-FABRIC.jar' 'https://cdn.modrinth.com/data/mOgUt4GM/versions/zv46i3PW/modmenu-7.1.0.jar' @@ -72,10 +72,10 @@ jobs: mc-runtime-test: lexforge fabric-api: none dependencies: >- - 'https://cdn.modrinth.com/data/ordsPcFz/versions/9j6YaPp2/kotlinforforge-4.10.0-all.jar' + 'https://cdn.modrinth.com/data/ordsPcFz/versions/Zsh14XeQ/kotlinforforge-4.12.0-all.jar' 'https://cdn.modrinth.com/data/9s6osm5g/versions/JoLgnJ0G/cloth-config-11.1.106-forge.jar' 'https://cdn.modrinth.com/data/TZo2wHFe/versions/HyBiJPtT/paucal-0.6.0%2B1.20.1-forge.jar' - 'https://cdn.modrinth.com/data/fin1PX4m/versions/U3ktiRdL/inline-forge-1.20.1-1.1.1.jar' + 'https://cdn.modrinth.com/data/fin1PX4m/versions/H1jsvy53/inline-forge-1.20.1-1.2.2.jar' 'https://cdn.modrinth.com/data/40FYwb4z/versions/fs9CeXYZ/caelus-forge-3.1.0%2B1.20.jar' 'https://cdn.modrinth.com/data/nU0bVIaL/versions/JMtc0mTS/Patchouli-1.20.1-84-FORGE.jar' runs-on: ubuntu-latest diff --git a/CHANGELOG.md b/CHANGELOG.md index f4498b2755..fa340f1955 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). - Fixed a crash loop when trying to generate a creative-mode ancient scroll for a Great Spell whose per-world pattern hasn't been calculated yet, by Robotgiggle in [992](https://github.com/FallingColors/HexMod/pull/992). +### Internal + +- The mod now uses Fabric Loom 1.9, Gradle 8.11, and Kotlin 2.0.20, by Robotgiggle in [#1043](https://github.com/FallingColors/HexMod/pull/1043). +- Updated Inline dependency from 1.0.1 to 1.2.2, by Robotgiggle in [#1043](https://github.com/FallingColors/HexMod/pull/1043). + ## `0.11.3` - 2025-11-22 ### Added diff --git a/Common/src/main/java/at/petrak/hexcasting/interop/inline/InlineHexClient.java b/Common/src/main/java/at/petrak/hexcasting/interop/inline/InlineHexClient.java index 8641d237c5..fe937b49ee 100644 --- a/Common/src/main/java/at/petrak/hexcasting/interop/inline/InlineHexClient.java +++ b/Common/src/main/java/at/petrak/hexcasting/interop/inline/InlineHexClient.java @@ -10,9 +10,9 @@ public static void init(){ InlineClientAPI.INSTANCE.addMatcher(HexPatternMatcher.INSTANCE); InlineClientAPI.INSTANCE.addRenderer(InlinePatternRenderer.INSTANCE); - ItemOverlayRenderer.registerRenderer(HexItems.SCROLL_LARGE, HexPatternOverlayRenderer.SCROLL_RENDERER); - ItemOverlayRenderer.registerRenderer(HexItems.SCROLL_MEDIUM, HexPatternOverlayRenderer.SCROLL_RENDERER); - ItemOverlayRenderer.registerRenderer(HexItems.SCROLL_SMOL, HexPatternOverlayRenderer.SCROLL_RENDERER); - ItemOverlayRenderer.registerRenderer(HexItems.SLATE, HexPatternOverlayRenderer.SLATE_RENDERER); + ItemOverlayRenderer.addRenderer(HexItems.SCROLL_LARGE, HexPatternOverlayRenderer.SCROLL_RENDERER); + ItemOverlayRenderer.addRenderer(HexItems.SCROLL_MEDIUM, HexPatternOverlayRenderer.SCROLL_RENDERER); + ItemOverlayRenderer.addRenderer(HexItems.SCROLL_SMOL, HexPatternOverlayRenderer.SCROLL_RENDERER); + ItemOverlayRenderer.addRenderer(HexItems.SLATE, HexPatternOverlayRenderer.SLATE_RENDERER); } } diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 03dd200517..9e61996a09 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version "1.6-SNAPSHOT" + id 'fabric-loom' version "1.9+" id "at.petra-k.pkpcpbp.PKSubprojPlugin" } @@ -19,8 +19,8 @@ pkSubproj { modrinthDependencies([ "paucal:dabyDTwJ", // 0.6.0-fabric "patchouli:1.20.1-80-fabric", - "fabric-language-kotlin:1.9.4+kotlin.1.8.21", - "inline:1.20.1-1.1.1-fabric", + "fabric-language-kotlin:1.13.7+kotlin.2.2.21", + "inline:1.20.1-1.2.2-fabric", "cloth-config:11.1.106+fabric", "cardinal-components-api:5.2.1", "fabric-api:0.84.0+1.20.1", diff --git a/Fabric/gradle.properties b/Fabric/gradle.properties index d042536ad9..fa12bb4b5c 100644 --- a/Fabric/gradle.properties +++ b/Fabric/gradle.properties @@ -1,8 +1,8 @@ platform=fabric -fabricVersion=0.85.0+1.20.1 -fabricLoaderVersion=0.14.21 -fabricLanguageKotlinVersion=1.9.4+kotlin.1.8.21 +fabricVersion=0.92.8+1.20.1 +fabricLoaderVersion=0.19.2 +fabricLanguageKotlinVersion=1.13.7+kotlin.2.2.21 # These are all included cardinalComponentsVersion=5.2.1 diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json index 6a289661b5..38174656fe 100644 --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json @@ -50,7 +50,7 @@ "java": ">=17", "fabricloader": ">=0.14", "fabric": ">=0.84", - "fabric-language-kotlin": ">=1.9.4+kotlin.1.8.21", + "fabric-language-kotlin": ">=1.13.7+kotlin.2.2.21", "cardinal-components-base": "~5.2.1", "cardinal-components-entity": "~5.2.1", "cardinal-components-item": "~5.2.1", @@ -58,7 +58,7 @@ "paucal": ">=0.6.0-pre <0.7.0", "cloth-config": "11.1.*", "patchouli": ">=1.20.1-80", - "inline": ">=1.20.1-1.1.1" + "inline": ">=1.20.1-1.2.2" }, "suggests": { "pehkui": ">=3.7.6", diff --git a/Forge/build.gradle b/Forge/build.gradle index fcc3feaf57..43831992c4 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -37,7 +37,7 @@ pkSubproj { "paucal:HyBiJPtT", // 0.6.0-forge "patchouli:1.20.1-80-forge", "caelus:3.1.0+1.20", - "inline:1.20.1-1.1.1-forge", + "inline:1.20.1-1.2.2-forge", ]) } diff --git a/Forge/gradle.properties b/Forge/gradle.properties index 8b3c7f47f9..43a9cbd5cb 100644 --- a/Forge/gradle.properties +++ b/Forge/gradle.properties @@ -2,7 +2,7 @@ platform=forge forgeVersion=47.1.47 -kotlinForForgeVersion=4.3.0 +kotlinForForgeVersion=4.12.0 curiosVersion=5.2.0-beta.3 caelusVersion=3.1.0+1.20 diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml index 93396c8d94..c599b86852 100644 --- a/Forge/src/main/resources/META-INF/mods.toml +++ b/Forge/src/main/resources/META-INF/mods.toml @@ -52,6 +52,6 @@ side = "BOTH" [[dependencies.hexcasting]] modId = "inline" mandatory = true -versionRange = "[1.20.1-1.1.1,)" +versionRange = "[1.20.1-1.2.2,)" ordering = "NONE" side = "BOTH" \ No newline at end of file diff --git a/build.gradle b/build.gradle index 957b112bed..97cab8aa70 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ plugins { // This needs to be in the root // https://github.com/FabricMC/fabric-loom/issues/612#issuecomment-1198444120 // Also it looks like property lookups don't work this early - id 'fabric-loom' version '1.6-SNAPSHOT' apply false + id 'fabric-loom' version '1.9+' apply false id("at.petra-k.pkpcpbp.PKPlugin") version "0.2.0-pre-104" id("at.petra-k.pkpcpbp.PKSubprojPlugin") version "0.2.0-pre-104" apply false diff --git a/gradle.properties b/gradle.properties index 7563800f36..4bc43541a6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ modName=Hex Casting jetbrainsAnnotationsVersion=23.0.0 minecraftVersion=1.20.1 -kotlinVersion=1.7.20 +kotlinVersion=2.2.21 modVersion=0.11.3 # this is the version published to modrinth/cf i swear @@ -17,7 +17,7 @@ paucalVersion=0.6.0-pre-118 patchouliVersion=83 jeiVersion=15.0.0.12 -pehkuiVersion=3.7.7 +pehkuiVersion=3.8.2 -inlineVersion=1.1.1 +inlineVersion=1.2.2 clothConfigVersion=11.1.106 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4413138c9..ca025c83a7 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.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME