Merge pull request #65 from GTNewHorizons/unified-build-script2

Move sources and resources

71 files changed, 0 insertions, 4902 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
deleted file mode 100644
index 0817202e85..0000000000
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package gtPlusPlus.xmod.gregtech.registration.gregtech;
-
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-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.multi.production.GT4Entity_AutoCrafter;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_ThermalBoiler;
-import gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving.*;
-
-public class Gregtech4Content {
-
-	// ID Range 828, 829, 833 - 850
-
-	public static void run() {
-		if (LoadedMods.Gregtech) {
-			workbenches();
-			thermalBoiler();
-			multiCrafter();
-			tesseracts();
-			shelves();
-		}
-	}
-
-	private static void workbenches() {
-		// Gregtech 4 Workbenches
-		//Utils.LOG_INFO("Gregtech 4 Content | Registering Workbenches.");
-		// Free //GregtechItemList.GT4_Workbench_Bronze.set(new
-		// GT_MetaTileEntity_BronzeCraftingTable(828, "workbench.bronze",
-		// "Bronze Workbench", 0).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 shelves() {
-		// Gregtech 4 Shelves
-		Logger.INFO("Gregtech 4 Content | Registering Shelves.");
-		GregtechItemList.GT4_Shelf
-				.set(new GT4Entity_Shelf(870, "gtplusplus.shelf.wooden", "Wooden Shelf", "Usually used for books")
-						.getStackForm(1L));
-		GregtechItemList.GT4_Shelf_Iron.set(
-				new GT4Entity_Shelf_Iron(871, "gtplusplus.shelf.iron", "Metal Shelf", "A heavy duty shelf")
-						.getStackForm(1L));
-		GregtechItemList.GT4_Shelf_FileCabinet.set(new GT4Entity_Shelf_FileCabinet(872, "gtplusplus.shelf.filecabinet",
-				"File Cabinet", "Could look nice in your office").getStackForm(1L));
-		GregtechItemList.GT4_Shelf_Desk.set(
-				new GT4Entity_Shelf_Desk(873, "gtplusplus.shelf.desk", "Metal encased Desk", "A place to study")
-						.getStackForm(1L));
-		GregtechItemList.GT4_Shelf_Compartment.set(new GT4Entity_Shelf_Compartment(874, "gtplusplus.shelf.compartment",
-				"Compartment", "Stores Books & Things").getStackForm(1L));
-		
-		//Custom Storage
-		GregtechItemList.GT4_Shelf_Large.set(
-				new GT4Entity_Shelf_Large(966, "gtplusplus.shelf.large", "Large Shelf", "A spacious shelf", 2048)
-						.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/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
deleted file mode 100644
index d50a8f3924..0000000000
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
+++ /dev/null
@@ -1,104 +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.lib.LoadedMods;
-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() {
-		if (LoadedMods.Gregtech) {
-			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) });
-
-	}
-
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java
deleted file mode 100644
index 3cefaa1bf7..0000000000
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package gtPlusPlus.xmod.gregtech.registration.gregtech;
-
-import java.util.Collection;
-
-import gregtech.api.enums.ItemList;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
-import gregtech.api.util.GTPP_Recipe;
-
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-
-public class GregtechAdvancedMixer {
-
-	private static int mID = 851;
-
-	public static void run(){
-		//generateMixerRecipeMap();
-		run1();
-	}
-	
-	private static GT_Recipe_Map map = GT_Recipe.GT_Recipe_Map.sMixerRecipes;
-	
-	private static boolean generateMixerRecipeMap(){
-		if (GTPP_Recipe.GTPP_Recipe_Map.sAdvancedMixerRecipes.mRecipeList.size() == 0){
-			GT_Recipe_Map oldMap = GT_Recipe.GT_Recipe_Map.sMixerRecipes;
-			GT_Recipe_Map map = GTPP_Recipe.GTPP_Recipe_Map.sAdvancedMixerRecipes;
-			final Collection<GT_Recipe> x = oldMap.mRecipeList;
-			//Logger.INFO("Generating " + map.mUnlocalizedName + " Recipes.");
-			for (final GT_Recipe g : x) {
-				GTPP_Recipe.GTPP_Recipe_Map.sAdvancedMixerRecipes.add(g);
-			}
-
-			if (GTPP_Recipe.GTPP_Recipe_Map.sAdvancedMixerRecipes.mRecipeList.size() > 0){
-				return true;
-			}
-			else {
-				Logger.INFO("Failed to generate "+ map.mUnlocalizedName +" recipes.");
-				return false;
-			}
-
-		}		
-		return true;
-	}
-
-	private static void run1(){
-		GregtechItemList.Machine_Advanced_LV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.01",
-				"Basic Combiner", 1, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1,
-				"MixerAdvanced.png", "", false, false, 0, "MIXER", null
-				/*new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
-						ItemList.Machine_LV_Mixer, Character.val