Skip to content

Commit

Permalink
Updated build files
Browse files Browse the repository at this point in the history
  • Loading branch information
Hexeption committed Mar 3, 2022
1 parent a45508e commit b63efe9
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 84 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
/projects/clean/
/projects/forge/
/projects/fmlonly/
/projects/magma/
#/patches/*

#occupational hazards
Expand Down
64 changes: 0 additions & 64 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,10 @@ println('Version: ' + VERSION +
' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ')' +
' Arch: ' + System.getProperty('os.arch'))

changelog {
fromTag MIN_TAG_FOR_CHANGELOG
}

def extraTxts = [
rootProject.file('CREDITS.txt'),
rootProject.file('LICENSE.txt'),
rootProject.tasks.createChangelog.outputFile
]

task downloadVersionManifest(type: Download) {
Expand Down Expand Up @@ -175,21 +171,6 @@ project(':clean') {
mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION

runs {
clean_client {
client true
taskName 'clean_client'
ideaModule "${rootProject.name}.${project.name}.main"

main 'net.minecraft.client.main.Main'
workingDirectory project.file('run')

args '--gameDir', '.'
args '--version', MC_VERSION
args '--assetsDir', downloadAssets.output
args '--assetIndex', '{asset_index}'
args '--accessToken', '0'
}

clean_server {
client false
taskName 'clean_server'
Expand Down Expand Up @@ -321,21 +302,6 @@ def sharedFmlonlyForge = { Project prj ->
//libraries.add("${project.group}:${project.name}:${project.version}:launcher")
inject = '' // We don't have a userdev sourceset anymore. Empty as a gradle workaround...
runs {
client {
environment 'MOD_CLASSES', '{source_roots}'
environment 'MCP_MAPPINGS', '{mcp_mappings}'

property 'nativesDirectory', '{natives}'
if (prj.name == 'forge') {
property 'forge.enableGameTest', 'true'
}

args '--launchTarget', "${launchPrefix}clientuserdev"
args '--version', 'MOD_DEV'
args '--assetIndex', '{asset_index}'
args '--assetsDir', '{assets_root}'
}

server {
environment 'MOD_CLASSES', '{source_roots}'
environment 'MCP_MAPPINGS', '{mcp_mappings}'
Expand Down Expand Up @@ -540,14 +506,6 @@ project(':fmlonly') {

mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
runs {
fmlonly_client {
args '--launchTarget', 'fmlclientdev'
ideaModule "${rootProject.name}.${project.name}.main"

mods {
minecraft { source sourceSets.main }
}
}
fmlonly_server {
args '--launchTarget', 'fmlserverdev'
ideaModule "${rootProject.name}.${project.name}.main"
Expand Down Expand Up @@ -889,28 +847,6 @@ project(':forge') {
sideAnnotationStrippers.from file("$rootDir/src/main/resources/forge.sas")

runs {
forge_client {
property 'eventbus.checkTypesOnDispatch', 'true'
args '--launchTarget', 'forgeclientdev'
ideaModule "${rootProject.name}.${project.name}.main"
mods {
minecraft { source sourceSets.main }
}
}

forge_test_client {
parent runs.forge_client
taskName 'forge_test_client'

property 'forge.enableGameTest', 'true'
environment 'MOD_CLASSES', 'dummy' // Needed to work around FG limitation, FG will replace this!

ideaModule "${rootProject.name}.${project.name}.test"

mods {
tests { sources sourceSets.test }
}
}

forge_server {
args '--launchTarget', 'forgeserverdev'
Expand Down
5 changes: 0 additions & 5 deletions fmlcore/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,3 @@ artifacts {
archives jar
archives sourcesJar
}

publishing.publications.mavenJava(MavenPublication) {
from components.java
artifact sourcesJar
}
5 changes: 0 additions & 5 deletions fmlloader/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,3 @@ artifacts {
archives jar
archives sourcesJar
}

publishing.publications.mavenJava(MavenPublication) {
from components.java
artifact sourcesJar
}
5 changes: 0 additions & 5 deletions javafmllanguage/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,3 @@ artifacts {
archives jar
archives sourcesJar
}

publishing.publications.mavenJava(MavenPublication) {
from components.java
artifact sourcesJar
}
5 changes: 0 additions & 5 deletions mclanguage/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,3 @@ artifacts {
archives jar
archives sourcesJar
}

publishing.publications.mavenJava(MavenPublication) {
from components.java
artifact sourcesJar
}

0 comments on commit b63efe9

Please sign in to comment.