Skip to content

Commit

Permalink
switched forge module to MDG legacy
Browse files Browse the repository at this point in the history
  • Loading branch information
@Trinsdar
Trinsdar committed Dec 8, 2024
1 parent f67706a commit 9cde669
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 101 deletions.
19 changes: 7 additions & 12 deletions common/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
plugins {
id "fabric-loom"
}
archivesBaseName = rootProject.tesseract_archive_base_name
archivesBaseName = "${project.tesseract_archive_base_name}-common"

dependencies{
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings loom.layered() {
officialMojangMappings()
parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.mappings_version}@zip")
parchment("org.parchmentmc.data:parchment-${project.minecraft_version}:${project.mappings_version}@zip")
}
//compileOnly("com.electronwill.night-config:toml:${rootProject.nightconfig_version}")
//compileOnly("com.electronwill.night-config:core:${rootProject.nightconfig_version}")
Expand All @@ -23,18 +23,13 @@ publishing {
}

repositories {
def isCI = System.getenv("GITHUB_ACTION")
def isRELEASE = System.getenv("GITHUB_RELEASE")
if (isCI && isRELEASE) {
def isCI = System.getenv("CI")
if (isCI) {
maven {
url = "https://repo.repsy.io/mvn/trinsdar/gregtech-intergalactical/"
credentials {
username = System.getenv("MAVEN_USERNAME")
password = System.getenv("MAVEN_PASSWORD")
}
url System.getenv("local_maven_url")
}
} else {
maven { url "file:///${project.projectDir}/mcmodsrepo"}
mavenLocal()
}
}
}
30 changes: 13 additions & 17 deletions fabric/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
id "fabric-loom"
}

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

