From 26caa265b7eae49767947e1ff4e6cfc8166b07f5 Mon Sep 17 00:00:00 2001 From: boubou19 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 Co-authored-by: Martin Robertz --- .../xmod/railcraft/HANDLER_Railcraft.java | 26 +++++++++------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/railcraft') diff --git a/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java b/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java index e41b744d18..ad0953b8f2 100644 --- a/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java +++ b/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.railcraft; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.Railcraft; import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc; import net.minecraft.init.Blocks; @@ -14,7 +17,6 @@ import gregtech.api.util.GT_Utility; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.base.BaseItemBurnable; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -23,8 +25,6 @@ import gtPlusPlus.xmod.railcraft.utils.RailcraftUtils; public class HANDLER_Railcraft { public static void preInit() { - if (LoadedMods.Railcraft) {} - // Register Custom Coal Coke ModItems.itemCoalCoke = new BaseItemBurnable( "itemCoalCoke", @@ -35,7 +35,7 @@ public class HANDLER_Railcraft { "Used for metallurgy.", "fuelCoke", 3200, - 0).setTextureName(CORE.MODID + ":burnables/itemCoalCoke"); + 0).setTextureName(GTPlusPlus.ID + ":burnables/itemCoalCoke"); // Add in things that once existed in 1.5.2 ModItems.itemCactusCharcoal = new BaseItemBurnable( @@ -47,7 +47,7 @@ public class HANDLER_Railcraft { "Used for smelting.", "fuelCactusCharcoal", 400, - 0).setTextureName(CORE.MODID + ":burnables/itemCactusCharcoal"); + 0).setTextureName(GTPlusPlus.ID + ":burnables/itemCactusCharcoal"); ModItems.itemSugarCharcoal = new BaseItemBurnable( "itemSugarCharcoal", "Sugar Charcoal", @@ -57,7 +57,7 @@ public class HANDLER_Railcraft { "Used for smelting.", "fuelSugarCharcoal", 400, - 0).setTextureName(CORE.MODID + ":burnables/itemSugarCharcoal"); + 0).setTextureName(GTPlusPlus.ID + ":burnables/itemSugarCharcoal"); ModItems.itemCactusCoke = new BaseItemBurnable( "itemCactusCoke", "Cactus Coke", @@ -67,7 +67,7 @@ public class HANDLER_Railcraft { "Used for smelting.", "fuelCactusCoke", 800, - 0).setTextureName(CORE.MODID + ":burnables/itemCactusCoke"); + 0).setTextureName(GTPlusPlus.ID + ":burnables/itemCactusCoke"); ModItems.itemSugarCoke = new BaseItemBurnable( "itemSugarCoke", "Sugar Coke", @@ -77,7 +77,7 @@ public class HANDLER_Railcraft { "Used for smelting.", "fuelSugarCoke", 800, - 0).setTextureName(CORE.MODID + ":burnables/itemSugarCoke"); + 0).setTextureName(GTPlusPlus.ID + ":burnables/itemSugarCoke"); ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemCactusCharcoal), "itemCharcoalCactus"); ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemCactusCoke), "itemCokeCactus"); @@ -85,13 +85,7 @@ public class HANDLER_Railcraft { ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemSugarCoke), "itemCokeSugar"); } - public static void init() { - if (LoadedMods.Railcraft) {} - } - public static void postInit() { - if (LoadedMods.Railcraft) {} - generateCokeOvenRecipes(); } @@ -185,7 +179,7 @@ public class HANDLER_Railcraft { 40, 8); } - if (LoadedMods.Railcraft) { + if (Railcraft.isModLoaded()) { for (int i = 0; i < aOutputs.length; i++) { RailcraftUtils.addCokeOvenRecipe( aInputs1[i], @@ -205,7 +199,7 @@ public class HANDLER_Railcraft { 500); } - if (LoadedMods.DreamCraft) { + if (NewHorizonsCoreMod.isModLoaded()) { for (int i = 0; i < aOutputs.length; i++) { RailcraftUtils.addAdvancedCokeOvenRecipe(aInputs1[i], true, true, aInputs2[i], 20); } -- cgit