From bf53c717b4fe999390d93ee539c2081cceed8f05 Mon Sep 17 00:00:00 2001 From: MartijnMuijsers Date: Fri, 25 Nov 2022 15:01:48 +0100 Subject: [PATCH] Do not log unrecognized recipes --- ... 0040-Do-not-log-invalid-statistics.patch} | 2 +- ...43-Do-not-log-setBlock-in-far-chunks.patch | 45 ++++++++++++++++++ ...0044-Do-not-log-unrecognized-recipes.patch | 46 +++++++++++++++++++ 3 files changed, 92 insertions(+), 1 deletion(-) rename patches/server/{0040-Do-nog-log-invalid-statistics.patch => 0040-Do-not-log-invalid-statistics.patch} (98%) create mode 100644 patches/server/0043-Do-not-log-setBlock-in-far-chunks.patch create mode 100644 patches/server/0044-Do-not-log-unrecognized-recipes.patch diff --git a/patches/server/0040-Do-nog-log-invalid-statistics.patch b/patches/server/0040-Do-not-log-invalid-statistics.patch similarity index 98% rename from patches/server/0040-Do-nog-log-invalid-statistics.patch rename to patches/server/0040-Do-not-log-invalid-statistics.patch index e3447b2..9b35f17 100644 --- a/patches/server/0040-Do-nog-log-invalid-statistics.patch +++ b/patches/server/0040-Do-not-log-invalid-statistics.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MartijnMuijsers Date: Thu, 24 Nov 2022 23:39:32 +0100 -Subject: [PATCH] Do nog log invalid statistics +Subject: [PATCH] Do not log invalid statistics License: MIT (https://opensource.org/licenses/MIT) diff --git a/patches/server/0043-Do-not-log-setBlock-in-far-chunks.patch b/patches/server/0043-Do-not-log-setBlock-in-far-chunks.patch new file mode 100644 index 0000000..0a086aa --- /dev/null +++ b/patches/server/0043-Do-not-log-setBlock-in-far-chunks.patch @@ -0,0 +1,45 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MartijnMuijsers +Date: Fri, 25 Nov 2022 13:28:38 +0100 +Subject: [PATCH] Do not log setBlock in far chunks + +License: MIT (https://opensource.org/licenses/MIT) + +This patch is based on the following patch: +"Logger settings (suppressing pointless logs)" +By: William Blake Galbreath +As part of: Purpur (https://github.com/PurpurMC/Purpur) +Licensed under: MIT (https://opensource.org/licenses/MIT) + +diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java +index 80c1e0e47818486a68e0114b063395290365346b..c9e719e676ea26ee94673538db2dfd9ce5c957ae 100644 +--- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java ++++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java +@@ -53,6 +53,7 @@ import net.minecraft.world.phys.AABB; + import net.minecraft.world.phys.Vec3; + import net.minecraft.world.ticks.LevelTickAccess; + import net.minecraft.world.ticks.WorldGenTickAccess; ++import org.galemc.gale.configuration.GaleGlobalConfiguration; + import org.slf4j.Logger; + + public class WorldGenRegion implements WorldGenLevel { +@@ -295,6 +296,7 @@ public class WorldGenRegion implements WorldGenLevel { + return true; + } else { + // Paper start ++ if (GaleGlobalConfiguration.get().logToConsole.setBlockInFarChunk) // Gale - Purpur - do not log setBlock in far chunks + if (!hasSetFarWarned) { + Util.logAndPauseIfInIde("Detected setBlock in a far chunk [" + i + ", " + j + "], pos: " + pos + ", status: " + this.generatingStatus + (this.currentlyGenerating == null ? "" : ", currently generating: " + (String) this.currentlyGenerating.get())); + hasSetFarWarned = true; +diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +index ae00ec83b9ba545f56d606a5c9802aab97fdefcb..242f39617ec5f146766c460ab65f4716f2847354 100644 +--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java ++++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +@@ -58,6 +58,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart { + + public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics + public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements ++ public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks + + public Chat chat; + public class Chat extends ConfigurationPart { diff --git a/patches/server/0044-Do-not-log-unrecognized-recipes.patch b/patches/server/0044-Do-not-log-unrecognized-recipes.patch new file mode 100644 index 0000000..7abda7d --- /dev/null +++ b/patches/server/0044-Do-not-log-unrecognized-recipes.patch @@ -0,0 +1,46 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MartijnMuijsers +Date: Fri, 25 Nov 2022 15:01:30 +0100 +Subject: [PATCH] Do not log unrecognized recipes + +License: MIT (https://opensource.org/licenses/MIT) + +This patch is based on the following patch: +"Logger settings (suppressing pointless logs)" +By: William Blake Galbreath +As part of: Purpur (https://github.com/PurpurMC/Purpur) +Licensed under: MIT (https://opensource.org/licenses/MIT) + +diff --git a/src/main/java/net/minecraft/stats/ServerRecipeBook.java b/src/main/java/net/minecraft/stats/ServerRecipeBook.java +index d13ed3069e944d138442ea440ac3eaf8d44c18d3..c89b8e5ea10a465160504f7364db47410ee5ec0d 100644 +--- a/src/main/java/net/minecraft/stats/ServerRecipeBook.java ++++ b/src/main/java/net/minecraft/stats/ServerRecipeBook.java +@@ -18,6 +18,7 @@ import net.minecraft.resources.ResourceLocation; + import net.minecraft.server.level.ServerPlayer; + import net.minecraft.world.item.crafting.Recipe; + import net.minecraft.world.item.crafting.RecipeManager; ++import org.galemc.gale.configuration.GaleGlobalConfiguration; + import org.slf4j.Logger; + + import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit +@@ -122,7 +123,7 @@ public class ServerRecipeBook extends RecipeBook { + Optional> optional = recipeManager.byKey(minecraftkey); + + if (!optional.isPresent()) { +- ServerRecipeBook.LOGGER.error("Tried to load unrecognized recipe: {} removed now.", minecraftkey); ++ if (GaleGlobalConfiguration.get().logToConsole.unrecognizedRecipes) ServerRecipeBook.LOGGER.error("Tried to load unrecognized recipe: {} removed now.", minecraftkey); // Gale - Purpur - do not log unrecognized recipes + } else { + handler.accept((Recipe) optional.get()); + } +diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +index 242f39617ec5f146766c460ab65f4716f2847354..ce5274e4093962a839f05063ffb7e2ab6244343b 100644 +--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java ++++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +@@ -59,6 +59,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart { + public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics + public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements + public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks ++ public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes + + public Chat chat; + public class Chat extends ConfigurationPart {