mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-01 23:47:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

disable quilt

Browse Source
This commit is contained in:
Zoë Gidiere 2023-10-18 19:53:59 -06:00
parent 4671ec5bd3
commit d3a9b57872
9 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
buildSrc/src/main/kotlin/Versions.kt
View File

@ -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"

2
platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricPlatform.java
View File

@ -33,7 +33,7 @@ public class FabricPlatform extends LifecyclePlatform {
@Override
protected Collection<BaseAddon> 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());
}

2
platforms/mixin-common/README.md
View File

@ -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.

3
platforms/mixin-common/build.gradle.kts
View File

@ -24,7 +24,8 @@ dependencies {
}
architectury {
common("fabric", "forge", "quilt")
// common("fabric", "forge", "quilt")
common("fabric", "forge")
minecraft = Versions.Mod.minecraft
}

2
platforms/mixin-lifecycle/README.md
View File

@ -1,3 +1,3 @@
# mixin-lifecycle
This project contains lifecycle mixins shared between Fabric and Quilt.
This project contains lifecycle mixins shared between Fabric and formerly Quilt.

3
platforms/mixin-lifecycle/build.gradle.kts
View File

@ -41,6 +41,7 @@ tasks {
}
architectury {
common("fabric", "quilt")
// common("fabric", "quilt")
common("fabric")
minecraft = Versions.Mod.minecraft
}

4
platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java
View File

@ -111,11 +111,11 @@ public abstract class LifecyclePlatform extends ModPlatform {
return addons;
}
protected Stream<EphemeralAddon> parseModData(String id, String modVersion) {
protected Stream<EphemeralAddon> 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 " +

0
platforms/quilt/build.gradle.kts → platforms/quilt/build.gradle.kts.disabled
View File

2
platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPlatform.java
View File

@ -32,7 +32,7 @@ public class QuiltPlatform extends LifecyclePlatform {
@Override
protected Collection<BaseAddon> 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());
}