diff --git a/README.md b/README.md index 2af11e0..fd202be 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ We also have described guidelines for existing mod [migration](docs/migration.md - Optional version replacement in Java files - Optional shadowing of dependencies - Simplified setup of Mixin and example + - Scala support - Optional named developer account for consistent player progression during testing - Boilerplate forge mod as starting point - Improved warnings for pitfalls diff --git a/build.gradle b/build.gradle index 3041be1..e9345da 100644 --- a/build.gradle +++ b/build.gradle @@ -37,8 +37,9 @@ plugins { id("com.palantir.git-version") version("0.12.3") } +apply plugin: 'scala' apply plugin: 'forge' -apply plugin: 'idea' +apply plugin: 'idea' java { toolchain { @@ -81,22 +82,28 @@ def checkPropertyExists(String propertyName) { } } -String targetPackage = "src/main/java/" + modGroup.toString().replaceAll("\\.", "/") -if(new File(targetPackage).exists() == false) { - throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackage) + +String javaSourceDir = "src/main/java/" +String scalaSourceDir = "src/main/scala/" + +String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") +String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") +if((new File(targetPackageJava).exists() || new File(targetPackageScala).exists()) == false) { + throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala) } if(apiPackage) { - targetPackage = "src/main/java/" + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") - if(new File(targetPackage).exists() == false) { - throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackage) + targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + if((new File(targetPackageJava).exists() || new File(targetPackageScala).exists()) == false) { + throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala) } } if(accessTransformersFile) { - targetPackage = "src/main/resources/META-INF/" + accessTransformersFile - if(new File(targetPackage).exists() == false) { - throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetPackage) + String targetFile = "src/main/resources/META-INF/" + accessTransformersFile + if(new File(targetFile).exists() == false) { + throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile) } } @@ -105,21 +112,24 @@ if(usesMixins.toBoolean()) { throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!") } - targetPackage = "src/main/java/" + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/") - if(new File(targetPackage).exists() == false) { - throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackage) + targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/") + targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/") + if((new File(targetPackageJava).exists() || new File(targetPackageScala).exists()) == false) { + throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala) } - String targetFile = "src/main/java/" + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java" - if(new File(targetFile).exists() == false) { - throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFile) + String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java" + String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala" + if((new File(targetFileJava).exists() || new File(targetFileScala).exists()) == false) { + throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala) } } if(coreModClass) { - String targetFile = "src/main/java/" + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java" - if(new File(targetFile).exists() == false) { - throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFile) + String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java" + String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala" + if((new File(targetFileJava).exists() || new File(targetFileScala).exists()) == false) { + throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFile + " or " + targetFileScala) } }