Skip to content

Commit 9cde669

Browse files
TrinsdarTrinsdar
committed
switched forge module to MDG legacy
1 parent f67706a commit 9cde669

File tree

4 files changed

+57
-101
lines changed

4 files changed

+57
-101
lines changed

‎common/build.gradle

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
plugins {
22
id "fabric-loom"
33
}
4-
archivesBaseName = rootProject.tesseract_archive_base_name
4+
archivesBaseName = "${project.tesseract_archive_base_name}-common"
55

66
dependencies{
7-
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
7+
minecraft "com.mojang:minecraft:${project.minecraft_version}"
88
mappings loom.layered() {
99
officialMojangMappings()
10-
parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.mappings_version}@zip")
10+
parchment("org.parchmentmc.data:parchment-${project.minecraft_version}:${project.mappings_version}@zip")
1111
}
1212
//compileOnly("com.electronwill.night-config:toml:${rootProject.nightconfig_version}")
1313
//compileOnly("com.electronwill.night-config:core:${rootProject.nightconfig_version}")
@@ -23,18 +23,13 @@ publishing {
2323
}
2424

2525
repositories {
26-
def isCI = System.getenv("GITHUB_ACTION")
27-
def isRELEASE = System.getenv("GITHUB_RELEASE")
28-
if (isCI && isRELEASE) {
26+
def isCI = System.getenv("CI")
27+
if (isCI) {
2928
maven {
30-
url = "https://repo.repsy.io/mvn/trinsdar/gregtech-intergalactical/"
31-
credentials {
32-
username = System.getenv("MAVEN_USERNAME")
33-
password = System.getenv("MAVEN_PASSWORD")
34-
}
29+
url System.getenv("local_maven_url")
3530
}
3631
} else {
37-
maven { url "file:///${project.projectDir}/mcmodsrepo"}
32+
mavenLocal()
3833
}
3934
}
4035
}

‎fabric/build.gradle

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id "fabric-loom"
33
}
44

5-
archivesBaseName = "${rootProject.tesseract_archive_base_name}-fabric"
5+
archivesBaseName = "${project.tesseract_archive_base_name}-fabric"
66

