From 012164f197d79ae94438a05abb1260a6c9f77f04 Mon Sep 17 00:00:00 2001 From: QuImUfu Date: Mon, 29 May 2023 17:17:48 +0200 Subject: [PATCH] fix build --- build.gradle | 17 +++++++++++------ gradle.properties | 3 ++- .../config/ColourfulPortalConfig.java | 3 ++- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 81f9dee..cb91e82 100644 --- a/build.gradle +++ b/build.gradle @@ -63,12 +63,12 @@ dependencies { exclude(group: "net.fabricmc.fabric-loader") transitive(false) } - - modImplementation("com.github.iPortalTeam.ImmersivePortalsMod:build:${project.immersive_portals_version}") { - exclude(group: "net.fabricmc.fabric-api") - exclude(group: "net.fabricmc.fabric-loader") - transitive(false) - } +// +// modImplementation("com.github.iPortalTeam.ImmersivePortalsMod:build:${project.immersive_portals_version}") { +// exclude(group: "net.fabricmc.fabric-api") +// exclude(group: "net.fabricmc.fabric-loader") +// transitive(false) +// } modApi("dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.cardinal_components_version}") { exclude(group: "net.fabricmc.fabric-loader") @@ -95,8 +95,13 @@ dependencies { include(modApi("de.siphalor.tweed4:tweed4-data-$project.minecraft_version_major")) include(modApi("de.siphalor.tweed4:tweed4-data-hjson-$project.minecraft_version_major")) include(modApi("de.siphalor.tweed4:tweed4-tailor-cloth-$project.minecraft_version_major")) + include(modApi("de.siphalor.tweed4:tweed4-tailor-screen-$project.minecraft_version_major")) + modImplementation("me.shedaniel.cloth:cloth-config-fabric:$project.cloth_config_version") { + exclude(group: "net.fabricmc.fabric-api") + } + modCompileOnly "maven.modrinth:sodium:mc${project.minecraft_version}-${project.sodium_version}" } diff --git a/gradle.properties b/gradle.properties index 278c60e..047f928 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,4 +19,5 @@ fabric_version=0.81.1+1.19.4 cardinal_components_version=5.1.0 immersive_portals_version=v2.6.9-mc1.19.4 tweed_version=1.3.0+mc1.19.4 -sodium_version=0.4.10 \ No newline at end of file +sodium_version=0.4.10 +cloth_config_version=10.0.96 \ No newline at end of file diff --git a/src/main/java/quimufu/colourful_portals/config/ColourfulPortalConfig.java b/src/main/java/quimufu/colourful_portals/config/ColourfulPortalConfig.java index 5adaa6e..fa7df6e 100644 --- a/src/main/java/quimufu/colourful_portals/config/ColourfulPortalConfig.java +++ b/src/main/java/quimufu/colourful_portals/config/ColourfulPortalConfig.java @@ -8,11 +8,12 @@ import de.siphalor.tweed4.config.ConfigEnvironment; import de.siphalor.tweed4.config.ConfigScope; import de.siphalor.tweed4.tailor.cloth.ClothData; import net.minecraft.util.DyeColor; +import quimufu.colourful_portals.ColourfulPortalsMod; import java.util.Map; @ATweedConfig(serializer = "tweed4:hjson", scope = ConfigScope.GAME, environment = ConfigEnvironment.SERVER, tailors = {"tweed4:lang_json_descriptions", "tweed4:coat", "tweed4:json_schema"}, casing = CaseFormat.LOWER_HYPHEN) -@ClothData(modid = "tweed4_testmod") +@ClothData(modid = ColourfulPortalsMod.MOD_ID) public class ColourfulPortalConfig { @AConfigEntry(comment =