mirror of
https://github.com/Dreeam-qwq/Gale.git
synced 2025-12-22 16:29:26 +00:00
Package license into binaries
This commit is contained in:
Martijn Muijsers
@@ -10,8 +10,47 @@ No license is given for images. Images are copyright (©) Martijn Muijsers, all
|
||||
License for non-image files: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||
Gale - https://galemc.org
|
||||
|
||||
diff --git a/LICENCE.txt b/LICENSE.txt
|
||||
similarity index 99%
|
||||
rename from LICENCE.txt
|
||||
rename to LICENSE.txt
|
||||
index 94a9ed024d3859793618152ea559a168bbcbb5e2..e60008693e017bec1b4eb49c84be3898e26fcf2a 100644
|
||||
--- a/LICENCE.txt
|
||||
+++ b/LICENSE.txt
|
||||
@@ -1,7 +1,7 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
- along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
-<http://www.gnu.org/licenses/>.
|
||||
+<https://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
||||
+<https://www.gnu.org/philosophy/why-not-lgpl.html>.
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index 81ff409e32d4c05ee69e6a6892c8c388ea0d7cc9..6827ccd77dbba737b80bd14456c54fc54f8058f2 100644
|
||||
index 123c2c1bdc4ba5b887910bc613a43bc60be1c99e..9606c6954f2c53dbbda7e7235cf37308822fea02 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -88,7 +88,7 @@ tasks.jar {
|
||||
@@ -23,6 +62,29 @@ index 81ff409e32d4c05ee69e6a6892c8c388ea0d7cc9..6827ccd77dbba737b80bd14456c54fc5
|
||||
"Implementation-Vendor" to date, // Paper
|
||||
"Specification-Title" to "Bukkit",
|
||||
"Specification-Version" to project.version,
|
||||
@@ -228,3 +228,22 @@ tasks.registerRunTask("runDev") {
|
||||
description = "Spin up a non-relocated Mojang-mapped test server"
|
||||
classpath(sourceSets.main.map { it.runtimeClasspath })
|
||||
}
|
||||
+
|
||||
+// Gale start - package license into jar
|
||||
+tasks.register<Copy>("copyLicense") {
|
||||
+ from(layout.projectDirectory.file("LICENSE.txt"))
|
||||
+ into(layout.buildDirectory.dir("tmp/copiedlicense"))
|
||||
+}
|
||||
+
|
||||
+tasks.processResources {
|
||||
+ dependsOn("copyLicense")
|
||||
+}
|
||||
+
|
||||
+sourceSets {
|
||||
+ main {
|
||||
+ resources {
|
||||
+ srcDir(layout.buildDirectory.dir("tmp/copiedlicense"))
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+// Gale end - package license into jar
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
||||
index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..03f5ec3c4f8eac9cecfef0f257b90090aece5017 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
||||
@@ -222,7 +284,7 @@ index 3238cbcba567b1242c77e41f6b6f19a8d157fb4e..6cf49bdf5c337213a474627bc1771ccb
|
||||
|
||||
public SystemReport fillSystemReport(SystemReport details) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 54f27d91f941235a99e341ed84531ad7f0840728..bb45f1f7691e7ce9ad819a8ceac0d3c3e962a5ce 100644
|
||||
index 249d76acac9a91cd46f0b8a477511974a75d6f4a..f336a4559b74dbe36ab0ea3ea2ccffce9743bfec 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -265,7 +265,7 @@ import javax.annotation.Nullable; // Paper
|
||||
|
||||
@@ -29,7 +29,7 @@ index 2868dab7b100d9c325b0e5056f86660d631dec4b..2acad4c3fd58178b0f8b22bdb04eeeeb
|
||||
}
|
||||
diff --git a/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java b/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..6db1098c6728e9de2863205da55208edf376acee
|
||||
index 0000000000000000000000000000000000000000..ba5ba96bbf5250005aca24aa808ef363899dd161
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java
|
||||
@@ -0,0 +1,37 @@
|
||||
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..6db1098c6728e9de2863205da55208ed
|
||||
+ * The <code>patch</code> version is incremented for small changes that do not affect the goal of any feature,
|
||||
+ * such as bug fixes, performance improvements or changes in wording.
|
||||
+ */
|
||||
+ public static final @NotNull String version = "0.5.4";
|
||||
+ public static final @NotNull String version = "0.5.5";
|
||||
+
|
||||
+ /**
|
||||
+ * The "<code>major.minor</code>" portion of the {@link #version}.
|
||||
|
||||
@@ -3,7 +3,7 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||
Date: Sat, 24 Dec 2022 13:24:18 +0100
|
||||
Subject: [PATCH] Make timings calls final
|
||||
|
||||
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
|
||||
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||
Gale - https://galemc.org
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
|
||||
@@ -3,7 +3,7 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||
Date: Wed, 23 Nov 2022 16:29:01 +0100
|
||||
Subject: [PATCH] Predict Halloween
|
||||
|
||||
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
|
||||
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||
Gale - https://galemc.org
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
|
||||
|
||||
@@ -3,7 +3,7 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||
Date: Thu, 24 Nov 2022 23:03:52 +0100
|
||||
Subject: [PATCH] Reduce hopper item checks
|
||||
|
||||
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
|
||||
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||
Gale - https://galemc.org
|
||||
|
||||
This patch is based on the following patch:
|
||||
|
||||
@@ -3,7 +3,7 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||
Date: Wed, 22 Mar 2023 00:18:15 +0100
|
||||
Subject: [PATCH] Variable entity wake-up duration
|
||||
|
||||
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
|
||||
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||
Gale - https://galemc.org
|
||||
|
||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||
|
||||
@@ -3,7 +3,7 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||
Date: Thu, 24 Nov 2022 23:45:57 +0100
|
||||
Subject: [PATCH] Do not log empty message warnings
|
||||
|
||||
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
|
||||
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||
Gale - https://galemc.org
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
|
||||
@@ -3,7 +3,7 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||
Date: Fri, 25 Nov 2022 15:07:55 +0100
|
||||
Subject: [PATCH] Do not log expired message warnings
|
||||
|
||||
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
|
||||
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||
Gale - https://galemc.org
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
|
||||
|
||||
@@ -3,7 +3,7 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||
Date: Mon, 26 Dec 2022 05:18:17 +0100
|
||||
Subject: [PATCH] Do not log out-of-order message warnings
|
||||
|
||||
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
|
||||
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||
Gale - https://galemc.org
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
|
||||
@@ -3,7 +3,7 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||
Date: Fri, 25 Nov 2022 15:13:38 +0100
|
||||
Subject: [PATCH] Do not log Not Secure marker
|
||||
|
||||
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
|
||||
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||
Gale - https://galemc.org
|
||||
|
||||
diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
|
||||
|
||||
@@ -3,7 +3,7 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||
Date: Sun, 25 Dec 2022 11:20:37 +0100
|
||||
Subject: [PATCH] Optimize villager data storage
|
||||
|
||||
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
|
||||
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||
Gale - https://galemc.org
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/Container.java b/src/main/java/net/minecraft/world/Container.java
|
||||
|
||||
@@ -3,7 +3,7 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||
Date: Tue, 29 Nov 2022 23:18:57 +0100
|
||||
Subject: [PATCH] Spread out sending all player info
|
||||
|
||||
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
|
||||
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||
Gale - https://galemc.org
|
||||
|
||||
This patch is based on the following patch:
|
||||
|
||||
@@ -3,7 +3,7 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||
Date: Sat, 24 Dec 2022 22:50:13 +0100
|
||||
Subject: [PATCH] Make slow login timeout configurable
|
||||
|
||||
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
|
||||
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||
Gale - https://galemc.org
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
|
||||
|
||||
@@ -3,7 +3,7 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||
Date: Sat, 24 Dec 2022 23:30:35 +0100
|
||||
Subject: [PATCH] Make max interaction distance configurable
|
||||
|
||||
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
|
||||
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||
Gale - https://galemc.org
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
|
||||
|
||||
@@ -3,7 +3,7 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||
Date: Sun, 25 Dec 2022 19:39:38 +0100
|
||||
Subject: [PATCH] Don't load chunks to activate climbing entities
|
||||
|
||||
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
|
||||
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||
Gale - https://galemc.org
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
|
||||
@@ -3,7 +3,7 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||
Date: Sun, 25 Dec 2022 20:51:32 +0100
|
||||
Subject: [PATCH] Optimize matching item checks
|
||||
|
||||
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
|
||||
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||
Gale - https://galemc.org
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
|
||||
|
||||
@@ -3,7 +3,7 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||
Date: Thu, 22 Dec 2022 15:47:39 +0100
|
||||
Subject: [PATCH] Server thread priority environment variable
|
||||
|
||||
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
|
||||
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||
Gale - https://galemc.org
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
|
||||
@@ -3,7 +3,7 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
|
||||
Date: Wed, 9 Aug 2023 15:04:56 +0200
|
||||
Subject: [PATCH] Virtual thread support
|
||||
|
||||
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
|
||||
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||
Gale - https://galemc.org
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
|
||||
@@ -35,7 +35,7 @@ index 850ccd53c5007e8b18344ba76c9e7f0003decaff..88102f6ba8352a080125512d0bbfacdf
|
||||
}
|
||||
diff --git a/src/main/java/org/galemc/gale/virtualthread/DirectVirtualThreadService.java b/src/main/java/org/galemc/gale/virtualthread/DirectVirtualThreadService.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..12eca4b93797b7f50f333d6cdd93e38bfedd4cd3
|
||||
index 0000000000000000000000000000000000000000..02bd280f549845c6fbf91ad26825d62eccf84d11
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/org/galemc/gale/virtualthread/DirectVirtualThreadService.java
|
||||
@@ -0,0 +1,50 @@
|
||||
@@ -50,7 +50,7 @@ index 0000000000000000000000000000000000000000..12eca4b93797b7f50f333d6cdd93e38b
|
||||
+/**
|
||||
+ * An implementation of {@link VirtualThreadService} that can create virtual threads directly.
|
||||
+ *
|
||||
+ * @author Martijn Muijsers under AGPL-3.0
|
||||
+ * @author Martijn Muijsers
|
||||
+ */
|
||||
+final class DirectVirtualThreadService extends VirtualThreadService {
|
||||
+
|
||||
@@ -91,7 +91,7 @@ index 0000000000000000000000000000000000000000..12eca4b93797b7f50f333d6cdd93e38b
|
||||
+}
|
||||
diff --git a/src/main/java/org/galemc/gale/virtualthread/ReflectionVirtualThreadService.java b/src/main/java/org/galemc/gale/virtualthread/ReflectionVirtualThreadService.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..5aad41cf610f16317ef94e1ff1e385c6eb5ee8f2
|
||||
index 0000000000000000000000000000000000000000..9bdd3a45141938a8f09567bd8a7908c7a317791f
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/org/galemc/gale/virtualthread/ReflectionVirtualThreadService.java
|
||||
@@ -0,0 +1,76 @@
|
||||
@@ -108,7 +108,7 @@ index 0000000000000000000000000000000000000000..5aad41cf610f16317ef94e1ff1e385c6
|
||||
+/**
|
||||
+ * An implementation of {@link VirtualThreadService} that can create virtual threads using Java reflection.
|
||||
+ *
|
||||
+ * @author Martijn Muijsers under AGPL-3.0
|
||||
+ * @author Martijn Muijsers
|
||||
+ */
|
||||
+final class ReflectionVirtualThreadService extends VirtualThreadService {
|
||||
+
|
||||
@@ -173,7 +173,7 @@ index 0000000000000000000000000000000000000000..5aad41cf610f16317ef94e1ff1e385c6
|
||||
+}
|
||||
diff --git a/src/main/java/org/galemc/gale/virtualthread/VirtualThreadService.java b/src/main/java/org/galemc/gale/virtualthread/VirtualThreadService.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..287cb044e04c031b69397746974e18140e54b4fb
|
||||
index 0000000000000000000000000000000000000000..e1b2dccd750a89d89484199eeaf6c376e4f900be
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/org/galemc/gale/virtualthread/VirtualThreadService.java
|
||||
@@ -0,0 +1,101 @@
|
||||
@@ -189,7 +189,7 @@ index 0000000000000000000000000000000000000000..287cb044e04c031b69397746974e1814
|
||||
+/**
|
||||
+ * An abstract service to create virtual threads.
|
||||
+ *
|
||||
+ * @author Martijn Muijsers under AGPL-3.0
|
||||
+ * @author Martijn Muijsers
|
||||
+ */
|
||||
+public sealed abstract class VirtualThreadService permits ReflectionVirtualThreadService, DirectVirtualThreadService {
|
||||
+
|
||||
|
||||
Reference in New Issue
Block a user