AtlasMediaGroup/Scissors
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/Scissors.git synced 2024-11-27 07:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lowercase project names and exclude paper-api from paper-mojangapi

Browse Source
This commit is contained in:
Jason Penilla 2021-12-02 20:58:35 -08:00
parent ad960f72e1
commit 74b34eec95
No known key found for this signature in database
GPG Key ID: 0E75A301420E48F8
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -46,7 +46,7 @@ out/
# other stuff # other stuff
run/ run/
ForkTest-Server forktest-server
ForkTest-API forktest-api
!gradle/wrapper/gradle-wrapper.jar !gradle/wrapper/gradle-wrapper.jar

6
build.gradle.kts
View File

@ -50,7 +50,7 @@ subprojects {
} }
paperweight { paperweight {
serverProject.set(project(":ForkTest-Server")) serverProject.set(project(":forktest-server"))
remapRepo.set("https://maven.fabricmc.net/") remapRepo.set("https://maven.fabricmc.net/")
decompileRepo.set("https://files.minecraftforge.net/maven/") decompileRepo.set("https://files.minecraftforge.net/maven/")
@ -58,10 +58,10 @@ paperweight {
usePaperUpstream(providers.gradleProperty("paperRef")) { usePaperUpstream(providers.gradleProperty("paperRef")) {
withPaperPatcher { withPaperPatcher {
apiPatchDir.set(layout.projectDirectory.dir("patches/api")) apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
apiOutputDir.set(layout.projectDirectory.dir("ForkTest-API")) apiOutputDir.set(layout.projectDirectory.dir("forktest-api"))
serverPatchDir.set(layout.projectDirectory.dir("patches/server")) serverPatchDir.set(layout.projectDirectory.dir("patches/server"))
serverOutputDir.set(layout.projectDirectory.dir("ForkTest-Server")) serverOutputDir.set(layout.projectDirectory.dir("forktest-server"))
} }
} }
} }

16
patches/server/0001-Build-changes.patch
View File

@ -5,21 +5,25 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index cd74406039704e5a880f00b9b60bb7b1dedc5398..f11c3e2eb81181075c51c624e00c466de50d3a18 100644 index cd74406039704e5a880f00b9b60bb7b1dedc5398..c4dfc34277e59143d346725c9ef2bfbcee59bc06 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -18,8 +18,8 @@ repositories { @@ -18,8 +18,12 @@ repositories {
} }
dependencies { dependencies {
- implementation(project(":paper-api")) - implementation(project(":paper-api"))
- implementation(project(":paper-mojangapi")) - implementation(project(":paper-mojangapi"))
+ implementation(project(":ForkTest-API")) // ForkTest + // ForkTest start
+ implementation("io.papermc.paper:paper-mojangapi:1.18-R0.1-SNAPSHOT") // ForkTest + implementation(project(":forktest-api"))
+ implementation("io.papermc.paper:paper-mojangapi:1.18-R0.1-SNAPSHOT") {
+ exclude("io.papermc.paper", "paper-api")
+ }
+ // ForkTest end
// Paper start // Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0") implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -67,7 +67,7 @@ tasks.jar { @@ -67,7 +71,7 @@ tasks.jar {
attributes( attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main", "Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit", "Implementation-Title" to "CraftBukkit",
@ -28,7 +32,7 @@ index cd74406039704e5a880f00b9b60bb7b1dedc5398..f11c3e2eb81181075c51c624e00c466d
"Implementation-Vendor" to date, // Paper "Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit", "Specification-Title" to "Bukkit",
"Specification-Version" to project.version, "Specification-Version" to project.version,
@@ -158,7 +158,7 @@ fun TaskContainer.registerRunTask( @@ -158,7 +162,7 @@ fun TaskContainer.registerRunTask(
name: String, name: String,
block: JavaExec.() -> Unit block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) { ): TaskProvider<JavaExec> = register<JavaExec>(name) {

4
settings.gradle.kts
View File

@ -5,6 +5,6 @@ pluginManagement {
} }
} }
rootProject.name = "ForkTest" rootProject.name = "forktest"
include("ForkTest-API", "ForkTest-Server") include("forktest-api", "forktest-server")