diff --git a/RebornCore/src/main/java/reborncore/RebornCore.java b/RebornCore/src/main/java/reborncore/RebornCore.java index b93771521..6604cbb14 100644 --- a/RebornCore/src/main/java/reborncore/RebornCore.java +++ b/RebornCore/src/main/java/reborncore/RebornCore.java @@ -33,8 +33,8 @@ import net.fabricmc.fabric.api.event.world.WorldTickCallback; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.util.Identifier; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import reborncore.api.ToolManager; import reborncore.api.blockentity.UnloadHandler; import reborncore.common.RebornCoreCommands; @@ -65,7 +65,7 @@ public class RebornCore implements ModInitializer { public static final String MOD_VERSION = "@MODVERSION@"; public static final String WEB_URL = "https://files.modmuss50.me/"; - public static final Logger LOGGER = LogManager.getFormatterLogger(MOD_ID); + public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); public static File configDir; public static boolean LOADED = false; diff --git a/RebornCore/src/main/java/reborncore/client/gui/builder/widget/GuiButtonExtended.java b/RebornCore/src/main/java/reborncore/client/gui/builder/widget/GuiButtonExtended.java index 1f0494f46..41e26b44f 100644 --- a/RebornCore/src/main/java/reborncore/client/gui/builder/widget/GuiButtonExtended.java +++ b/RebornCore/src/main/java/reborncore/client/gui/builder/widget/GuiButtonExtended.java @@ -26,8 +26,7 @@ package reborncore.client.gui.builder.widget; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.text.Text; -import org.apache.logging.log4j.util.TriConsumer; - +import reborncore.common.misc.TriConsumer; public class GuiButtonExtended extends ButtonWidget { diff --git a/RebornCore/src/main/java/reborncore/client/screen/builder/BuiltScreenHandler.java b/RebornCore/src/main/java/reborncore/client/screen/builder/BuiltScreenHandler.java index debb19671..076d8e6aa 100644 --- a/RebornCore/src/main/java/reborncore/client/screen/builder/BuiltScreenHandler.java +++ b/RebornCore/src/main/java/reborncore/client/screen/builder/BuiltScreenHandler.java @@ -37,8 +37,8 @@ import net.minecraft.screen.slot.Slot; import net.minecraft.util.math.BlockPos; import org.apache.commons.lang3.Range; import org.apache.commons.lang3.tuple.Pair; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.network.ClientBoundPackets; import reborncore.common.network.NetworkManager; @@ -54,7 +54,7 @@ import java.util.function.Predicate; import java.util.function.Supplier; public class BuiltScreenHandler extends ScreenHandler { - private static final Logger LOGGER = LogManager.getLogger(); + private static final Logger LOGGER = LoggerFactory.getLogger(BuiltScreenHandler.class); private final String name; diff --git a/RebornCore/src/main/java/reborncore/common/misc/TriConsumer.java b/RebornCore/src/main/java/reborncore/common/misc/TriConsumer.java new file mode 100644 index 000000000..44a618285 --- /dev/null +++ b/RebornCore/src/main/java/reborncore/common/misc/TriConsumer.java @@ -0,0 +1,30 @@ +/* + * This file is part of RebornCore, licensed under the MIT License (MIT). + * + * Copyright (c) 2021 TeamReborn + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package reborncore.common.misc; + +@FunctionalInterface +public interface TriConsumer { + void accept(A a, B b, C c); +} \ No newline at end of file diff --git a/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockWorldRegistry.java b/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockWorldRegistry.java index 3037b70d3..9eff7fdfc 100644 --- a/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockWorldRegistry.java +++ b/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockWorldRegistry.java @@ -225,9 +225,7 @@ public class MultiblockWorldRegistry { } if (newMaster == null) { - RebornCore.LOGGER.fatal( - String.format("Multiblock system checked a merge pool of size %d, found no master candidates. This should never happen.", - mergePool.size())); + RebornCore.LOGGER.error("Multiblock system checked a merge pool of size %d, found no master candidates. This should never happen., {}", mergePool.size()); } else { // Merge all the other machines into the master machine, // then unregister them @@ -282,8 +280,7 @@ public class MultiblockWorldRegistry { // potentially dead. // Validate that they are empty/dead, then unregister them. if (!controller.isEmpty()) { - RebornCore.LOGGER.fatal( - "Found a non-empty controller. Forcing it to shed its blocks and die. This should never happen!"); + RebornCore.LOGGER.error("Found a non-empty controller. Forcing it to shed its blocks and die. This should never happen!"); detachedParts.addAll(controller.detachAllBlocks()); } diff --git a/RebornCore/src/main/java/reborncore/common/network/ClientBoundPacketHandlers.java b/RebornCore/src/main/java/reborncore/common/network/ClientBoundPacketHandlers.java index 385799aa6..8c157c583 100644 --- a/RebornCore/src/main/java/reborncore/common/network/ClientBoundPacketHandlers.java +++ b/RebornCore/src/main/java/reborncore/common/network/ClientBoundPacketHandlers.java @@ -37,8 +37,8 @@ import net.minecraft.screen.ScreenHandler; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import reborncore.RebornCore; import reborncore.client.ClientChunkManager; import reborncore.client.screen.builder.BuiltScreenHandler; @@ -46,13 +46,12 @@ import reborncore.common.blockentity.FluidConfiguration; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.blockentity.SlotConfiguration; import reborncore.common.chunkloading.ChunkLoaderManager; -import reborncore.common.util.WorldUtils; import java.util.List; @Environment(EnvType.CLIENT) public class ClientBoundPacketHandlers { - private static final Logger LOGGER = LogManager.getLogger(); + private static final Logger LOGGER = LoggerFactory.getLogger(ClientBoundPacketHandlers.class); public static void init() { NetworkManager.registerClientBoundHandler(new Identifier("reborncore", "custom_description"), (client, handler, packetBuffer, responseSender) -> { diff --git a/src/main/java/techreborn/TechReborn.java b/src/main/java/techreborn/TechReborn.java index 233f72deb..ef699bfce 100644 --- a/src/main/java/techreborn/TechReborn.java +++ b/src/main/java/techreborn/TechReborn.java @@ -33,8 +33,8 @@ import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import reborncore.common.blockentity.RedstoneConfiguration; import reborncore.common.config.Configuration; import reborncore.common.recipes.RecipeCrafter; @@ -58,7 +58,7 @@ import java.util.function.Predicate; public class TechReborn implements ModInitializer { public static final String MOD_ID = "techreborn"; - public static final Logger LOGGER = LogManager.getLogger(MOD_ID); + public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); public static TechReborn INSTANCE; public static ItemGroup ITEMGROUP = FabricItemGroupBuilder.build(