Skip to content

Commit 50c04fd

Browse files
committed
Prepare gradle for remapping
1 parent 8edf357 commit 50c04fd

File tree

5 files changed

+219
-174
lines changed

5 files changed

+219
-174
lines changed

build.gradle

+20-35
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
buildscript {
22
repositories {
3-
maven { url = 'https://files.minecraftforge.net/maven' }
3+
maven { url = 'https://maven.minecraftforge.net' }
44
maven { url = 'https://repo.spongepowered.org/maven' }
55
jcenter()
66
mavenCentral()
77
}
88
dependencies {
9-
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
9+
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1+', changing: true
1010
classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
1111
}
1212
}
@@ -18,7 +18,7 @@ plugins {
1818
apply plugin: 'net.minecraftforge.gradle'
1919
apply plugin: 'org.spongepowered.mixin'
2020
apply plugin: 'eclipse'
21-
apply plugin: 'maven'
21+
apply plugin: 'maven-publish'
2222

2323
apply plugin: 'pmd'
2424

@@ -31,7 +31,8 @@ archivesBaseName = config.mod_name
3131

3232
compileJava.options.compilerArgs << "-Xlint:all,-classfile,-processing,-deprecation" << "-Werror"
3333

34-
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
34+
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
35+
println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
3536

3637
if (System.getenv('BUILD_NUMBER') != null) {
3738
version += "." + System.getenv('BUILD_NUMBER')
@@ -56,12 +57,6 @@ minecraft {
5657
workingDirectory project.file('run')
5758
arg "-mixin.config=quark.mixins.json"
5859

59-
// Recommended logging data for a userdev environment
60-
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
61-
62-
// Recommended logging level for the console
63-
property 'forge.logging.console.level', 'debug'
64-
6560
mods {
6661
examplemod {
6762
source sourceSets.main
@@ -73,12 +68,6 @@ minecraft {
7368
workingDirectory project.file('run')
7469
arg "-mixin.config=quark.mixins.json"
7570

76-
// Recommended logging data for a userdev environment
77-
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
78-
79-
// Recommended logging level for the console
80-
property 'forge.logging.console.level', 'debug'
81-
8271
mods {
8372
examplemod {
8473
source sourceSets.main
@@ -96,29 +85,24 @@ repositories {
9685
maven {
9786
// for AutoRegLib
9887
name "blamejared"
99-
url "http://maven.blamejared.com/"
88+
url "https://maven.blamejared.com/"
10089
}
101-
maven {
90+
/*maven {
10291
// for JEI
10392
name "progwml6"
10493
url "http://dvs1.progwml6.com/files/maven"
105-
}
106-
maven {
107-
// for Mappings
108-
name "gigaherz"
109-
url "http://dogforce-games.com/maven/"
110-
}
94+
}*/
11195
}
11296

11397

11498
dependencies {
11599
minecraft "net.minecraftforge:forge:${config.mc_version}-${config.forge_version}"
116100

117-
compile fg.deobf("vazkii.autoreglib:AutoRegLib:${config.arl_version}")
118-
119-
compileOnly fg.deobf("mezz.jei:${config.jei_version}:api")
120-
runtimeOnly fg.deobf("mezz.jei:${config.jei_version}")
101+
compileOnly fg.deobf("vazkii.autoreglib:AutoRegLib:${config.arl_version}")
102+
runtimeOnly fg.deobf("vazkii.autoreglib:AutoRegLib:${config.arl_version}")
121103

104+
//compileOnly fg.deobf("mezz.jei:${config.jei_version}:api")
105+
//runtimeOnly fg.deobf("mezz.jei:${config.jei_version}")
122106
}
123107

124108
spotless {
@@ -229,12 +213,13 @@ jar {
229213
// archives deobfJar
230214
//}
231215

232-
uploadArchives {
233-
repositories {
234-
mavenDeployer {
235-
repository(url: "file://" + (System.getenv("local_maven") != null ? System.getenv("local_maven") : System.getenv("bamboo_local_maven")))
236-
}
237-
}
238-
}
216+
// TODO Jared you figure this one out
217+
//uploadArchives {
218+
// repositories {
219+
// mavenDeployer {
220+
// repository(url: "file://" + (System.getenv("local_maven") != null ? System.getenv("local_maven") : System.getenv("bamboo_local_maven")))
221+
// }
222+
// }
223+
//}
239224

240225
defaultTasks 'clean', 'build', 'sortArtifacts', 'incrementBuildNumber'

gradle/wrapper/gradle-wrapper.jar

4.71 KB
Binary file not shown.
+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Thu Aug 15 08:53:26 EDT 2019
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip

0 commit comments

Comments
 (0)