Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-21 15:59:23 +00:00
Code Issues Releases Activity

revert <= to <

Browse Source
This commit is contained in:
NONPLAYT
2024-03-06 21:32:33 +03:00
parent 797f1ef60a
commit c8853b3a64
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0004-Add-Higher-Java-Version-for-Pufferfish.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add Higher Java Version for Pufferfish
diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
index ab5fea0b03224bf249352ce340e94704ff713345..d78ecd78f5ebfa4d93ac6e3f5b4c47ec3711dd80 100644 index ab5fea0b03224bf249352ce340e94704ff713345..f0c33c55bcbbd93c658179b1b573354fc9480b79 100644
--- a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java --- a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
+++ b/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 { @@ -15,7 +15,7 @@ public class SIMDChecker {
@@ -13,7 +13,7 @@ index ab5fea0b03224bf249352ce340e94704ff713345..d78ecd78f5ebfa4d93ac6e3f5b4c47ec
public static boolean canEnable(Logger logger) { public static boolean canEnable(Logger logger) {
try { try {
- if (SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19) { - if (SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19) {
+ if (SIMDDetection.getJavaVersion() <= 17) { // DivineMC - Add Higher Java Version for Pufferfish + if (SIMDDetection.getJavaVersion() < 17) { // DivineMC - Add Higher Java Version for Pufferfish
return false; return false;
} else { } else {
SIMDDetection.testRun = true; SIMDDetection.testRun = true;

13
patches/server/0028-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add Higher Java Version for Pufferfish SIMD
diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
index 3fea9b69f4cfc94e7f01d4e3ca4ce7506a8e5d5c..4b4b90726fea700c4fd88b1ea2ed3d7804f63337 100644 index 3fea9b69f4cfc94e7f01d4e3ca4ce7506a8e5d5c..5faa0d20b92d3483bd8eb1993da2a28b3416f94f 100644
--- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
+++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
@@ -87,7 +87,7 @@ public class PufferfishConfig { @@ -87,7 +87,7 @@ public class PufferfishConfig {
@@ -13,7 +13,16 @@ index 3fea9b69f4cfc94e7f01d4e3ca4ce7506a8e5d5c..4b4b90726fea700c4fd88b1ea2ed3d78
try { try {
SIMDDetection.isEnabled = SIMDDetection.canEnable(PufferfishLogger.LOGGER); SIMDDetection.isEnabled = SIMDDetection.canEnable(PufferfishLogger.LOGGER);
- SIMDDetection.versionLimited = SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19; - SIMDDetection.versionLimited = SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19;
+ SIMDDetection.versionLimited = SIMDDetection.getJavaVersion() <= 17; // DivineMC - Add Higher Java Version for Pufferfish SIMD + SIMDDetection.versionLimited = SIMDDetection.getJavaVersion() < 17; // DivineMC - Add Higher Java Version for Pufferfish SIMD
} catch (NoClassDefFoundError | Exception ignored) { } catch (NoClassDefFoundError | Exception ignored) {
ignored.printStackTrace(); ignored.printStackTrace();
} }
@@ -95,7 +95,7 @@ public class PufferfishConfig {
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, Java 18, and Java 19.");
+ PufferfishLogger.LOGGER.warning("Will not enable SIMD! These optimizations are only safely supported on Java 17 and higher.");
} 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\".");