Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove redundant code #238

Merged
merged 1 commit into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions patches/server/0003-Setup-Gradle-project.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Subject: [PATCH] Setup Gradle project

diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000000000000000000000000000000000000..c751b21fcf9b6b30b6546179ca11c9f6319f3370
index 0000000000000000000000000000000000000000..a3683ff6a707c5966896a363afc39a0aa7c64390
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,132 @@
@@ -0,0 +1,129 @@
+plugins {
+ id("pandaspigot.conventions")
+ id("com.github.johnrengelman.shadow") version "7.1.2"
Expand Down Expand Up @@ -55,9 +55,6 @@ index 0000000000000000000000000000000000000000..c751b21fcf9b6b30b6546179ca11c9f6
+ providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run")
+ ).get().asFile
+
+ if (project.hasProperty("disableWatchdog")) {
+ systemProperty("disable.watchdog", true)
+ }
+ doFirst {
+ workingDir.mkdirs()
+ }
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0006-Update-to-Netty-4.1.x.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Update to Netty 4.1.x


diff --git a/build.gradle.kts b/build.gradle.kts
index c751b21fcf9b6b30b6546179ca11c9f6319f3370..3e97931d3695e9b4e6aca80842832c65ad44bd06 100644
index a3683ff6a707c5966896a363afc39a0aa7c64390..242341aea3f7515693240a643ca1f39846208a9d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
Expand All @@ -25,7 +25,7 @@ index c751b21fcf9b6b30b6546179ca11c9f6319f3370..3e97931d3695e9b4e6aca80842832c65
implementation("net.sf.jopt-simple:jopt-simple:3.2")
implementation("jline:jline:2.12.1")

@@ -56,6 +55,7 @@ tasks {
@@ -53,6 +52,7 @@ tasks {
shadowJar {
mergeServiceFiles()
archiveClassifier.set("unmapped")
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0015-PandaSpigot-Configuration.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] PandaSpigot Configuration


diff --git a/build.gradle.kts b/build.gradle.kts
index 3e97931d3695e9b4e6aca80842832c65ad44bd06..7c0bac5144853c7258bb65ddf6a0654ca5697269 100644
index 242341aea3f7515693240a643ca1f39846208a9d..d130985a63c1074de418ce40a7035811a19e3115 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,6 +12,12 @@ repositories {
Expand All @@ -21,7 +21,7 @@ index 3e97931d3695e9b4e6aca80842832c65ad44bd06..7c0bac5144853c7258bb65ddf6a0654c
// Minecraft libraries:
implementation("io.netty:netty-all:4.1.91.Final") // PandaSpigot - Update Netty to 4.1.x
implementation("com.mojang:authlib:1.5.21")
@@ -56,6 +62,13 @@ tasks {
@@ -53,6 +59,13 @@ tasks {
mergeServiceFiles()
archiveClassifier.set("unmapped")
append("META-INF/io.netty.versions.properties")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ This patch contains heavy inspiration from:
https://github.com/PaperMC/Paper/blob/master/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch

diff --git a/build.gradle.kts b/build.gradle.kts
index 7c0bac5144853c7258bb65ddf6a0654ca5697269..22b69df26679d07893224314d16483aa83b42004 100644
index d130985a63c1074de418ce40a7035811a19e3115..4a1bd0cf33d98c8cd3e09c8ba92af080b2bd0324 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -21,8 +21,10 @@ dependencies {
Expand Down Expand Up @@ -55,7 +55,7 @@ index 7c0bac5144853c7258bb65ddf6a0654ca5697269..22b69df26679d07893224314d16483aa
testImplementation("junit:junit:4.11")
testImplementation("org.hamcrest:hamcrest-library:1.3")
}
@@ -62,6 +68,7 @@ tasks {
@@ -59,6 +65,7 @@ tasks {
mergeServiceFiles()
archiveClassifier.set("unmapped")
append("META-INF/io.netty.versions.properties")
Expand Down
Loading