From f037c50c52cb92acbbced30a6e7760953029da83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ciro=20Garc=C3=ADa=20Belmonte?= Date: Mon, 31 Mar 2025 05:09:13 +0200 Subject: [PATCH 1/2] fix: update dependencies and fix imports --- build.gradle.kts | 4 ++++ gradle.properties | 5 +++-- src/main/kotlin/littlechasiu/ctm/Extensions.kt | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 490f487..7974572 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,6 +17,7 @@ val minecraft_version: String by project val maven_group: String by project val archives_base_name: String by project val create_version_short: String by project +val ponder_version: String by project version = mod_version group = maven_group @@ -33,6 +34,8 @@ repositories { maven("https://thedarkcolour.github.io/KotlinForForge/") maven("https://maven.blamejared.com/") // JEI maven("https://squiddev.cc/maven/") // CC: Tweaked + maven("https://maven.createmod.net") // Ponder (Catnip) + maven("https://raw.githubusercontent.com/Fuzss/modresources/main/maven/") // Forge Config Api Port } val shadowDep: Configuration by configurations.creating @@ -55,6 +58,7 @@ dependencies { minecraft("net.neoforged:forge:${minecraft_version}-${forge_version}") implementation("thedarkcolour:kotlinforforge:$forge_kotlin_version") implementation(fg.deobf("com.simibubi.create:create-${minecraft_version}:${create_version}:slim")) + implementation("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}") shadowDep("io.ktor:ktor-server-core-jvm:$ktor_version") shadowDep("io.ktor:ktor-server-cio-jvm:$ktor_version") diff --git a/gradle.properties b/gradle.properties index 511a66a..fbbddad 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,8 +11,9 @@ minecraft_version = 1.20.1 forge_version = 47.1.79 forge_kotlin_version = 3.9.1 -create_version = 0.5.1.d-9 -create_version_short = 0.5.1 +create_version = 6.0.0-85 +create_version_short = 6.0.0 +ponder_version = 1.0.52 ktor_version = 2.3.0 kotlin_json_version = 1.4.1 kotlin_css_version = 1.0.0-pre.511 diff --git a/src/main/kotlin/littlechasiu/ctm/Extensions.kt b/src/main/kotlin/littlechasiu/ctm/Extensions.kt index 571889d..62ab4be 100644 --- a/src/main/kotlin/littlechasiu/ctm/Extensions.kt +++ b/src/main/kotlin/littlechasiu/ctm/Extensions.kt @@ -6,8 +6,8 @@ import com.simibubi.create.content.trains.entity.TravellingPoint import com.simibubi.create.content.trains.graph.TrackEdge import com.simibubi.create.content.trains.graph.TrackNode import com.simibubi.create.content.trains.graph.TrackNodeLocation -import com.simibubi.create.foundation.utility.Couple import littlechasiu.ctm.model.* +import net.createmod.catnip.data.Couple import net.minecraft.resources.ResourceKey import net.minecraft.world.level.Level import net.minecraft.world.phys.Vec3 From a8de77c7f6b1dbec8d3c48af401589bec68cf942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ciro=20Garc=C3=ADa=20Belmonte?= Date: Mon, 31 Mar 2025 08:49:27 +0200 Subject: [PATCH 2/2] refactor: remove unused dep --- build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7974572..8e26330 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,7 +35,6 @@ repositories { maven("https://maven.blamejared.com/") // JEI maven("https://squiddev.cc/maven/") // CC: Tweaked maven("https://maven.createmod.net") // Ponder (Catnip) - maven("https://raw.githubusercontent.com/Fuzss/modresources/main/maven/") // Forge Config Api Port } val shadowDep: Configuration by configurations.creating