Skip to content

Commit a7c57e7

Browse files
committed
move to moddevgradle
1 parent 34f0628 commit a7c57e7

File tree

4 files changed

+61
-37
lines changed

4 files changed

+61
-37
lines changed

build.gradle

Lines changed: 57 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
plugins {
22
id "idea"
3+
id "eclipse"
34
id "maven-publish"
4-
id 'net.minecraftforge.gradle' version '[6.0,6.2)'
5-
id 'org.parchmentmc.librarian.forgegradle' version '1.+'
5+
id 'net.neoforged.moddev.legacyforge' version '2.0.91'
66
id 'com.diffplug.spotless' version '7.0.2'
77
}
88

99
def generatedResources = file("src/generated")
1010

1111
sourceSets {
12-
main {
13-
resources.srcDir generatedResources
12+
main.resources {
13+
srcDir generatedResources
1414
}
1515
}
1616

@@ -83,27 +83,51 @@ base { archivesName = archives_base_name }
8383
java { sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17 }
8484
sourceSets.main.resources { srcDir 'src/generated/resources' }
8585

86-
minecraft {
87-
mappings channel: mapping_channel, version: mapping_version
88-
copyIdeResources = true
86+
legacyForge {
87+
version = project.minecraft_version + '-' + project.forge_version
88+
89+
parchment {
90+
mappingsVersion = project.mapping_version
91+
minecraftVersion = project.minecraft_version
92+
}
93+
8994
runs {
9095
configureEach {
91-
workingDirectory project.file('run')
92-
property 'forge.logging.markers', 'REGISTRIES'
93-
property 'forge.logging.console.level', 'debug'
94-
mods { "${mod_id}" { source sourceSets.main } }
95-
property 'mixin.env.remapRefMap', 'true'
96-
property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
96+
// Recommended logging data for a userdev environment
97+
// The markers can be added/remove as needed separated by commas.
98+
// "SCAN": For mods scan.
99+
// "REGISTRIES": For firing of registry events.
100+
// "REGISTRYDUMP": For getting the contents of all registries.
101+
systemProperty 'forge.logging.markers', 'REGISTRIES'
102+
103+
// Recommended logging level for the console
104+
// You can set various levels here.
105+
// Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
106+
logLevel = org.slf4j.event.Level.DEBUG
107+
}
108+
client {
109+
client()
110+
sourceSet = sourceSets.main
111+
systemProperty('forge.enabledGameTestNamespaces', project.mod_id)
112+
}
113+
server {
114+
server()
115+
sourceSet = sourceSets.main
116+
systemProperty('forge.enabledGameTestNamespaces', project.mod_id)
117+
programArguments.addAll('--nogui', '--world', 'world-extra')
97118
}
98-
client { property 'forge.enabledGameTestNamespaces', mod_id }
99-
server { property 'forge.enabledGameTestNamespaces', mod_id; args '--nogui' }
100119
data {
101-
// example of overriding the workingDirectory set in configureEach above
102-
workingDirectory project.file('run-data')
120+
data()
121+
sourceSet = sourceSets.main
103122

104123
// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
105-
args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
106-
args '--existing-mod', 'gtceu'
124+
programArguments.addAll('--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath())
125+
programArguments.addAll('--existing-mod', 'gtceu')
126+
}
127+
}
128+
mods {
129+
"${mod_id}" {
130+
sourceSet(sourceSets.main)
107131
}
108132
}
109133
}
@@ -112,25 +136,24 @@ minecraft {
112136
apply from: "$rootDir/gradle/scripts/spotless.gradle"
113137

114138
dependencies {
115-
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
139+
compileOnly("org.jetbrains:annotations:26.0.1")
116140

117141
// JEI, EMI, Jade
118-
compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")
119-
compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
120-
runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")
121-
runtimeOnly fg.deobf("dev.emi:emi-forge:${emi_version}+${minecraft_version}")
122-
runtimeOnly fg.deobf("curse.maven:jade-324717:5390389")
123-
compileOnly fg.deobf("curse.maven:jade-324717:5390389")
142+
modCompileOnly("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")
143+
modCompileOnly("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
144+
modRuntimeOnly("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")
145+
modRuntimeOnly("dev.emi:emi-forge:${emi_version}+${minecraft_version}")
146+
modImplementation("curse.maven:jade-324717:5390389")
124147

125148
// GregTech and dependencies
126-
implementation fg.deobf("com.gregtechceu.gtceu:gtceu-${minecraft_version}:${gtceu_version}:slim") { transitive = false }
127-
implementation fg.deobf("com.lowdragmc.ldlib:ldlib-forge-${minecraft_version}:${ldlib_version}") { transitive = false }
128-
implementation fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}")
129-
implementation fg.deobf("dev.latvian.mods:kubejs-forge:${kubejs_version}")
130-
implementation fg.deobf("dev.latvian.mods:rhino-forge:${rhino_version}")
131-
implementation fg.deobf("dev.toma.configuration:configuration-forge-${minecraft_version}:${configuration_version}")
132-
runtimeOnly fg.deobf("dev.architectury:architectury-forge:${architectury_version}")
133-
implementation fg.deobf("appeng:appliedenergistics2-forge:${appeng_version}")
149+
modImplementation("com.gregtechceu.gtceu:gtceu-${minecraft_version}:${gtceu_version}:slim") { transitive = false }
150+
modImplementation("com.lowdragmc.ldlib:ldlib-forge-${minecraft_version}:${ldlib_version}") { transitive = false }
151+
modImplementation("com.tterrag.registrate:Registrate:${registrate_version}")
152+
modImplementation("dev.latvian.mods:kubejs-forge:${kubejs_version}")
153+
modImplementation("dev.latvian.mods:rhino-forge:${rhino_version}")
154+
modImplementation("dev.toma.configuration:configuration-forge-${minecraft_version}:${configuration_version}")
155+
modRuntimeOnly("dev.architectury:architectury-forge:${architectury_version}")
156+
modImplementation("appeng:appliedenergistics2-forge:${appeng_version}")
134157

135158
// lombok
136159
compileOnly 'org.projectlombok:lombok:1.18.24'

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
88
# forge version, latest version can be found on https://files.minecraftforge.net/
99
forge_version=47.3.0
1010
mapping_channel=parchment
11-
mapping_version=2023.09.03-1.20.1
11+
mapping_version=2023.09.03
1212

1313
# Mod Properties
1414
mod_version=2.2.3

settings.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ pluginManagement {
77
maven { url = 'https://maven.parchmentmc.org' }
88
}
99
}
10+
plugins {
11+
id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
12+
}

src/main/java/net/neganote/gtutilities/datagen/lang/UtilLangHandler.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ public static void init(RegistrateLangProvider provider) {
4444

4545
provider.add("config.jade.plugin_gtmutils.pterb_info", "WAT Info");
4646

47-
provider.add("material.gtmutils.quantum_coolant", "Quantum Coolant");
48-
4947
multiLang(provider, "gtceu.placeholder_info.watfrequency",
5048
"Returns the current frequency used by a Wireless Active Transformer.",
5149
"Usage:",

0 commit comments

Comments
 (0)