Skip to content

Updated Upstream (Pufferfish) #1575

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.

Sign up for GitHub

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

Merged
granny merged 4 commits into from
Aug 15, 2024
Merged

Updated Upstream (Pufferfish) #1575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6334899
Updated Upstream (Pufferfish)
granny Aug 6, 2024
0883dbc
add missing pufferfish ServerBuildInfo
granny Aug 6, 2024
9f97a45
Merge branch 'ver/1.21.1' into chore/bring-back-pufferfish
granny Aug 15, 2024
b4049b2
Updated Upstream (Pufferfish)
granny Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
113 changes: 0 additions & 113 deletions patches/1-20-6/unapplied-server/0003-Fix-pufferfish-issues.patch
View file
Open in desktop

This file was deleted.

16 changes: 8 additions & 8 deletions ...ied-api/0001-Pufferfish-API-Changes.patch → ...hes/api/0001-Pufferfish-API-Changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.

diff --git a/build.gradle.kts b/build.gradle.kts
index 04853c43b99951bf0d4c96ef73724625bdaf018f..9164120d299d062c62529a7ef74eac0ded367993 100644
index 540fe7e2c110e79c3742f229b3ed8c54b101d260..07945418e95cbe07c45bfa815d828fa311c7f033 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -51,6 +51,7 @@ dependencies {
@@ -52,6 +52,7 @@ dependencies {
apiAndDocs("net.kyori:adventure-text-logger-slf4j")
api("org.apache.logging.log4j:log4j-api:$log4jVersion")
api("org.slf4j:slf4j-api:$slf4jVersion")
+ api("io.sentry:sentry:5.4.0") // Pufferfish

implementation("org.ow2.asm:asm:9.7")
implementation("org.ow2.asm:asm-commons:9.7")
@@ -109,6 +110,13 @@ val generateApiVersioningFile by tasks.registering {
@@ -130,6 +131,13 @@ val generateApiVersioningFile by tasks.registering {
}
}

Expand Down Expand Up @@ -214,7 +214,7 @@ index 0000000000000000000000000000000000000000..10310fdd53de28efb8a8250f6d3b0c8e
+}
diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
new file mode 100644
index 0000000000000000000000000000000000000000..ab5fea0b03224bf249352ce340e94704ff713345
index 0000000000000000000000000000000000000000..3441cdad70da1bd523c5933b1a914688718c2657
--- /dev/null
+++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
@@ -0,0 +1,40 @@
Expand All @@ -235,7 +235,7 @@ index 0000000000000000000000000000000000000000..ab5fea0b03224bf249352ce340e94704
+ @Deprecated
+ public static boolean canEnable(Logger logger) {
+ try {
+ if (SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19) {
+ if (SIMDDetection.getJavaVersion() < 17 || SIMDDetection.getJavaVersion() > 21) {
+ return false;
+ } else {
+ SIMDDetection.testRun = true;
Expand Down Expand Up @@ -426,10 +426,10 @@ index c80faa079eca1564847070f0338fc98024639829..e632d51d3487eb4807243b6705999ad1
}

diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index fc2dae69165776d08274e34a69962cc70445f411..899d67fa782fac639fe7fb096e05c551d75bd647 100644
index 003bece642b682985625db93cad93026352bfc66..e8ba4f1108f2548a487877027e37d81fc150e042 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -584,7 +584,9 @@ public final class SimplePluginManager implements PluginManager {
@@ -597,7 +597,9 @@ public final class SimplePluginManager implements PluginManager {

// Paper start
private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
Expand All @@ -439,7 +439,7 @@ index fc2dae69165776d08274e34a69962cc70445f411..899d67fa782fac639fe7fb096e05c551
callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerPluginEnableDisableException(msg, ex, plugin)));
}
// Paper end
@@ -654,9 +656,11 @@ public final class SimplePluginManager implements PluginManager {
@@ -667,9 +669,11 @@ public final class SimplePluginManager implements PluginManager {
));
}
} catch (Throwable ex) {
Expand Down
33 changes: 19 additions & 14 deletions ...lied-api/0002-Fix-pufferfish-issues.patch → patches/api/0002-Fix-pufferfish-issues.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,26 @@ Date: Tue, 4 Jan 2022 23:05:41 -0600
Subject: [PATCH] Fix pufferfish issues


diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
index ab5fea0b03224bf249352ce340e94704ff713345..3441cdad70da1bd523c5933b1a914688718c2657 100644
--- a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
+++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
@@ -15,7 +15,7 @@ public class SIMDChecker {
@Deprecated
public static boolean canEnable(Logger logger) {
try {
- if (SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19) {
+ if (SIMDDetection.getJavaVersion() < 17 || SIMDDetection.getJavaVersion() > 21) {
return false;
} else {
SIMDDetection.testRun = true;
diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
index 9df9d09aa477d4cd3c496ba0933c816df1ef0964..2655f98322bcab8622e5f84db1085c3b1f5174b7 100644
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
@@ -18,6 +18,13 @@ public interface ServerBuildInfo {
*/
Key BRAND_PAPER_ID = Key.key("papermc", "paper");

+ // Purpur start
+ /**
+ * The brand id for Pufferfish.
+ */
+ Key BRAND_PUFFERFISH_ID = Key.key("pufferfish", "pufferfish");
+ // Purpur end
+
/**
* Gets the {@code ServerBuildInfo}.
*
diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
index 88f1ca89fa640a686231b8eec87e70419b2d73ef..d6b91c49a267c89d7df2ddee7ccfe64675d117be 100644
index b82f07a2879412f6b30643ca93a97439aa49a98a..6369124775f8b51b10476a6819969fd075cb61e1 100644
--- a/src/test/java/org/bukkit/AnnotationTest.java
+++ b/src/test/java/org/bukkit/AnnotationTest.java
@@ -47,6 +47,10 @@ public class AnnotationTest {
Expand Down
8 changes: 4 additions & 4 deletions patches/api/0001-Rebrand.patch → patches/api/0003-Rebrand.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ Subject: [PATCH] Rebrand


diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
index 9df9d09aa477d4cd3c496ba0933c816df1ef0964..7107eabf02d9d9b69d97c978ba421ad52031ec3f 100644
index 2655f98322bcab8622e5f84db1085c3b1f5174b7..8c2c5ea14a839c8767bbf120ae5512f65475cbb0 100644
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
@@ -18,6 +18,13 @@ public interface ServerBuildInfo {
*/
Key BRAND_PAPER_ID = Key.key("papermc", "paper");
@@ -25,6 +25,13 @@ public interface ServerBuildInfo {
Key BRAND_PUFFERFISH_ID = Key.key("pufferfish", "pufferfish");
// Purpur end

+ // Purpur start
+ /**
Expand Down
0 patches/api/0002-Purpur-config-files.patch → patches/api/0004-Purpur-config-files.patch
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions patches/api/0003-Build-System-Changes.patch → patches/api/0005-Build-System-Changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Build System Changes


diff --git a/build.gradle.kts b/build.gradle.kts
index fd39ed209b20c927054b8482c400beeeeab460a3..6aef83558a5ef7e84873b127c3bb43a6468c9a24 100644
index 07945418e95cbe07c45bfa815d828fa311c7f033..b7d584c8b96eb7699e5df90ed04bf22ee256d571 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -142,6 +142,8 @@ tasks.jar {
@@ -150,6 +150,8 @@ tasks.jar {
}

tasks.withType<Javadoc> {
Expand Down
0 patches/api/0004-Purpur-client-support.patch → patches/api/0006-Purpur-client-support.patch
View file
Open in desktop
File renamed without changes.
0 patches/api/0005-Default-permissions.patch → patches/api/0007-Default-permissions.patch
View file
Open in desktop
File renamed without changes.
0 patches/api/0006-Ridables.patch → patches/api/0008-Ridables.patch
View file
Open in desktop
File renamed without changes.
0 ...s/api/0007-Allow-inventory-resizing.patch → ...s/api/0009-Allow-inventory-resizing.patch
View file
Open in desktop
File renamed without changes.
0 patches/api/0008-Llama-API.patch → patches/api/0010-Llama-API.patch
View file
Open in desktop
File renamed without changes.
0 patches/api/0009-AFK-API.patch → patches/api/0011-AFK-API.patch
View file
Open in desktop
File renamed without changes.
0 ...hes/api/0010-Bring-back-server-name.patch → ...hes/api/0012-Bring-back-server-name.patch
View file
Open in desktop
File renamed without changes.
0 patches/api/0011-ExecuteCommandEvent.patch → patches/api/0013-ExecuteCommandEvent.patch
View file
Open in desktop
File renamed without changes.
0 patches/api/0012-Lagging-threshold.patch → patches/api/0014-Lagging-threshold.patch
View file
Open in desktop
File renamed without changes.
0 ...13-PlayerSetSpawnerTypeWithEggEvent.patch → ...15-PlayerSetSpawnerTypeWithEggEvent.patch
View file
Open in desktop
File renamed without changes.
0 patches/api/0014-Anvil-API.patch → patches/api/0016-Anvil-API.patch
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../0015-ItemStack-convenience-methods.patch → .../0017-ItemStack-convenience-methods.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ index 54704da43cf9c429f3914f0580246dde99aa93c0..e1a677cfde05aba487a09e34e170fea6
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 8bbd98ea729755e7666403b96f277fd419560951..cb37a8af9e54349fc8a3eb70bbe2fddaaa3767d6 100644
index b3abe3bde05d4a360e31e490bff8a859dc2bd4a6..9b8b958ce181b60eb5db89d4720380153152a2ac 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -19,6 +19,17 @@ import org.bukkit.inventory.meta.ItemMeta;
Expand Down
0 ...hes/api/0016-ChatColor-conveniences.patch → ...hes/api/0018-ChatColor-conveniences.patch
View file
Open in desktop
File renamed without changes.
0 ...hes/api/0017-Item-entity-immunities.patch → ...hes/api/0019-Item-entity-immunities.patch
View file
Open in desktop
File renamed without changes.
0 ...-to-recipe-s-ExactChoice-ingredient.patch → ...-to-recipe-s-ExactChoice-ingredient.patch
View file
Open in desktop
File renamed without changes.
0 patches/api/0019-Rabid-Wolf-API.patch → patches/api/0021-Rabid-Wolf-API.patch
View file
Open in desktop
File renamed without changes.
0 ...es/api/0020-PlayerBookTooLargeEvent.patch → ...es/api/0022-PlayerBookTooLargeEvent.patch
View file
Open in desktop
File renamed without changes.
0 ...herite-armor-grants-fire-resistance.patch → ...herite-armor-grants-fire-resistance.patch
View file
Open in desktop
File renamed without changes.
0 ...022-Add-EntityTeleportHinderedEvent.patch → ...024-Add-EntityTeleportHinderedEvent.patch
View file
Open in desktop
File renamed without changes.
0 ...tment-target-for-bows-and-crossbows.patch → ...tment-target-for-bows-and-crossbows.patch
View file
Open in desktop
File renamed without changes.
0 ...24-API-for-any-mob-to-burn-daylight.patch → ...26-API-for-any-mob-to-burn-daylight.patch
View file
Open in desktop
File renamed without changes.
0 ...d-back-player-spawned-endermite-API.patch → ...d-back-player-spawned-endermite-API.patch
View file
Open in desktop
File renamed without changes.
0 .../0026-Fix-default-permission-system.patch → .../0028-Fix-default-permission-system.patch
View file
Open in desktop
File renamed without changes.
0 patches/api/0027-Summoner-API.patch → patches/api/0029-Summoner-API.patch
View file
Open in desktop
File renamed without changes.
0 ...028-Clean-up-version-command-output.patch → ...030-Clean-up-version-command-output.patch
View file
Open in desktop
File renamed without changes.
0 ...api/0029-Extended-OfflinePlayer-API.patch → ...api/0031-Extended-OfflinePlayer-API.patch
View file
Open in desktop
File renamed without changes.
0 ...he-ability-to-add-combustible-items.patch → ...he-ability-to-add-combustible-items.patch
View file
Open in desktop
File renamed without changes.
0 patches/api/0031-Grindstone-API.patch → patches/api/0033-Grindstone-API.patch
View file
Open in desktop
File renamed without changes.
0 ...Shears-can-have-looting-enchantment.patch → ...Shears-can-have-looting-enchantment.patch
View file
Open in desktop
File renamed without changes.
0 ...api/0033-Lobotomize-stuck-villagers.patch → ...api/0035-Lobotomize-stuck-villagers.patch
View file
Open in desktop
File renamed without changes.
0 ...s/api/0034-Add-local-difficulty-api.patch → ...s/api/0036-Add-local-difficulty-api.patch
View file
Open in desktop
File renamed without changes.
0 patches/api/0035-Remove-Timings.patch → patches/api/0037-Remove-Timings.patch
View file
Open in desktop
File renamed without changes.
0 patches/api/0036-Add-Bee-API.patch → patches/api/0038-Add-Bee-API.patch
View file
Open in desktop
File renamed without changes.
0 patches/api/0037-Debug-Marker-API.patch → patches/api/0039-Debug-Marker-API.patch
View file
Open in desktop
File renamed without changes.
0 patches/api/0038-Add-death-screen-API.patch → patches/api/0040-Add-death-screen-API.patch
View file
Open in desktop
File renamed without changes.
0 patches/api/0039-Language-API.patch → patches/api/0041-Language-API.patch
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...d-log-suppression-for-LibraryLoader.patch → ...d-log-suppression-for-LibraryLoader.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Add log suppression for LibraryLoader


diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..f1e58639213be0c43cd2ff090b625e7d0a67e8be 100644
index 301e82369603f3dd6e6c1bd380da4bacacd7ef6c..0c6ca7588fb3d6b6497ddf032fe75e5c6c9719e5 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -55,6 +55,7 @@ public final class JavaPluginLoader implements PluginLoader {
Expand Down
0 patches/api/0041-Fire-Immunity-API.patch → patches/api/0043-Fire-Immunity-API.patch
View file
Open in desktop
File renamed without changes.
0 patches/api/0042-Added-goat-ram-event.patch → patches/api/0044-Added-goat-ram-event.patch
View file
Open in desktop
File renamed without changes.
0 patches/api/0043-Add-PreExplodeEvents.patch → patches/api/0045-Add-PreExplodeEvents.patch
View file
Open in desktop
File renamed without changes.
0 patches/api/0044-Stored-Bee-API.patch → patches/api/0046-Stored-Bee-API.patch
View file
Open in desktop
File renamed without changes.
0 patches/api/0045-Explorer-Map-API.patch → patches/api/0047-Explorer-Map-API.patch
View file
Open in desktop
File renamed without changes.
0 patches/api/0046-Stonecutter-damage.patch → patches/api/0048-Stonecutter-damage.patch
View file
Open in desktop
File renamed without changes.
Loading