77
sourceSets {
88
test {
@@ -36,19 +36,20 @@ repositories {
3636
}
3737

3838
dependencies {
39-
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
39+
minecraft "com.mojang:minecraft:${project.minecraft_version}"
4040
mappings loom.layered() {
4141
officialMojangMappings()
42-
parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.mappings_version}@zip")
42+
parchment("org.parchmentmc.data:parchment-${project.minecraft_version}:${project.mappings_version}@zip")
4343
}
44-
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
45-
modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
44+
modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
45+
modApi "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
46+
compileOnly(project(":tesseract-common"))
4647

47-
modApi(include("teamreborn:energy:${rootProject.energy_version}")) {
48+
modApi(include("teamreborn:energy:${project.energy_version}")) {
4849
transitive = false
4950
}
5051
modImplementation(include("earth.terrarium:botarium-fabric-${project.minecraft_version}:${project.botarium_version}"))
51-
modCompileOnly("curse.maven:modern_industrialization-405388:3866891")
52+
modCompileOnly("curse.maven:modern_industrialization-405388:${project.modern_industrialization_file}")
5253
modImplementation(include("maven.modrinth:carbon-config:${project.carbon_config_fabric_version}"))
5354
}
5455

@@ -61,7 +62,7 @@ processResources {
6162
}
6263
}
6364

64-
tasks.withType(JavaCompile) {
65+
tasks.named('compileJava', JavaCompile) {
6566
source(project(":tesseract-common").sourceSets.main.allSource)
6667
}
6768

@@ -77,18 +78,13 @@ publishing {
7778
}
7879

7980
repositories {
80-
def isCI = System.getenv("GITHUB_ACTION")
81-
def isRELEASE = System.getenv("GITHUB_RELEASE")
82-
if (isCI && isRELEASE) {
81+
def isCI = System.getenv("CI")
82+
if (isCI) {
8383
maven {
84-
url = "https://repo.repsy.io/mvn/trinsdar/gregtech-intergalactical/"
85-
credentials {
86-
username = System.getenv("MAVEN_USERNAME")
87-
password = System.getenv("MAVEN_PASSWORD")
88-
}
84+
url System.getenv("local_maven_url")
8985
}
9086
} else {
91-
maven { url "file:///${project.projectDir}/mcmodsrepo" }
87+
mavenLocal()
9288
}
9389
}
9490
}

‎fabric/gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
energy_version=2.2.0
22

3-
mod_version=0.2.4
3+
mod_version=0.2.4
4+
modern_industrialization_file=3866891

‎forge/build.gradle

Lines changed: 35 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,63 @@
11
plugins {
2-
id 'net.minecraftforge.gradle' version '[6.0,6.2)'
3-
id 'org.parchmentmc.librarian.forgegradle' version '1.+'
4-
id 'org.spongepowered.mixin' version '0.7.+'
2+
id "net.neoforged.moddev.legacyforge" version "2.0.55-beta"
53
}
6-
archivesBaseName = "${rootProject.tesseract_archive_base_name}-forge"
7-
8-
minecraft {
9-
// Change to your preferred mappings
10-
mappings channel: "parchment", version: "${rootProject.mappings_version}-${rootProject.minecraft_version}"
4+
archivesBaseName = "${project.tesseract_archive_base_name}-forge"
115

6+
neoForge {
7+
version = "${project.minecraft_version}-${project.forge_version}"
8+
def at = project(':tesseract-common').file('src/main/resources/META-INF/accesstransformer.cfg')
9+
if (at.exists()) {
10+
accessTransformers.add(at.absolutePath)
11+
}
12+
parchment {
13+
minecraftVersion = rootProject.minecraft_version
14+
mappingsVersion = rootProject.mappings_version
15+
}
1216
runs {
13-
// applies to all the run configs below
14-
configureEach {
15-
workingDirectory project.file('run')
16-
property 'forge.logging.markers', 'REGISTRIES'
17-
property 'forge.logging.console.level', 'debug'
18-
property 'mixin.env.remapRefMap', 'true'
19-
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
20-
21-
// Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
22-
property 'forge.enabledGameTestNamespaces', mod_id
23-
24-
mods {
25-
"${mod_id}" {
26-
source sourceSets.main
27-
}
28-
}
29-
}
30-
3117
client {
32-
property 'forge.enabledGameTestNamespaces', mod_id
18+
client()
3319
}
34-
35-
server {
36-
workingDirectory project.file('run/server')
37-
property 'forge.enabledGameTestNamespaces', mod_id
38-
args '--nogui'
20+
data {
21+
data()
3922
}
40-
41-
// This run config launches GameTestServer and runs all registered gametests, then exits.
42-
// By default, the server will crash when no gametests are provided.
43-
// The gametest system is also enabled by default for other run configs under the /test command.
44-
gameTestServer {
45-
property 'forge.enabledGameTestNamespaces', mod_id
23+
server {
24+
server()
4625
}
47-
48-
data {
49-
// example of overriding the workingDirectory set in configureEach above
50-
workingDirectory project.file('run-data')
51-
52-
// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
53-
args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
26+
}
27+
mods {
28+
"${project.mod_id}" {
29+
sourceSet sourceSets.main
5430
}
5531
}
5632
}
5733

5834
mixin {
5935
add sourceSets.main, "tesseract-forge.refmap.json"
6036
config "tesseract-forge.mixins.json"
61-
debug.verbose = true
62-
debug.export = true
6337
}
6438

65-
jarJar.enable()
66-
6739
dependencies {
68-
minecraft "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"
6940
implementation(fg.deobf("earth.terrarium:botarium-forge-${project.minecraft_version}:${project.botarium_version}")){
7041
exclude(group: "curse.maven")
7142
}
43+
compileOnly(project(":tesseract-common"))
7244
testImplementation('junit:junit:4.11')
7345
implementation(fg.deobf("maven.modrinth:carbon-config:${project.carbon_config_forge_version}"))
7446
jarJar("earth.terrarium:botarium-forge-${project.minecraft_version}:${project.botarium_version}"){
75-
jarJar.ranged(it, "[2.0.5,)")
47+
version {
48+
strictly "[${project.botarium_version},)"
49+
prefer "${project.botarium_version}"
50+
}
7651
}
7752
jarJar("maven.modrinth:carbon-config:${project.carbon_config_forge_version}"){
78-
jarJar.ranged(it, "[1.18.2-1.2.6,)")
53+
version {
54+
strictly("[1.18.2-1.2.6,)")
55+
prefer("[1.18.2-1.2.6,)")
56+
}
7957
}
8058
}
8159

82-
tasks.withType(JavaCompile) {
60+
tasks.named('compileJava', JavaCompile) {
8361
source(project(":tesseract-common").sourceSets.main.allSource)
8462
}
8563

@@ -96,10 +74,6 @@ sourcesJar {
9674
from(project(':tesseract-common').sourceSets.main.allSource)
9775
}
9876

99-
tasks.named('jarJar', Jar).configure {
100-
archiveClassifier.set("")
101-
}
102-
10377
tasks.named('jar', Jar).configure {
10478
manifest {
10579
attributes([
@@ -112,33 +86,23 @@ tasks.named('jar', Jar).configure {
11286
'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
11387
])
11488
}
115-
116-
// This is the preferred method to reobfuscate your jar file
117-
finalizedBy 'reobfJar'
118-
archiveClassifier.set "thin"
11989
}
12090

12191
publishing {
12292
publications {
12393
mavenJava(org.gradle.api.publish.maven.MavenPublication) {
12494
from components.java
125-
jarJar.component(it)
12695
}
12796
}
12897

12998
repositories {
130-
def isCI = System.getenv("GITHUB_ACTION")
131-
def isRELEASE = System.getenv("GITHUB_RELEASE")
132-
if (isCI && isRELEASE) {
99+
def isCI = System.getenv("CI")
100+
if (isCI) {
133101
maven {
134-
url = "https://repo.repsy.io/mvn/trinsdar/gregtech-intergalactical/"
135-
credentials {
136-
username = System.getenv("MAVEN_USERNAME")
137-
password = System.getenv("MAVEN_PASSWORD")
138-
}
102+
url System.getenv("local_maven_url")
139103
}
140104
} else {
141-
maven { url "file:///${project.projectDir}/mcmodsrepo"}
105+
mavenLocal()
142106
}
143107
}
144108
}

0 commit comments

Comments
 (0)