Skip to content

Commit 3fd2f27

Browse files
DoJapHDDoJapHD
committed
Update LabyGradle
1 parent da16fe5 commit 3fd2f27

File tree

7 files changed

+42
-101
lines changed

7 files changed

+42
-101
lines changed

‎api/build.gradle.kts‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
1-
version = "0.1.0"
2-
3-
plugins {
4-
id("java-library")
5-
}
1+
import net.labymod.labygradle.common.extension.LabyModAnnotationProcessorExtension.ReferenceType
62

73
dependencies {
4+
labyProcessor()
85
labyApi("api")
96
}
107

11-
labyModProcessor {
12-
referenceType = net.labymod.gradle.core.processor.ReferenceType.INTERFACE
13-
}
14-
15-
java {
16-
sourceCompatibility = JavaVersion.VERSION_21
17-
targetCompatibility = JavaVersion.VERSION_21
8+
labyModAnnotationProcessor {
9+
referenceType = ReferenceType.INTERFACE
1810
}

‎build.gradle.kts‎

Lines changed: 18 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,42 @@
11
plugins {
2-
id("java-library")
3-
id("net.labymod.gradle")
4-
id("net.labymod.gradle.addon")
2+
id("net.labymod.labygradle")
3+
id("net.labymod.labygradle.addon")
54
}
65

7-
java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
6+
val versions = providers.gradleProperty("net.labymod.minecraft-versions").get().split(";")
7+
8+
group = "de.dojaphd"
9+
version = providers.environmentVariable("VERSION").getOrElse("1.0.0")
810

911
labyMod {
1012
defaultPackageName = "de.dojaphd.sendserver.core"
13+
1114
addonInfo {
1215
namespace = "sendserveraddon"
1316
displayName = "Send To Server"
1417
author = "DoJapHD"
1518
description = "Easy to use, command based way, to switch between server. '/ssahelp' for more information."
1619
minecraftVersion = "*"
17-
version = System.getenv().getOrDefault("VERSION", "0.0.1")
20+
version = rootProject.version.toString()
1821
}
1922

2023
minecraft {
21-
registerVersions(
22-
"1.8.9",
23-
"1.12.2",
24-
"1.16.5",
25-
"1.17.1",
26-
"1.18.2",
27-
"1.19.2",
28-
"1.19.3",
29-
"1.19.4",
30-
"1.20.1",
31-
"1.20.2",
32-
"1.20.4"
33-
) { version, provider ->
34-
configureRun(provider, version)
35-
}
36-
37-
subprojects.forEach {
38-
if (it.name != "game-runner") {
39-
filter(it.name)
24+
registerVersion(versions.toTypedArray()) {
25+
runs {
26+
getByName("client") {
27+
// When the property is set to true, you can log in with a Minecraft account
28+
devLogin = true
29+
}
4030
}
4131
}
4232
}
43-
44-
addonDev {
45-
productionRelease()
46-
}
4733
}
4834

4935
subprojects {
50-
plugins.apply("java-library")
51-
plugins.apply("net.labymod.gradle")
52-
plugins.apply("net.labymod.gradle.addon")
36+
plugins.apply("net.labymod.labygradle")
37+
plugins.apply("net.labymod.labygradle.addon")
5338

54-
repositories {
55-
maven("https://libraries.minecraft.net/")
56-
maven("https://repo.spongepowered.org/repository/maven-public/")
57-
}
39+
group = rootProject.group
40+
version = rootProject.version
5841
}
5942

60-
fun configureRun(provider: net.labymod.gradle.core.minecraft.provider.VersionProvider, gameVersion: String) {
61-
provider.runConfiguration {
62-
mainClass = "net.minecraft.launchwrapper.Launch"
63-
jvmArgs("-Dnet.labymod.running-version=${gameVersion}")
64-
jvmArgs("-Dmixin.debug=true")
65-
jvmArgs("-Dnet.labymod.debugging.all=true")
66-
jvmArgs("-Dmixin.env.disableRefMap=true")
67-
68-
args("--tweakClass", "net.labymod.core.loader.vanilla.launchwrapper.LabyModLaunchWrapperTweaker")
69-
args("--labymod-dev-environment", "true")
70-
args("--addon-dev-environment", "true")
71-
}
72-
73-
provider.javaVersion = when (gameVersion) {
74-
else -> {
75-
JavaVersion.VERSION_21
76-
}
77-
}
78-
79-
provider.mixin {
80-
val mixinMinVersion = when (gameVersion) {
81-
"1.8.9", "1.12.2", "1.16.5" -> {
82-
"0.6.6"
83-
}
84-
85-
else -> {
86-
"0.8.2"
87-
}
88-
}
89-
90-
minVersion = mixinMinVersion
91-
}
92-
}

‎core/build.gradle.kts‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
version = "0.1.0"
2-
plugins {
3-
id("java-library")
4-
}
1+
import net.labymod.labygradle.common.extension.LabyModAnnotationProcessorExtension.ReferenceType
2+
53
dependencies {
4+
labyProcessor()
65
api(project(":api"))
7-
}
8-
labyModProcessor {
9-
referenceType = net.labymod.gradle.core.processor.ReferenceType.DEFAULT
6+
7+
// An example of how to add an external dependency that is used by the addon.
8+
// addonMavenDependency("org.jeasy:easy-random:5.0.0")
109
}
1110

12-
java {
13-
sourceCompatibility = JavaVersion.VERSION_21
14-
targetCompatibility = JavaVersion.VERSION_21
11+
labyModAnnotationProcessor {
12+
referenceType = ReferenceType.DEFAULT
1513
}

‎game-runner/gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
lg_versioned_module=true

‎gradle.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
org.gradle.jvmargs=-Xmx4096m
1+
org.gradle.jvmargs=-Xmx4096m
2+
net.labymod.minecraft-versions=1.8.9;1.12.2;1.16.5;1.17.1;1.18.2;1.19.2;1.19.3;1.19.4;1.20.1;1.20.2;1.20.4;1.20.5;1.20.6;1.21;1.21.1
3+
net.labymod.labydevlogin.profile=DoJapHD

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
5-
zipStorePath=wrapper/dists
5+
zipStorePath=wrapper/dists

‎settings.gradle.kts‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
rootProject.name = "sendserveraddon"
22

33
pluginManagement {
4-
val labyGradlePluginVersion = "0.3.48"
5-
plugins {
6-
id("net.labymod.gradle") version (labyGradlePluginVersion)
7-
}
8-
4+
val labyGradlePluginVersion = "0.5.3"
95
buildscript {
106
repositories {
117
maven("https://dist.labymod.net/api/v1/maven/release/")
12-
maven("https://repo.spongepowered.org/repository/maven-public")
8+
maven("https://maven.neoforged.net/releases/")
9+
maven("https://maven.fabricmc.net/")
10+
gradlePluginPortal()
1311
mavenCentral()
1412
}
1513

1614
dependencies {
17-
classpath("net.labymod.gradle", "addon", labyGradlePluginVersion)
15+
classpath("net.labymod.gradle", "common", labyGradlePluginVersion)
1816
}
1917
}
2018
}
2119

22-
plugins.apply("net.labymod.gradle")
20+
plugins.apply("net.labymod.labygradle.settings")
2321

2422
include(":api")
2523
include(":core")

0 commit comments

Comments
 (0)