From e3c532142694df20a31738da41e3e5a909082f95 Mon Sep 17 00:00:00 2001 From: gamma-delta <29877714+gamma-delta@users.noreply.github.com> Date: Thu, 3 Nov 2022 16:31:05 +0100 Subject: [PATCH] start getting on 1.19 --- Fabric/build.gradle | 9 ++++----- Fabric/gradle.properties | 15 +++++++-------- Forge/build.gradle | 9 ++++++--- Forge/gradle.properties | 2 +- Forge/src/main/resources/META-INF/mods.toml | 8 ++++---- gradle.properties | 14 +++++++------- 6 files changed, 29 insertions(+), 28 deletions(-) diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 0dbdf09c..2c6a0214 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -45,7 +45,7 @@ repositories { maven { url "https://mvn.devos.one/snapshots/" } maven { name = "TerraformersMC" - url = "https://maven.terraformersmc.com/" + url = "https://maven.terraformersmc.com/releases/" } } @@ -74,13 +74,12 @@ dependencies { modImplementation "com.jamieswhiteshirt:reach-entity-attributes:2.1.1" include "com.jamieswhiteshirt:reach-entity-attributes:2.1.1" - modImplementation "io.github.tropheusj:serialization-hooks:$serializationHooksVersion" - include "io.github.tropheusj:serialization-hooks:$serializationHooksVersion" + // TODO(yrsegal): do whatever it is you did with this on 1.18, on 1.19 +// modImplementation "io.github.tropheusj:serialization-hooks:$serializationHooksVersion" +// include "io.github.tropheusj:serialization-hooks:$serializationHooksVersion" // Optional integrations - modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:$reiVersion" - modApi("me.shedaniel.cloth:cloth-config-fabric:$clothConfigVersion") { exclude(group: "net.fabricmc.fabric-api") } diff --git a/Fabric/gradle.properties b/Fabric/gradle.properties index 8912af00..a5da419b 100644 --- a/Fabric/gradle.properties +++ b/Fabric/gradle.properties @@ -1,12 +1,11 @@ loomVersion=0.11-SNAPSHOT -fabricVersion=0.51.1+1.18.2 -fabricLoaderVersion=0.14.5 + +fabricVersion=0.64.0+1.19.2 +fabricLoaderVersion=0.14.10 fiberVersion=0.23.0-2 -cardinalComponentsVersion=4.1.4 -serializationHooksVersion=0.1.0+1.18.095e8a6 +cardinalComponentsVersion=5.0.2 -reiVersion=8.0.442 -emiVersion=0.1.0+1.18.2 -gravityApiVersion=0.7.7+fabric -clothConfigVersion=6.1.48 +emiVersion=0.4.0+1.19 +gravityApiVersion=0.7.12+fabric +clothConfigVersion=8.2.88 diff --git a/Forge/build.gradle b/Forge/build.gradle index ed6a3cea..219e7d62 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -135,13 +135,16 @@ dependencies { compileOnly fg.deobf("vazkii.patchouli:Patchouli:$minecraftVersion-$patchouliVersion") runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:$minecraftVersion-$patchouliVersion") - compileOnly fg.deobf("mezz.jei:jei-$minecraftVersion:$jeiVersion:api") - runtimeOnly fg.deobf("mezz.jei:jei-$minecraftVersion:$jeiVersion") - // aughh testCompileOnly fg.deobf("at.petra-k.paucal:paucal-forge-$minecraftVersion:$paucalVersion") testCompileOnly fg.deobf("vazkii.patchouli:Patchouli:$minecraftVersion-$patchouliVersion") + // Optional interop + + // For some reason this isn't working so for now it will be commented out +// compileOnly fg.deobf("mezz.jei:jei-$minecraftVersion-1.19.2-forge-api:$jeiVersion") +// runtimeOnly fg.deobf("mezz.jei:jei-$minecraftVersion-1.19.2-forge:$jeiVersion") + api fg.deobf("com.github.Virtuoel:Pehkui:${pehkuiVersion}-${minecraftVersion}-forge") } diff --git a/Forge/gradle.properties b/Forge/gradle.properties index ad1f412f..af9a7bfb 100644 --- a/Forge/gradle.properties +++ b/Forge/gradle.properties @@ -1 +1 @@ -forgeVersion=40.1.0 +forgeVersion=43.1.47 diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml index d1e4b7a2..656cdd78 100644 --- a/Forge/src/main/resources/META-INF/mods.toml +++ b/Forge/src/main/resources/META-INF/mods.toml @@ -17,27 +17,27 @@ description = "Cast powerful Hexes on the fly by drawing patterns with a staff." [[dependencies.hexcasting]] modId = "forge" mandatory = true -versionRange = "[40,)" +versionRange = "[41,)" ordering = "NONE" side = "BOTH" [[dependencies.hexcasting]] modId = "minecraft" mandatory = true -versionRange = "[1.18.2,1.19)" +versionRange = "[1.19.2,1.20)" ordering = "NONE" side = "BOTH" [[dependencies.hexcasting]] modId = "paucal" mandatory = true -versionRange = "[0.4.6,0.5.0)" +versionRange = "[0.5.0,0.6.0)" ordering = "NONE" side = "BOTH" [[dependencies.hexcasting]] modId = "patchouli" mandatory = true -versionRange = "[1.18.2-69,)" +versionRange = "[1.19.2-77,)" ordering = "NONE" side = "BOTH" diff --git a/gradle.properties b/gradle.properties index a7c9bb1d..1f968879 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,12 +6,12 @@ org.gradle.daemon=false modID=hexcasting modName=Hex Casting -minecraftVersion=1.18.2 -kotlinVersion=1.6.21 -modVersion=0.9.1 +minecraftVersion=1.19.2 +kotlinVersion=1.7.20 +modVersion=1.0 -paucalVersion=0.4.6 -patchouliVersion=69 +paucalVersion=0.5.0 +patchouliVersion=77 -jeiVersion=9.5.3.143 -pehkuiVersion=3.3.2 \ No newline at end of file +jeiVersion=11.4.0.282 +pehkuiVersion=3.6.0 \ No newline at end of file