Moves current mod integrations to modules

src/main/java/gregtech/GregTechMod.java

@@ -6,12 +6,12 @@
 import gregtech.api.util.oreglob.OreGlob;
 import gregtech.client.utils.BloomEffectUtil;
 import gregtech.common.covers.filter.oreglob.impl.OreGlobParser;
-import gregtech.integration.groovy.GroovyScriptCompat;
 import gregtech.modules.GregTechModules;
 import gregtech.modules.ModuleManager;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.event.*;
@@ -47,14 +47,12 @@ public void onConstruction(FMLConstructionEvent event) {
         OreGlob.setCompiler(input -> new OreGlobParser(input).compile());
         moduleManager.registerContainer(new GregTechModules());
         MinecraftForge.EVENT_BUS.post(new ModuleContainerRegistryEvent());
-
-        /* GroovyScript must be initialized during construction since the first load stage is right after construction */
-        GroovyScriptCompat.init();
+        moduleManager.setup(event.getASMHarvestedData(), Loader.instance().getConfigDir());
+        moduleManager.onConstruction(event);
     }
 
     @EventHandler
     public void preInit(FMLPreInitializationEvent event) {
-        moduleManager.setup(event);
         moduleManager.onPreInit(event);
     }
 

src/main/java/gregtech/api/gui/widgets/RecipeProgressWidget.java

@@ -1,12 +1,14 @@
 package gregtech.api.gui.widgets;
 
 import gregtech.api.GTValues;
+import gregtech.api.GregTechAPI;
 import gregtech.api.gui.resources.TextureArea;
 import gregtech.api.recipes.RecipeMap;
 import gregtech.api.recipes.RecipeMaps;
-import gregtech.api.util.GTLog;
-import gregtech.integration.jei.GTJeiPlugin;
+import gregtech.integration.IntegrationModule;
+import gregtech.integration.jei.JustEnoughItemsModule;
 import gregtech.integration.jei.recipe.RecipeMapCategory;
+import gregtech.modules.GregTechModules;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.I18n;
 import net.minecraftforge.fml.client.config.GuiUtils;
