ok (#64)

Former-commit-id: 81a404d8c6b28764c9dc5630fe77286077cd3cb7

2 files changed, 1 insertions, 686 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
index c3cc760025..8c464f2993 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
@@ -41,14 +41,11 @@ import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
 import com.github.bartimaeusnek.bartworks.system.material.processingLoaders.DownTierLoader;
 import com.github.bartimaeusnek.bartworks.system.oredict.OreDictHandler;
 import com.github.bartimaeusnek.bartworks.util.log.DebugLog;
-import com.github.bartimaeusnek.bartworks.util.log.STFUGTPPLOG;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.event.*;
 import cpw.mods.fml.common.network.IGuiHandler;
 import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.GregTech_API;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;
@@ -91,14 +88,6 @@ public final class MainMod {
     public static MainMod instance;
     public static BW_Network BW_Network_instance = new BW_Network();
 
-    @SideOnly(Side.CLIENT)
-    private void ClientGTppWarning() {
-        javax.swing.JOptionPane.showMessageDialog(null,
-                "BartWorks was NOT meant to be played with GT++," +
-                        " since GT++'s Multiblocks break the Platinum Processing chain. " +
-                        "Feel free to continue, but be aware of this.","GT++ Warning", javax.swing.JOptionPane.ERROR_MESSAGE);
-    }
-
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent preinit) {
 
@@ -109,16 +98,7 @@ public final class MainMod {
         LoaderReference.init(); //Check for ALL the mods.
 
         if (LoaderReference.miscutils) {
-            //if (SideReference.Side.Client)
-                //ClientGTppWarning();
-
-            MainMod.LOGGER.error("BartWorks was NOT meant to be played with GT++," +
-                        " since GT++'s Multiblocks break the Platinum Processing chain. " +
-                        "Feel free to continue, but be aware of this.");
-        }
-
-        if (LoaderReference.miscutils && ConfigHandler.GTppLogDisabler) {
-            STFUGTPPLOG.replaceLogger();
+            MainMod.LOGGER.info("Found GT++, continuing");
         }
 
         if (LoaderReference.dreamcraft)
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/log/STFUGTPPLOG.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/log/STFUGTPPLOG.java
deleted file mode 100644
index 8199032651..0000000000
--- a/src/main/java/com/github/bartimaeusnek/bartworks/util/log/STFUGTPPLOG.java
+++ /dev/null
@@ -1,665 +0,0 @@
-/*
- * Copyright (c) 2018-2020 bartimaeusnek
- *
- * 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 com.github.bartimaeusnek.bartworks.util.log;
-
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.Marker;
-import org.apache.logging.log4j.message.Message;
-import org.apache.logging.log4j.message.MessageFactory;
-
-import java.lang.reflect.Field;
-
-public class STFUGTPPLOG implements Logger {
-
-    public static void replaceLogger(){
-        try {
-            Field loggerField = FieldUtils.getField(Class.forName("gtPlusPlus.api.objects.Logger"), "modLogger", true);
-            FieldUtils.removeFinalModifier(loggerField, true);
-            loggerField.set(null, new STFUGTPPLOG());
-        } catch (IllegalAccessException | ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void catching(Level level, Throwable t) {
-
-    }
-
-    @Override
-    public void catching(Throwable t) {
-
-    }
-
-    @Override
-    public void debug(Marker marker, Message msg) {
-
-    }
-
-    @Override
-    public void debug(Marker marker, Message msg, Throwable t) {
-
-    }
-
-    @Override
-    public void debug(Marker marker, Object message) {
-
-    }
-
-    @Override
-    public void debug(Marker marker, Object message, Throwable t) {
-
-    }
-
-    @Override
-    public void debug(Marker marker, String message) {
-
-    }
-
-    @Override
-    public void debug(Marker marker, String message, Object... params) {
-
-    }
-
-    @Override
-    public void debug(Marker marker, String message, Throwable t) {
-
-    }
-
-    @Override
-    public void debug(Message msg) {
-
-    }
-
-    @Override
-    public void debug(Message msg, Throwable t) {
-
-    }
-
-    @Override
-    public void debug(Object message) {
-
-    }
-
-    @Override
-    public void debug(Object message, Throwable t) {
-
-    }
-
-    @Override
-    public void debug(String message) {
-
-    }
-
-    @Override
-    public void debug(String message, Object... params) {
-
-    }
-
-    @Override
-    public void debug(String message, Throwable t) {
-
-    }
-
-    @Override
-    public void entry() {
-
-    }
-
-    @Override
-    public void entry(Object... params) {
-
-    }
-
-    @Override
-    public void error(Marker marker, Message msg) {
-
-    }
-
-    @Override
-    public void error(Marker marker, Message msg, Throwable t) {
-
-    }
-
-    @Override
-    public void error(Marker marker, Object message) {
-
-    }
-
-    @Override
-    public void error(Marker marker, Object message, Throwable t) {
-
-    }
-
-    @Override
-    public void error(Marker marker, String message) {
-
-    }
-
-    @Override
-    public void error(Marker marker, String message, Object... params) {
-
-    }
-
-    @Override
-    public void error(Marker marker, String message, Throwable t) {
-
-    }
-
-    @Override
-    public void error(Message msg) {
-
-    }
-
-    @Override
-    public void error(Message msg, Throwable t) {
-
-    }
-
-    @Override
-    public void error(Object message) {
-
-    }
-
-    @Override
-    public void error(Object message, Throwable t) {
-
-    }
-
-    @Override
-    public void error(String message) {
-
-    }
-
-    @Override
-    public void error(String message, Object... params) {
-
-    }
-
-    @Override
-    public void error(String message, Throwable t) {
-
-    }
-
-    @Override
-    public void exit() {
-
-    }
-
-    @Override
-    public <R> R exit(R result) {
-        return null;
-    }
-
-    @Override
-    public void fatal(Marker marker, Message msg) {
-
-    }
-
-    @Override
-    public void fatal(Marker marker, Message msg, Throwable t) {
-
-    }
-
-    @Override
-    public void fatal(Marker marker, Object message) {
-
-    }
-
-    @Override
-    public void fatal(Marker marker, Object message, Throwable t) {
-
-    }
-
-    @Override
-    public void fatal(Marker marker, String message) {
-
-    }
-
-    @Override
-    public void fatal(Marker marker, String message, Object... params) {
-
-    }
-
-    @Override
-    public void fatal(Marker marker, String message, Throwable t) {
-
-    }
-
-    @Override
-    public void fatal(Message msg) {
-
-    }
-
-    @Override
-    public void fatal(Message msg, Throwable t) {
-
-    }
-
-    @Override
-    public void fatal(Object message) {
-
-    }
-
-    @Override
-    public void fatal(Object message, Throwable t) {
-
-    }
-
-    @Override
-    public void fatal(String message) {
-
-    }
-
-    @Override
-    public void fatal(String message, Object... params) {
-
-    }
-
-    @Override
-    public void fatal(String message, Throwable t) {
-
-    }
-
-    @Override
-    public MessageFactory getMessageFactory() {
-        return null;
-    }
-
-    @Override
-    public String getName() {
-        return null;
-    }
-
-    @Override
-    public void info(Marker marker, Message msg) {
-
-    }
-
-    @Override
-    public void info(Marker marker, Message msg, Throwable t) {
-
-    }
-
-    @Override
-    public void info(Marker marker, Object message) {
-
-    }
-
-    @Override
-    public void info(Marker marker, Object message, Throwable t) {
-
-    }
-
-    @Override
-    public void info(Marker marker, String message) {
-
-    }
-
-    @Override
-    public void info(Marker marker, String message, Object... params) {
-
-    }
-
-    @Override
-    public void info(Marker marker, String message, Throwable t) {
-
-    }
-
-    @Override
-    public void info(Message msg) {
-
-    }
-
-    @Override
-    public void info(Message msg, Throwable t) {
-
-    }
-
-    @Override
-    public void info(Object message) {
-
-    }
-
-    @Override
-    public void info(Object message, Throwable t) {
-
-    }
-
-    @Override
-    public void info(String message) {
-
-    }
-
-    @Override
-    public void info(String message, Object... params) {
-
-    }
-
-    @Override
-    public void info(String message, Throwable t) {
-
-    }
-
-    @Override
-    public boolean isDebugEnabled() {
-        return false;
-    }
-
-    @Override
-    public boolean isDebugEnabled(Marker marker) {
-        return false;
-    }
-
-    @Override
-    public boolean isEnabled(Level level) {
-        return false;
-    }
-
-    @Override
-    public boolean isEnabled(Level level, Marker marker) {
-        return false;
-    }
-
-    @Override
-    public boolean isErrorEnabled() {
-        return false;
-    }
-
-    @Override
-    public boolean isErrorEnabled(Marker marker) {
-        return false;
-    }
-
-    @Override
-    public boolean isFatalEnabled() {
-        return false;
-    }
-
-    @Override
-    public boolean isFatalEnabled(Marker marker) {
-        return false;
-    }
-
-    @Override
-    public boolean isInfoEnabled() {
-        return false;
-    }
-
-    @Override
-    public boolean isInfoEnabled(Marker marker) {
-        return false;
-    }
-
-    @Override
-    public boolean isTraceEnabled() {
-        return false;
-    }
-
-    @Override
-    public boolean isTraceEnabled(Marker marker) {
-        return false;
-    }
-
-    @Override
-    public boolean isWarnEnabled() {
-        return false;
-    }
-
-    @Override
-    public boolean isWarnEnabled(Marker marker) {
-        return false;
-    }
-
-    @Override
-    public void log(Level level, Marker marker, Message msg) {
-
-    }
-
-    @Override
-    public void log(Level level, Marker marker, Message msg, Throwable t) {
-
-    }
-
-    @Override
-    public void log(Level level, Marker marker, Object message) {
-
-    }
-
-    @Override
-    public void log(Level level, Marker marker, Object message, Throwable t) {
-
-    }
-
-    @Override
-    public void log(Level level, Marker marker, String message) {
-
-    }
-
-    @Override
-    public void log(Level level, Marker marker, String message, Object... params) {
-
-    }
-
-    @Override
-    public void log(Level level, Marker marker, String message, Throwable t) {
-
-    }
-
-    @Override
-    public void log(Level level, Message msg) {
-
-    }
-
-    @Override
-    public void log(Level level, Message msg, Throwable t) {
-
-    }
-
-    @Override
-    public void log(Level level, Object message) {
-
-    }
-
-    @Override
-    public void log(Level level, Object message, Throwable t) {
-
-    }
-
-    @Override
-    public void log(Level level, String message) {
-
-    }
-
-    @Override
-    public void log(Level level, String message, Object... params) {
-
-    }
-
-    @Override
-    public void log(Level level, String message, Throwable t) {
-
-    }
-
-    @Override
-    public void printf(Level level, Marker marker, String format, Object... params) {
-
-    }
-
-    @Override
-    public void printf(Level level, String format, Object... params) {
-
-    }
-
-    @Override
-    public <T extends Throwable> T throwing(Level level, T t) {
-        return null;
-    }
-
-    @Override
-    public <T extends Throwable> T throwing(T t) {
-        return null;
-    }
-
-    @Override
-    public void trace(Marker marker, Message msg) {
-
-    }
-
-    @Override
-    public void trace(Marker marker, Message msg, Throwable t) {
-
-    }
-
-    @Override
-    public void trace(Marker marker, Object message) {
-
-    }
-
-    @Override
-    public void trace(Marker marker, Object message, Throwable t) {
-
-    }
-
-    @Override
-    public void trace(Marker marker, String message) {
-
-    }
-
-    @Override
-    public void trace(Marker marker, String message, Object... params) {
-
-    }
-
-    @Override
-    public void trace(Marker marker, String message, Throwable t) {
-
-    }
-
-    @Override
-    public void trace(Message msg) {
-
-    }
-
-    @Override
-    public void trace(Message msg, Throwable t) {
-
-    }
-
-    @Override
-    public void trace(Object message) {
-
-    }
-
-    @Override
-    public void trace(Object message, Throwable t) {
-
-    }
-
-    @Override
-    public void trace(String message) {
-
-    }
-
-    @Override
-    public void trace(String message, Object... params) {
-
-    }
-
-    @Override
-    public void trace(String message, Throwable t) {
-
-    }
-
-    @Override
-    public void warn(Marker marker, Message msg) {
-
-    }
-
-    @Override
-    public void warn(Marker marker, Message msg, Throwable t) {
-
-    }
-
-    @Override
-    public void warn(Marker marker, Object message) {
-
-    }
-
-    @Override
-    public void warn(Marker marker, Object message, Throwable t) {
-
-    }
-
-    @Override
-    public void warn(Marker marker, String message) {
-
-    }
-
-    @Override
-    public void warn(Marker marker, String message, Object... params) {
-
-    }
-
-    @Override
-    public void warn(Marker marker, String message, Throwable t) {
-
-    }
-
-    @Override
-    public void warn(Message msg) {
-
-    }
-
-    @Override
-    public void warn(Message msg, Throwable t) {
-
-    }
-
-    @Override
-    public void warn(Object message) {
-
-    }
-
-    @Override
-    public void warn(Object message, Throwable t) {
-
-    }
-
-    @Override
-    public void warn(String message) {
-
-    }
-
-    @Override
-    public void warn(String message, Object... params) {
-
-    }
-
-    @Override
-    public void warn(String message, Throwable t) {
-
-    }
-}