Fix gradle issues (compiling works again)

This commit is contained in:
James Seibel
2021-11-27 21:12:42 -06:00
parent a40417bbd6
commit 88c5fc8fde
3 changed files with 26 additions and 20 deletions
+25 -19
View File
@@ -2,21 +2,23 @@ buildscript {
repositories {
maven { url = 'https://files.minecraftforge.net' }
mavenCentral()
// potential replacement in case of problems:
// https://dist.creeper.host/Sponge/maven
// potential replacement in case of problems: https://dist.creeper.host/Sponge/maven
maven { url = 'https://repo.spongepowered.org/maven/' }
// used to download and compile dependencies from git repos
maven { url 'https://jitpack.io' }
gradlePluginPortal()
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
// Note to self: Don't try to update ForgeGradle!
// As of 11-27-2021 Mixins don't work on Gradle 7,
// which the newer versions of ForgeGradle use
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3+', changing: true
classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
}
}
plugins {
id "com.github.johnrengelman.shadow" version "7.0.0"
id "com.github.johnrengelman.shadow" version "4.0.4"
}
apply plugin: 'net.minecraftforge.gradle'
@@ -40,7 +42,7 @@ minecraft {
// Use non-default mappings at your own risk. they may not always work.
// Simply re-run your setup task after changing the mappings to update your workspace.
mappings channel: 'official', version: '1.16.5'
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
@@ -121,8 +123,19 @@ minecraft {
}
}
// Include resources generated by data generators.
sourceSets.main.resources { srcDir 'src/generated/resources' }
sourceSets {
main {
java {
// add Distant Horizon's Core source folders
srcDirs("core/src/main/java");
srcDirs("core/src/main/resources")
}
resources {
// Include resources generated by data generators.
srcDir("src/generated/resources")
}
}
}
// this is required so that we can use
// jitpack in the dependencies section below
@@ -142,8 +155,10 @@ dependencies {
// that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
// The userdev artifact is a special name and will get all sorts of transformations applied to it.
minecraft 'net.minecraftforge:forge:1.16.5-36.1.0'
// required to generate the mixin refmap
annotationProcessor 'org.spongepowered:mixin:0.8:processor'
implementation 'org.tukaani:xz:1.9'
shadowMe 'org.tukaani:xz:1.9'
implementation 'org.apache.commons:commons-compress:1.21'
@@ -179,7 +194,6 @@ dependencies {
// For more info...
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
// http://www.gradle.org/docs/current/userguide/dependency_management.html
}
task copyCoreResources(type: Copy) {
@@ -251,14 +265,6 @@ publishing {
mixin {
add sourceSets.main, "lod.refmap.json"
config "lod.mixins.json"
}
// add Distant Horizon's Core source folders
sourceSets {
main {
java {
srcDirs("core/src/main/java");
srcDirs("core/src/main/resources")
}
}
}
Binary file not shown.
+1 -1
View File
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists