Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2026-01-06 15:41:56 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source
This commit is contained in:
Martijn Muijsers
2023-04-29 15:31:21 +02:00
parent a5def95a2e
commit 798ae738ad
158 changed files with 343 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0001-Hide-irrelevant-compilation-warnings.patch
View File

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/build.gradle.kts b/build.gradle.kts
index cad12a2632b9ebb569280441c42869685db1f31a..dce9befdddf18048384b828dfe52593d5b0eaa99 100644
index 279a666e8ea2c07f41ee3f28b768e95dca5f0a10..cd3207095c92ab6a195f8a24dbe4afaa65bf0996 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -85,6 +85,15 @@ val generateApiVersioningFile by tasks.registering {
@@ -26,7 +26,7 @@ index cad12a2632b9ebb569280441c42869685db1f31a..dce9befdddf18048384b828dfe52593d
tasks.jar {
from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
into("META-INF/maven/${project.group}/${project.name}")
@@ -133,6 +142,8 @@ tasks.withType<Javadoc> {
@@ -134,6 +143,8 @@ tasks.withType<Javadoc> {
into("build/docs/javadoc")
}
}

4
patches/api/0002-Gale-configuration.patch
View File

@@ -13,10 +13,10 @@ As part of: Paper (https://github.com/PaperMC/Paper)
Licensed under: MIT (https://opensource.org/licenses/MIT)
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 2204336d8800311b65e894739ab1b27273e7c6f2..aec6ef7197ed8caec451954727c1f7149491d3f9 100644
index 8621dba7f10ab822b5b99ce0d05da58823605cb6..aa4e8a9664cea33677b8be67260d4ecc056da575 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1969,6 +1969,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1966,6 +1966,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
{
throw new UnsupportedOperationException("Not supported yet.");
}

6
patches/api/0003-Make-timings-calls-final.patch
View File

@@ -7,10 +7,10 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java
index 43b85ce3a6c27a2f92c67d62bee7484c2652b72a..bbc73f3591afe29de429e7e7d693a536616e8dbc 100644
index 36b8fe86335df851f9c85d6bb2a91368b4d945d1..16040016d7de911eddec278ec2adc2b856df9bcd 100644
--- a/src/main/java/co/aikar/timings/FullServerTickHandler.java
+++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java
@@ -18,8 +18,7 @@ public class FullServerTickHandler extends TimingHandler {
@@ -19,8 +19,7 @@ public class FullServerTickHandler extends TimingHandler {
}
@NotNull
@@ -20,7 +20,7 @@ index 43b85ce3a6c27a2f92c67d62bee7484c2652b72a..bbc73f3591afe29de429e7e7d693a536
if (TimingsManager.needsFullReset) {
TimingsManager.resetTimings();
} else if (TimingsManager.needsRecheckEnabled) {
@@ -28,8 +27,7 @@ public class FullServerTickHandler extends TimingHandler {
@@ -29,8 +28,7 @@ public class FullServerTickHandler extends TimingHandler {
return super.startTiming();
}

4
patches/api/0004-SIMD-support.patch
View File

@@ -13,7 +13,7 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/build.gradle.kts b/build.gradle.kts
index dce9befdddf18048384b828dfe52593d5b0eaa99..8af9efe2dbc9563a2c327002cf05c5d2fd8fc68b 100644
index cd3207095c92ab6a195f8a24dbe4afaa65bf0996..0719e49dde343c80d18daf82d7fed926150d7d6d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -91,6 +91,7 @@ tasks.withType<JavaCompile> {
@@ -24,7 +24,7 @@ index dce9befdddf18048384b828dfe52593d5b0eaa99..8af9efe2dbc9563a2c327002cf05c5d2
}
// Gale end - hide irrelevant compilation warnings
@@ -144,6 +145,7 @@ tasks.withType<Javadoc> {
@@ -145,6 +146,7 @@ tasks.withType<Javadoc> {
}
options.addStringOption("Xdoclint:none", "-quiet") // Gale - hide irrelevant compilation warnings

6
patches/api/0007-Player-canSee-by-entity-UUID.patch
View File

@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 660f28e371176c62e38a84b187958aceb235c8e3..15c57f3e4e1c023e0f3168ce03dd770f006cf27b 100644
index ee446bfb3e6c4b1d4428c00d6406bf9455c68ad5..2258276b31dda927003367a92e31f05f2c362b1e 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3,6 +3,8 @@ package org.bukkit.entity;
@@ -49,8 +49,8 @@ index 660f28e371176c62e38a84b187958aceb235c8e3..15c57f3e4e1c023e0f3168ce03dd770f
import org.bukkit.DyeColor;
import org.bukkit.Effect;
import org.bukkit.GameMode;
@@ -1587,6 +1589,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@org.jetbrains.annotations.ApiStatus.Experimental // Paper
@@ -1622,6 +1624,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@ApiStatus.Experimental
public boolean canSee(@NotNull Entity entity);
+ // Gale start - Purpur - Player#canSee by entity UUID

8
patches/api/0008-Specific-interval-TPS-API.patch
View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index ac9b690fcccb60b587e5345f12f1383afd0a73a1..e9ff914c9e602887c433c3aa7aab5a170dd31f17 100644
index f1af93319d6b29d7bc709e7e273e8abe26c7b4af..87891ac18a1e4ba8ca8af955f7cb39686150a2d5 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2072,6 +2072,37 @@ public final class Bukkit {
@@ -2069,6 +2069,37 @@ public final class Bukkit {
return server.getTPS();
}
@@ -49,10 +49,10 @@ index ac9b690fcccb60b587e5345f12f1383afd0a73a1..e9ff914c9e602887c433c3aa7aab5a17
* Get a sample of the servers last tick times (in nanos)
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index aec6ef7197ed8caec451954727c1f7149491d3f9..7d0baa4306fecb79d069a7f5aed81e12a80a1f0e 100644
index aa4e8a9664cea33677b8be67260d4ecc056da575..17fe974e08c63e529f11d2d00366b55683467d5d 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1751,6 +1751,31 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1748,6 +1748,31 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
public double[] getTPS();

8
patches/api/0009-5-second-TPS-average.patch
View File

@@ -37,10 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index e9ff914c9e602887c433c3aa7aab5a170dd31f17..daf11e58b0a5f8cc8890af24fa51e3c46a4043b6 100644
index 87891ac18a1e4ba8ca8af955f7cb39686150a2d5..bf33dfa921e0099490e5485ac85a0c84645929e7 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2072,8 +2072,30 @@ public final class Bukkit {
@@ -2069,8 +2069,30 @@ public final class Bukkit {
return server.getTPS();
}
@@ -72,10 +72,10 @@ index e9ff914c9e602887c433c3aa7aab5a170dd31f17..daf11e58b0a5f8cc8890af24fa51e3c4
* Gets the average server TPS over the last 1 minute
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 7d0baa4306fecb79d069a7f5aed81e12a80a1f0e..359ec91be83f52776cb1da092fd1756085816668 100644
index 17fe974e08c63e529f11d2d00366b55683467d5d..b191c731c2d7e316481043ee5f12f934848af76e 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1751,8 +1751,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1748,8 +1748,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
public double[] getTPS();

4
patches/api/0010-Last-tick-time-API.patch
View File

@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 359ec91be83f52776cb1da092fd1756085816668..db76574dd624e7edabc0fde717e7788dd66b7845 100644
index b191c731c2d7e316481043ee5f12f934848af76e..6253e761c595c8b89d08f9d42fe3e19cadbf4918 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2192,4 +2192,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2189,4 +2189,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
// Paper end