diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 0982994a4..6a56ded4c 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -23,11 +23,11 @@ object Versions { object Fabric { const val fabricAPI = "0.90.0+${Mod.minecraft}" } - - object Quilt { - const val quiltLoader = "0.20.2" - const val fabricApi = "7.3.1+0.89.3-1.20.1" - } +// +// object Quilt { +// const val quiltLoader = "0.20.2" +// const val fabricApi = "7.3.1+0.89.3-1.20.1" +// } object Mod { const val mixin = "0.12.5+mixin.0.8.5" @@ -57,13 +57,13 @@ object Versions { const val runPaper = "2.2.0" const val paperWeight = "1.5.6" } - - object Sponge { - const val sponge = "9.0.0-SNAPSHOT" - const val mixin = "0.8.2" - const val minecraft = "1.17.1" - } - +// +// object Sponge { +// const val sponge = "9.0.0-SNAPSHOT" +// const val mixin = "0.8.2" +// const val minecraft = "1.17.1" +// } +// object CLI { const val nbt = "6.1" const val logback = "1.4.11" diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricPlatform.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricPlatform.java index 1501b736d..da44b168e 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricPlatform.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricPlatform.java @@ -33,7 +33,7 @@ public class FabricPlatform extends LifecyclePlatform { @Override protected Collection getPlatformMods() { return FabricLoader.getInstance().getAllMods().stream().flatMap( - mod -> parseModData(mod.getMetadata().getId(), mod.getMetadata().getVersion().getFriendlyString())).collect( + mod -> parseModData(mod.getMetadata().getId(), mod.getMetadata().getVersion().getFriendlyString(), "fabric")).collect( Collectors.toList()); } diff --git a/platforms/mixin-common/README.md b/platforms/mixin-common/README.md index 0c411a1bf..f252941a2 100644 --- a/platforms/mixin-common/README.md +++ b/platforms/mixin-common/README.md @@ -1,4 +1,4 @@ # mixin-common -This project contains mixins shared between Forge, Fabric and Quilt, as +This project contains mixins shared between Forge, Fabric and formerly Quilt, as well as glue code. \ No newline at end of file diff --git a/platforms/mixin-common/build.gradle.kts b/platforms/mixin-common/build.gradle.kts index 49c2f5188..fb73717b1 100644 --- a/platforms/mixin-common/build.gradle.kts +++ b/platforms/mixin-common/build.gradle.kts @@ -24,7 +24,8 @@ dependencies { } architectury { - common("fabric", "forge", "quilt") +// common("fabric", "forge", "quilt") + common("fabric", "forge") minecraft = Versions.Mod.minecraft } diff --git a/platforms/mixin-lifecycle/README.md b/platforms/mixin-lifecycle/README.md index 6c2c62cba..95d7e8c1c 100644 --- a/platforms/mixin-lifecycle/README.md +++ b/platforms/mixin-lifecycle/README.md @@ -1,3 +1,3 @@ # mixin-lifecycle -This project contains lifecycle mixins shared between Fabric and Quilt. \ No newline at end of file +This project contains lifecycle mixins shared between Fabric and formerly Quilt. \ No newline at end of file diff --git a/platforms/mixin-lifecycle/build.gradle.kts b/platforms/mixin-lifecycle/build.gradle.kts index 1108046f3..142d6868b 100644 --- a/platforms/mixin-lifecycle/build.gradle.kts +++ b/platforms/mixin-lifecycle/build.gradle.kts @@ -41,6 +41,7 @@ tasks { } architectury { - common("fabric", "quilt") +// common("fabric", "quilt") + common("fabric") minecraft = Versions.Mod.minecraft } \ No newline at end of file diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java index bafd0a02e..9e0e081d3 100644 --- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java +++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java @@ -111,11 +111,11 @@ public abstract class LifecyclePlatform extends ModPlatform { return addons; } - protected Stream parseModData(String id, String modVersion) { + protected Stream parseModData(String id, String modVersion, String platform) { if(id.equals("terra") || id.equals("minecraft") || id.equals("java")) return Stream.empty(); try { Version version = Versions.parseVersion(modVersion); - return Stream.of(new EphemeralAddon(version, "quilt:" + id)); + return Stream.of(new EphemeralAddon(version, platform + ":" + id)); } catch(ParseException e) { LOGGER.warn( "Mod {}, version {} does not follow semantic versioning specification, Terra addons will be unable to depend on " + diff --git a/platforms/quilt/build.gradle.kts b/platforms/quilt/build.gradle.kts.disabled similarity index 100% rename from platforms/quilt/build.gradle.kts rename to platforms/quilt/build.gradle.kts.disabled diff --git a/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPlatform.java b/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPlatform.java index 0aa2e4323..32772b349 100644 --- a/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPlatform.java +++ b/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPlatform.java @@ -32,7 +32,7 @@ public class QuiltPlatform extends LifecyclePlatform { @Override protected Collection getPlatformMods() { - return QuiltLoader.getAllMods().stream().flatMap(mod -> parseModData(mod.metadata().id(), mod.metadata().version().raw())).collect( + return QuiltLoader.getAllMods().stream().flatMap(mod -> parseModData(mod.metadata().id(), mod.metadata().version().raw(), "quilt")).collect( Collectors.toList()); }