mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-12-12 03:00:30 +00:00
Code Issues Releases Wiki Activity

Make CC:T work as a non-root project

Browse Source
This commit is contained in:
Jonathan Coates 2021-01-08 16:16:56 +00:00
parent b2e5401486
commit 2232f025b8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build.gradle
View File

@ -50,7 +50,7 @@ minecraft {
} }
server { server {
workingDirectory project.file("run/server-${mc_version}") workingDirectory project.file("run/server")
property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP' property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
property 'forge.logging.console.level', 'debug' property 'forge.logging.console.level', 'debug'
@ -388,14 +388,14 @@ license {
it.configure { it.configure {
include("**/*.java") include("**/*.java")
exclude("dan200/computercraft/api/**") exclude("dan200/computercraft/api/**")
header rootProject.file('config/license/main.txt') header file('config/license/main.txt')
} }
} }
[licenseTest, licenseFormatTest].forEach { [licenseTest, licenseFormatTest].forEach {
it.configure { it.configure {
include("**/*.java") include("**/*.java")
header rootProject.file('config/license/main.txt') header file('config/license/main.txt')
} }
} }
@ -412,7 +412,7 @@ task licenseFormatAPI(type: LicenseFormat);
it.configure { it.configure {
source = sourceSets.main.java source = sourceSets.main.java
include("dan200/computercraft/api/**") include("dan200/computercraft/api/**")
header rootProject.file('config/license/api.txt') header file('config/license/api.txt')
} }
} }
@ -430,7 +430,7 @@ task checkRelease {
def ok = true def ok = true
// Check we're targetting the current version // Check we're targetting the current version
def whatsnew = new File("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt").readLines() def whatsnew = new File(projectDir, "src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt").readLines()
if (whatsnew[0] != "New features in CC: Tweaked $mod_version") { if (whatsnew[0] != "New features in CC: Tweaked $mod_version") {
ok = false ok = false
project.logger.error("Expected `whatsnew.txt' to target $mod_version.") project.logger.error("Expected `whatsnew.txt' to target $mod_version.")
@ -447,7 +447,7 @@ task checkRelease {
// Check whatsnew and changelog match. // Check whatsnew and changelog match.
def versionChangelog = "# " + whatsnew.join("\n") def versionChangelog = "# " + whatsnew.join("\n")
def changelog = new File("src/main/resources/data/computercraft/lua/rom/help/changelog.txt").getText() def changelog = new File(projectDir, "src/main/resources/data/computercraft/lua/rom/help/changelog.txt").getText()
if (!changelog.startsWith(versionChangelog)) { if (!changelog.startsWith(versionChangelog)) {
ok = false ok = false
project.logger.error("whatsnew and changelog are not in sync") project.logger.error("whatsnew and changelog are not in sync")
@ -535,7 +535,7 @@ githubRelease {
tagName "v${mc_version}-${mod_version}" tagName "v${mc_version}-${mod_version}"
releaseName "[${mc_version}] ${mod_version}" releaseName "[${mc_version}] ${mod_version}"
body { body {
"## " + new File("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt") "## " + new File(projectDir, "src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt")
.readLines() .readLines()
.takeWhile { it != 'Type "help changelog" to see the full version history.' } .takeWhile { it != 'Type "help changelog" to see the full version history.' }
.join("\n").trim() .join("\n").trim()

2
config/checkstyle/checkstyle.xml
View File

@ -7,7 +7,7 @@
<property name="charset" value="UTF-8" /> <property name="charset" value="UTF-8" />
<module name="SuppressionFilter"> <module name="SuppressionFilter">
<property name="file" value="config/checkstyle/suppressions.xml" /> <property name="file" value="${config_loc}/suppressions.xml" />
</module> </module>
<module name="BeforeExecutionExclusionFileFilter"> <module name="BeforeExecutionExclusionFileFilter">