Skip to content

Commit e675887

Browse files
isXanderisXander
committed
fix everything
1 parent ab87e1d commit e675887

File tree

14 files changed

+109
-46
lines changed

14 files changed

+109
-46
lines changed

‎build.gradle.kts‎

Lines changed: 59 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ plugins {
1010
id("me.modmuss50.mod-publish-plugin") version "0.8.4"
1111
`maven-publish`
1212
signing
13-
id("dev.isxander.secrets") version "0.1.0"
13+
id("dev.isxander.secrets")
14+
id("com.gradleup.nmcp")
1415
id("org.ajoberstar.grgit") version "5.3.2"
1516
}
1617

@@ -59,6 +60,13 @@ stonecutter {
5960
"float" else "double"
6061
)
6162

63+
fun String.propDefined() = project.findProperty(this)?.toString()?.isNotBlank() ?: false
64+
65+
constants {
66+
put("mod-menu", "deps.modMenu".propDefined())
67+
put("controlify", "deps.controlify".propDefined())
68+
}
69+
6270
}
6371

6472
repositories {
@@ -76,14 +84,6 @@ repositories {
7684
forRepository { maven("https://maven.parchmentmc.org") }
7785
filter { includeGroup("org.parchmentmc.data") }
7886
}
79-
exclusiveContent {
80-
forRepository { maven("https://api.modrinth.com/maven") }
81-
filter { includeGroup("maven.modrinth") }
82-
}
83-
exclusiveContent {
84-
forRepository { maven("https://cursemaven.com") }
85-
filter { includeGroup("curse.maven") }
86-
}
8787
}
8888

