Added a small error if the user forgot to clone the sub-project, and some extra comments
This commit is contained in:
+9
-1
@@ -313,10 +313,17 @@ subprojects { p ->
|
||||
|
||||
// Put stuff from gradle.properties into the mod info
|
||||
processResources {
|
||||
duplicatesStrategy = DuplicatesStrategy.WARN
|
||||
// Include all the resources
|
||||
from project(":common").sourceSets.main.resources
|
||||
from project(":core").sourceSets.main.resources
|
||||
from project(":api").sourceSets.main.resources
|
||||
|
||||
// Copy accessWideners
|
||||
// FIXME: remove copyCommonLoaderResources and use this instead (and if you are removing that task, also remove copyCoreResources while your at it)
|
||||
// from project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener")
|
||||
// into(file(p.file("build/resources/main")))
|
||||
// rename "${accessWidenerVersion}.distanthorizons.accesswidener", "distanthorizons.accesswidener"
|
||||
|
||||
// Location of where to inject the properties
|
||||
def resourceTargets = [
|
||||
@@ -476,7 +483,7 @@ allprojects { p ->
|
||||
javadoc.title = rootProject.mod_name + "-" + project.name
|
||||
|
||||
// Some annotations arent "technically" part of the official java standard,
|
||||
// so we define it ourself here
|
||||
// so we define it ourself here
|
||||
javadoc {
|
||||
configure( options ) {
|
||||
tags(
|
||||
@@ -563,6 +570,7 @@ allprojects { p ->
|
||||
// Set the OS lwjgl is using to the current os
|
||||
project.ext.lwjglNatives = "natives-" + os.toFamilyName()
|
||||
|
||||
// TODO: Include Minecraft in core-projects but dont include MC code stuff
|
||||
dependencies { // All of these dependencies are in Vanilla Minecraft, but we need to depend on it as we arent importing Minecraft in the core
|
||||
// Imports most of lwjgl's libraries (well, only the ones that we need)
|
||||
implementation platform("org.lwjgl:lwjgl-bom:${rootProject.lwjgl_version}") // TODO: Use Minecraft's version for lwjgl_version (which changes in nearly every version) instead of a hard defined version for all versions
|
||||
|
||||
@@ -50,6 +50,21 @@ plugins {
|
||||
|
||||
|
||||
|
||||
// Throw an error and a little help message if the user forgot to clone the core sub-project
|
||||
if (!file("./coreSubProjects/LICENSE.txt").exists()) { // the LICENCE.txt file should always, and only exist if the core-sub-project was cloned
|
||||
println('''
|
||||
It seems that the core sub project was not included...
|
||||
please make sure that when you were cloning the repo, you were using the `--recurse-submodules` flag on git.
|
||||
and if its too late now to re-clone the project, please grab the core sub project in whatever way you can from https://gitlab.com/jeseibel/distant-horizons-core.git
|
||||
|
||||
If you still need help with compiling, please read the Readme.md
|
||||
''')
|
||||
throw new GradleException("coreSubProject not found")
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/** Loads the VersionProperties fiel for the currently selected Minecraft version. */
|
||||
def loadProperties() {
|
||||
def defaultMcVersion = "1.20.1" // 1.20.1 is our current most stable version so we use that if no version was defined
|
||||
|
||||
Reference in New Issue
Block a user