Compare commits

..

5 Commits

Author SHA1 Message Date
MrHua269
38e4a96ab7 Fix tpsbar and membar 2024-12-15 10:49:36 +08:00
MrHua269
c7134597cb Move C2ME native optimizations to todo list 2024-12-14 18:45:13 +08:00
MrHua269
b1c6c29458 Removed linker options 2024-12-14 18:00:51 +08:00
MrHua269
eeae6bc62c Merge branch 'dev/1.21.4' of https://github.com/LuminolMC/Luminol into dev/1.21.4 2024-12-14 17:52:34 +08:00
MrHua269
852529973b Bump to java 22 2024-12-14 17:49:01 +08:00
3 changed files with 14 additions and 5 deletions

View File

@@ -117,7 +117,7 @@ index 0000000000000000000000000000000000000000..aafb2f5052c7c8e5971a47308253badb
+}
diff --git a/src/main/java/me/earthme/luminol/functions/GlobalServerTpsBar.java b/src/main/java/me/earthme/luminol/functions/GlobalServerTpsBar.java
new file mode 100644
index 0000000000000000000000000000000000000000..ff503ab69dce8f034500e64ce31556d721395732
index 0000000000000000000000000000000000000000..de2f03d6e771c09e8da2da454b7ec4a16c0a17ab
--- /dev/null
+++ b/src/main/java/me/earthme/luminol/functions/GlobalServerTpsBar.java
@@ -0,0 +1,214 @@
@@ -243,7 +243,7 @@ index 0000000000000000000000000000000000000000..ff503ab69dce8f034500e64ce31556d7
+ if (removed != null) {
+ apiPlayer.hideBossBar(removed);
+ }
+ }, 0, TpsBarConfig.updateInterval);
+ }, 1, TpsBarConfig.updateInterval);
+ }
+
+ private static void updateTpsBar(double tps, double mspt, @NotNull BossBar bar, @NotNull Player player){

View File

@@ -115,7 +115,7 @@ index 0000000000000000000000000000000000000000..b632c4a636974535bf001f010de1dcb6
+}
diff --git a/src/main/java/me/earthme/luminol/functions/GlobalServerMemoryBar.java b/src/main/java/me/earthme/luminol/functions/GlobalServerMemoryBar.java
new file mode 100644
index 0000000000000000000000000000000000000000..4827562a5b4deca0153995b8e1680d820123a712
index 0000000000000000000000000000000000000000..3535cf03e7855b4d8b312ccf3a7b0564ea753019
--- /dev/null
+++ b/src/main/java/me/earthme/luminol/functions/GlobalServerMemoryBar.java
@@ -0,0 +1,171 @@
@@ -240,7 +240,7 @@ index 0000000000000000000000000000000000000000..4827562a5b4deca0153995b8e1680d82
+ if (removed != null) {
+ apiPlayer.hideBossBar(removed);
+ }
+ }, 0, MembarConfig.updateInterval);
+ }, 1, MembarConfig.updateInterval);
+ }
+
+ private static void updateMembar(@NotNull BossBar bar, long used, long xmx){

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] C2ME Native math noise optimizations
diff --git a/build.gradle.kts b/build.gradle.kts
index 97c1116fd2695cf4061f428910d4fcb4b605edcc..84ccac8ef4cd49c8547670dbca11a003bfe575f7 100644
index 97c1116fd2695cf4061f428910d4fcb4b605edcc..663bb587dbbbcc1c0dbbff2b4f73024336a6d739 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -97,6 +97,13 @@ tasks.withType<JavaCompile> {
@@ -22,6 +22,15 @@ index 97c1116fd2695cf4061f428910d4fcb4b605edcc..84ccac8ef4cd49c8547670dbca11a003
tasks.jar {
archiveClassifier.set("dev")
@@ -190,7 +197,7 @@ fun TaskContainer.registerRunTask(
.dir(providers.gradleProperty("paper.runWorkDir").getOrElse("run"))
.asFile
javaLauncher.set(project.javaToolchains.launcherFor {
- languageVersion.set(JavaLanguageVersion.of(21))
+ languageVersion.set(JavaLanguageVersion.of(22))
vendor.set(JvmVendorSpec.JETBRAINS)
})
jvmArgs("-XX:+AllowEnhancedClassRedefinition", "-XX:+AllowRedefinitionToAddDeleteMethods")
diff --git a/src/main/java/com/ishland/c2me/opts/natives_math/common/Bindings.java b/src/main/java/com/ishland/c2me/opts/natives_math/common/Bindings.java
new file mode 100644
index 0000000000000000000000000000000000000000..e94fbc2afcca53465889822eee41e9df4c7cd390