Skip to content

Commit b891aad

Browse files
mysticdrewmysticdrew
committed
1.21.3 and moved to mdg for common
1 parent 0d78305 commit b891aad

File tree

9 files changed

+119
-125
lines changed

9 files changed

+119
-125
lines changed

‎Common/build.gradle‎

Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,8 @@
1-
buildscript {
2-
repositories {
3-
mavenCentral()
4-
5-
maven {
6-
name = "forge"
7-
url = "https://maven.minecraftforge.net"
8-
}
9-
maven {
10-
url = 'https://maven.parchmentmc.org'
11-
}
12-
maven {
13-
url "https://plugins.gradle.org/m2/"
14-
}
15-
maven {
16-
url = 'https://repo.spongepowered.org/maven'
17-
}
18-
}
19-
20-
dependencies {
21-
classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.4.0'
22-
classpath 'org.parchmentmc:librarian:1.+'
23-
classpath 'org.spongepowered:mixingradle:0.7.+'
24-
classpath group: 'com.modrinth.minotaur', name: 'Minotaur', version: '2.+'
25-
}
26-
}
27-
281
plugins {
2+
id 'idea'
293
id 'java'
30-
id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT'
4+
id 'net.neoforged.moddev'
5+
id 'maven-publish'
316
}
327

338

@@ -41,17 +16,30 @@ configurations {
4116
shade
4217
}
4318

