Skip to content

Update Gradle, Kotlin, and Loom to support Inline 1.2.2 #1043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Robotgiggle merged 5 commits into from
May 12, 2026
Merged

Update Gradle, Kotlin, and Loom to support Inline 1.2.2 #1043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
254c170
Update Gradle, Kotlin, and Loom to support Inline 1.2.2
Robotgiggle May 11, 2026
4022830
Update changelog
Robotgiggle May 11, 2026
cef5105
Even newerer kotlin version
Robotgiggle May 11, 2026
9c43a17
Update kotlin libraries, minor kotlin bump
Robotgiggle May 11, 2026
b6f7b13
Update fabric to fix mixin issue
Robotgiggle May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/pr.yml
View file
Open in desktop
Copy link
Copy Markdown
Member

@object-Object object-Object May 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we also need to update the versions for fabric-language-kotlin and kotlinforforge?

Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions Common/src/main/java/at/petrak/hexcasting/interop/inline/InlineHexClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
6 changes: 3 additions & 3 deletions Fabric/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version "1.6-SNAPSHOT"
id 'fabric-loom' version "1.9+"
id "at.petra-k.pkpcpbp.PKSubprojPlugin"
}

Expand All @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions Fabric/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions Fabric/src/main/resources/fabric.mod.json
View file
Open in desktop
Copy link
Copy Markdown
Member

@object-Object object-Object May 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here and in mods.toml - should we increase the minimum required kotlin versions?

Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@
"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",
"cardinal-components-block": "~5.2.1",
"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",
Expand Down
2 changes: 1 addition & 1 deletion Forge/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
])
}

Expand Down
2 changes: 1 addition & 1 deletion Forge/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Forge/src/main/resources/META-INF/mods.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ 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
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
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading