Skip to content

Commit 10e781d

Browse files
committed
Update to MDG
1 parent 9907958 commit 10e781d

File tree

7 files changed

+241
-175
lines changed

7 files changed

+241
-175
lines changed

build.gradle

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'net.neoforged.gradle.userdev'
2+
id 'net.neoforged.moddev'
33
id 'maven-publish'
44
id 'com.diffplug.spotless'
55
id 'com.matthewprenger.cursegradle'
@@ -52,9 +52,6 @@ repositories {
5252
}
5353

5454
dependencies {
55-
// To change the versions see the gradle.properties file
56-
implementation "net.neoforged:neoforge:${project.neoforge_version}"
57-
5855
if (project.runtime_itemlist_mod == "jei") {
5956
implementation("mezz.jei:jei-${project.jei_minecraft_version}-neoforge:${project.jei_version}") {
6057
exclude group: "mezz.jei"
@@ -104,45 +101,48 @@ sourceSets {
104101
}
105102
}
106103

107-
minecraft {
108-
accessTransformers {
109-
file('src/main/resources/META-INF/accesstransformer.cfg')
110-
}
111-
}
104+
neoForge {
105+
version = project.neoforge_version
112106

113-
runs {
114-
configureEach {
115-
workingDirectory = project.file('run')
116-
modSources = [sourceSets.main]
117-
}
118-
client {
119-
}
120-
gametestWorld {
121-
configure("client")
122-
programArguments("--username", "MDDev", "--quickPlaySingleplayer", "GametestWorld")
123-
}
124-
server {
125-
}
126-
data {
127-
programArguments = [
128-
'--mod', 'moderndynamics',
129-
'--all',
130-
'--output', file('src/generated/resources/').absolutePath,
131-
'--existing', file('src/main/resources').absolutePath
132-
]
107+
mods {
108+
moderndynamics {
109+
sourceSet sourceSets.main
110+
}
133111
}
134-
// Use to run the tests
135-
gametest {
136-
configure("gameTestServer")
137-
workingDirectory = project.file("build/gametest")
112+
113+
runs {
114+
client {
115+
client()
116+
}
117+
gametestWorld {
118+
client()
119+
programArguments.addAll("--username", "MDDev", "--quickPlaySingleplayer", "GametestWorld")
120+
}
121+
server {
122+
server()
123+
}
124+
data {
125+
data()
126+
programArguments = [
127+
'--mod', 'moderndynamics',
128+
'--all',
129+
'--output', file('src/generated/resources/').absolutePath,
130+
'--existing', file('src/main/resources').absolutePath
131+
]
132+
}
133+
// Use to run the tests
134+
gametest {
135+
type = "gameTestServer"
136+
gameDirectory = project.file("build/gametest")
137+
}
138138
}
139139
}
140140

141141
test.dependsOn runGametest
142142

143143
java {
144144
toolchain {
145-
languageVersion = JavaLanguageVersion.of(17)
145+
languageVersion = JavaLanguageVersion.of(21)
146146
}
147147
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
148148
// if it is present.

gradle.properties

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ org.gradle.jvmargs=-Xmx1G \
99

1010
org.gradle.caching=true
1111
org.gradle.parallel=true
12+
org.gradle.configuration-cache=true
1213

13-
minecraft_version=1.20.4
14+
minecraft_version=1.21
1415

1516
# Mod Properties
1617
maven_group = dev.technici4n
@@ -19,25 +20,25 @@ curseforge_project = 552758
1920
modrinth_project = fMpvLrnF
2021

2122
# Dependencies
22-
neoforge_version=20.4.235
23+
neoforge_version=21.0.24-beta
2324

2425
#########################################################
2526
# Parchment #
2627
#########################################################
27-
neogradle.subsystems.parchment.minecraftVersion=1.20.3
28-
neogradle.subsystems.parchment.mappingsVersion=2023.12.26-nightly-SNAPSHOT
28+
neoForge.parchment.minecraftVersion=1.20.6
29+
neoForge.parchment.mappingsVersion=2024.06.16
2930

3031
# In-dev runtime mods
31-
rei_version=14.0.688
32+
rei_version=16.0.729
3233

33-
jei_minecraft_version=1.20.4
34-
jei_version=17.0.0.37
34+
jei_minecraft_version=1.21
35+
jei_version=19.0.0.1
3536

36-
emi_minecraft_version=1.20.4
37-
emi_version=1.1.0
37+
emi_minecraft_version=1.21
38+
emi_version=1.1.7
3839

3940
# Set to emi, jei, or rei to pick which tooltip mod gets picked at runtime
4041
# for the dev environment.
4142
runtime_itemlist_mod=emi
4243

43-
jade_file_id=5109393
44+
jade_file_id=5427817

gradle/wrapper/gradle-wrapper.jar

-15.7 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)