From bb9da48b9975cb27e3b7c538bff2853a34b36fcd Mon Sep 17 00:00:00 2001
From: miozune <miozune@gmail.com>
Date: Sun, 5 Feb 2023 01:40:43 +0900
Subject: Remove redundant flags (#529)

* Remove CORE.GTNH

* Remove LoadedMods.Gregtech

* Remove LoadedMods.IndustrialCraft2

* Remove LoadedMods.MiscUtils

* Remove CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK

* clean

* Remove mention to GT versions

* Fix assembler mode
---
 .../java/gtPlusPlus/core/common/CommonProxy.java   |  5 ----
 .../gtPlusPlus/core/common/compat/COMPAT_IC2.java  | 29 ++++++++++------------
 2 files changed, 13 insertions(+), 21 deletions(-)

(limited to 'src/main/java/gtPlusPlus/core/common')

diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
index 26bf349b93..19cf2d8356 100644
--- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
@@ -50,11 +50,6 @@ public class CommonProxy {
     public CommonProxy() {
         // Should Register Gregtech Materials I've Made
         Utils.registerEvent(this);
-        if (!CORE.GTNH) {
-            Logger.INFO("We're using Gregtech " + Utils.getGregtechVersionAsString());
-        } else {
-            Logger.INFO("We're using GTNH's Gregtech " + Utils.getGregtechVersionAsString());
-        }
     }
 
     public void preInit(final FMLPreInitializationEvent e) {
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
index 666c0177ee..357647c83e 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
@@ -5,7 +5,6 @@ import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
 import net.minecraft.item.ItemStack;
 
 import gtPlusPlus.core.lib.CORE.ConfigSwitches;
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.recipe.ShapedRecipeObject;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
@@ -50,22 +49,20 @@ public class COMPAT_IC2 {
 
         if (ConfigSwitches.disableIC2Recipes) {
 
-            if (LoadedMods.Gregtech) {
-                // Fuck these right off.
-                RemoveRecipeQueue.add("IC2:itemCable");
-                RemoveRecipeQueue.add("IC2:itemCable:1");
-                RemoveRecipeQueue.add("IC2:itemCable:2");
-                RemoveRecipeQueue.add("IC2:itemCable:3");
-                RemoveRecipeQueue.add("IC2:itemCable:5");
-                RemoveRecipeQueue.add("IC2:itemCable:6");
-                RemoveRecipeQueue.add("IC2:itemCable:10");
-                RemoveRecipeQueue.add("IC2:itemCable:13");
-                // RemoveRecipeQueue.add(itemCropnalyzer);
-                // RemoveRecipeQueue.add(itemSolarHelmet);
+            // Fuck these right off.
+            RemoveRecipeQueue.add("IC2:itemCable");
+            RemoveRecipeQueue.add("IC2:itemCable:1");
+            RemoveRecipeQueue.add("IC2:itemCable:2");
+            RemoveRecipeQueue.add("IC2:itemCable:3");
+            RemoveRecipeQueue.add("IC2:itemCable:5");
+            RemoveRecipeQueue.add("IC2:itemCable:6");
+            RemoveRecipeQueue.add("IC2:itemCable:10");
+            RemoveRecipeQueue.add("IC2:itemCable:13");
+            // RemoveRecipeQueue.add(itemCropnalyzer);
+            // RemoveRecipeQueue.add(itemSolarHelmet);
 
-                // AddRecipeQueue.add(Cropnalyzer);
-                // AddRecipeQueue.add(SolarHelmet);
-            }
+            // AddRecipeQueue.add(Cropnalyzer);
+            // AddRecipeQueue.add(SolarHelmet);
         }
     }
 }
-- 
cgit