mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-17 13:49:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify dependency configuration

Browse Source
This commit is contained in:
dfsek
2022-05-05 08:25:30 -07:00
parent 42fb3642f9
commit 41e7ad35bd
40 changed files with 72 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platforms/bukkit/build.gradle.kts
View File

@@ -14,21 +14,21 @@ val paperURL = "https://papermc.io/api/v2/projects/paper/versions/%version%/buil
val purpurURL = "https://api.pl3x.net/v2/purpur/%version%/latest/download"
dependencies {
shadedApi(project(":common:implementation:base"))
api(project(":common:implementation:base"))
shadedApi("org.slf4j:slf4j-api:1.8.0-beta4") {
api("org.slf4j:slf4j-api:1.8.0-beta4") {
because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.")
}
shadedImplementation("org.apache.logging.log4j", "log4j-slf4j18-impl", Versions.Libraries.log4j_slf4j_impl) {
implementation("org.apache.logging.log4j", "log4j-slf4j18-impl", Versions.Libraries.log4j_slf4j_impl) {
because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.")
}
compileOnly("io.papermc.paper", "paper-api", Versions.Bukkit.paper)
shadedImplementation("io.papermc", "paperlib", Versions.Bukkit.paperLib)
implementation("io.papermc", "paperlib", Versions.Bukkit.paperLib)
shadedApi("com.google.guava:guava:30.0-jre")
api("com.google.guava:guava:30.0-jre")
shadedApi("cloud.commandframework", "cloud-paper", Versions.Libraries.cloud)
api("cloud.commandframework", "cloud-paper", Versions.Libraries.cloud)
}
val jvmFlags = listOf(

12
platforms/cli/build.gradle.kts
View File

@@ -3,15 +3,15 @@ repositories {
}
dependencies {
shadedApi("commons-io:commons-io:2.6")
shadedApi("com.github.Querz:NBT:6.1")
shadedApi(project(":common:implementation:base"))
api("commons-io:commons-io:2.7")
api("com.github.Querz:NBT:6.1")
api(project(":common:implementation:base"))
shadedImplementation("com.google.guava:guava:31.0.1-jre")
implementation("com.google.guava:guava:31.0.1-jre")
shadedImplementation("ch.qos.logback:logback-classic:1.2.7")
implementation("ch.qos.logback:logback-classic:1.2.9")
shadedImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
}
tasks.withType<Jar>() {

2
platforms/fabric/build.gradle.kts
View File

@@ -8,7 +8,7 @@ plugins {
}
dependencies {
shadedApi(project(":common:implementation:base"))
api(project(":common:implementation:base"))
minecraft("com.mojang:minecraft:${Versions.Fabric.minecraft}")
mappings("net.fabricmc:yarn:${Versions.Fabric.yarn}:v2")

4
platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/DataPackContentsMixin.java
View File

@@ -13,7 +13,9 @@ import com.dfsek.terra.fabric.util.FabricUtil;
@Mixin(DataPackContents.class)
public class DataPackContentsMixin {
/*
* #refresh populates all tags in the registries
*/
@Inject(method = "refresh(Lnet/minecraft/util/registry/DynamicRegistryManager;)V", at = @At("RETURN"))
private void injectReload(DynamicRegistryManager dynamicRegistryManager, CallbackInfo ci) {
FabricUtil.registerTags(dynamicRegistryManager.get(Registry.BIOME_KEY));

2
platforms/merged/build.gradle.kts
View File

@@ -3,7 +3,7 @@ val platformOverrides = mapOf(
)
dependencies {
shadedApi(project(":common:implementation"))
api(project(":common:implementation:base"))
}
val taskSet = HashSet<AbstractArchiveTask>()

6
platforms/sponge/build.gradle.kts
View File

@@ -9,12 +9,12 @@ repositories {
}
dependencies {
shadedApi(project(":common:implementation:base"))
api(project(":common:implementation:base"))
shadedApi("org.slf4j:slf4j-api:1.8.0-beta4") {
api("org.slf4j:slf4j-api:1.8.0-beta4") {
because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.")
}
shadedImplementation("org.apache.logging.log4j", "log4j-slf4j18-impl", Versions.Libraries.log4j_slf4j_impl) {
implementation("org.apache.logging.log4j", "log4j-slf4j18-impl", Versions.Libraries.log4j_slf4j_impl) {
because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.")
}