Skip to content

Commit

Permalink
infrastructure for local ponder
Browse files Browse the repository at this point in the history
  • Loading branch information
TropheusJ committed Mar 3, 2025
1 parent bdc6e0f commit 84bb5cb
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 11 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,7 @@ local.properties

.DS_Store
#/libs/

# don't push local Ponder
.gitmodules
Ponder/
10 changes: 9 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ repositories {
maven("https://jm.gserv.me/repository/maven-public/") // Journey map
}

val ponder = file("Ponder")

dependencies {
// setup
minecraft("com.mojang:minecraft:$minecraftVersion")
Expand All @@ -118,11 +120,17 @@ dependencies {
modApi(include("com.electronwill.night-config:toml:$nightConfigVersion")!!)
modApi(include("fuzs.forgeconfigapiport:forgeconfigapiport-fabric:$configApiVersion")!!)
modApi(include("dev.engine-room.flywheel:flywheel-fabric-$minecraftVersion:$flywheelVersion")!!)
modApi(include("net.createmod.ponder:Ponder-Fabric-$minecraftVersion:$ponderVersion")!!)
modApi(include("com.jamieswhiteshirt:reach-entity-attributes:$reaVersion")!!)
modApi(include("io.github.tropheusj:milk-lib:$milkLibVersion")!!)
api(include("com.google.code.findbugs:jsr305:$jsr305Version")!!)

if (ponder.exists()) {
implementation("net.createmod.ponder:Ponder-Fabric-$minecraftVersion:$ponderVersion")
implementation("net.createmod.ponder:Ponder-Common-$minecraftVersion:$ponderVersion")
} else {
modApi(include("net.createmod.ponder:Ponder-Fabric-$minecraftVersion:$ponderVersion")!!)
}

// compat
modCompileOnly("cc.tweaked:cc-tweaked-$minecraftVersion-fabric-api:$ccVersion")

Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
org.gradle.jvmargs = -Xmx3G
org.gradle.parallel = true
org.gradle.caching = true
org.gradle.configuration-cache=true
# FIXME: ponder is incompatible with it
org.gradle.configuration-cache=false
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
8 changes: 0 additions & 8 deletions settings.gradle

This file was deleted.

18 changes: 18 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
pluginManagement {
repositories {
maven("https://maven.fabricmc.net/")
gradlePluginPortal()
}
}

enableFeaturePreview("STABLE_CONFIGURATION_CACHE")

if (file("Ponder").exists()) {
includeBuild(".")
includeBuild("Ponder") {
dependencySubstitution {
substitute(module("net.createmod.ponder:Ponder-Fabric-1.20.1")).using(project(":Fabric"))
substitute(module("net.createmod.ponder:Ponder-Common-1.20.1")).using(project(":Common"))
}
}
}

0 comments on commit 84bb5cb

Please sign in to comment.