aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/galacticraft
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2023-04-09 01:08:26 +0200
committerGitHub <noreply@github.com>2023-04-09 01:08:26 +0200
commit26caa265b7eae49767947e1ff4e6cfc8166b07f5 (patch)
tree0fc0332da7a843cf153bf75fcc2e20601bbf18ee /src/main/java/gtPlusPlus/xmod/galacticraft
parentc33b3ba66194c7441fbd437530d21a51aa4395d5 (diff)
downloadGT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.tar.gz
GT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.tar.bz2
GT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.zip
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>
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/galacticraft')
-rw-r--r--src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java31
-rw-r--r--src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java5
2 files changed, 3 insertions, 33 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java b/src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java
deleted file mode 100644
index 1cbf4a4787..0000000000
--- a/src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package gtPlusPlus.xmod.galacticraft;
-
-import gtPlusPlus.core.lib.LoadedMods;
-
-public class HANDLER_GalactiCraft {
-
- // private static final HashMap<String, BaseSolarSystem> mSystemsCache = new HashMap<String, BaseSolarSystem>();
-
- public static void preInit() {
- if (LoadedMods.GalacticraftCore) {
- // mSystemsCache.put("HD10180", new SystemHD10180());
- /*
- * for (BaseSolarSystem solar : mSystemsCache.values()) {
- * Logger.SPACE("Running 'pre-init' for "+solar.mSystemName); solar.preInit(); }
- */
- }
- }
-
- public static void init() {
- if (LoadedMods.GalacticraftCore) {
- /*
- * for (BaseSolarSystem solar : mSystemsCache.values()) {
- * Logger.SPACE("Running 'init' for "+solar.mSystemName); solar.init(); }
- */
- }
- }
-
- public static void postInit() {
- if (LoadedMods.GalacticraftCore) {}
- }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java b/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java
index 103699e228..54cde6194c 100644
--- a/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java
+++ b/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.galacticraft.handler;
+import static gregtech.api.enums.Mods.GalacticraftCore;
+
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -11,7 +13,6 @@ import net.minecraftforge.fluids.Fluid;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import gtPlusPlus.core.item.chemistry.RocketFuels;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.preloader.asm.AsmConfig;
@@ -29,7 +30,7 @@ public class HandlerTooltip_GC {
@SubscribeEvent
public void onItemTooltip(ItemTooltipEvent event) {
- if (LoadedMods.GalacticraftCore && AsmConfig.enableGcFuelChanges) {
+ if (GalacticraftCore.isModLoaded() && AsmConfig.enableGcFuelChanges) {
if (mBlock == null) {
try {