Skip to content
This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

Commit

Permalink
Add some system properties
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlphaKR93
AlphaKR93 committed Nov 12, 2022
1 parent 7fca9aa commit 8a71df5
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 5 deletions.
13 changes: 13 additions & 0 deletions patches/api/0005-Miscellaneous-patches.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,19 @@ index 8e64ccdb928bc38cb703e60c8ec31339a6f6d894..dd8c91f73988a9ed972efbd33349de0d
api("org.yaml:snakeyaml:1.33")
// Paper start
api("com.googlecode.json-simple:json-simple:1.1.1") {
diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
index 93f5d7ca36e043e6c0f959450d38e6946b348eaf..4b802e5c4a286ef7f35447fdb60c86f6dbc75254 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) {
+ if (Boolean.getBoolean("Prismarine.SkipSIMDJavaVersionCheck") || SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19) { // Prismarine - Support Java 19
return false;
} else {
SIMDDetection.testRun = true;
diff --git a/src/main/java/org/bukkit/configuration/ConfigurationSection.java b/src/main/java/org/bukkit/configuration/ConfigurationSection.java
index b6b00af08f12f838411845e4f4e29e62826dfc7f..4b5267576390515dbbdeed7a5752c80b6f951b34 100644
--- a/src/main/java/org/bukkit/configuration/ConfigurationSection.java
Expand Down
21 changes: 21 additions & 0 deletions patches/server/0014-Miscellaneous-patches.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,27 @@ Date: Sat, 5 Mar 2022 12:27:53 +0900
Subject: [PATCH] Miscellaneous patches


diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
index 7b34c1b859e5fdc8487e202f87a76f490382ce07..5e10c6876eb076b42e82f2c5442ab63c23a95711 100644
--- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
+++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
@@ -95,13 +95,14 @@ public class PufferfishConfig {
// Attempt to detect vectorization
try {
SIMDDetection.isEnabled = SIMDDetection.canEnable(PufferfishLogger.LOGGER);
- SIMDDetection.versionLimited = SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18;
+ SIMDDetection.versionLimited = Boolean.getBoolean("Prismarine.SkipSIMDJavaVersionCheck") || SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19; // Prismarine
} catch (NoClassDefFoundError | Exception ignored) {}

if (SIMDDetection.isEnabled) {
PufferfishLogger.LOGGER.info("SIMD operations detected as functional. Will replace some operations with faster versions.");
} else if (SIMDDetection.versionLimited) {
- PufferfishLogger.LOGGER.warning("Will not enable SIMD! These optimizations are only safely supported on Java 17 and Java 18.");
+ PufferfishLogger.LOGGER.warning("Will not enable SIMD! These optimizations are only safely supported on Java 17, 18 and 19."); // Prismarine
+ PufferfishLogger.LOGGER.warning("If you really want to enable them, add \"-DPrismarine.SkipSIMDJavaVersionCheck=true\" to your startup flags, BEFORE the \"-jar\"."); // Prismarine
} else {
PufferfishLogger.LOGGER.warning("SIMD operations are available for your server, but are not configured!");
PufferfishLogger.LOGGER.warning("To enable additional optimizations, add \"--add-modules=jdk.incubator.vector\" to your startup flags, BEFORE the \"-jar\".");
diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishVersionFetcher.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishVersionFetcher.java
deleted file mode 100644
index e877921370f6009a4bd204d9b17d2d58834b8822..0000000000000000000000000000000000000000
Expand Down
25 changes: 25 additions & 0 deletions patches/server/0015-EntityBreedPrepareEvent.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,19 @@ Date: Sun, 24 Apr 2022 18:25:04 +0900
Subject: [PATCH] EntityBreedPrepareEvent


diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
index 5e10c6876eb076b42e82f2c5442ab63c23a95711..82ae8c6e0509a54ebf9226a879db6648a6a4bbe5 100644
--- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
+++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
@@ -102,7 +102,7 @@ public class PufferfishConfig {
PufferfishLogger.LOGGER.info("SIMD operations detected as functional. Will replace some operations with faster versions.");
} else if (SIMDDetection.versionLimited) {
PufferfishLogger.LOGGER.warning("Will not enable SIMD! These optimizations are only safely supported on Java 17, 18 and 19."); // Prismarine
- PufferfishLogger.LOGGER.warning("If you really want to enable them, add \"-DPrismarine.SkipSIMDJavaVersionCheck=true\" to your startup flags, BEFORE the \"-jar\"."); // Prismarine
+ PufferfishLogger.LOGGER.warning("If you really want to enable them, add \"-DPrismarine.SkipSIMDJavaVersionCheck=true\" to your startup flags, BETWEEN the \"-jar\" and *server file name*."); // Prismarine
} else {
PufferfishLogger.LOGGER.warning("SIMD operations are available for your server, but are not configured!");
PufferfishLogger.LOGGER.warning("To enable additional optimizations, add \"--add-modules=jdk.incubator.vector\" to your startup flags, BEFORE the \"-jar\".");
diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/BreedGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/BreedGoal.java
index d037595b71511814caac0a40eb8d37ef35264cd2..6902fbf6657e41e1d784be94e9b44806bee7ca31 100644
--- a/src/main/java/net/minecraft/world/entity/ai/goal/BreedGoal.java
Expand All @@ -26,3 +39,15 @@ index d037595b71511814caac0a40eb8d37ef35264cd2..6902fbf6657e41e1d784be94e9b44806
this.animal.getLookControl().setLookAt(this.partner, 10.0F, (float)this.animal.getMaxHeadXRot());
this.animal.getNavigation().moveTo(this.partner, this.speedModifier);
++this.loveTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6e5e964917bf9d04935badf05dc2191988251656..a536c9ffdf191610e4c6f0fe4fde0a142e5f5003 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -460,6 +460,7 @@ public final class CraftServer implements Server {
}

extraJars.add(file);
+ getLogger().info("Purpur: Spark has been downloaded and installed. If you really don't want to use Spark, add \"-DPurpur.IReallyDontWantSpark=true\" to your startup flags, BETWEEN the \"-jar\" and *server file name*.");
} catch (Exception e) {
getLogger().severe("Purpur: Failed to download and install spark plugin");
e.printStackTrace();
4 changes: 2 additions & 2 deletions patches/server/0024-Add-1-second-tps-average-in-TPS.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ index 02c130383c0d26626ae867d1ceaba13517970cf8..752d67399c47475bd546395638892c99
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6e5e964917bf9d04935badf05dc2191988251656..6a04927801202026411e3f67c192fdc6df6d2a2a 100644
index a536c9ffdf191610e4c6f0fe4fde0a142e5f5003..5d5112dd1c9a1122e5031444a0530e2894ffec23 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2795,6 +2795,7 @@ public final class CraftServer implements Server {
@@ -2796,6 +2796,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0026-Revert-Purpur-commit-disable-pufferfish-mechanical-c.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Subject: [PATCH] Revert Purpur commit "disable pufferfish mechanical changes


diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
index 7b34c1b859e5fdc8487e202f87a76f490382ce07..d26f8c2ac792bbf990f2f61a5d5c7f83fa61a562 100644
index 82ae8c6e0509a54ebf9226a879db6648a6a4bbe5..cae44452cddc52e942ee2e0a86ab1fd5c6bec906 100644
--- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
+++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
@@ -247,7 +247,7 @@ public class PufferfishConfig {
@@ -248,7 +248,7 @@ public class PufferfishConfig {
public static int activationDistanceMod;

private static void dynamicActivationOfBrains() throws IOException {
Expand All @@ -18,7 +18,7 @@ index 7b34c1b859e5fdc8487e202f87a76f490382ce07..d26f8c2ac792bbf990f2f61a5d5c7f83
startDistance = getInt("dab.start-distance", "activation-range.start-distance", 12,
"This value determines how far away an entity has to be",
"from the player to start being effected by DEAR.");
@@ -291,7 +291,7 @@ public class PufferfishConfig {
@@ -292,7 +292,7 @@ public class PufferfishConfig {

public static boolean throttleInactiveGoalSelectorTick;
private static void inactiveGoalSelectorThrottle() {
Expand Down

0 comments on commit 8a71df5

Please sign in to comment.