44-
minecraft {
45-
version(minecraft_version)
46-
accessWideners(project.file("src/main/resources/journeymap_webmap.accesswidener"))
19+
20+
neoForge {
21+
neoFormVersion = neo_form_version
22+
// Automatically enable AccessTransformers if the file exists
23+
// While this location can be changed, it is recommended for
24+
// common and neoforge to share an accesstransformer file
25+
// and this location is hardcoded in FML
26+
// https://github.com/neoforged/FancyModLoader/blob/a952595eaaddd571fbc53f43847680b00894e0c1/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModFile.java#L118
27+
def at = file('src/main/resources/META-INF/accesstransformer.cfg')
28+
if (at.exists()) {
29+
accessTransformers.add(at.absolutePath)
30+
}
31+
addModdingDependenciesTo(sourceSets["test"])
32+
// parchment {
33+
// minecraftVersion = mappings_mc_version
34+
// mappingsVersion = mappings_date
35+
// }
4736
}
4837

4938
dependencies {
5039
implementation 'org.jetbrains:annotations:20.1.0'
5140
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
5241
compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5'
5342
compileOnly group: 'info.journeymap', name: 'journeymap-api-common', version: "${project.journeymap_api_version}-${project.minecraft_version}-SNAPSHOT", changing: true
54-
5543
// for annotations
5644
implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
5745
}

NeoForge/src/main/resources/META-INF/accesstransformer.cfg renamed to Common/src/main/resources/META-INF/accesstransformer.cfg

File renamed without changes.

‎Fabric/build.gradle‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
buildscript {
2-
repositories {
3-
mavenCentral()
4-
maven {
5-
url "https://plugins.gradle.org/m2/"
6-
}
7-
8-
}
9-
102
dependencies {
113
classpath group: 'com.modrinth.minotaur', name: 'Minotaur', version: '2.+'
124
}
135
}
146

157
plugins {
16-
id 'fabric-loom' version '1.6-SNAPSHOT'
8+
id 'fabric-loom' version '1.7-SNAPSHOT'
179
id 'net.darkhax.curseforgegradle' version '1.+'
1810
id 'io.github.juuxel.loom-quiltflower' version '1.8.0'
1911
}
@@ -84,7 +76,7 @@ dependencies {
8476
minecraft "com.mojang:minecraft:${project.minecraft_version}"
8577
mappings loom.layered() {
8678
officialMojangMappings()
87-
parchment("org.parchmentmc.data:parchment-${project.mappings}:${project.parchment_mappings}@zip")
79+
// parchment("org.parchmentmc.data:parchment-${project.mappings_mc_version}:${project.parchment_mappings}@zip")
8880
}
8981

9082
modCompileOnly group: 'info.journeymap', name: 'journeymap-api-fabric', version: "${project.journeymap_api_version}-${project.minecraft_version}-SNAPSHOT", changing: true
@@ -94,7 +86,7 @@ dependencies {
9486
compileOnly project(":Common")
9587

9688
implementation include(group: 'info.journeymap', name: 'webmap-client', version: project.journeymap_webmap_version, changing: true)
97-
implementation include(group: 'io.javalin', name: 'javalin', version: '6.1.6')
89+
implementation include(group: 'io.javalin', name: 'javalin', version: project.javalin_version)
9890
//external libs shade
9991
compileOnly include(group: 'org.eclipse.jetty', name: 'jetty-server', version: '11.0.20')
10092
compileOnly include(group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '11.0.20')

‎Forge/build.gradle‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,4 @@
11
buildscript {
2-
repositories {
3-
mavenCentral()
4-
5-
maven {
6-
name = "forge"
7-
url = "https://maven.minecraftforge.net"
8-
}
9-
maven {
10-
url = 'https://maven.parchmentmc.org'
11-
}
12-
maven {
13-
url "https://plugins.gradle.org/m2/"
14-
}
15-
maven {
16-
url = 'https://repo.spongepowered.org/maven'
17-
}
18-
}
19-
202
dependencies {
213
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.0.23+', changing: true
224
classpath("io.github.goooler.shadow:shadow-gradle-plugin:8.1.7")
@@ -78,7 +60,7 @@ dependencies {
7860
//external libs shade
7961
// shade group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'
8062
shade group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.9.23'
81-
shade group: 'io.javalin', name: 'javalin', version: '6.0.0'
63+
shade group: 'io.javalin', name: 'javalin', version: project.javalin_version
8264
// shade group: 'org.slf4j', name: 'slf4j-simple', version: '2.0.3'
8365

8466
compileOnly project(":Common")
@@ -206,6 +188,7 @@ def replaceProperties = [
206188

207189
processResources() {
208190
from project(":Common").sourceSets.main.resources
191+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
209192
// duplicatesStrategy = DuplicatesStrategy.INCLUDE
210193
// this will ensure that this task is redone when the versions change.
211194
inputs.properties replaceProperties

‎NeoForge/build.gradle‎

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
buildscript {
2-
repositories {
3-
mavenCentral()
4-
5-
maven {
6-
url "https://plugins.gradle.org/m2/"
7-
}
8-
}
9-
102
dependencies {
113
classpath("io.github.goooler.shadow:shadow-gradle-plugin:8.1.7")
124
classpath group: 'com.modrinth.minotaur', name: 'Minotaur', version: '2.+'
@@ -15,17 +7,17 @@ buildscript {
157
}
168

179
plugins {
10+
id "maven-publish"
1811
id "java-library"
1912
id "idea"
20-
id "net.neoforged.gradle.userdev" version '[7.0.145]'
13+
id 'net.neoforged.moddev'
2114
id 'net.darkhax.curseforgegradle' version '1.+'
15+
id "com.modrinth.minotaur" version "2.+"
2216
}
2317

2418
apply plugin: 'org.jetbrains.kotlin.jvm'
2519
apply plugin: 'kotlin'
2620
apply plugin: 'io.github.goooler.shadow'
27-
apply plugin: "com.modrinth.minotaur"
28-
apply plugin: "maven-publish"
2921

3022
def loaderName = "neoforge"
3123
version = "${project.minecraft_version}-${project.mod_version}"
@@ -42,12 +34,8 @@ configurations.all {
4234
// Check for snapshots more frequently than Gradle's default of 1 day. 0 = every build.
4335
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
4436
}
45-
if (file("src/main/resources/META-INF/accesstransformer.cfg").exists()) {
46-
minecraft.accessTransformers.file file("src/main/resources/META-INF/accesstransformer.cfg")
47-
}
4837

4938
dependencies {
50-
implementation "net.neoforged:neoforge:${neoforge_version}"
5139
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
5240
implementation group: "info.journeymap", name: "journeymap-api-neoforge", version: "${project.journeymap_api_version}-${project.minecraft_version}-SNAPSHOT", changing: true
5341
// implementation fg.deobf("curse.maven:journeymap-32274:${project.jourenymap_forge_version}")
@@ -60,25 +48,42 @@ dependencies {
6048
//external libs shade
6149
// shade group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'
6250
shade group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.9.23'
63-
shade group: 'io.javalin', name: 'javalin', version: '6.0.0'
51+
shade group: 'io.javalin', name: 'javalin', version: project.javalin_version
6452
// shade group: 'org.slf4j', name: 'slf4j-simple', version: '2.0.3'
6553
compileOnly project(":Common")
6654
}
6755

68-
runs {
69-
configureEach {
70-
systemProperty "mixin.debug.export", "true"
71-
systemProperty "forge.logging.console.level", "info"
72-
systemProperty "journeymap.map_testing", "true"
73-
74-
modSource project.sourceSets.main
56+
neoForge {
57+
version = neoforge_version
58+
// Automatically enable neoforge AccessTransformers if the file exists
59+
def at = project(':Common').file('src/main/resources/META-INF/accesstransformer.cfg')
60+
if (at.exists()) {
61+
accessTransformers.add(at.absolutePath)
7562
}
76-
client {
77-
workingDirectory project.file("run/client")
63+
addModdingDependenciesTo(sourceSets["test"])
64+
// parchment {
65+
// minecraftVersion = mappings_mc_version
66+
// mappingsVersion = mappings_date
67+
// }
68+
runs {
69+
configureEach {
70+
// systemProperty('neoforge.enabledGameTestNamespaces', mod_id)
71+
ideName = "NeoForge ${it.name.capitalize()} (${project.path})" // Unify the run config names with fabric
72+
jvmArgument("-Dmixin.debug.export=true")
73+
}
74+
client {
75+
client()
76+
gameDirectory = project.file('run/client')
77+
}
78+
server {
79+
server()
80+
gameDirectory = project.file("run/server")
81+
}
7882
}
79-
server {
80-
programArgument "--nogui"
81-
workingDirectory project.file("run/server")
83+
mods {
84+
"${mod_id}" {
85+
sourceSet sourceSets.main
86+
}
8287
}
8388
}
8489

@@ -237,7 +242,7 @@ modrinth {
237242
token = "${modrinthApiKey}"
238243
projectId = modrinth_project_id
239244
versionNumber = "${version}-forge"
240-
versionName ="${project.mod_id}-${version}+${loaderName}"
245+
versionName = "${project.mod_id}-${version}+${loaderName}"
241246
versionType = release_type
242247
uploadFile = shadowJar
243248
gameVersions = ["${project.minecraft_version}", "1.21.1"]

‎build.gradle‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
buildscript {
2-
repositories {
3-
mavenCentral()
4-
maven {
5-
url "https://plugins.gradle.org/m2/"
6-
}
7-
8-
}
9-
102
dependencies {
113
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20'
124
}
135
}
6+
147
plugins {
15-
id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.7"
8+
id 'net.neoforged.moddev' version '0.1.112' apply false
169
}
10+
1711
configurations.all {
1812
// Check for snapshots more frequently than Gradle's default of 1 day. 0 = every build.
1913
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
@@ -84,14 +78,21 @@ subprojects {
8478
implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
8579

8680
// external libs
81+
// implementation 'org.slf4j:slf4j-api:2.0.16'
8782
implementation group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'
8883
implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.9.20'
89-
implementation group: 'io.javalin', name: 'javalin', version: '6.1.6'
90-
// testImplementation "curse.maven:journeymap-32274:${project.journeymap_forge_version}"
91-
testImplementation "ignored:journeymap-forge:1.21.1-6.0.0-beta.27"
84+
implementation group: 'io.javalin', name: 'javalin', version: project.javalin_version
85+
testImplementation "curse.maven:journeymap-32274:${project.journeymap_forge_version}"
86+
// testImplementation "ignored:journeymap-forge:1.21.1-6.0.0-beta.27"
9287

9388
}
9489

90+
plugins.withType(JavaPlugin) {
91+
dependencies {
92+
implementation enforcedPlatform('org.slf4j:slf4j-api:2.0.9')
93+
}
94+
}
95+
9596

9697
tasks.withType(JavaCompile).configureEach {
9798
it.options.encoding = 'UTF-8'

‎gradle.properties‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
mod_version=1.0.2
2-
mappings=1.20.6
3-
minecraft_version=1.21
2+
minecraft_version=1.21.3
3+
4+
mappings_mc_version=1.21.3
5+
mappings_date=2024.07.28
6+
47
journeymap_webmap_version=1.1-SNAPSHOT
58
journeymap_api_version=2.0.0
69
group_id=info.journeymap_webmap
@@ -12,20 +15,22 @@ parchment_mappings=2024.06.02
1215
release_type=release
1316

1417
# Forge
15-
mappings_channel=parchment
16-
forge_version=51.0.0
18+
mappings_channel=official
19+
forge_version=53.0.0
1720
journeymap_forge_version=5820526
1821

1922
#neoforge
20-
neoforge_version=21.3.3-beta
23+
neoforge_version=21.3.2-beta
2124
# https://projects.neoforged.net/neoforged/neoform
2225
neo_form_version=1.21.3-20241023.131943
2326

2427
# Fabric
25-
fabric_api_version=0.102.0+1.21
26-
fabric_loader_version=0.15.11
28+
fabric_api_version=0.107.0+1.21.3
29+
fabric_loader_version=0.16.7
2730
journeymap_fabric_version=4240509
2831

32+
javalin_version=6.3.0
33+
2934
curseforge_project_id=793035
3035
modrinth_project_id=YaZ1fUTg
3136

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
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.8-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)