@@ -39,8 +41,9 @@ public RecipeProgressWidget(int ticksPerCycle, int x, int y, int width, int heig
 
     @Override
     public boolean mouseClicked(int mouseX, int mouseY, int button) {
-        if (!Loader.isModLoaded(GTValues.MODID_JEI))
+        if (!GregTechAPI.moduleManager.isModuleEnabled(GregTechModules.MODULE_JEI)) {
             return false;
+        }
         if (isMouseOverElement(mouseX, mouseY) && RecipeMapCategory.getCategoryMap().containsKey(recipeMap)) {
             // Since categories were even registered at all, we know JEI is active.
             List<String> categoryID = new ArrayList<>();
@@ -50,11 +53,12 @@ public boolean mouseClicked(int mouseX, int mouseY, int button) {
             else {
                 categoryID.add(RecipeMapCategory.getCategoryMap().get(recipeMap).getUid());
             }
-            if (GTJeiPlugin.jeiRuntime == null) {
-                GTLog.logger.error("GTCEu JEI integration has crashed, this is not a good thing");
+
+            if (JustEnoughItemsModule.jeiRuntime == null) {
+                IntegrationModule.logger.error("GTCEu JEI integration has crashed, this is not a good thing");
                 return false;
             }
-            GTJeiPlugin.jeiRuntime.getRecipesGui().showCategories(categoryID);
+            JustEnoughItemsModule.jeiRuntime.getRecipesGui().showCategories(categoryID);
             return true;
         }
         return false;

src/main/java/gregtech/api/modules/GregTechModule.java

@@ -15,6 +15,8 @@
 
     String name();
 
+    String[] modDependencies() default {};
+
     boolean coreModule() default false;
 
     String author() default "";

src/main/java/gregtech/api/modules/IGregTechModule.java

@@ -16,9 +16,7 @@ default Set<ResourceLocation> getDependencyUids() {
         return Collections.emptySet();
     }
 
-    @Nonnull
-    default Set<String> getModDependencyIDs() {
-        return Collections.emptySet();
+    default void construction(FMLConstructionEvent event) {
     }
 
     default void preInit(FMLPreInitializationEvent event) {

src/main/java/gregtech/api/modules/ModuleStage.java

@@ -3,6 +3,7 @@
 public enum ModuleStage {
     C_SETUP,         // Initializing Module Containers
     M_SETUP,         // Initializing Modules
+    CONSTRUCTION,    // MC Construction stage
     PRE_INIT,        // MC PreInitialization stage
     INIT,            // MC Initialization stage
     POST_INIT,       // MC PostInitialization stage

src/main/java/gregtech/api/recipes/Recipe.java

@@ -9,7 +9,7 @@
 import gregtech.api.recipes.recipeproperties.RecipeProperty;
 import gregtech.api.util.GTUtility;
 import gregtech.api.util.ItemStackHashStrategy;
-import gregtech.integration.groovy.GroovyScriptCompat;
+import gregtech.integration.groovy.GroovyScriptModule;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
@@ -106,7 +106,7 @@ public Recipe(List<GTRecipeInput> inputs, List<ItemStack> outputs, List<ChanceEn
         this.hidden = hidden;
         this.isCTRecipe = isCTRecipe;
         this.hashCode = makeHashCode();
-        this.groovyRecipe = GroovyScriptCompat.isCurrentlyRunning();
+        this.groovyRecipe = GroovyScriptModule.isCurrentlyRunning();
     }
 
     public Recipe copy() {

src/main/java/gregtech/api/recipes/RecipeBuilder.java

@@ -24,7 +24,7 @@
 import gregtech.api.util.GTUtility;
 import gregtech.api.util.ValidationResult;
 import gregtech.common.ConfigHolder;
-import gregtech.integration.groovy.GroovyScriptCompat;
+import gregtech.integration.groovy.GroovyScriptModule;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -739,7 +739,7 @@ public ValidationResult<Recipe> build() {
     }
 
     protected EnumValidationResult validate() {
-        if (GroovyScriptCompat.isCurrentlyRunning()) {
+        if (GroovyScriptModule.isCurrentlyRunning()) {
             GroovyLog.Msg msg = GroovyLog.msg("Error adding GregTech " + recipeMap.unlocalizedName + " recipe").error();
             validateGroovy(msg);
             return msg.postIfNotEmpty() ? EnumValidationResult.SKIP : EnumValidationResult.VALID;

src/main/java/gregtech/api/recipes/RecipeMap.java

@@ -9,6 +9,7 @@
 import gnu.trove.map.TByteObjectMap;
 import gnu.trove.map.hash.TByteObjectHashMap;
 import gregtech.api.GTValues;
+import gregtech.api.GregTechAPI;
 import gregtech.api.capability.IMultipleTankHandler;
 import gregtech.api.capability.impl.FluidTankList;
 import gregtech.api.gui.GuiTextures;
@@ -18,17 +19,19 @@
 import gregtech.api.gui.widgets.RecipeProgressWidget;
 import gregtech.api.gui.widgets.SlotWidget;
 import gregtech.api.gui.widgets.TankWidget;
-import gregtech.api.recipes.crafttweaker.CTRecipe;
-import gregtech.api.recipes.crafttweaker.CTRecipeBuilder;
+import gregtech.integration.crafttweaker.CTRecipeHelper;
+import gregtech.integration.crafttweaker.recipe.CTRecipe;
+import gregtech.integration.crafttweaker.recipe.CTRecipeBuilder;
 import gregtech.api.recipes.ingredients.GTRecipeInput;
 import gregtech.api.recipes.ingredients.IntCircuitIngredient;
 import gregtech.api.recipes.map.*;
 import gregtech.api.unification.material.Material;
 import gregtech.api.unification.ore.OrePrefix;
 import gregtech.api.util.*;
 import gregtech.common.ConfigHolder;
-import gregtech.integration.groovy.GroovyScriptCompat;
+import gregtech.integration.groovy.GroovyScriptModule;
 import gregtech.integration.groovy.VirtualizedRecipeMap;
+import gregtech.modules.GregTechModules;
 import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
@@ -185,7 +188,8 @@ public RecipeMap(@Nonnull String unlocalizedName,
         this.recipeBuilderSample = defaultRecipeBuilder;
         RECIPE_MAP_REGISTRY.put(unlocalizedName, this);
 
-        this.virtualizedRecipeMap = GroovyScriptCompat.isLoaded() ? new VirtualizedRecipeMap(this) : null;
+        this.virtualizedRecipeMap = GregTechAPI.moduleManager.isModuleEnabled(GregTechModules.MODULE_GRS)
+                ? new VirtualizedRecipeMap(this) : null;
     }
 
 
@@ -304,7 +308,7 @@ public void compileRecipe(Recipe recipe) {
     public boolean removeRecipe(@Nonnull Recipe recipe) {
         List<List<AbstractMapIngredient>> items = fromRecipe(recipe);
         if (recurseIngredientTreeRemove(recipe, items, lookup, 0) != null) {
-            if (GroovyScriptCompat.isCurrentlyRunning()) {
+            if (GroovyScriptModule.isCurrentlyRunning()) {
                 this.virtualizedRecipeMap.addBackup(recipe);
             }
             return true;

src/main/java/gregtech/api/terminal/TerminalRegistry.java

@@ -45,11 +45,11 @@
 import java.util.stream.Collectors;
 
 public class TerminalRegistry {
-    protected static final Map<String, AbstractApplication> APP_REGISTER = new LinkedHashMap<>();
-    protected static final Map<String, Hardware> HW_REGISTER = new LinkedHashMap<>();
-    protected static final Map<String, List<Hardware>[]> APP_HW_DEMAND = new HashMap<>();
-    protected static final Map<String, List<ItemStack>[]> APP_UPGRADE_CONDITIONS = new HashMap<>();
-    protected static final List<String> DEFAULT_APPS = new ArrayList<>();
+    public static final Map<String, AbstractApplication> APP_REGISTER = new LinkedHashMap<>();
+    public static final Map<String, Hardware> HW_REGISTER = new LinkedHashMap<>();
+    public static final Map<String, List<Hardware>[]> APP_HW_DEMAND = new HashMap<>();
+    public static final Map<String, List<ItemStack>[]> APP_UPGRADE_CONDITIONS = new HashMap<>();
+    public static final List<String> DEFAULT_APPS = new ArrayList<>();
     @SideOnly(Side.CLIENT)
     public static File TERMINAL_PATH;
 
@@ -158,9 +158,6 @@ public static void init() {
         AppRegistryBuilder.create(new CapeSelectorApp())
                 .battery(GTValues.ULV, 8)
                 .build();
-        if (Loader.isModLoaded(GTValues.MODID_CT)) { // handle CT register
-            CTTerminalRegistry.register();
-        }
     }
 
     @SideOnly(Side.CLIENT)

src/main/java/gregtech/common/CommonProxy.java

@@ -7,7 +7,6 @@
 import gregtech.api.items.metaitem.MetaItem;
 import gregtech.api.items.toolitem.IGTTool;
 import gregtech.api.recipes.ModHandler;
-import gregtech.api.recipes.crafttweaker.MetaItemBracketHandler;
 import gregtech.api.recipes.ingredients.GTRecipeInput;
 import gregtech.api.recipes.recipeproperties.FusionEUToStartProperty;
 import gregtech.api.terminal.TerminalRegistry;
@@ -29,8 +28,6 @@
 import gregtech.common.pipelike.fluidpipe.ItemBlockFluidPipe;
 import gregtech.common.pipelike.itempipe.BlockItemPipe;
 import gregtech.common.pipelike.itempipe.ItemBlockItemPipe;
-import gregtech.integration.groovy.GroovyScriptCompat;
-import gregtech.integration.jei.GTJeiPlugin;
 import gregtech.loaders.MaterialInfoLoader;
 import gregtech.loaders.OreDictionaryLoader;
 import gregtech.loaders.recipe.CraftingComponent;
@@ -49,12 +46,10 @@
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.event.furnace.FurnaceFuelBurnTimeEvent;
 import net.minecraftforge.fml.client.event.ConfigChangedEvent;
-import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent;
 import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.registries.IForgeRegistry;
 import org.apache.commons.lang3.ArrayUtils;
 
@@ -312,13 +307,6 @@ public static void registerRecipesLowest(RegistryEvent.Register<IRecipe> event)
         GTLog.logger.info("Running late material handlers...");
         OrePrefix.runMaterialHandlers();
         GTRecipeManager.loadLatest();
-
-        if (Loader.isModLoaded(GTValues.MODID_CT)) {
-            MetaItemBracketHandler.rebuildComponentRegistry();
-        }
-        if (GroovyScriptCompat.isLoaded()) {
-            GroovyScriptCompat.loadMetaItemBracketHandler();
-        }
     }
 
     @SubscribeEvent
@@ -374,9 +362,6 @@ public void onPostLoad() {
     }
 
     public void onLoadComplete(FMLLoadCompleteEvent event) {
-        if (Loader.isModLoaded(GTValues.MODID_JEI) && event.getSide() == Side.CLIENT) {
-            GTJeiPlugin.setupInputHandler();
-        }
         GTRecipeInput.INSTANCES = new ObjectOpenHashSet<>();
     }
 

src/main/java/gregtech/common/command/CommandHand.java

@@ -1,15 +1,16 @@
 package gregtech.common.command;
 
+import gregtech.api.GregTechAPI;
 import gregtech.api.capability.GregtechCapabilities;
 import gregtech.api.capability.IElectricItem;
 import gregtech.api.items.toolitem.IGTTool;
 import gregtech.api.unification.OreDictUnifier;
 import gregtech.api.unification.ore.OrePrefix;
 import gregtech.api.unification.stack.MaterialStack;
-import gregtech.api.util.CTRecipeHelper;
 import gregtech.api.util.ClipboardUtil;
-import gregtech.integration.groovy.GroovyScriptCompat;
 import gregtech.api.util.GTLog;
+import gregtech.integration.RecipeCompatUtil;
+import gregtech.modules.GregTechModules;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
@@ -91,7 +92,7 @@ public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sen
                 }
             }
 
-            String id = CTRecipeHelper.getMetaItemId(stackInHand);
+            String id = RecipeCompatUtil.getMetaItemId(stackInHand);
             if (id != null) {
                 String ctId = "<metaitem:" + id + ">";
                 ClipboardUtil.copyToClipboard(player, ctId);
@@ -127,7 +128,7 @@ public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sen
                 }
             }
 
-            if (GroovyScriptCompat.isLoaded()) {
+            if (GregTechAPI.moduleManager.isModuleEnabled(GregTechModules.MODULE_GRS)) {
                 sender.sendMessage(new TextComponentTranslation("gregtech.command.hand.groovy"));
             }
         } else {

src/main/java/gregtech/common/items/MetaItems.java

@@ -5,7 +5,6 @@
 import gregtech.api.items.materialitem.MetaPrefixItem;
 import gregtech.api.items.metaitem.MetaItem;
 import gregtech.api.items.metaitem.MetaItem.MetaValueItem;
-import gregtech.api.items.metaitem.MetaOreDictItem;
 import gregtech.api.unification.OreDictUnifier;
 import gregtech.api.unification.material.MarkerMaterial;
 import gregtech.api.unification.ore.OrePrefix;
@@ -556,8 +555,6 @@ private MetaItems() {
 
     public static MetaItem<?>.MetaValueItem MULTIBLOCK_BUILDER;
 
-    public static MetaOreDictItem CT_OREDICT_ITEM;
-
     private static final List<OrePrefix> orePrefixes = new ArrayList<>();
 
     static {
@@ -605,8 +602,6 @@ private MetaItems() {
     public static void init() {
         MetaItem1 first = new MetaItem1();
         first.setRegistryName("meta_item_1");
-        CT_OREDICT_ITEM = new MetaOreDictItem((short) 0);
-        CT_OREDICT_ITEM.setRegistryName("meta_oredict_item_ct");
         MetaArmor armor = new MetaArmor();
         armor.setRegistryName("gt_armor");
         for (OrePrefix prefix : orePrefixes) {

src/main/java/gregtech/common/terminal/app/recipechart/widget/RGNode.java

@@ -17,7 +17,7 @@
 import gregtech.api.terminal.os.TerminalTheme;
 import gregtech.api.util.GTUtility;
 import gregtech.api.util.Position;
-import gregtech.integration.jei.GTJeiPlugin;
+import gregtech.integration.jei.JustEnoughItemsModule;
 import gregtech.integration.jei.recipe.GTRecipeWrapper;
 import mezz.jei.api.gui.IRecipeLayout;
 import mezz.jei.api.recipe.IFocus;
@@ -167,8 +167,8 @@ private void init(RGContainer container) {
                 .setIcon(GuiTextures.ICON_LOCATION)
                 .setHoverText("terminal.recipe_chart.jei")
                 .setClickListener(cd -> {
-                    if (GTJeiPlugin.jeiRuntime != null && head != null && !(head instanceof ItemStack && ((ItemStack) head).isEmpty())) {
-                        GTJeiPlugin.jeiRuntime.getRecipesGui().show(new Focus<>(IFocus.Mode.OUTPUT, head));
+                    if (JustEnoughItemsModule.jeiRuntime != null && head != null && !(head instanceof ItemStack && ((ItemStack) head).isEmpty())) {
+                        JustEnoughItemsModule.jeiRuntime.getRecipesGui().show(new Focus<>(IFocus.Mode.OUTPUT, head));
                     }
                 }));
         inputsGroup.setVisible(false);
@@ -409,7 +409,7 @@ public boolean transferRecipe(ModularUIContainer x, IRecipeLayout recipeLayout,
                 }
             }
             IRecipeCategory<?> category = recipeLayout.getRecipeCategory();
-            List<Object> catalysts = GTJeiPlugin.jeiRuntime.getRecipeRegistry().getRecipeCatalysts(category);
+            List<Object> catalysts = JustEnoughItemsModule.jeiRuntime.getRecipeRegistry().getRecipeCatalysts(category);
             ItemStack catalyst = null;
 
             if (recipe != null) { // GT