Skip to content

Commit 7085bd3

Browse files
committed
update buildscript
1 parent 00f518a commit 7085bd3

3 files changed

Lines changed: 31 additions & 28 deletions

File tree

addon.gradle

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,3 @@ minecraft {
2727

2828
//extraTweakClasses << "${modGroup}.LaunchTweaker"
2929
}
30-
31-
configurations {
32-
specialEmbed
33-
implementation.extendsFrom(specialEmbed)
34-
}
35-
36-
jar {
37-
from provider {
38-
configurations.specialEmbed.collect {
39-
it.isDirectory() ? it : zipTree(it)
40-
}
41-
}, {
42-
exclude 'META-INF', 'META-INF/**', 'about*.html'
43-
}
44-
}

build.gradle

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//version: 1753288091
1+
//version: 1762213476
22
/*
33
* DO NOT CHANGE THIS FILE!
44
* Also, you may replace this file at any time if there is an update available.
@@ -318,14 +318,6 @@ tasks.withType(ScalaCompile).configureEach {
318318
}
319319

320320

321-
// Allow others using this buildscript to have custom gradle code run
322-
if (getFile('addon.gradle').exists()) {
323-
apply from: 'addon.gradle'
324-
} else if (getFile('addon.gradle.kts').exists()) {
325-
apply from: 'addon.gradle.kts'
326-
}
327-
328-
329321
// Configure Minecraft
330322

331323
// Try to gather mod version from git tags if version is not manually specified
@@ -372,11 +364,14 @@ minecraft {
372364

373365
// JVM arguments
374366
extraRunJvmArguments.add("-ea:${modGroup}")
367+
368+
// enable JLine Terminal since idea_rt.jar is no longer added to the classpath
369+
extraRunJvmArguments.add('-Dterminal.jline=true')
375370
if (usesMixins.toBoolean()) {
376371
extraRunJvmArguments.addAll([
377-
'-Dmixin.hotSwap=true',
378-
'-Dmixin.checks.interfaces=true',
379-
'-Dmixin.debug.export=true'
372+
'-Dmixin.hotSwap=true',
373+
'-Dmixin.checks.interfaces=true',
374+
'-Dmixin.debug.export=true'
380375
])
381376
}
382377

@@ -874,7 +869,7 @@ if (enableJava17RunTasks.toBoolean()) {
874869
if (modId != 'lwjgl3ify') {
875870
java17Dependencies("io.github.twilightflower:lwjgl3ify:1.0.1")
876871
java17PatchDependencies("io.github.twilightflower:lwjgl3ify:1.0.1:forgePatches") {
877-
transitive = false
872+
transitive = false
878873
}
879874
}
880875
}
@@ -1549,3 +1544,11 @@ def getLastTag() {
15491544
return runShell('git describe --abbrev=0 --tags ' +
15501545
(githubTag.isPresent() ? runShell('git rev-list --tags --skip=1 --max-count=1') : ''))
15511546
}
1547+
1548+
1549+
// Allow others using this buildscript to have custom gradle code run
1550+
if (getFile('addon.gradle').exists()) {
1551+
apply from: 'addon.gradle'
1552+
} else if (getFile('addon.gradle.kts').exists()) {
1553+
apply from: 'addon.gradle.kts'
1554+
}

dependencies.gradle

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,21 @@ final Map<String, List<String>> runtime_dependencies = [
146146
'curse.maven:vintagefix-871198:5536276' : [dev_vintagefix],
147147
]
148148

149+
configurations {
150+
specialEmbed
151+
implementation.extendsFrom(specialEmbed)
152+
}
153+
154+
jar {
155+
from provider {
156+
configurations.specialEmbed.collect {
157+
it.isDirectory() ? it : zipTree(it)
158+
}
159+
}, {
160+
exclude 'META-INF', 'META-INF/**', 'about*.html'
161+
}
162+
}
163+
149164
dependencies {
150165
embed "org.apache.groovy:groovy:${project.groovy_version}"
151166

0 commit comments

Comments
 (0)