sourceSets {
test {
Expand Down Expand Up @@ -36,19 +36,20 @@ repositories {
}

dependencies {
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings loom.layered() {
officialMojangMappings()
parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.mappings_version}@zip")
parchment("org.parchmentmc.data:parchment-${project.minecraft_version}:${project.mappings_version}@zip")
}
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
modApi "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
compileOnly(project(":tesseract-common"))

modApi(include("teamreborn:energy:${rootProject.energy_version}")) {
modApi(include("teamreborn:energy:${project.energy_version}")) {
transitive = false
}
modImplementation(include("earth.terrarium:botarium-fabric-${project.minecraft_version}:${project.botarium_version}"))
modCompileOnly("curse.maven:modern_industrialization-405388:3866891")
modCompileOnly("curse.maven:modern_industrialization-405388:${project.modern_industrialization_file}")
modImplementation(include("maven.modrinth:carbon-config:${project.carbon_config_fabric_version}"))
}

Expand All @@ -61,7 +62,7 @@ processResources {
}
}

tasks.withType(JavaCompile) {
tasks.named('compileJava', JavaCompile) {
source(project(":tesseract-common").sourceSets.main.allSource)
}

Expand All @@ -77,18 +78,13 @@ publishing {
}

repositories {
def isCI = System.getenv("GITHUB_ACTION")
def isRELEASE = System.getenv("GITHUB_RELEASE")
if (isCI && isRELEASE) {
def isCI = System.getenv("CI")
if (isCI) {
maven {
url = "https://repo.repsy.io/mvn/trinsdar/gregtech-intergalactical/"
credentials {
username = System.getenv("MAVEN_USERNAME")
password = System.getenv("MAVEN_PASSWORD")
}
url System.getenv("local_maven_url")
}
} else {
maven { url "file:///${project.projectDir}/mcmodsrepo" }
mavenLocal()
}
}
}
3 changes: 2 additions & 1 deletion fabric/gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
energy_version=2.2.0

mod_version=0.2.4
mod_version=0.2.4
modern_industrialization_file=3866891
106 changes: 35 additions & 71 deletions forge/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,85 +1,63 @@
plugins {
id 'net.minecraftforge.gradle' version '[6.0,6.2)'
id 'org.parchmentmc.librarian.forgegradle' version '1.+'
id 'org.spongepowered.mixin' version '0.7.+'
id "net.neoforged.moddev.legacyforge" version "2.0.55-beta"
}
archivesBaseName = "${rootProject.tesseract_archive_base_name}-forge"

minecraft {
// Change to your preferred mappings
mappings channel: "parchment", version: "${rootProject.mappings_version}-${rootProject.minecraft_version}"
archivesBaseName = "${project.tesseract_archive_base_name}-forge"

neoForge {
version = "${project.minecraft_version}-${project.forge_version}"
def at = project(':tesseract-common').file('src/main/resources/META-INF/accesstransformer.cfg')
if (at.exists()) {
accessTransformers.add(at.absolutePath)
}
parchment {
minecraftVersion = rootProject.minecraft_version
mappingsVersion = rootProject.mappings_version
}
runs {
// applies to all the run configs below
configureEach {
workingDirectory project.file('run')
property 'forge.logging.markers', 'REGISTRIES'
property 'forge.logging.console.level', 'debug'
property 'mixin.env.remapRefMap', 'true'
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"

// Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
property 'forge.enabledGameTestNamespaces', mod_id

mods {
"${mod_id}" {
source sourceSets.main
}
}
}

client {
property 'forge.enabledGameTestNamespaces', mod_id
client()
}

server {
workingDirectory project.file('run/server')
property 'forge.enabledGameTestNamespaces', mod_id
args '--nogui'
data {
data()
}

// This run config launches GameTestServer and runs all registered gametests, then exits.
// By default, the server will crash when no gametests are provided.
// The gametest system is also enabled by default for other run configs under the /test command.
gameTestServer {
property 'forge.enabledGameTestNamespaces', mod_id
server {
server()
}

data {
// example of overriding the workingDirectory set in configureEach above
workingDirectory project.file('run-data')

// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
}
mods {
"${project.mod_id}" {
sourceSet sourceSets.main
}
}
}

mixin {
add sourceSets.main, "tesseract-forge.refmap.json"
config "tesseract-forge.mixins.json"
debug.verbose = true
debug.export = true
}

jarJar.enable()

dependencies {
minecraft "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"
implementation(fg.deobf("earth.terrarium:botarium-forge-${project.minecraft_version}:${project.botarium_version}")){
exclude(group: "curse.maven")
}
compileOnly(project(":tesseract-common"))
testImplementation('junit:junit:4.11')
implementation(fg.deobf("maven.modrinth:carbon-config:${project.carbon_config_forge_version}"))
jarJar("earth.terrarium:botarium-forge-${project.minecraft_version}:${project.botarium_version}"){
jarJar.ranged(it, "[2.0.5,)")
version {
strictly "[${project.botarium_version},)"
prefer "${project.botarium_version}"
}
}
jarJar("maven.modrinth:carbon-config:${project.carbon_config_forge_version}"){
jarJar.ranged(it, "[1.18.2-1.2.6,)")
version {
strictly("[1.18.2-1.2.6,)")
prefer("[1.18.2-1.2.6,)")
}
}
}

tasks.withType(JavaCompile) {
tasks.named('compileJava', JavaCompile) {
source(project(":tesseract-common").sourceSets.main.allSource)
}

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

tasks.named('jarJar', Jar).configure {
archiveClassifier.set("")
}

tasks.named('jar', Jar).configure {
manifest {
attributes([
Expand All @@ -112,33 +86,23 @@ tasks.named('jar', Jar).configure {
'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
])
}

// This is the preferred method to reobfuscate your jar file
finalizedBy 'reobfJar'
archiveClassifier.set "thin"
}

publishing {
publications {
mavenJava(org.gradle.api.publish.maven.MavenPublication) {
from components.java
jarJar.component(it)
}
}

repositories {
def isCI = System.getenv("GITHUB_ACTION")
def isRELEASE = System.getenv("GITHUB_RELEASE")
if (isCI && isRELEASE) {
def isCI = System.getenv("CI")
if (isCI) {
maven {
url = "https://repo.repsy.io/mvn/trinsdar/gregtech-intergalactical/"
credentials {
username = System.getenv("MAVEN_USERNAME")
password = System.getenv("MAVEN_PASSWORD")
}
url System.getenv("local_maven_url")
}
} else {
maven { url "file:///${project.projectDir}/mcmodsrepo"}
mavenLocal()
}
}
}

0 comments on commit 9cde669

Please sign in to comment.