Leaves: Add Syncmatica Protocol

Winds-Studio · Oct 10, 2023 · c0b740d · c0b740d
1 parent 6e5e72d
commit c0b740d
Show file tree

Hide file tree

Showing 10 changed files with 2,054 additions and 6 deletions.
diff --git a/patches/server/0022-Leaves-Protocol-Core.patch b/patches/server/0022-Leaves-Protocol-Core.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: violetc <58360096+s-yh-china@users.noreply.github.com>
 Date: Tue, 26 Sep 2023 19:00:41 +0800
-Subject: [PATCH] Leaves Protocol Core
+Subject: [PATCH] Leaves: Protocol Core
 
 Original license: GPLv3
 Original project: https://github.com/LeavesMC/Leaves

diff --git a/patches/server/0026-Leaves-Syncmatica-Protocol.patch b/patches/server/0026-Leaves-Syncmatica-Protocol.patch
diff --git a/...og4j-compatible-with-future-release.patch → ...og4j-compatible-with-future-release.patch b/...og4j-compatible-with-future-release.patch → ...og4j-compatible-with-future-release.patch
diff --git a/...Optimize-villager-data-storage.patc.patch → ...Optimize-villager-data-storage.patc.patch b/...Optimize-villager-data-storage.patc.patch → ...Optimize-villager-data-storage.patc.patch
diff --git a/...server/0028-Petal-Async-Pathfinding.patch → ...server/0029-Petal-Async-Pathfinding.patch b/...server/0028-Petal-Async-Pathfinding.patch → ...server/0029-Petal-Async-Pathfinding.patch
@@ -935,7 +935,7 @@ index 0e2b14e7dfedf209d63279c81723fd7955122d78..079b278e2e262af433bb5bd0c12b3d8d
 
      public SwimNodeEvaluator(boolean canJumpOutOfWater) {
 diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java
-index 080cf996ee41503c6adc1d66e19be219102cbbcd..245bf3d0c17e91c24ff28e53f0ee73b66b4d5e50 100644
+index 0daa9a6ecefe67c6df2f9f36fac6dbbad2d74288..839b4dba682b67f4ea291717d45d973c84cd3612 100644
 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java
 +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java
 @@ -3,6 +3,7 @@ package org.dreeam.leaf;

diff --git a/patches/server/0029-Fix-tracker-NPE.patch → patches/server/0030-Fix-tracker-NPE.patch b/patches/server/0029-Fix-tracker-NPE.patch → patches/server/0030-Fix-tracker-NPE.patch
diff --git a/...he-minecart-vehicle-collide-results.patch → ...he-minecart-vehicle-collide-results.patch b/...he-minecart-vehicle-collide-results.patch → ...he-minecart-vehicle-collide-results.patch
diff --git a/patches/server/0031-Reduce-canSee-work.patch → patches/server/0032-Reduce-canSee-work.patch b/patches/server/0031-Reduce-canSee-work.patch → patches/server/0032-Reduce-canSee-work.patch
diff --git a/...server/0032-Faster-Natural-Spawning.patch → ...server/0033-Faster-Natural-Spawning.patch b/...server/0032-Faster-Natural-Spawning.patch → ...server/0033-Faster-Natural-Spawning.patch
diff --git a/...dom-for-xaeroMapServerID-generation.patch → ...dom-for-xaeroMapServerID-generation.patch b/...dom-for-xaeroMapServerID-generation.patch → ...dom-for-xaeroMapServerID-generation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Faster Random for xaeroMapServerID generation
 
 
 diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java
-index 245bf3d0c17e91c24ff28e53f0ee73b66b4d5e50..c9e57d0b97797aef9008cbdeeb4ab2a8bf51ea59 100644
+index 839b4dba682b67f4ea291717d45d973c84cd3612..3935afc36528c1d9bb2d38e60e98999cb8301be4 100644
 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java
 +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java
 @@ -1,7 +1,7 @@
@@ -23,6 +23,6 @@ index 245bf3d0c17e91c24ff28e53f0ee73b66b4d5e50..c9e57d0b97797aef9008cbdeeb4ab2a8
      public static boolean xaeroMapProtocol = false;
 -    public static int xaeroMapServerID = new Random().nextInt();
 +    public static int xaeroMapServerID = ThreadLocalRandom.current().nextInt(); // Leaf - Faster Random
-     private static void network() {
-         jadeProtocol = getBoolean("network.protocol.jade-protocol", jadeProtocol);
-         appleskinProtocol = getBoolean("network.protocol.appleskin-protocol", appleskinProtocol);
+     public static boolean syncmaticaProtocol = false;
+     public static boolean syncmaticaQuota = false;
+     public static int syncmaticaQuotaLimit = 40000000;