8989
dependencies {
@@ -115,7 +115,9 @@ tasks.javadoc {
115115
}
116116

117117
kotlin {
118-
//jvmToolchain(modstitch.javaVersion)
118+
jvmToolchain {
119+
languageVersion = modstitch.javaVersion.map { JavaLanguageVersion.of(it) }
120+
}
119121
}
120122

121123
tasks.register("releaseMod") {
@@ -186,26 +188,58 @@ publishMods {
186188
publishing {
187189
publications {
188190
create<MavenPublication>("mod") {
191+
from(components["java"])
192+
189193
groupId = "dev.isxander"
190194
artifactId = "zoomify"
191-
192-
from(components["java"])
195+
version = modstitch.metadata.modVersion.get()
196+
197+
pom {
198+
name = modstitch.metadata.modName
199+
description = modstitch.metadata.modDescription
200+
url = "https://www.isxander.dev/projects/zoomify"
201+
licenses {
202+
license {
203+
name = "LGPL-3.0-or-later"
204+
url = "https://www.gnu.org/licenses/lgpl-3.0.en.html"
205+
}
206+
}
207+
developers {
208+
developer {
209+
id = "isXander"
210+
name = "Xander"
211+
email = "[email protected]"
212+
}
213+
}
214+
scm {
215+
url = "https://github.com/isXander/Zoomify"
216+
connection = "scm:git:git//github.com/isXander/Zoomify.git"
217+
developerConnection = "scm:git:ssh://[email protected]/isXander/Zoomify.git"
218+
}
219+
}
193220
}
194221
}
195-
196-
repositories {
197-
val username = "XANDER_MAVEN_USER".let { System.getenv(it) ?: findProperty(it) }?.toString()
198-
val password = "XANDER_MAVEN_PASS".let { System.getenv(it) ?: findProperty(it) }?.toString()
199-
if (username != null && password != null) {
200-
maven(url = "https://maven.isxander.dev/releases") {
201-
name = "XanderReleases"
202-
credentials {
203-
this.username = username
204-
this.password = password
205-
}
222+
}
223+
val signingKeyProvider = secrets.gradleProperty("signing.secretKey")
224+
val signingPasswordProvider = secrets.gradleProperty("signing.password")
225+
signing {
226+
sign(publishing.publications["mod"])
227+
}
228+
// not configuration cache friendly, but neither is the whole of signing plugin
229+
// this plugin does not support lazy configuration of signing keys
230+
gradle.taskGraph.whenReady {
231+
val willSign = allTasks.any { it.name.startsWith("sign") }
232+
if (willSign) {
233+
signing {
234+
val signingKey = signingKeyProvider.orNull
235+
val signingPassword = signingPasswordProvider.orNull
236+
237+
isRequired = signingKey != null && signingPassword != null
238+
if (isRequired) {
239+
useInMemoryPgpKeys(signingKey, signingPassword)
240+
} else {
241+
logger.error("Signing keys not found; skipping signing!")
206242
}
207-
} else {
208-
println("Xander Maven credentials not satisfied.")
209243
}
210244
}
211245
}

‎gradle.properties‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ org.gradle.jvmargs=-Xmx2G
33
kotlin.code.style=official
44
systemProp.kotlinVersion=2.3.0
55

6-
modstitch.platform=fabric-loom-remap
7-
86
modId=zoomify
97
modVersion=2.14.6
108
modName=Zoomify

‎src/main/kotlin/dev/isxander/zoomify/config/SettingsGuiFactory.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ private class SettingsGuiFactory {
285285

286286
OptionUtils.forEachOptions(screen.config, Option<*>::forgetPendingValue)
287287
ZoomifySettings.saveToFile()
288-
screen.init(screen.width, screen.height)
288+
screen.init(/*? if <1.21.11 {*//*minecraft,*//*?}*/ screen.width, screen.height)
289289
}
290290
}
291291
}

‎src/main/kotlin/dev/isxander/zoomify/integrations/ControlifyIntegration.kt‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,32 @@
1+
//? if controlify {
12
package dev.isxander.zoomify.integrations
23

34
import dev.isxander.controlify.api.ControlifyApi
45
import dev.isxander.controlify.api.entrypoint.ControlifyEntrypoint
6+
import dev.isxander.controlify.api.entrypoint.InitContext
7+
import dev.isxander.controlify.api.entrypoint.PreInitContext
58
import dev.isxander.controlify.api.event.ControlifyEvents
69
import dev.isxander.yacl3.config.v3.value
710
import dev.isxander.zoomify.Zoomify
811
import dev.isxander.zoomify.config.ZoomifySettings
912
import net.minecraft.util.Mth
1013

1114
object ControlifyIntegration : ControlifyEntrypoint {
12-
override fun onControlifyInit(controlify: ControlifyApi) {
15+
override fun onControllersDiscovered(controlify: ControlifyApi) {
16+
17+
}
18+
19+
20+
override fun onControlifyInit(context: InitContext) {
1321
ControlifyEvents.LOOK_INPUT_MODIFIER.register {
1422
it.lookInput.x /= Mth.lerp(ZoomifySettings.relativeSensitivity.value / 100.0, 1.0, Zoomify.previousZoomDivisor).toFloat()
1523
it.lookInput.y /= Mth.lerp(ZoomifySettings.relativeSensitivity.value / 100.0, 1.0, Zoomify.previousZoomDivisor).toFloat()
1624
}
1725
}
1826

19-
override fun onControllersDiscovered(controlify: ControlifyApi) {
27+
override fun onControlifyPreInit(context: PreInitContext) {
2028

2129
}
30+
2231
}
32+
//?}

‎src/main/templates/fabric.mod.json‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"schemaVersion": 1,
3-
"id": "${id}",
4-
"version": "${version}",
5-
"name": "${name}",
6-
"description": "${description}",
3+
"id": "${mod_id}",
4+
"version": "${mod_version}",
5+
"name": "${mod_name}",
6+
"description": "${mod_description}",
77
"authors": [
8-
"isXander"
8+
"${mod_author}"
99
],
1010
"contact": {
1111
"homepage": "https://isxander.dev",
1212
"issues": "https://github.com/isXander/Zoomify/issues",
1313
"sources": "https://github.com/isXander/Zoomify"
1414
},
1515
"icon": "assets/zoomify/zoomify.png",
16-
"license": "LGPLv3",
16+
"license": "${mod_license}",
1717
"environment": "client",
1818
"entrypoints": {
1919
"client": [
@@ -39,17 +39,16 @@
3939
"zoomify.mixins.json"
4040
],
4141
"depends": {
42-
"fabricloader": ">=0.16.0",
43-
"fabric-language-kotlin": ">=1.13.4+kotlin.2.2.0",
44-
"minecraft": "${mc}",
42+
"fabricloader": ">=0.18.0",
43+
"fabric-language-kotlin": ">=1.13.8+kotlin.2.3.0",
44+
"minecraft": "${minecraft_version}",
4545
"java": ">=17",
4646
"yet_another_config_lib_v3": ">=3.6.6"
4747
},
4848
"suggests": {
4949
"modmenu": "*"
5050
},
5151
"breaks": {
52-
"optifabric": "*",
53-
"controlify": "<2.0.0-beta.9"
52+
"optifabric": "*"
5453
}
5554
}

‎stonecutter.gradle.kts‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
plugins {
22
id("dev.kikugie.stonecutter")
3+
id("dev.isxander.secrets") version "0.1.0"
4+
id("com.gradleup.nmcp.aggregation") version "1.4.3"
35
}
46
stonecutter active file("versions/current")
57

6-
stonecutter parameters {
7-
fun String.propDefined() = project.findProperty(this)?.toString()?.isNotBlank() ?: false
8+
nmcpAggregation {
9+
centralPortal {
10+
username = secrets.gradleProperty("mcentral.username")
11+
password = secrets.gradleProperty("mcentral.password")
812

9-
constants {
10-
put("mod-menu", "deps.modMenu".propDefined())
13+
publicationName = "yet-another-config-lib:$version"
14+
}
15+
}
16+
dependencies {
17+
allprojects {
18+
nmcpAggregation(project(path))
1119
}
1220
}

‎versions/1.20.1/gradle.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
modstitch.platform=fabric-loom-remap
2+
13
mcVersion=1.20.1
24

35
deps.fabricApi=0.92.0+1.20.1

‎versions/1.20.4/gradle.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
modstitch.platform=fabric-loom-remap
2+
13
mcVersion=1.20.4
24

35
deps.fabricApi=0.96.11+1.20.4

‎versions/1.20.6/gradle.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
modstitch.platform=fabric-loom-remap
2+
13
mcVersion=1.20.6
24

35
deps.fabricApi=0.100.0+1.20.6

‎versions/1.21.1/gradle.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
modstitch.platform=fabric-loom-remap
2+
13
mcVersion=1.21.1
24

35
deps.fabricApi=0.104.0+1.21.1

0 commit comments

Comments
 (0)