Skip to content

Commit 84bb5cb

Browse files
committed
infrastructure for local ponder
1 parent bdc6e0f commit 84bb5cb

File tree

6 files changed

+34
-11
lines changed

6 files changed

+34
-11
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,7 @@ local.properties
5151

5252
.DS_Store
5353
#/libs/
54+
55+
# don't push local Ponder
56+
.gitmodules
57+
Ponder/

build.gradle.kts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ repositories {
9797
maven("https://jm.gserv.me/repository/maven-public/") // Journey map
9898
}
9999

100+
val ponder = file("Ponder")
101+
100102
dependencies {
101103
// setup
102104
minecraft("com.mojang:minecraft:$minecraftVersion")
@@ -118,11 +120,17 @@ dependencies {
118120
modApi(include("com.electronwill.night-config:toml:$nightConfigVersion")!!)
119121
modApi(include("fuzs.forgeconfigapiport:forgeconfigapiport-fabric:$configApiVersion")!!)
120122
modApi(include("dev.engine-room.flywheel:flywheel-fabric-$minecraftVersion:$flywheelVersion")!!)
121-
modApi(include("net.createmod.ponder:Ponder-Fabric-$minecraftVersion:$ponderVersion")!!)
122123
modApi(include("com.jamieswhiteshirt:reach-entity-attributes:$reaVersion")!!)
123124
modApi(include("io.github.tropheusj:milk-lib:$milkLibVersion")!!)
124125
api(include("com.google.code.findbugs:jsr305:$jsr305Version")!!)
125126

127+
if (ponder.exists()) {
128+
implementation("net.createmod.ponder:Ponder-Fabric-$minecraftVersion:$ponderVersion")
129+
implementation("net.createmod.ponder:Ponder-Common-$minecraftVersion:$ponderVersion")
130+
} else {
131+
modApi(include("net.createmod.ponder:Ponder-Fabric-$minecraftVersion:$ponderVersion")!!)
132+
}
133+
126134
// compat
127135
modCompileOnly("cc.tweaked:cc-tweaked-$minecraftVersion-fabric-api:$ccVersion")
128136

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
org.gradle.jvmargs = -Xmx3G
22
org.gradle.parallel = true
33
org.gradle.caching = true
4-
org.gradle.configuration-cache=true
4+
# FIXME: ponder is incompatible with it
5+
org.gradle.configuration-cache=false

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

settings.gradle

Lines changed: 0 additions & 8 deletions
This file was deleted.

settings.gradle.kts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
pluginManagement {
2+
repositories {
3+
maven("https://maven.fabricmc.net/")
4+
gradlePluginPortal()
5+
}
6+
}
7+
8+
enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
9+
10+
if (file("Ponder").exists()) {
11+
includeBuild(".")
12+
includeBuild("Ponder") {
13+
dependencySubstitution {
14+
substitute(module("net.createmod.ponder:Ponder-Fabric-1.20.1")).using(project(":Fabric"))
15+
substitute(module("net.createmod.ponder:Ponder-Common-1.20.1")).using(project(":Common"))
16+
}
17+
}
18+
}

0 commit comments

Comments
 (0)