From 26caa265b7eae49767947e1ff4e6cfc8166b07f5 Mon Sep 17 00:00:00 2001
From: boubou19 <miisterunknown@gmail.com>
Date: Sun, 9 Apr 2023 01:08:26 +0200
Subject: clean up GT++ code (#589)

* yeet big reactor support

* yeet IC2 classic support

* yeet pneumaticraft support

* yeet More Planets support

* yeet Immersive Engineering support

* yeet Psychedilicraft support

* yeet Beyond Reality Core support

* sort mods to see what must be purged

* yeet simply jetpacks

* yeet RFTools

* yeet xReliquary

* yeet RedTech

* yeet Mekanism

* yeet GrowthCraft

* yeet ihl

* leftover cleaning

* yeet thermal fondation support

* yeet compact windmills support

* spotless

* remove constants from LoadedMods (part 1 / 2)

* spotless

* remove constants from LoadedMods (part 2 / 2)

* use mod id enum instead of strings + optimize imports

* Loaded.isModLoaded -> enum

* restore RA init

* missing !

* start organizing recipes stuff

* fix crash on world load in dev

* remove unused class

* remove HazmatUtils.java

* move all the removals

* remove enableHarderRecipesForHighTierCasings and usages(disabled in the pack)

* move some pyrolyse oven recipes to its own file

* sa

* bump GT version

* bump GT5U version

* spotless apply

* use Everglades entry from the mod enum

---------

Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
---
 src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/main/java/gtPlusPlus/xmod/witchery')

diff --git a/src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java b/src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java
index 78a1bcba91..b5ee266143 100644
--- a/src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java
+++ b/src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.xmod.witchery;
 
+import static gregtech.api.enums.Mods.Witchery;
+
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 
@@ -11,7 +13,6 @@ import net.minecraftforge.oredict.OreDictionary;
 
 import com.mojang.authlib.GameProfile;
 
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
@@ -23,7 +24,7 @@ public class WitchUtils {
     static {
         Field a1 = null, a2 = null;
         GameProfile b1 = null, b2 = null;
-        if (LoadedMods.Witchery) {
+        if (Witchery.isModLoaded()) {
             try {
                 a1 = getField("com.emoniph.witchery.entity.ai.EntityAIDigBlocks", "NORMAL_MINER_PROFILE");
                 a2 = getField("com.emoniph.witchery.entity.ai.EntityAIDigBlocks", "KOBOLDITE_MINER_PROFILE");
@@ -38,7 +39,7 @@ public class WitchUtils {
     // com.emoniph.witchery.entity.ai.EntityAIDigBlocks.onHarvestDrops(EntityPlayer, HarvestDropsEvent)
     public static void onHarvestDrops(final EntityPlayer harvester, final BlockEvent.HarvestDropsEvent event) {
 
-        if (LoadedMods.Witchery) {
+        if (Witchery.isModLoaded()) {
 
             if (harvester != null && !harvester.worldObj.isRemote
                     && !event.isCanceled()
-- 
cgit