Merge addon sources

58 files changed, 0 insertions, 4322 deletions

diff --git a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
deleted file mode 100644
index d08b010e97..0000000000
--- a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package gtPlusPlus.xmod.gregtech.registration.gregtech;
-
-import gregtech.api.GregTech_API;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_ElectricAutoWorkbench;
-import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator;
-import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_CropHarvestor;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_AutoCrafter;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_ThermalBoiler;
-
-public class Gregtech4Content {
-
-    // ID Range 828, 829, 833 - 850
-
-    public static void run() {
-        Logger.INFO("Max MTE: " + GregTech_API.METATILEENTITIES.length + " | " + GregTech_API.MAXIMUM_METATILE_IDS);
-        thermalBoiler();
-        multiCrafter();
-        tesseracts();
-        basic();
-        automation();
-    }
-
-    private static void automation() {
-        Logger.INFO("Gregtech 4 Content | Registering Auto Workbenches.");
-        GregtechItemList.GT4_Electric_Auto_Workbench_LV
-            .set(new GT_MetaTileEntity_ElectricAutoWorkbench(31091, 1, "Automatic crafting machine").getStackForm(1L));
-        GregtechItemList.GT4_Electric_Auto_Workbench_MV
-            .set(new GT_MetaTileEntity_ElectricAutoWorkbench(31092, 2, "Automatic crafting machine").getStackForm(1L));
-        GregtechItemList.GT4_Electric_Auto_Workbench_HV
-            .set(new GT_MetaTileEntity_ElectricAutoWorkbench(31093, 3, "Automatic crafting machine").getStackForm(1L));
-        GregtechItemList.GT4_Electric_Auto_Workbench_EV
-            .set(new GT_MetaTileEntity_ElectricAutoWorkbench(31094, 4, "Automatic crafting machine").getStackForm(1L));
-        GregtechItemList.GT4_Electric_Auto_Workbench_IV
-            .set(new GT_MetaTileEntity_ElectricAutoWorkbench(31095, 5, "Automatic crafting machine").getStackForm(1L));
-        GregtechItemList.GT4_Electric_Auto_Workbench_LuV
-            .set(new GT_MetaTileEntity_ElectricAutoWorkbench(31096, 6, "Automatic crafting machine").getStackForm(1L));
-        GregtechItemList.GT4_Electric_Auto_Workbench_ZPM
-            .set(new GT_MetaTileEntity_ElectricAutoWorkbench(31097, 7, "Automatic crafting machine").getStackForm(1L));
-        GregtechItemList.GT4_Electric_Auto_Workbench_UV
-            .set(new GT_MetaTileEntity_ElectricAutoWorkbench(31098, 8, "Automatic crafting machine").getStackForm(1L));
-
-    }
-
-    private static void basic() {
-        Logger.INFO("Gregtech 4 Content | Registering Crop Managers.");
-        GregtechItemList.GT4_Crop_Harvester_LV.set(
-            new GT_MetaTileEntity_CropHarvestor(31111, 1, "Harvests the Cropsticks in front of it").getStackForm(1L));
-        GregtechItemList.GT4_Crop_Harvester_MV.set(
-            new GT_MetaTileEntity_CropHarvestor(31112, 2, "Harvests the Cropsticks in front of it").getStackForm(1L));
-        GregtechItemList.GT4_Crop_Harvester_HV.set(
-            new GT_MetaTileEntity_CropHarvestor(31113, 3, "Harvests the Cropsticks in front of it").getStackForm(1L));
-        GregtechItemList.GT4_Crop_Harvester_EV.set(
-            new GT_MetaTileEntity_CropHarvestor(31114, 4, "Harvests the Cropsticks in front of it").getStackForm(1L));
-        GregtechItemList.GT4_Crop_Harvester_IV.set(
-            new GT_MetaTileEntity_CropHarvestor(31115, 5, "Harvests the Cropsticks in front of it").getStackForm(1L));
-        GregtechItemList.GT4_Crop_Harvester_LuV.set(
-            new GT_MetaTileEntity_CropHarvestor(31116, 6, "Harvests the Cropsticks in front of it").getStackForm(1L));
-        GregtechItemList.GT4_Crop_Harvester_ZPM.set(
-            new GT_MetaTileEntity_CropHarvestor(31117, 7, "Harvests the Cropsticks in front of it").getStackForm(1L));
-        GregtechItemList.GT4_Crop_Harvester_UV.set(
-            new GT_MetaTileEntity_CropHarvestor(31118, 8, "Harvests the Cropsticks in front of it").getStackForm(1L));
-    }
-
-    private static void tesseracts() {
-        // Gregtech 4 Tesseracts
-        Logger.INFO("Gregtech 4 Content | Registering Tesseracts.");
-        GregtechItemList.GT4_Tesseract_Generator.set(
-            new GT_MetaTileEntity_TesseractGenerator(833, "tesseract.generator", "Tesseract Generator", 4)
-                .getStackForm(1L));
-        GregtechItemList.GT4_Tesseract_Terminal.set(
-            new GT_MetaTileEntity_TesseractTerminal(834, "tesseract.terminal", "Tesseract Terminal", 4)
-                .getStackForm(1L));
-    }
-
-    private static void thermalBoiler() {
-        // Gregtech 4 Thermal Boiler
-        if (CORE.ConfigSwitches.enableMultiblock_ThermalBoiler) {
-            Logger.INFO("Gregtech 4 Content | Registering Thermal Boiler.");
-            GregtechItemList.GT4_Thermal_Boiler
-                .set(new GT4Entity_ThermalBoiler(875, "gtplusplus.thermal.boiler", "Thermal Boiler").getStackForm(1L));
-        }
-    }
-
-    private static void multiCrafter() {
-        // Gregtech 4 Multiblock Auto-Crafter
-        Logger.INFO("Gregtech 4 Content | Registering Multiblock Crafter.");
-        GregtechItemList.GT4_Multi_Crafter.set(
-            new GT4Entity_AutoCrafter(876, "gtplusplus.autocrafter.multi", "Large Scale Auto-Assembler v1.01")
-                .getStackForm(1L));
-    }
-}
diff --git a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java b/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
deleted file mode 100644
index e77e2b1c54..0000000000
--- a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package gtPlusPlus.xmod.gregtech.registration.gregtech;
-
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.material.ALLOY;
-import gtPlusPlus.core.recipe.RECIPES_MachineComponents;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_Boiler_HV;
-import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_Boiler_LV;
-import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_Boiler_MV;
-
-public class GregtechAdvancedBoilers {
-
-    public static void run() {
-        Logger.INFO("Gregtech5u Content | Registering Advanced Boilers.");
-        run1();
-    }
-
-    private static void run1() {
-        // Boilers
-        GregtechItemList.Boiler_Advanced_LV
-            .set(new GT_MetaTileEntity_Boiler_LV(753, "Advanced Boiler [LV]", 1).getStackForm(1L));
-        GregtechItemList.Boiler_Advanced_MV
-            .set(new GT_MetaTileEntity_Boiler_MV(754, "Advanced Boiler [MV]", 2).getStackForm(1L));
-        GregtechItemList.Boiler_Advanced_HV
-            .set(new GT_MetaTileEntity_Boiler_HV(755, "Advanced Boiler [HV]", 3).getStackForm(1L));
-
-        ItemStack chassisT1 = ItemUtils
-            .getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 0, 1);
-        ItemStack chassisT2 = ItemUtils
-            .getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 1, 1);
-        ItemStack chassisT3 = ItemUtils
-            .getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 2, 1);
-
-        // Make the Coil in each following recipe a hammer and a Screwdriver.
-
-        // Chassis Recipes
-        GT_ModHandler.addCraftingRecipe(
-            chassisT1,
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE
-                | GT_ModHandler.RecipeBits.BUFFERED,
-            new Object[] { "WCW", "GMG", "WPW", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('P'),
-                OrePrefixes.pipeLarge.get(Materials.Bronze), Character.valueOf('C'),
-                OrePrefixes.circuit.get(Materials.Primitive), Character.valueOf('W'),
-                OrePrefixes.plate.get(Materials.Lead), Character.valueOf('G'),
-                OrePrefixes.pipeSmall.get(Materials.Copper) });
-
-        GT_ModHandler.addCraftingRecipe(
-            chassisT2,
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE
-                | GT_ModHandler.RecipeBits.BUFFERED,
-            new Object[] { "WCW", "GMG", "WPW", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('P'),
-                OrePrefixes.pipeLarge.get(Materials.Steel), Character.valueOf('C'),
-                OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('W'),
-                OrePrefixes.plate.get(Materials.Steel), Character.valueOf('G'),
-                OrePrefixes.pipeSmall.get(Materials.Bronze) });
-
-        GT_ModHandler.addCraftingRecipe(
-            chassisT3,
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE
-                | GT_ModHandler.RecipeBits.BUFFERED,
-            new Object[] { "WCW", "GMG", "WPW", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('P'),
-                OrePrefixes.pipeLarge.get(Materials.StainlessSteel), Character.valueOf('C'),
-                OrePrefixes.circuit.get(Materials.Good), Character.valueOf('W'),
-                OrePrefixes.plate.get(Materials.Aluminium), Character.valueOf('G'),
-                OrePrefixes.pipeSmall.get(Materials.Steel) });
-
-        ItemStack pipeTier1 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier7, 1);
-        ItemStack pipeTier2 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier8, 1);
-        ItemStack pipeTier3 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier9, 1);
-
-        // Boiler Recipes
-        GT_ModHandler.addCraftingRecipe(
-            GregtechItemList.Boiler_Advanced_LV.get(1L, new Object[0]),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE
-                | GT_ModHandler.RecipeBits.BUFFERED,
-            new Object[] { "dCw", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('P'),
-                pipeTier1, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('W'),
-                chassisT1, Character.valueOf('G'), OrePrefixes.gear.get(Materials.Steel) });
-
-        GT_ModHandler.addCraftingRecipe(
-            GregtechItemList.Boiler_Advanced_MV.get(1L, new Object[0]),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE
-                | GT_ModHandler.RecipeBits.BUFFERED,
-            new Object[] { "dCw", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('P'),
-                pipeTier2, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good), Character.valueOf('W'),
-                chassisT2, Character.valueOf('G'), ALLOY.SILICON_CARBIDE.getGear(1) });
-
-        GT_ModHandler.addCraftingRecipe(
-            GregtechItemList.Boiler_Advanced_HV.get(1L, new Object[0]),
-            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                | GT_ModHandler.RecipeBits.REVERSIBLE
-                | GT_ModHandler.RecipeBits.BUFFERED,
-            new Object[] { "dCw", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('P'),
-                pipeTier3, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('W'),
-                chassisT3, Character.valueOf('G'), ALLOY.SILICON_CARBIDE.getGear(1) });
-    }
-}
diff --git a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java b/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java
deleted file mode 100644
index 3c244739f6..0000000000
--- a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package gtPlusPlus.xmod.gregtech.registration.gregtech;
-
-import gregtech.api.GregTech_API;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.GT_MetaTileEntity_Hatch_Catalysts;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.algae.GregtechMTE_AlgaePondBase;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.chemplant.GregtechMTE_ChemicalPlant;
-
-public class GregtechAlgaeContent {
-
-    public static void run() {
-        Logger.INFO("Gregtech5u Content | Registering Algae Content.");
-        run1();
-    }
-
-    private static void run1() {
-
-        // Algae Pond
-        GregtechItemList.AlgaeFarm_Controller
-            .set(new GregtechMTE_AlgaePondBase(997, "algaefarm.controller.tier.single", "Algae Farm").getStackForm(1L));
-
-        // Chemical Plant
-        GregtechItemList.ChemicalPlant_Controller.set(
-            new GregtechMTE_ChemicalPlant(998, "chemicalplant.controller.tier.single", "ExxonMobil Chemical Plant")
-                .getStackForm(1L));
-
-        GregtechItemList.Bus_Catalysts.set(
-            (new GT_MetaTileEntity_Hatch_Catalysts(31030, "hatch.catalysts", "Catalyst Housing")).getStackForm(1L));
-
-        int aTier = 0;
-        // Bronze
-        GregtechMTE_ChemicalPlant.registerMachineCasingForTier(aTier++, ModBlocks.blockCustomMachineCasings, 0, 10);
-        // Steel
-        GregtechMTE_ChemicalPlant.registerMachineCasingForTier(aTier++, GregTech_API.sBlockCasings2, 0, 16);
-        // Aluminium
-        GregtechMTE_ChemicalPlant.registerMachineCasingForTier(aTier++, ModBlocks.blockCustomMachineCasings, 1, 17);
-        // Stainless
-        GregtechMTE_ChemicalPlant.registerMachineCasingForTier(aTier++, GregTech_API.sBlockCasings4, 1, 49);
-        // Titanium
-        GregtechMTE_ChemicalPlant.registerMachineCasingForTier(aTier++, GregTech_API.sBlockCasings4, 2, 50);
-        // Tungsten
-        GregtechMTE_ChemicalPlant.registerMachineCasingForTier(aTier++, GregTech_API.sBlockCasings4, 0, 48);
-        // Laurenium
-        GregtechMTE_ChemicalPlant.registerMachineCasingForTier(aTier++, ModBlocks.blockCustomMachineCasings, 2, 84);
-        // Botmium
-        GregtechMTE_ChemicalPlant.registerMachineCasingForTier(aTier++, ModBlocks.blockCustomMachineCasings, 3, 11);
-    }
-}
diff --git a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java b/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java
deleted file mode 100644
index 8fc84177ca..0000000000
--- a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package gtPlusPlus.xmod.gregtech.registration.gregtech;
-
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.misc.GMTE_AmazonPackager;
-
-public class GregtechAmazonWarehouse {
-
-    public static void run() {
-        Logger.INFO("Gregtech5u Content | Registering Amazon Warehouse Multiblock.");
-        run1();
-    }
-
-    private static void run1() {
-        // Amazon packager multiblock
-        GregtechItemList.Amazon_Warehouse_Controller.set(
-            new GMTE_AmazonPackager(942, "amazonprime.controller.tier.single", "Amazon Warehousing Depot.")
-                .getStackForm(1L));
-    }
-}
diff --git a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java b/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java
deleted file mode 100644
index 20df726ebe..0000000000
--- a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java
+++ /dev/null