From c25c1bce2dd620c2d39b77f33c57c1fc08b1ecb8 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Thu, 30 Dec 2021 07:17:26 -0800 Subject: Refactors for easier reading (#839) * Refactors * Common functionality to base classes * GT Pre/Postload broken into more modular pieces * Extract common (mainly cover related) functionality from BaseMetaTileEntity & BaseMetaPipeEntity --- src/main/java/gregtech/api/util/GT_CLS_Compat.java | 3 ++- src/main/java/gregtech/api/util/GT_ModHandler.java | 15 +++------------ 2 files changed, 5 insertions(+), 13 deletions(-) (limited to 'src/main/java/gregtech/api/util') diff --git a/src/main/java/gregtech/api/util/GT_CLS_Compat.java b/src/main/java/gregtech/api/util/GT_CLS_Compat.java index 902aa28a80..83b292d274 100644 --- a/src/main/java/gregtech/api/util/GT_CLS_Compat.java +++ b/src/main/java/gregtech/api/util/GT_CLS_Compat.java @@ -4,6 +4,7 @@ import cpw.mods.fml.common.ProgressManager; import gregtech.GT_Mod; import gregtech.api.enums.Materials; import gregtech.common.GT_Proxy; +import gregtech.loaders.postload.GT_PostLoad; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -137,7 +138,7 @@ public class GT_CLS_Compat { } registerAndReportProgression("Vanilla materials", replacedVanillaItemsSet, progressBar, m -> m.mDefaultLocalName, - m -> GT_Mod.doActualRegistration(m) + m -> GT_PostLoad.doActualRegistration(m) ); } diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java index 80b505ccfb..0d8585994f 100644 --- a/src/main/java/gregtech/api/util/GT_ModHandler.java +++ b/src/main/java/gregtech/api/util/GT_ModHandler.java @@ -535,21 +535,12 @@ public class GT_ModHandler { /** * RC-BlastFurnace Recipes - + */ + @Deprecated public static boolean addRCBlastFurnaceRecipe(ItemStack aInput, ItemStack aOutput, int aTime) { - aOutput = GT_OreDictUnificator.get(true, aOutput); - if (aInput == null || aOutput == null || aTime <= 0) return false; - if (!GregTech_API.sRecipeFile.get(ConfigCategories.Machines.rcblastfurnace, aInput, true)) return false; - aInput = GT_Utility.copyOrNull(aInput); - aOutput = GT_Utility.copyOrNull(aOutput); - try { - mods.railcraft.api.crafting.RailcraftCraftingManager.blastFurnace.addRecipe(aInput, true, false, aTime, aOutput); - } catch (Throwable e) { - return false; - } return true; } -*/ + public static boolean addPulverisationRecipe(ItemStack aInput, ItemStack aOutput1) { return addPulverisationRecipe(aInput, aOutput1, null, 0, false); } -- cgit