SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use class loggers without the fqn for non-debug logging (#9012)

Browse Source
This commit is contained in:
Jake Potrebic
2023-03-20 01:23:52 -07:00
parent c54215c1b2
commit 4015d08acf
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/Paper-config-files.patch
View File

@@ -160,7 +160,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+
+public abstract class Configurations<G, W> {
+
+ private static final Logger LOGGER = LogUtils.getLogger();
+ private static final Logger LOGGER = LogUtils.getClassLogger();
+ public static final String WORLD_DEFAULTS = "__world_defaults__";
+ public static final ResourceLocation WORLD_DEFAULTS_KEY = new ResourceLocation("configurations", WORLD_DEFAULTS);
+ protected final Path globalFolder;
@@ -1011,7 +1011,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+@SuppressWarnings("Convert2Diamond")
+public class PaperConfigurations extends Configurations<GlobalConfiguration, WorldConfiguration> {
+
+ private static final Logger LOGGER = LogUtils.getLogger();
+ private static final Logger LOGGER = LogUtils.getClassLogger();
+ static final String GLOBAL_CONFIG_FILE_NAME = "paper-global.yml";
+ static final String WORLD_DEFAULTS_CONFIG_FILE_NAME = "paper-world-defaults.yml";
+ static final String WORLD_CONFIG_FILE_NAME = "paper-world.yml";
@@ -1502,7 +1502,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+
+@SuppressWarnings({"FieldCanBeLocal", "FieldMayBeFinal", "NotNullFieldNotInitialized", "InnerClassMayBeStatic"})
+public class WorldConfiguration extends ConfigurationPart {
+ private static final Logger LOGGER = LogUtils.getLogger();
+ private static final Logger LOGGER = LogUtils.getClassLogger();
+ static final int CURRENT_VERSION = 30; // (when you change the version, change the comment, so it conflicts on rebases): rename filter bad nbt from spawn eggs
+
+ private transient final SpigotWorldConfig spigotConfig;
@@ -1993,7 +1993,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+
+ public static final class Velocity implements Constraint<GlobalConfiguration.Proxies.Velocity> {
+
+ private static final Logger LOGGER = LogUtils.getLogger();
+ private static final Logger LOGGER = LogUtils.getClassLogger();
+
+ @Override
+ public void validate(final GlobalConfiguration.Proxies.@Nullable Velocity value) throws SerializationException {
@@ -2279,7 +2279,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ */
+public class EnumValueSerializer extends ScalarSerializer<Enum<?>> {
+
+ private static final Logger LOGGER = LogUtils.getLogger();
+ private static final Logger LOGGER = LogUtils.getClassLogger();
+
+ public EnumValueSerializer() {
+ super(new TypeToken<Enum<?>>() {});
@@ -2393,7 +2393,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+@SuppressWarnings("Convert2Diamond")
+public final class PacketClassSerializer extends ScalarSerializer<Class<? extends Packet<?>>> implements MapSerializer.WriteBack {
+
+ private static final Logger LOGGER = LogUtils.getLogger();
+ private static final Logger LOGGER = LogUtils.getClassLogger();
+ private static final TypeToken<Class<? extends Packet<?>>> TYPE = new TypeToken<Class<? extends Packet<?>>>() {};
+ private static final List<String> SUBPACKAGES = List.of("game", "handshake", "login", "status");
+ private static final BiMap<String, String> MOJANG_TO_OBF;
@@ -2626,7 +2626,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+
+ public static final TypeToken<Map<?, ?>> TYPE = new TypeToken<Map<?, ?>>() {};
+
+ private static final Logger LOGGER = LogUtils.getLogger();
+ private static final Logger LOGGER = LogUtils.getClassLogger();
+
+ private final boolean clearInvalids;
+
@@ -3076,7 +3076,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+import static org.spongepowered.configurate.NodePath.path;
+
+public final class LegacyPaperConfig {
+ private static final Logger LOGGER = LogUtils.getLogger();
+ private static final Logger LOGGER = LogUtils.getClassLogger();
+
+ private LegacyPaperConfig() {
+ }
@@ -3309,13 +3309,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+
+import static org.spongepowered.configurate.NodePath.path;
+
+public class FeatureSeedsGeneration implements TransformAction {
+public final class FeatureSeedsGeneration implements TransformAction {
+
+ public static final String FEATURE_SEEDS_KEY = "feature-seeds";
+ public static final String GENERATE_KEY = "generate-random-seeds-for-all";
+ public static final String FEATURES_KEY = "features";
+
+ private static final Logger LOGGER = LogUtils.getLogger();
+ private static final Logger LOGGER = LogUtils.getClassLogger();
+
+ private final ResourceLocation worldKey;
+
@@ -4064,7 +4064,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+
+public interface IntOr {
+
+ Logger LOGGER = LogUtils.getLogger();
+ Logger LOGGER = LogUtils.getClassLogger();
+
+ default int or(final int fallback) {
+ return this.value().orElse(fallback);