From 35eb9cad33c134f0edf80e142be3cf3360387b85 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Thu, 29 Jun 2017 10:45:56 +0200 Subject: [PATCH] Replace usage of FMLLog with the mod logger --- src/main/java/com/replaymod/online/ReplayModOnline.java | 8 ++++---- .../java/com/replaymod/online/gui/GuiReplayCenter.java | 5 +++-- .../com/replaymod/render/metadata/MetadataInjector.java | 5 +++-- src/main/java/com/replaymod/replay/ReplayModReplay.java | 6 +++--- .../com/replaymod/replay/gui/screen/GuiReplayViewer.java | 5 +++-- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/replaymod/online/ReplayModOnline.java b/src/main/java/com/replaymod/online/ReplayModOnline.java index 84762330..e2d42a2c 100644 --- a/src/main/java/com/replaymod/online/ReplayModOnline.java +++ b/src/main/java/com/replaymod/online/ReplayModOnline.java @@ -40,7 +40,7 @@ public class ReplayModOnline { private ReplayModReplay replayModule; - private Logger logger; + public static Logger LOGGER; private ApiClient apiClient; @@ -53,7 +53,7 @@ public class ReplayModOnline { @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { - logger = event.getModLog(); + LOGGER = event.getModLog(); core = ReplayMod.instance; replayModule = ReplayModReplay.instance; @@ -69,7 +69,7 @@ public class ReplayModOnline { public void init(FMLInitializationEvent event) { if (!getDownloadsFolder().exists()){ if (!getDownloadsFolder().mkdirs()) { - logger.warn("Failed to create downloads folder: " + getDownloadsFolder()); + LOGGER.warn("Failed to create downloads folder: " + getDownloadsFolder()); } } @@ -96,7 +96,7 @@ public class ReplayModOnline { } public Logger getLogger() { - return logger; + return LOGGER; } public ApiClient getApiClient() { diff --git a/src/main/java/com/replaymod/online/gui/GuiReplayCenter.java b/src/main/java/com/replaymod/online/gui/GuiReplayCenter.java index 2470bd2d..ec71bd05 100644 --- a/src/main/java/com/replaymod/online/gui/GuiReplayCenter.java +++ b/src/main/java/com/replaymod/online/gui/GuiReplayCenter.java @@ -37,7 +37,6 @@ import de.johni0702.minecraft.gui.layout.VerticalLayout; import de.johni0702.minecraft.gui.popup.GuiYesNoPopup; import de.johni0702.minecraft.gui.utils.Colors; import de.johni0702.minecraft.gui.utils.Consumer; -import net.minecraftforge.fml.common.FMLLog; import org.apache.commons.io.FilenameUtils; import org.apache.logging.log4j.core.helpers.Strings; import org.lwjgl.util.Dimension; @@ -51,6 +50,8 @@ import java.util.Date; import java.util.HashSet; import java.util.Set; +import static com.replaymod.online.ReplayModOnline.LOGGER; + public class GuiReplayCenter extends GuiScreen { private final ReplayModOnline mod; private final ApiClient apiClient; @@ -336,7 +337,7 @@ public class GuiReplayCenter extends GuiScreen { } }); } catch (Exception e) { - FMLLog.getLogger().error("Could not load Replay File " + fileInfo.getId(), e); + LOGGER.error("Could not load Replay File {}", fileInfo.getId(), e); } } } diff --git a/src/main/java/com/replaymod/render/metadata/MetadataInjector.java b/src/main/java/com/replaymod/render/metadata/MetadataInjector.java index eebb92d7..1b8d76ba 100644 --- a/src/main/java/com/replaymod/render/metadata/MetadataInjector.java +++ b/src/main/java/com/replaymod/render/metadata/MetadataInjector.java @@ -4,7 +4,6 @@ import com.coremedia.iso.IsoFile; import com.coremedia.iso.boxes.*; import com.google.common.primitives.Bytes; import com.googlecode.mp4parser.BasicContainer; -import net.minecraftforge.fml.common.FMLLog; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; @@ -13,6 +12,8 @@ import java.io.FileOutputStream; import java.io.IOException; import java.nio.ByteBuffer; +import static com.replaymod.render.ReplayModRender.LOGGER; + public class MetadataInjector { private static final String STITCHING_SOFTWARE = "Minecraft ReplayMod"; @@ -96,7 +97,7 @@ public class MetadataInjector { videoFileOutputStream = new FileOutputStream(videoFile); tempIsoFile.getBox(videoFileOutputStream.getChannel()); } catch(Exception e) { - FMLLog.getLogger().error("360 Degree Metadata couldn't be injected", e); + LOGGER.error("360 Degree Metadata couldn't be injected", e); } finally { IOUtils.closeQuietly(tempIsoFile); IOUtils.closeQuietly(videoFileOutputStream); diff --git a/src/main/java/com/replaymod/replay/ReplayModReplay.java b/src/main/java/com/replaymod/replay/ReplayModReplay.java index 426d7027..3cb513ec 100644 --- a/src/main/java/com/replaymod/replay/ReplayModReplay.java +++ b/src/main/java/com/replaymod/replay/ReplayModReplay.java @@ -46,7 +46,7 @@ public class ReplayModReplay { private final CameraControllerRegistry cameraControllerRegistry = new CameraControllerRegistry(); - private Logger logger; + public static Logger LOGGER; protected ReplayHandler replayHandler; @@ -56,7 +56,7 @@ public class ReplayModReplay { @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { - logger = event.getModLog(); + LOGGER = event.getModLog(); core = ReplayMod.instance; core.getSettingsRegistry().register(Setting.class); @@ -195,7 +195,7 @@ public class ReplayModReplay { } public Logger getLogger() { - return logger; + return LOGGER; } public CameraControllerRegistry getCameraControllerRegistry() { diff --git a/src/main/java/com/replaymod/replay/gui/screen/GuiReplayViewer.java b/src/main/java/com/replaymod/replay/gui/screen/GuiReplayViewer.java index b9ba3961..3de20bd7 100755 --- a/src/main/java/com/replaymod/replay/gui/screen/GuiReplayViewer.java +++ b/src/main/java/com/replaymod/replay/gui/screen/GuiReplayViewer.java @@ -28,7 +28,6 @@ import de.johni0702.minecraft.gui.utils.Consumer; import net.minecraft.client.gui.GuiErrorScreen; import net.minecraft.client.resources.I18n; import net.minecraft.util.Util; -import net.minecraftforge.fml.common.FMLLog; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOCase; @@ -47,6 +46,8 @@ import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; +import static com.replaymod.replay.ReplayModReplay.LOGGER; + public class GuiReplayViewer extends GuiScreen { private final ReplayModReplay mod; @@ -91,7 +92,7 @@ public class GuiReplayViewer extends GuiScreen { obj.consume(() -> new GuiReplayEntry(file, metaData, theThumb)); } } catch (Exception e) { - FMLLog.getLogger().error("Could not load Replay File " + file.getName(), e); + LOGGER.error("Could not load Replay File {}", file.getName(), e); } } } catch (IOException e) {