Update logger in Pufferfish patches

Winds-Studio · Oct 12, 2024 · 3e45fc8 · 3e45fc8
1 parent cca4472
commit 3e45fc8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 34 deletions.
diff --git a/patches/server/0005-Pufferfish-Utils.patch b/patches/server/0005-Pufferfish-Utils.patch
@@ -6,39 +6,18 @@ Subject: [PATCH] Pufferfish: Utils
 Original license: GPL v3
 Original project: https://github.com/pufferfish-gg/Pufferfish
 
-diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishLogger.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishLogger.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..53aab67aea0a28c004c6106aa775443c30457141
---- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishLogger.java
-@@ -0,0 +1,17 @@
-+package gg.pufferfish.pufferfish;
-+
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+
-+import org.bukkit.Bukkit;
-+
-+public class PufferfishLogger extends Logger {
-+    public static final PufferfishLogger LOGGER = new PufferfishLogger();
-+
-+    private PufferfishLogger() {
-+        super("Pufferfish", null);
-+
-+        setParent(Bukkit.getLogger());
-+        setLevel(Level.ALL);
-+    }
-+}
 diff --git a/src/main/java/gg/pufferfish/pufferfish/util/AsyncExecutor.java b/src/main/java/gg/pufferfish/pufferfish/util/AsyncExecutor.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..a62d22dc4ae2cc82cf6763e8b0ce6d4611782a57
+index 0000000000000000000000000000000000000000..b8f01ce7f4e260f6e871dcc9cd628094b3184fb9
 --- /dev/null
 +++ b/src/main/java/gg/pufferfish/pufferfish/util/AsyncExecutor.java
-@@ -0,0 +1,73 @@
+@@ -0,0 +1,76 @@
 +package gg.pufferfish.pufferfish.util;
 +
 +import com.google.common.collect.Queues;
-+import gg.pufferfish.pufferfish.PufferfishLogger;
++import org.apache.logging.log4j.LogManager;
++import org.apache.logging.log4j.Logger;
++import org.apache.logging.log4j.Marker;
 +
 +import java.util.Queue;
 +import java.util.concurrent.locks.Condition;
@@ -48,6 +27,7 @@ index 0000000000000000000000000000000000000000..a62d22dc4ae2cc82cf6763e8b0ce6d46
 +
 +public class AsyncExecutor implements Runnable {
 +
++    private final Logger LOGGER = LogManager.getLogger("Leaf");
 +    private final Queue<Runnable> jobs = Queues.newArrayDeque();
 +    private final Lock mutex = new ReentrantLock();
 +    private final Condition cond = mutex.newCondition();
@@ -88,7 +68,7 @@ index 0000000000000000000000000000000000000000..a62d22dc4ae2cc82cf6763e8b0ce6d46
 +            } catch (InterruptedException e) {
 +                Thread.currentThread().interrupt();
 +            } catch (Exception e) {
-+                PufferfishLogger.LOGGER.log(Level.SEVERE, e, () -> "Failed to execute async job for thread " + thread.getName());
++                LOGGER.error("Failed to execute async job for thread {}", thread.getName(), e);
 +            }
 +        }
 +    }

diff --git a/patches/server/0006-Pufferfish-Sentry.patch b/patches/server/0006-Pufferfish-Sentry.patch
@@ -8,7 +8,7 @@ Original project: https://github.com/pufferfish-gg/Pufferfish
 
 diff --git a/src/main/java/gg/pufferfish/pufferfish/sentry/PufferfishSentryAppender.java b/src/main/java/gg/pufferfish/pufferfish/sentry/PufferfishSentryAppender.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..7ba5790b4e73827daf14f08069190a8e8052f081
+index 0000000000000000000000000000000000000000..a8779d7c5bee9869e214f1e5550faedd785c78d9
 --- /dev/null
 +++ b/src/main/java/gg/pufferfish/pufferfish/sentry/PufferfishSentryAppender.java
 @@ -0,0 +1,130 @@
@@ -35,7 +35,7 @@ index 0000000000000000000000000000000000000000..7ba5790b4e73827daf14f08069190a8e
 +
 +public class PufferfishSentryAppender extends AbstractAppender {
 +
-+    private static final org.apache.logging.log4j.Logger logger = LogManager.getLogger(PufferfishSentryAppender.class);
++    private static final org.apache.logging.log4j.Logger logger = LogManager.getLogger(PufferfishSentryAppender.class.getSimpleName());
 +    private static final Gson GSON = new Gson();
 +
 +    public PufferfishSentryAppender() {

diff --git a/patches/server/0008-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0008-Pufferfish-Dynamic-Activation-of-Brain.patch
@@ -32,7 +32,7 @@ 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/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8353c264597de5b1ddcc1643c87f6ea09a22523b..881f507ff6fcac86f8ef04cbd3ff10c41c840d52 100644
+index d5652de3b6d71198a0153f087b43281fe579355d..9e4b4737ffcd777ad973e5c3c8f6c78c58995829 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -701,6 +701,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -44,7 +44,7 @@ index 8353c264597de5b1ddcc1643c87f6ea09a22523b..881f507ff6fcac86f8ef04cbd3ff10c4
                      if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
                          entity.discard();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e89df1ecf0cbfa9cc4ef9ab0fc386bb863245522..4408787317b93d0e15a14dc68e3d4c6bb5c10799 100644
+index 48c62f19459406ba393b4f5c277fdf9a393be5a3..22d3d963dc9806643608d077324b27832641ce57 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -430,6 +430,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -295,10 +295,10 @@ index 71a3eadd2f1e00fa066dbfe9918d749d43435a18..03513d3b6118ac5d0a58788462dcbc98
          }
 diff --git a/src/main/java/org/dreeam/leaf/config/modules/opt/DynamicActivationofBrain.java b/src/main/java/org/dreeam/leaf/config/modules/opt/DynamicActivationofBrain.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..9fa2104554c3022c5189b6edb5768b3cd4963fb1
+index 0000000000000000000000000000000000000000..bde8bd5e8288f5cbeaedbbb1450159b019432fe6
 --- /dev/null
 +++ b/src/main/java/org/dreeam/leaf/config/modules/opt/DynamicActivationofBrain.java
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,57 @@
 +package org.dreeam.leaf.config.modules.opt;
 +
 +import net.minecraft.core.registries.BuiltInRegistries;
@@ -345,11 +345,15 @@ index 0000000000000000000000000000000000000000..9fa2104554c3022c5189b6edb5768b3c
 +                "A list of entities to ignore for activation");
 +
 +        startDistanceSquared = startDistance * startDistance;
++
 +        for (EntityType<?> entityType : BuiltInRegistries.ENTITY_TYPE) {
 +            entityType.dabEnabled = true; // reset all, before setting the ones to true
 +        }
++
 +        blackedEntities.forEach(name -> EntityType.byString(name).ifPresentOrElse(entityType ->
-+                entityType.dabEnabled = false, () -> LeafConfig.LOGGER.warn("Unknown entity \"{}\"", name)));
++                entityType.dabEnabled = false,
++                () -> LeafConfig.LOGGER.warn("Skip unknown entity {}, in {}", name, getBasePath() + ".blacklisted-entities")
++        ));
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java