mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
remove forking mojangapi (not needed)
This commit is contained in:
@@ -1,6 +1,3 @@
|
|||||||
import io.papermc.paperweight.util.cache
|
|
||||||
import io.papermc.paperweight.util.Git
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
java
|
java
|
||||||
id("com.github.johnrengelman.shadow") version "7.0.0" apply false
|
id("com.github.johnrengelman.shadow") version "7.0.0" apply false
|
||||||
@@ -53,17 +50,6 @@ subprojects {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val initMojangApi by tasks.registering {
|
|
||||||
val paperMojangApi = project.layout.cache.resolve("paperweight/upstreams/paper/Paper-MojangAPI").toFile()
|
|
||||||
|
|
||||||
outputs.upToDateWhen { paperMojangApi.resolve(".git").exists() }
|
|
||||||
doLast {
|
|
||||||
Git(paperMojangApi)("init").executeOut()
|
|
||||||
Git(paperMojangApi)("add", ".").executeOut()
|
|
||||||
Git(paperMojangApi)("commit", "-m", "Initial Source", "--author=Initial <auto@mated.null>").executeOut()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
paperweight {
|
paperweight {
|
||||||
serverProject.set(project(":Purpur-Server"))
|
serverProject.set(project(":Purpur-Server"))
|
||||||
|
|
||||||
@@ -76,16 +62,4 @@ paperweight {
|
|||||||
serverOutputDir.set(layout.projectDirectory.dir("Purpur-Server"))
|
serverOutputDir.set(layout.projectDirectory.dir("Purpur-Server"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
upstreams {
|
|
||||||
register("Paper") {
|
|
||||||
upstreamDataTask.get().finalizedBy(initMojangApi)
|
|
||||||
|
|
||||||
patchTasks.register("mojangApi") {
|
|
||||||
sourceDir.set(project.layout.cache.resolve("paperweight/upstreams/paper/Paper-MojangAPI").toFile())
|
|
||||||
patchDir.set(file("patches/mojangapi"))
|
|
||||||
outputDir.set(file("Purpur-MojangAPI"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,65 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ben Kerllenevich <me@notom3ga.me>
|
|
||||||
Date: Mon, 14 Jun 2021 07:01:43 -0400
|
|
||||||
Subject: [PATCH] Build System Changes
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/.gitignore b/.gitignore
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000000000000000000000000000000000..24e871ba0f9b63707f0da79084f9658d665612e6
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/.gitignore
|
|
||||||
@@ -0,0 +1,40 @@
|
|
||||||
+.gradle/
|
|
||||||
+build/
|
|
||||||
+
|
|
||||||
+# Eclipse stuff
|
|
||||||
+/.classpath
|
|
||||||
+/.project
|
|
||||||
+/.settings
|
|
||||||
+
|
|
||||||
+# netbeans
|
|
||||||
+/nbproject
|
|
||||||
+nb*.xml
|
|
||||||
+
|
|
||||||
+# we use maven!
|
|
||||||
+/build.xml
|
|
||||||
+
|
|
||||||
+# maven
|
|
||||||
+/target
|
|
||||||
+dependency-reduced-pom.xml
|
|
||||||
+
|
|
||||||
+# vim
|
|
||||||
+.*.sw[a-p]
|
|
||||||
+
|
|
||||||
+# various other potential build files
|
|
||||||
+/build
|
|
||||||
+/bin
|
|
||||||
+/dist
|
|
||||||
+/manifest.mf
|
|
||||||
+
|
|
||||||
+/world
|
|
||||||
+/logs
|
|
||||||
+
|
|
||||||
+# Mac filesystem dust
|
|
||||||
+.DS_Store
|
|
||||||
+
|
|
||||||
+# intellij
|
|
||||||
+*.iml
|
|
||||||
+*.ipr
|
|
||||||
+*.iws
|
|
||||||
+.idea/
|
|
||||||
+
|
|
||||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
|
||||||
index 536b4577cfb37c1a79d33e35ddcec61000cb9d4a..fb29f2eb1b21074c8784febddca18eab63b29e34 100644
|
|
||||||
--- a/build.gradle.kts
|
|
||||||
+++ b/build.gradle.kts
|
|
||||||
@@ -13,7 +13,7 @@ repositories {
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
- implementation(project(":Paper-API"))
|
|
||||||
+ implementation(project(":Purpur-API")) // Purpur
|
|
||||||
api("com.mojang:brigadier:1.0.18")
|
|
||||||
|
|
||||||
compileOnly("it.unimi.dsi:fastutil:8.2.2")
|
|
||||||
@@ -6,7 +6,7 @@ Subject: [PATCH] Build System Changes
|
|||||||
todo: merge with rebrand patch
|
todo: merge with rebrand patch
|
||||||
|
|
||||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||||
index 5c885454c729467e29fd3784058fff6a7379c9dc..29538a699e610dae422635b8e256cb44773ddfcf 100644
|
index 5c885454c729467e29fd3784058fff6a7379c9dc..eeefb573a73d27ce850f5303be86aae7c4897fe6 100644
|
||||||
--- a/build.gradle.kts
|
--- a/build.gradle.kts
|
||||||
+++ b/build.gradle.kts
|
+++ b/build.gradle.kts
|
||||||
@@ -20,8 +20,8 @@ repositories {
|
@@ -20,8 +20,8 @@ repositories {
|
||||||
@@ -16,7 +16,7 @@ index 5c885454c729467e29fd3784058fff6a7379c9dc..29538a699e610dae422635b8e256cb44
|
|||||||
- implementation(project(":Paper-API"))
|
- implementation(project(":Paper-API"))
|
||||||
- implementation(project(":Paper-MojangAPI"))
|
- implementation(project(":Paper-MojangAPI"))
|
||||||
+ implementation(project(":Purpur-API")) // Purpur
|
+ implementation(project(":Purpur-API")) // Purpur
|
||||||
+ implementation(project(":Purpur-MojangAPI")) // Purpur
|
+ implementation("com.destroystokyo.paper:paper-mojangapi:1.16.5-R0.1-SNAPSHOT") // Purpur
|
||||||
// Paper start
|
// Paper start
|
||||||
implementation("org.jline:jline-terminal-jansi:3.12.1")
|
implementation("org.jline:jline-terminal-jansi:3.12.1")
|
||||||
implementation("net.minecrell:terminalconsoleappender:1.2.0")
|
implementation("net.minecrell:terminalconsoleappender:1.2.0")
|
||||||
|
|||||||
@@ -6,4 +6,4 @@ pluginManagement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
rootProject.name = "Purpur"
|
rootProject.name = "Purpur"
|
||||||
include("Purpur-API", "Purpur-MojangAPI", "Purpur-Server")
|
include("Purpur-API", "Purpur-Server")
|
||||||
|
|||||||
Reference in New Issue
Block a user