Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

rebase

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-11-29 08:28:20 -05:00
parent 9afd573ce5
commit f0e15c4d2a
29 changed files with 84 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/api/0001-Build-System-Changes.patch
View File

@@ -6,14 +6,14 @@ Subject: [PATCH] Build System Changes
todo: merge with rebrand patch
diff --git a/build.gradle.kts b/build.gradle.kts
index 720ba2774196f24cca6c4d1b173f90f8151c8a5e..c5d5bd6e4e074b9290a37c5a5c5957936ed346f6 100644
index 241ee5c98275a4517e040c86355ae6702f8efca1..43ce7fe6b65488d00c69986908c788761ccd74ad 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -37,6 +37,7 @@ dependencies {
@@ -40,6 +40,7 @@ dependencies {
apiAndDocs("net.kyori:adventure-text-serializer-plain")
api("org.apache.logging.log4j:log4j-api:2.14.1") // Paper
api("org.slf4j:slf4j-api:1.7.30") // Paper
api("org.apache.logging.log4j:log4j-api:2.14.1")
api("org.slf4j:slf4j-api:1.8.0-beta4")
+ api("net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT") // Purpur
implementation("org.ow2.asm:asm:9.1")
implementation("org.ow2.asm:asm-commons:9.1")
implementation("org.ow2.asm:asm:9.2")
implementation("org.ow2.asm:asm-commons:9.2")

4
patches/api/0003-Purpur-client-support.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 5d928c5e82033dd812d406fce7353fd4824195c0..8189fe28d692608b78c7861f0202d2ba17587de9 100644
index bdb830942b7751bfcce36583ffd59488473f2db8..ccd12268d9c1b2c889a68735831a9b26a80dbf53 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2298,4 +2298,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2331,4 +2331,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end

4
patches/api/0008-AFK-API.patch
View File

@@ -81,10 +81,10 @@ index 0000000000000000000000000000000000000000..0c8b3e5e4ba412624357ea5662a78862
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 8189fe28d692608b78c7861f0202d2ba17587de9..252d848393525da36378148d9698cc05a39d8d11 100644
index ccd12268d9c1b2c889a68735831a9b26a80dbf53..af0c24d79251ba032b8ca3051fb451b00a5986e4 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2306,5 +2306,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2339,5 +2339,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return True if Player uses Purpur Client
*/
public boolean usesPurpurClient();

4
patches/api/0015-Player-invulnerabilities.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 252d848393525da36378148d9698cc05a39d8d11..18eb516f3fbe29df9b4e81d3969d6c3fee799dd7 100644
index af0c24d79251ba032b8ca3051fb451b00a5986e4..1010232accc7cb0052dade56e7366d90179d7f93 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2325,5 +2325,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2358,5 +2358,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();

6
patches/api/0027-Fix-javadoc-warnings-missing-param-and-return.patch
View File

@@ -921,10 +921,10 @@ index a6a7429ed2e1eefb2b12b7480ed74fcc3963a864..e8027e1d505dda6effbb1698550016e8
NORMAL(false),
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 18eb516f3fbe29df9b4e81d3969d6c3fee799dd7..ef9a545f71a2a5ee37b188355d789705f928280e 100644
index 1010232accc7cb0052dade56e7366d90179d7f93..b17e9e446aafc029d70b45fd7879d77cc82d8359 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2128,6 +2128,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2161,6 +2161,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void resetCooldown();
/**
@@ -933,7 +933,7 @@ index 18eb516f3fbe29df9b4e81d3969d6c3fee799dd7..ef9a545f71a2a5ee37b188355d789705
* @return the client option value of the player
*/
@NotNull
@@ -2159,6 +2161,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2192,6 +2194,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Paper end
// Spigot start

6
patches/api/0031-Conflict-on-change-for-adventure-deprecations.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Conflict on change for adventure deprecations
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index a8fc16f2fa6713a4cbe75c17a8e6743f69c383d5..167d8fa9f8cb5ee67149da3b9b63c613668f20b0 100644
index 365bb7c092cf7f008ba376ae3b511d69431a28f7..4ef8c75df64e670c55f13efaa69651fd636d5f12 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -370,7 +370,7 @@ public final class Bukkit {
@@ -170,7 +170,7 @@ index c8d37184d8e882a4084a1bfef85faa330588600b..46bae5c13ce2b973b114682f6a338981
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index fb4d5be0a972a5a8d441a628d796d6ada86cfe79..2b2c36e950f1518c795208157f52211a2e93f467 100644
index b17e9e446aafc029d70b45fd7879d77cc82d8359..ba1894762ede0af3ba18a4105e12e241139ba65d 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -75,7 +75,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -281,7 +281,7 @@ index fb4d5be0a972a5a8d441a628d796d6ada86cfe79..2b2c36e950f1518c795208157f52211a
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
/**
@@ -1863,7 +1863,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1896,7 +1896,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @deprecated in favour of {@link #locale()}
*/
@NotNull

4
patches/api/0035-Flying-Fall-Damage-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 15243abfcbebb0219cabbf56a18910da2f1a027a..ada1063772875d02321cefead55a054efc4369c0 100644
index ba1894762ede0af3ba18a4105e12e241139ba65d..15160d8999665c2dce77bfcd44630247a2377ede 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2351,5 +2351,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2384,5 +2384,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param invulnerableTicks Invulnerable ticks remaining
*/
void setSpawnInvulnerableTicks(int invulnerableTicks);

4
patches/api/0040-Add-force-and-prompt-parameters-to-resource-pack-api.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add force and prompt parameters to resource pack api
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index d4f66b338ecfe8c1bdcd8f5763e61539923c7efc..40f56815ecee852582b5ed5a86393bee69d90b91 100644
index 15160d8999665c2dce77bfcd44630247a2377ede..0cbf3ba84da691ad5be6d36820e72a6d9f58cfbc 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1486,6 +1486,88 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1519,6 +1519,88 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void setResourcePack(@NotNull String url, @NotNull byte[] hash);