diff options
| author | boubou19 <miisterunknown@gmail.com> | 2024-08-15 16:48:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-15 16:48:03 +0200 |
| commit | 361adcefd72d3f58040b18cc7ae92b65ec017522 (patch) | |
| tree | 8a93908c1fc4f0cf4e2395b02715f2cbd9fd805f | |
| parent | 0f990a7cfd78c3ede4db09a893e1e6edff164a2a (diff) | |
| download | GT5-Unofficial-361adcefd72d3f58040b18cc7ae92b65ec017522.tar.gz GT5-Unofficial-361adcefd72d3f58040b18cc7ae92b65ec017522.tar.bz2 GT5-Unofficial-361adcefd72d3f58040b18cc7ae92b65ec017522.zip | |
add forbidden getModItem calls (#2869)
* add forbidden getModItem calls
* remove bartworks gmi
* remove goodgenerators gmi
* spotless
* no more literals in getModItem calls
* fix kekztech calls
* fix kubatech calls
* fix gregtech calls (1/?)
* move WA from NHCore to GT5U
* MTE enum expanded with bw values
* MTE enum expanded with tectech values
* fix inversion
* fix gregtech calls (2/?)
* copied enum from NHCore to GT5U and moved machine hulls
* moved plasma gens and alloy smelters
* moved machine matter amplifiers, assemblers, scanners, Pump, transformers
* moved battery buffer 1,2,3,4, battery charger 4x4, dynamo hatches, energy hatches
* moved wet transformers, hi amps transformers, turbo chargers, chest buffers, rock breakers, input hatches, output hatches
* moved circuit assemblers
* moved chemical bath, chemical reactor, fermenter, fluid canner, fluid extractor, fluid heater, mixer
* moved autoclave, bending machine, compressor, cutting machine, distillery, electric furnace, electrolyzer, electromagnetic separator, extractor, extruder, fluid solidifier, forming press, forge hammer, lathe, precision laser engraver, macerator, matter fabricator, microwave, washing plant, polarizer, recycler, replicator, sifter, slicer, thermal centrifuge, wiremill, arc furnace, centrifuge, plasma arc furnace, canning machine
* moved batteries
* comment
* spotless apply
* yeet * imports
* bronze blast furnace is no more since a while
* sanitize kubatech MTE registration
* merge GG's MTE enum into GT5U one
* fix gregtech calls (3/4)
* fix gt++ calls (1/?)
* small cleanup
* fix gt++ calls (2/3)
* fix gt++ calls (3/3)
* temporary test
* fix config
* Revert "temporary test"
This reverts commit ad99b8a4736794aab1d01ff453809c6f7e721724.
* disabled the GT check until GTNH-Intergalactic is merged into GT5U or at least its GT5U parts
* spotless apply
* dumb dumb
* fix dynamic access to CustomItemList
* update tests
* fix scala test
* fix script?
* fix script?
* actual fix?
* there we go!
* yeet GT for now, until we move the EOH Controller recipe somewhere else
* fix dep
69 files changed, 10805 insertions, 1507 deletions
diff --git a/.github/test-scala-presence.toml b/.github/test-scala-presence.toml deleted file mode 100644 index ae0e9acd49..0000000000 --- a/.github/test-scala-presence.toml +++ /dev/null @@ -1,2 +0,0 @@ -[exclude] -"src/main/java/**/*.java" = "import scala."
\ No newline at end of file diff --git a/.github/workflows/test-forbidden-getmoditems.yml b/.github/workflows/test-forbidden-getmoditems.yml new file mode 100644 index 0000000000..ab683d26eb --- /dev/null +++ b/.github/workflows/test-forbidden-getmoditems.yml @@ -0,0 +1,18 @@ +name: Forbidden getModItems + +on: + pull_request: + branches: [ master, main ] + push: + branches: [ master, main ] + +jobs: + test-forbidden-getmoditems: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Detect forbidden getModItem calls + shell: bash + run: | + ! grep -E -r 'getModItem\(("(bartworks|galacticgreg|ggfab|GoodGenerator|gregtech|gtnhlanth|miscutils|kekztech|kubatech|tectech)"|(BartWorks|GalactiGreg|GGFab|GoodGenerator|GTNHLanthanides|GTPlusPlus|KekzTech|KubaTech|TecTech)\.ID)' src/main/java diff --git a/.github/workflows/test-scala-presence.yml b/.github/workflows/test-scala-presence.yml index 6b1091e1fd..5baca0bdc9 100644 --- a/.github/workflows/test-scala-presence.yml +++ b/.github/workflows/test-scala-presence.yml @@ -11,8 +11,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 - - name: Check file content - uses: mattsb42-meta/not-grep@1.0.0 - with: - config-file: ./.github/test-scala-presence.toml + uses: actions/checkout@v4 + - name: Detect scala presence + shell: bash + run: | + ! grep -E -r 'import scala\.' src/main/java + diff --git a/dependencies.gradle b/dependencies.gradle index 4fed0c334c..a8aca2eae3 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -54,7 +54,8 @@ dependencies { implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.3.3:dev') { transitive = false } compileOnlyApi("com.github.GTNewHorizons:Avaritia:1.51:dev") - compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.9.7:dev") { transitive = false } + // this is required because forestry is an hidden hard dep, revert this if you fixed the hidden hard dep + implementation("com.github.GTNewHorizons:ForestryMC:4.9.7:dev") { transitive = false } compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta4:api') { transitive = false } compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.0:dev") { transitive = false } diff --git a/src/functionalTest/java/gregtech/test/GTRecipeTest.java b/src/functionalTest/java/gregtech/test/GTRecipeTest.java index 8cf7c36b84..104228992e 100644 --- a/src/functionalTest/java/gregtech/test/GTRecipeTest.java +++ b/src/functionalTest/java/gregtech/test/GTRecipeTest.java @@ -1,12 +1,11 @@ package gregtech.test; +import static gregtech.api.GregTech_API.sBlockOres1; import static gregtech.api.enums.GT_Values.RA; import static gregtech.api.enums.ItemList.Circuit_Parts_Crystal_Chip_Master; import static gregtech.api.enums.ItemList.IC2_LapotronCrystal; -import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.OrePrefixes.circuit; import static gregtech.api.enums.OrePrefixes.lens; -import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_OreDictUnificator.get; import static gregtech.api.util.GT_Utility.copyAmount; import static net.minecraft.init.Blocks.chest; @@ -69,7 +68,7 @@ class GTRecipeTest { .toArray(new GT_Recipe[0])[0]; RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.blockores", 1, 32)) + .itemInputs(new ItemStack(sBlockOres1, 1, 32)) .itemOutputs(new ItemStack(iron_ingot, 1)) .duration(0) .eut(0) @@ -227,7 +226,7 @@ class GTRecipeTest { // as mUnificationTarget is not set for circuits in GT5. // But it works in the same way; specific circuit -> GT ore block, unificated circuit -> vanilla ore block GT_Recipe recipeCorrectOre = recipeMap.findRecipeQuery() - .items(getModItem(GregTech.ID, "gt.blockores", 1, 32)) + .items(new ItemStack(sBlockOres1, 1, 32)) .find(); assertNotNull(recipeCorrectOre); diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index 19c258d429..140485c317 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -81,6 +81,8 @@ import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.Thulium import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.YtterbiumChlorideConcentrate; import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.YtterbiumExtractingNanoResin; import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.YtterbiumOreConcentrate; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.enums.OrePrefixes.blockCasingAdvanced; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; @@ -281,7 +283,7 @@ public class RecipeLoader { .eut(7680) .addTo(assemblerRecipes); - ItemStack insulator = GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorSheet", 1); + ItemStack insulator = GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorSheet", 1); // Coolant Delivery Casing @@ -629,7 +631,7 @@ public class RecipeLoader { .itemInputs( new ItemStack(LanthItemList.MASKED_MASK), MyMaterial.lithiumChloride.get(OrePrefixes.dust, 2), - GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 4)) + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 4)) .itemOutputs(new ItemStack(LanthItemList.maskMap.get(MaskList.BLANK2))) .duration(25 * GT_RecipeBuilder.SECONDS) .eut(1920) @@ -948,7 +950,7 @@ public class RecipeLoader { // IODINE-START // SeaweedAsh GT_ModHandler.addSmeltingRecipe( - GT_ModHandler.getModItem("harvestcraft", "seaweedItem", 1), + GT_ModHandler.getModItem(PamsHarvestCraft.ID, "seaweedItem", 1), WerkstoffMaterialPool.SeaweedAsh.get(OrePrefixes.dustSmall, 1)); // SeaweedConcentrate @@ -985,7 +987,7 @@ public class RecipeLoader { GT_Values.RA.stdBuilder() .itemInputs( Materials.Pyrolusite.getDust(6), - GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 6), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 6), WerkstoffMaterialPool.PotassiumChlorate.get(OrePrefixes.dust, 5)) .itemOutputs( WerkstoffMaterialPool.PotassiumPermanganate.get(OrePrefixes.dust, 12), @@ -1008,7 +1010,7 @@ public class RecipeLoader { // 6KOH + 6Cl = KClO3 + 5KCl + 3H2O GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 18), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 18), GT_Utility.getIntegratedCircuit(3)) .itemOutputs( Materials.RockSalt.getDust(10), @@ -2224,7 +2226,7 @@ public class RecipeLoader { // Lanthanum GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Lanthanum.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2236,7 +2238,7 @@ public class RecipeLoader { // Praseodymium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Praseodymium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2248,7 +2250,7 @@ public class RecipeLoader { // Cerium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Cerium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2260,7 +2262,7 @@ public class RecipeLoader { // Neodymium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Neodymium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2272,7 +2274,7 @@ public class RecipeLoader { // Promethium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Promethium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2284,7 +2286,7 @@ public class RecipeLoader { // Sm GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Samarium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2296,7 +2298,7 @@ public class RecipeLoader { // Europium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Europium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2308,7 +2310,7 @@ public class RecipeLoader { // Gadolinium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Gadolinium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2320,7 +2322,7 @@ public class RecipeLoader { // Terbium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Terbium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2332,7 +2334,7 @@ public class RecipeLoader { // Dysprosium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Dysprosium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2344,7 +2346,7 @@ public class RecipeLoader { // Holmium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Holmium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2356,7 +2358,7 @@ public class RecipeLoader { // Erbium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Erbium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2368,7 +2370,7 @@ public class RecipeLoader { // Thulium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Thulium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2380,7 +2382,7 @@ public class RecipeLoader { // Ytterbium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Ytterbium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2392,7 +2394,7 @@ public class RecipeLoader { // Lutetium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Lutetium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java index 4378f87a96..27cf0f4fe6 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java @@ -24,10 +24,8 @@ import com.github.bartimaeusnek.bartworks.API.API_ConfigValues; public class ConfigHandler { - private static final int IDU = 10 * 8 + 5; public static Configuration c; - public static int IDOffset = 12600; public static int megaMachinesMax = 256; public static int mbWaterperSec = 150; public static int ross128BID = -64; @@ -130,14 +128,6 @@ public class ConfigHandler { "If you wish to enable \"Shared Item Stack\" tooltips") .getBoolean(true); - ConfigHandler.IDOffset = ConfigHandler.c - .get( - "System", - "ID Offset", - 12600, - "ID Offset for this mod. This Mod uses " + ConfigHandler.IDU - + " IDs. DO NOT CHANGE IF YOU DONT KNOW WHAT THIS IS") - .getInt(12600); ConfigHandler.teslastaff = ConfigHandler.c .get( "System", @@ -238,18 +228,6 @@ public class ConfigHandler { "How much should the MBF produce pollution per tick per ingot. Then it'll be multiplied by the amount of ingots done in parallel") .getInt(ConfigHandler.basePollutionMBFSecond); - if (ConfigHandler.IDOffset == 0) { - ConfigHandler.IDOffset = 12600; - ConfigHandler.c - .get( - "System", - "ID Offset", - 12600, - "ID Offset for this mod. This Mod uses " + ConfigHandler.IDU - + " IDs. DO NOT CHANGE IF YOU DONT KNOW WHAT THIS IS") - .set(12600); - } - ConfigHandler.GTppLogDisabler = ConfigHandler.c .get("System", "Disable GT++ Logging", false, "Enables or Disables GT++ Logging.") .getBoolean(false); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java index 0e7614110b..dfc3ab7e83 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java @@ -1,10 +1,15 @@ package com.github.bartimaeusnek.bartworks.common.loaders; import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.electricImplosionCompressorRecipes; +import static goodgenerator.loader.Loaders.highDensityPlutonium; +import static goodgenerator.loader.Loaders.highDensityPlutoniumNugget; +import static goodgenerator.loader.Loaders.highDensityThorium; +import static goodgenerator.loader.Loaders.highDensityThoriumNugget; +import static goodgenerator.loader.Loaders.highDensityUranium; +import static goodgenerator.loader.Loaders.highDensityUraniumNugget; import static gregtech.api.enums.GT_Values.M; import static gregtech.api.enums.Mods.Avaritia; import static gregtech.api.enums.Mods.EternalSingularity; -import static gregtech.api.enums.Mods.GoodGenerator; import static gregtech.api.enums.Mods.OpenComputers; import static gregtech.api.enums.Mods.SuperSolarPanels; import static gregtech.api.enums.Mods.UniversalSingularities; @@ -12,6 +17,8 @@ import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -51,8 +58,8 @@ public class ElectricImplosionCompressorRecipes implements Runnable { } GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GoodGenerator.ID, "highDensityPlutoniumNugget", 5L)) - .itemOutputs(getModItem(GoodGenerator.ID, "highDensityPlutonium", 1L)) + .itemInputs(new ItemStack(highDensityPlutoniumNugget, 5)) + .itemOutputs(new ItemStack(highDensityPlutonium, 1)) .fluidInputs(Materials.Neutronium.getMolten(72L)) .duration(1) .eut(TierEU.RECIPE_UEV) @@ -60,8 +67,8 @@ public class ElectricImplosionCompressorRecipes implements Runnable { .addTo(electricImplosionCompressorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GoodGenerator.ID, "highDensityUraniumNugget", 5L)) - .itemOutputs(getModItem(GoodGenerator.ID, "highDensityUranium", 1L)) + .itemInputs(new ItemStack(highDensityUraniumNugget, 5)) + .itemOutputs(new ItemStack(highDensityUranium, 1)) .fluidInputs(Materials.Neutronium.getMolten(72L)) .duration(1) .eut(TierEU.RECIPE_UEV) @@ -69,8 +76,8 @@ public class ElectricImplosionCompressorRecipes implements Runnable { .addTo(electricImplosionCompressorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GoodGenerator.ID, "highDensityThoriumNugget", 5L)) - .itemOutputs(getModItem(GoodGenerator.ID, "highDensityThorium", 1L)) + .itemInputs(new ItemStack(highDensityThoriumNugget, 5)) + .itemOutputs(new ItemStack(highDensityThorium, 1)) .fluidInputs(Materials.Neutronium.getMolten(72L)) .duration(1) .eut(TierEU.RECIPE_UEV) diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java index 841066a893..d1167b3a09 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java @@ -15,6 +15,165 @@ package com.github.bartimaeusnek.bartworks.common.loaders; import static com.github.bartimaeusnek.bartworks.MainMod.BWT; import static com.github.bartimaeusnek.bartworks.MainMod.GT2; +import static gregtech.api.enums.MetaTileEntityIDs.AcidGeneratorEV; +import static gregtech.api.enums.MetaTileEntityIDs.AcidGeneratorHV; +import static gregtech.api.enums.MetaTileEntityIDs.AcidGeneratorLV; +import static gregtech.api.enums.MetaTileEntityIDs.AcidGeneratorMV; +import static gregtech.api.enums.MetaTileEntityIDs.CircuitAssemblyLine; +import static gregtech.api.enums.MetaTileEntityIDs.CompressedFluidHatch; +import static gregtech.api.enums.MetaTileEntityIDs.DeepEarthHeatingPump; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_HV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_LV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_MV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_UV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_UXV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_HV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_LV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_MV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_UV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_UXV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_HV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_LV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_MV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_UV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_UXV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_HV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_LV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_MV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_UV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_UXV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_HV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_LV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_MV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_UV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_UXV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.ElectricImplosionCompressor; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_EV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_HV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_IV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_LV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_MV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_UV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_UXV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.GiantOutputHatch; +import static gregtech.api.enums.MetaTileEntityIDs.HighTemperatureGasCooledReactor; +import static gregtech.api.enums.MetaTileEntityIDs.HumongousInputHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter128A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter128A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter128A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter128A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter32A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter32A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter32A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter32A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter64A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter64A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter64A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter64A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter96A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter96A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter96A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter96A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserPipe; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch128A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch128A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch128A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch128A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch32A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch32A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch32A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch32A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch64A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch64A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch64A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch64A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch96A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch96A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch96A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch96A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch128A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch128A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch128A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch128A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch32A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch32A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch32A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch32A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch64A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch64A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch64A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch64A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch96A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch96A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch96A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch96A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.MegaBlastFurnace; +import static gregtech.api.enums.MetaTileEntityIDs.MegaChemicalReactor; +import static gregtech.api.enums.MetaTileEntityIDs.MegaDistillationTower; +import static gregtech.api.enums.MetaTileEntityIDs.MegaOilCracker; +import static gregtech.api.enums.MetaTileEntityIDs.MegaVacuumFreezer; +import static gregtech.api.enums.MetaTileEntityIDs.ThoriumHighTemperatureReactor; +import static gregtech.api.enums.MetaTileEntityIDs.VoidMinerI; +import static gregtech.api.enums.MetaTileEntityIDs.VoidMinerII; +import static gregtech.api.enums.MetaTileEntityIDs.VoidMinerIII; import static gregtech.api.enums.Mods.GalactiGreg; import net.minecraft.block.Block; @@ -71,6 +230,7 @@ import fox.spiteful.avaritia.blocks.LudicrousBlocks; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; +import gregtech.api.enums.MetaTileEntityIDs; import gregtech.api.enums.Mods; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; @@ -261,9 +421,13 @@ public class ItemRegistry { GameRegistry.registerItem(ItemRegistry.ROCKCUTTER_HV, ItemRegistry.ROCKCUTTER_HV.getUnlocalizedName()); GameRegistry.registerItem(ItemRegistry.TAB, "tabIconGT2"); - new CreativeScanner(ConfigHandler.IDOffset + 200, "Creative Debug Scanner", "Creative Debug Scanner", 14); + new CreativeScanner( + MetaTileEntityIDs.CreativeScanner.ID, + "Creative Debug Scanner", + "Creative Debug Scanner", + 14); ItemRegistry.eic = new GT_TileEntity_ElectricImplosionCompressor( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 6, + ElectricImplosionCompressor.ID, "ElectricImplosionCompressor", "Electric Implosion Compressor").getStackForm(1L); @@ -282,160 +446,218 @@ public class ItemRegistry { } ItemRegistry.THTR = new GT_TileEntity_THTR( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 5, + ThoriumHighTemperatureReactor.ID, "THTR", "Thorium High Temperature Reactor").getStackForm(1L); GT_TileEntity_THTR.THTRMaterials.registeraTHR_Materials(); ItemRegistry.HTGR = new GT_TileEntity_HTGR( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 15 + 48, + HighTemperatureGasCooledReactor.ID, "HTGR", "High Temperature Gas-cooled Reactor").getStackForm(1L); GT_TileEntity_HTGR.HTGRMaterials.registeraTHR_Materials(); - // ID ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 15 + 49 IS TAKEN !!! (12792) + // ID 12728 + 15 + 49 IS TAKEN !!! (12792) GT_OreDictUnificator .add(OrePrefixes.block, Materials.BorosilicateGlass, new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)); GT_OreDictUnificator .registerOre(OrePrefixes.block, Materials.NickelZincFerrite, new ItemStack(ItemRegistry.BW_BLOCKS[2])); + + int[] Diode2A = new int[] { Diode2A_ULV.ID, Diode2A_LV.ID, Diode2A_MV.ID, Diode2A_HV.ID, Diode2A_EV.ID, + Diode2A_IV.ID, Diode2A_LuV.ID, Diode2A_ZPM.ID, Diode2A_UV.ID, Diode2A_UHV.ID, Diode2A_UEV.ID, + Diode2A_UIV.ID, Diode2A_UMV.ID, Diode2A_UXV.ID, Diode2A_MAX.ID }; + int[] Diode4A = new int[] { Diode4A_ULV.ID, Diode4A_LV.ID, Diode4A_MV.ID, Diode4A_HV.ID, Diode4A_EV.ID, + Diode4A_IV.ID, Diode4A_LuV.ID, Diode4A_ZPM.ID, Diode4A_UV.ID, Diode4A_UHV.ID, Diode4A_UEV.ID, + Diode4A_UIV.ID, Diode4A_UMV.ID, Diode4A_UXV.ID, Diode4A_MAX.ID }; + int[] Diode8A = new int[] { Diode8A_ULV.ID, Diode8A_LV.ID, Diode8A_MV.ID, Diode8A_HV.ID, Diode8A_EV.ID, + Diode8A_IV.ID, Diode8A_LuV.ID, Diode8A_ZPM.ID, Diode8A_UV.ID, Diode8A_UHV.ID, Diode8A_UEV.ID, + Diode8A_UIV.ID, Diode8A_UMV.ID, Diode8A_UXV.ID, Diode8A_MAX.ID }; + int[] Diode12A = new int[] { Diode12A_ULV.ID, Diode12A_LV.ID, Diode12A_MV.ID, Diode12A_HV.ID, Diode12A_EV.ID, + Diode12A_IV.ID, Diode12A_LuV.ID, Diode12A_ZPM.ID, Diode12A_UV.ID, Diode12A_UHV.ID, Diode12A_UEV.ID, + Diode12A_UIV.ID, Diode12A_UMV.ID, Diode12A_UXV.ID, Diode12A_MAX.ID }; + int[] Diode16A = new int[] { Diode16A_ULV.ID, Diode16A_LV.ID, Diode16A_MV.ID, Diode16A_HV.ID, Diode16A_EV.ID, + Diode16A_IV.ID, Diode16A_LuV.ID, Diode16A_ZPM.ID, Diode16A_UV.ID, Diode16A_UHV.ID, Diode16A_UEV.ID, + Diode16A_UIV.ID, Diode16A_UMV.ID, Diode16A_UXV.ID, Diode16A_MAX.ID }; + int[] EnergyDistributors = new int[] { EnergyDistributor_ULV.ID, EnergyDistributor_LV.ID, + EnergyDistributor_MV.ID, EnergyDistributor_HV.ID, EnergyDistributor_EV.ID, EnergyDistributor_IV.ID, + EnergyDistributor_LuV.ID, EnergyDistributor_ZPM.ID, EnergyDistributor_UV.ID, EnergyDistributor_UHV.ID, + EnergyDistributor_UEV.ID, EnergyDistributor_UIV.ID, EnergyDistributor_UMV.ID, EnergyDistributor_UXV.ID, + EnergyDistributor_MAX.ID }; + for (int i = 0; i < GT_Values.VN.length - 1; i++) { ItemRegistry.diode2A[i] = new GT_MetaTileEntity_Diode( - ConfigHandler.IDOffset + GT_Values.VN.length + 1 + i, + Diode2A[i], "diode" + "2A" + GT_Values.VN[i], StatCollector.translateToLocal("tile.diode.name") + " 2A " + GT_Values.VN[i], i).getStackForm(1L); ItemRegistry.diode4A[i] = new GT_MetaTileEntity_Diode( - ConfigHandler.IDOffset + GT_Values.VN.length * 2 + 1 + i, + Diode4A[i], "diode" + "4A" + GT_Values.VN[i], StatCollector.translateToLocal("tile.diode.name") + " 4A " + GT_Values.VN[i], i).getStackForm(1L); ItemRegistry.diode8A[i] = new GT_MetaTileEntity_Diode( - ConfigHandler.IDOffset + GT_Values.VN.length * 3 + 1 + i, + Diode8A[i], "diode" + "8A" + GT_Values.VN[i], StatCollector.translateToLocal("tile.diode.name") + " 8A " + GT_Values.VN[i], i).getStackForm(1L); ItemRegistry.diode12A[i] = new GT_MetaTileEntity_Diode( - ConfigHandler.IDOffset + GT_Values.VN.length * 4 + 1 + i, + Diode12A[i], "diode" + "12A" + GT_Values.VN[i], StatCollector.translateToLocal("tile.diode.name") + " 12A " + GT_Values.VN[i], i).getStackForm(1L); ItemRegistry.diode16A[i] = new GT_MetaTileEntity_Diode( - ConfigHandler.IDOffset + GT_Values.VN.length * 5 + 1 + i, + Diode16A[i], "diode" + "16A" + GT_Values.VN[i], StatCollector.translateToLocal("tile.diode.name") + " 16A " + GT_Values.VN[i], i).getStackForm(1L); ItemRegistry.energyDistributor[i] = new GT_MetaTileEntity_EnergyDistributor( - ConfigHandler.IDOffset + 1 + i, + EnergyDistributors[i], "energydistributor" + GT_Values.VN[i], StatCollector.translateToLocal("tile.energydistributor.name") + " " + GT_Values.VN[i], i).getStackForm(1L); } - for (int i = 0; i < 3; i++) { - ItemRegistry.acidGens[i] = new GT_MetaTileEntity_AcidGenerator( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 - 2 + i, - "acidgenerator" + GT_Values.VN[i + 2], - StatCollector.translateToLocal("tile.acidgenerator.name") + " " + GT_Values.VN[i + 2], - i + 2).getStackForm(1); - } + + ItemRegistry.acidGens[0] = new GT_MetaTileEntity_AcidGenerator( + AcidGeneratorMV.ID, + "acidgenerator" + GT_Values.VN[2], + StatCollector.translateToLocal("tile.acidgenerator.name") + " " + GT_Values.VN[2], + 2).getStackForm(1); + ItemRegistry.acidGens[1] = new GT_MetaTileEntity_AcidGenerator( + AcidGeneratorHV.ID, + "acidgenerator" + GT_Values.VN[3], + StatCollector.translateToLocal("tile.acidgenerator.name") + " " + GT_Values.VN[3], + 3).getStackForm(1); + ItemRegistry.acidGens[2] = new GT_MetaTileEntity_AcidGenerator( + AcidGeneratorEV.ID, + "acidgenerator" + GT_Values.VN[4], + StatCollector.translateToLocal("tile.acidgenerator.name") + " " + GT_Values.VN[4], + 4).getStackForm(1); ItemRegistry.acidGensLV = new GT_MetaTileEntity_AcidGenerator( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 65, + AcidGeneratorLV.ID, "acidgenerator" + GT_Values.VN[1], StatCollector.translateToLocal("tile.acidgenerator.name") + " " + GT_Values.VN[1], +1).getStackForm(1L); - ItemRegistry.dehp = new GT_TileEntity_DEHP( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 1, - 1, - "DEHP", - "Deep Earth Heating Pump").getStackForm(1L); + ItemRegistry.dehp = new GT_TileEntity_DEHP(DeepEarthHeatingPump.ID, 1, "DEHP", "Deep Earth Heating Pump") + .getStackForm(1L); ItemRegistry.megaMachines[0] = new GT_TileEntity_MegaBlastFurnace( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 2, + MegaBlastFurnace.ID, "MegaBlastFurnace", StatCollector.translateToLocal("tile.bw.mbf.name")).getStackForm(1L); ItemRegistry.megaMachines[1] = new GT_TileEntity_MegaVacuumFreezer( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 3, + MegaVacuumFreezer.ID, "MegaVacuumFreezer", StatCollector.translateToLocal("tile.bw.mvf.name")).getStackForm(1L); ItemRegistry.cal = new GT_TileEntity_CircuitAssemblyLine( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 7, + CircuitAssemblyLine.ID, "CircuitAssemblyLine", "Circuit Assembly Line").getStackForm(1L); ItemRegistry.compressedHatch = new GT_MetaTileEntity_CompressedFluidHatch( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 8, + CompressedFluidHatch.ID, "CompressedFluidHatch", "Liquid Air Fluid Hatch").getStackForm(1L); ItemRegistry.giantOutputHatch = new GT_MetaTileEntity_GiantOutputHatch( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 9, + GiantOutputHatch.ID, "GiantOutputHatch", "Giant Output Hatch").getStackForm(1L); ItemRegistry.humongousInputHatch = new GT_MetaTileEntity_HumongousInputHatch( - ConfigHandler.IDOffset + GT_Values.VN.length * 9 + 55, + HumongousInputHatch.ID, "HumongousInputHatch", "Humongous Input Hatch").getStackForm(1L); ItemRegistry.megaMachines[2] = new GT_TileEntity_MegaDistillTower( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 10, + MegaDistillationTower.ID, "MegaDistillationTower", "Mega Distillation Tower").getStackForm(1L); ItemRegistry.megaMachines[3] = new GT_TileEntity_MegaChemicalReactor( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 638, + MegaChemicalReactor.ID, "MegaChemicalReactor", "Mega Chemical Reactor").getStackForm(1L); ItemRegistry.megaMachines[4] = new GT_TileEntity_MegaOilCracker( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 639, + MegaOilCracker.ID, "MegaOilCracker", "Mega Oil Cracker").getStackForm(1L); if (GalactiGreg.isModLoaded()) { ItemRegistry.voidminer[2] = new GT_TileEntity_VoidMiners.VMUV( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 11, + VoidMinerIII.ID, "VoidMiner3", "Void Miner III").getStackForm(1L); ItemRegistry.voidminer[1] = new GT_TileEntity_VoidMiners.VMZPM( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 12, + VoidMinerII.ID, "VoidMiner2", "Void Miner II").getStackForm(1L); - ItemRegistry.voidminer[0] = new GT_TileEntity_VoidMiners.VMLUV( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 13, - "VoidMiner1", - "Void Miner I").getStackForm(1L); + ItemRegistry.voidminer[0] = new GT_TileEntity_VoidMiners.VMLUV(VoidMinerI.ID, "VoidMiner1", "Void Miner I") + .getStackForm(1L); } TecTechPipeEnergyLowPower = new TT_MetaTileEntity_Pipe_Energy_LowPower( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 14, + LowPowerLaserPipe.ID, "pipe.lowpowerlaser", "Low Power Laser Pipe").getStackForm(1L); - int startID = ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 15; + + int[] LowPowerLaserConverter32A = new int[] { LowPowerLaserConverter32A_EV.ID, LowPowerLaserConverter32A_IV.ID, + LowPowerLaserConverter32A_LuV.ID, LowPowerLaserConverter32A_ZPM.ID }; + int[] LowPowerLaserConverter64A = new int[] { LowPowerLaserConverter64A_EV.ID, LowPowerLaserConverter64A_IV.ID, + LowPowerLaserConverter64A_LuV.ID, LowPowerLaserConverter64A_ZPM.ID }; + int[] LowPowerLaserConverter96A = new int[] { LowPowerLaserConverter96A_EV.ID, LowPowerLaserConverter96A_IV.ID, + LowPowerLaserConverter96A_LuV.ID, LowPowerLaserConverter96A_ZPM.ID }; + int[] LowPowerLaserConverter128A = new int[] { LowPowerLaserConverter128A_EV.ID, + LowPowerLaserConverter128A_IV.ID, LowPowerLaserConverter128A_LuV.ID, LowPowerLaserConverter128A_ZPM.ID }; + int[][] LowPowerLaserConverter = new int[][] { LowPowerLaserConverter32A, LowPowerLaserConverter64A, + LowPowerLaserConverter96A, LowPowerLaserConverter128A }; + for (int amps = 32; amps <= 128; amps += 32) { for (int tier = 4; tier < 8; tier++) { TecTechLaserAdditions[0][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserBox( - startID, + LowPowerLaserConverter[amps / 32 - 1][tier - 4], GT_Values.VN[tier] + "_LPLaser_Converter_" + amps, GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Converter", tier, amps).getStackForm(1L); - startID++; } } + + int[] LowPowerLaserTargetHatch32A = new int[] { LowPowerLaserTargetHatch32A_EV.ID, + LowPowerLaserTargetHatch32A_IV.ID, LowPowerLaserTargetHatch32A_LuV.ID, LowPowerLaserTargetHatch32A_ZPM.ID }; + int[] LowPowerLaserTargetHatch64A = new int[] { LowPowerLaserTargetHatch64A_EV.ID, + LowPowerLaserTargetHatch64A_IV.ID, LowPowerLaserTargetHatch64A_LuV.ID, LowPowerLaserTargetHatch64A_ZPM.ID }; + int[] LowPowerLaserTargetHatch96A = new int[] { LowPowerLaserTargetHatch96A_EV.ID, + LowPowerLaserTargetHatch96A_IV.ID, LowPowerLaserTargetHatch96A_LuV.ID, LowPowerLaserTargetHatch96A_ZPM.ID }; + int[] LowPowerLaserTargetHatch128A = new int[] { LowPowerLaserTargetHatch128A_EV.ID, + LowPowerLaserTargetHatch128A_IV.ID, LowPowerLaserTargetHatch128A_LuV.ID, + LowPowerLaserTargetHatch128A_ZPM.ID }; + int[][] LowPowerLaserTargetHatch = new int[][] { LowPowerLaserTargetHatch32A, LowPowerLaserTargetHatch64A, + LowPowerLaserTargetHatch96A, LowPowerLaserTargetHatch128A }; for (int amps = 32; amps <= 128; amps += 32) { for (int tier = 4; tier < 8; tier++) { TecTechLaserAdditions[1][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserHatch( - startID, + LowPowerLaserTargetHatch[amps / 32 - 1][tier - 4], GT_Values.VN[tier] + "_LPLaser_Hatch_" + amps, GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Target Hatch", tier, amps).getStackForm(1L); - startID++; } } + + int[] LowPowerLaserSourceHatch32A = new int[] { LowPowerLaserSourceHatch32A_EV.ID, + LowPowerLaserSourceHatch32A_IV.ID, LowPowerLaserSourceHatch32A_LuV.ID, LowPowerLaserSourceHatch32A_ZPM.ID }; + int[] LowPowerLaserSourceHatch64A = new int[] { LowPowerLaserSourceHatch64A_EV.ID, + LowPowerLaserSourceHatch64A_IV.ID, LowPowerLaserSourceHatch64A_LuV.ID, LowPowerLaserSourceHatch64A_ZPM.ID }; + int[] LowPowerLaserSourceHatch96A = new int[] { LowPowerLaserSourceHatch96A_EV.ID, + LowPowerLaserSourceHatch96A_IV.ID, LowPowerLaserSourceHatch96A_LuV.ID, LowPowerLaserSourceHatch96A_ZPM.ID }; + int[] LowPowerLaserSourceHatch128A = new int[] { LowPowerLaserSourceHatch128A_EV.ID, + LowPowerLaserSourceHatch128A_IV.ID, LowPowerLaserSourceHatch128A_LuV.ID, + LowPowerLaserSourceHatch128A_ZPM.ID }; + int[][] LowPowerLaserSourceHatch = new int[][] { LowPowerLaserSourceHatch32A, LowPowerLaserSourceHatch64A, + LowPowerLaserSourceHatch96A, LowPowerLaserSourceHatch128A }; for (int amps = 32; amps <= 128; amps += 32) { for (int tier = 4; tier < 8; tier++) { TecTechLaserAdditions[2][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserDynamo( - startID, + LowPowerLaserSourceHatch[amps / 32 - 1][tier - 4], GT_Values.VN[tier] + "_LPLaser_Dynamo_" + amps, GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Source Hatch", tier, amps).getStackForm(1L); - startID++; } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java index e156aacbe7..6c6896d786 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java @@ -1,5 +1,33 @@ package com.github.bartimaeusnek.bartworks.common.loaders.recipes; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_EV; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_HV; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_IV; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_UV; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_UXV; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.BioVat; +import static gregtech.api.enums.MetaTileEntityIDs.LESU; +import static gregtech.api.enums.MetaTileEntityIDs.ManualTrafo; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_EV; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_HV; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_IV; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_UV; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_UXV; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.Windmill; import static gregtech.api.enums.Mods.IndustrialCraft2; import net.minecraft.init.Blocks; @@ -68,7 +96,7 @@ public class CraftingRecipes implements Runnable { ItemList.Machine_EV_ChemicalReactor.get(1L) }; GT_ModHandler.addCraftingRecipe( - new GT_TileEntity_LESU(ConfigHandler.IDOffset, "LESU", "L.E.S.U.").getStackForm(1L), + new GT_TileEntity_LESU(LESU.ID, "LESU", "L.E.S.U.").getStackForm(1L), RecipeLoader.BITSD, new Object[] { "CDC", "SBS", "CFC", 'C', "circuitAdvanced", 'D', ItemList.Cover_Screen.get(1L), 'S', GT_OreDictUnificator.get(OrePrefixes.cableGt12, Materials.Platinum, 1L), 'B', @@ -241,7 +269,7 @@ public class CraftingRecipes implements Runnable { GT_ModHandler.addCraftingRecipe( new GT_TileEntity_ManualTrafo( - ConfigHandler.IDOffset + GT_Values.VN.length * 6 + 1, + ManualTrafo.ID, "bw.manualtrafo", StatCollector.translateToLocal("tile.manutrafo.name")).getStackForm(1L), RecipeLoader.BITSD, @@ -251,7 +279,7 @@ public class CraftingRecipes implements Runnable { GT_ModHandler.addCraftingRecipe( new GT_TileEntity_Windmill( - ConfigHandler.IDOffset + GT_Values.VN.length * 6 + 2, + Windmill.ID, "bw.windmill", StatCollector.translateToLocal("tile.bw.windmill.name")).getStackForm(1L), RecipeLoader.BITSD, @@ -399,10 +427,8 @@ public class CraftingRecipes implements Runnable { ItemList.Sensor_LuV.get(1L), 'P', WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 1), }); GT_ModHandler.addCraftingRecipe( - new GT_TileEntity_BioVat( - ConfigHandler.IDOffset + GT_Values.VN.length * 7, - "bw.biovat", - StatCollector.translateToLocal("tile.biovat.name")).getStackForm(1L), + new GT_TileEntity_BioVat(BioVat.ID, "bw.biovat", StatCollector.translateToLocal("tile.biovat.name")) + .getStackForm(1L), RecipeLoader.BITSD, new Object[] { "GCG", "KHK", "GCG", 'G', new ItemStack(ItemRegistry.bw_glasses[0], 1, 1), 'C', "circuit" + Materials.EV, 'K', GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Silver, 1L), @@ -422,15 +448,20 @@ public class CraftingRecipes implements Runnable { Materials[] circuits2 = { Materials.HV, Materials.EV, Materials.IV, Materials.LuV, Materials.ZPM, Materials.UV }; + int[] BioLab = new int[] { BioLab_HV.ID, BioLab_EV.ID, BioLab_IV.ID, BioLab_LuV.ID, BioLab_ZPM.ID, BioLab_UV.ID, + BioLab_UHV.ID, BioLab_UEV.ID, BioLab_UIV.ID, BioLab_UMV.ID, BioLab_UXV.ID, BioLab_MAX.ID }; + int[] RadioHatch = new int[] { RadioHatch_HV.ID, RadioHatch_EV.ID, RadioHatch_IV.ID, RadioHatch_LuV.ID, + RadioHatch_ZPM.ID, RadioHatch_UV.ID, RadioHatch_UHV.ID, RadioHatch_UEV.ID, RadioHatch_UIV.ID, + RadioHatch_UMV.ID, RadioHatch_UXV.ID, RadioHatch_MAX.ID }; + for (int i = 3; i < GT_Values.VN.length - 1; i++) { - // 12625 BioLab2[i - 3] = new GT_MetaTileEntity_BioLab( - ConfigHandler.IDOffset + GT_Values.VN.length * 6 + i, + BioLab[i - 3], "bw.biolab" + GT_Values.VN[i], GT_Values.VN[i] + " " + StatCollector.translateToLocal("tile.biolab.name"), i).getStackForm(1L); RadioHatch2[i - 3] = new GT_MetaTileEntity_RadioHatch( - ConfigHandler.IDOffset + GT_Values.VN.length * 7 - 2 + i, + RadioHatch[i - 3], "bw.radiohatch" + GT_Values.VN[i], GT_Values.VN[i] + " " + StatCollector.translateToLocal("tile.radiohatch.name"), i).getStackForm(1L); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java index 57512e40c0..4bcf4f829c 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java @@ -13,6 +13,17 @@ package com.github.bartimaeusnek.bartworks.common.tileentities.tiered; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_ULV; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; @@ -21,7 +32,6 @@ import net.minecraftforge.common.util.ForgeDirection; import org.apache.commons.lang3.ArrayUtils; -import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference; import gregtech.api.enums.GT_Values; @@ -104,17 +114,12 @@ public class GT_MetaTileEntity_Diode extends GT_MetaTileEntity_BasicHull { } private long getAmpsfromMeta(int meta) { - if (meta > ConfigHandler.IDOffset + GT_Values.VN.length - && meta <= ConfigHandler.IDOffset + GT_Values.VN.length * 2) return 2L; - if (meta > ConfigHandler.IDOffset + GT_Values.VN.length * 2 - && meta <= ConfigHandler.IDOffset + GT_Values.VN.length * 3) return 4L; - else if (meta > ConfigHandler.IDOffset + GT_Values.VN.length * 3 - && meta <= ConfigHandler.IDOffset + GT_Values.VN.length * 4) return 8L; - else if (meta > ConfigHandler.IDOffset + GT_Values.VN.length * 4 - && meta <= ConfigHandler.IDOffset + GT_Values.VN.length * 5) return 12L; - else if (meta > ConfigHandler.IDOffset + GT_Values.VN.length * 5 - && meta <= ConfigHandler.IDOffset + GT_Values.VN.length * 6) return 16L; - else return 0L; + if (meta >= Diode2A_ULV.ID && meta <= Diode2A_MAX.ID) return 2L; + if (meta >= Diode4A_ULV.ID && meta <= Diode4A_MAX.ID) return 4L; + if (meta >= Diode8A_ULV.ID && meta <= Diode8A_MAX.ID) return 8L; + if (meta >= Diode12A_ULV.ID && meta <= Diode12A_MAX.ID) return 12L; + if (meta >= Diode16A_ULV.ID && meta <= Diode16A_MAX.ID) return 16L; + return 0L; } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java index 79fe34bb82..c1f7bf5439 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java @@ -57,7 +57,6 @@ import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Sodiumformate; import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Sodiumsulfate; import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.ZincSulfate; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GalaxySpace; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.OrePrefixes.cell; @@ -79,6 +78,8 @@ import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +import static gtPlusPlus.core.material.ALLOY.HELICOPTER; +import static gtPlusPlus.core.material.ELEMENT.STANDALONE.WHITE_METAL; import java.util.ArrayList; import java.util.Arrays; @@ -1079,11 +1080,11 @@ public class PlatinumSludgeOverHaul { } catch (ClassNotFoundException e) { e.printStackTrace(); } - if (stack.getItem() == GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustHeLiCoPtEr", 1L) + if (stack.getItem() == HELICOPTER.getDust(1) .getItem()) { return true; } - if (stack.getItem() == GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustWhiteMetal", 1L) + if (stack.getItem() == WHITE_METAL.getDust(1) .getItem()) { return true; } diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java index d0c34f50cd..7198832c4f 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java @@ -1,10 +1,9 @@ package com.github.technus.tectech.loader.recipe; +import static com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry.bw_realglas; import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getItemContainer; import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getOrDefault; -import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; -import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -287,7 +286,7 @@ public class Assembler implements Runnable { // Dynamo UHV 4A GT_Values.RA.stdBuilder() .itemInputs( - ItemList.Hatch_Dynamo_MAX.get(1), + ItemList.Hatch_Dynamo_UHV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2)) .itemOutputs(CustomItemList.eM_dynamoMulti4_UHV.get(1)) @@ -298,7 +297,7 @@ public class Assembler implements Runnable { // Dynamo UEV 4A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hatch_Dynamo_UEV").get(1), + ItemList.Hatch_Dynamo_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Draconium, 2), GT_OreDictUnificator .get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 2)) @@ -310,7 +309,7 @@ public class Assembler implements Runnable { // Dynamo UIV 4A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hatch_Dynamo_UIV").get(1), + ItemList.Hatch_Dynamo_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NetherStar, 2), GT_OreDictUnificator .get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 2)) @@ -322,7 +321,7 @@ public class Assembler implements Runnable { // Dynamo UMV 4A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hatch_Dynamo_UMV").get(1), + ItemList.Hatch_Dynamo_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Quantium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 2)) .itemOutputs(CustomItemList.eM_dynamoMulti4_UMV.get(1)) @@ -333,7 +332,7 @@ public class Assembler implements Runnable { // Dynamo UXV 4A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hatch_Dynamo_UXV").get(1), + ItemList.Hatch_Dynamo_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.BlackPlutonium, 2), GT_OreDictUnificator .get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1), @@ -412,7 +411,7 @@ public class Assembler implements Runnable { // Dynamo UHV 16A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Transformer_UEV_UHV").get(1), + ItemList.Transformer_UEV_UHV.get(1), CustomItemList.eM_dynamoMulti4_UHV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUHV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4)) @@ -424,7 +423,7 @@ public class Assembler implements Runnable { // Dynamo UEV 16A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Transformer_UIV_UEV").get(1), + ItemList.Transformer_UIV_UEV.get(1), CustomItemList.eM_dynamoMulti4_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Draconium, 2), GT_OreDictUnificator @@ -437,7 +436,7 @@ public class Assembler implements Runnable { // Dynamo UIV 16A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Transformer_UMV_UIV").get(1), + ItemList.Transformer_UMV_UIV.get(1), CustomItemList.eM_dynamoMulti4_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NetherStar, 2), GT_OreDictUnificator @@ -450,7 +449,7 @@ public class Assembler implements Runnable { // Dynamo UMV 16A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Transformer_UXV_UMV").get(1), + ItemList.Transformer_UXV_UMV.get(1), CustomItemList.eM_dynamoMulti4_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Quantium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 4)) @@ -462,7 +461,7 @@ public class Assembler implements Runnable { // Dynamo UXV 16A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Transformer_MAX_UXV").get(1), + ItemList.Transformer_MAX_UXV.get(1), CustomItemList.eM_dynamoMulti4_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.BlackPlutonium, 2), GT_OreDictUnificator @@ -481,7 +480,7 @@ public class Assembler implements Runnable { // Dynamo EV 64A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_IV_EV").get(1), + ItemList.WetTransformer_IV_EV.get(1), CustomItemList.eM_dynamoMulti16_EV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Aluminium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6)) @@ -493,7 +492,7 @@ public class Assembler implements Runnable { // Dynamo IV 64A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_LuV_IV").get(1), + ItemList.WetTransformer_LuV_IV.get(1), CustomItemList.eM_dynamoMulti16_IV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Tungsten, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6)) @@ -505,7 +504,7 @@ public class Assembler implements Runnable { // Dynamo LuV 64A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_ZPM_LuV").get(1), + ItemList.WetTransformer_ZPM_LuV.get(1), CustomItemList.eM_dynamoMulti16_LuV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2), GT_OreDictUnificator @@ -518,7 +517,7 @@ public class Assembler implements Runnable { // Dynamo ZPM 64A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_UV_ZPM").get(1), + ItemList.WetTransformer_UV_ZPM.get(1), CustomItemList.eM_dynamoMulti16_ZPM.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Naquadah, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6)) @@ -530,7 +529,7 @@ public class Assembler implements Runnable { // Dynamo UV 64A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_UHV_UV").get(1), + ItemList.WetTransformer_UHV_UV.get(1), CustomItemList.eM_dynamoMulti16_UV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NaquadahAlloy, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 6)) @@ -542,7 +541,7 @@ public class Assembler implements Runnable { // Dynamo UHV 64A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_UEV_UHV").get(1), + ItemList.WetTransformer_UEV_UHV.get(1), CustomItemList.eM_dynamoMulti16_UHV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.SuperconductorUHV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6)) @@ -554,7 +553,7 @@ public class Assembler implements Runnable { // Dynamo UEV 64A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_UIV_UEV").get(1), + ItemList.WetTransformer_UIV_UEV.get(1), CustomItemList.eM_dynamoMulti16_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Draconium, 2), GT_OreDictUnificator @@ -567,7 +566,7 @@ public class Assembler implements Runnable { // Dynamo UIV 64A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_UMV_UIV").get(1), + ItemList.WetTransformer_UMV_UIV.get(1), CustomItemList.eM_dynamoMulti16_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NetherStar, 2), GT_OreDictUnificator @@ -580,7 +579,7 @@ public class Assembler implements Runnable { // Dynamo UMV 64A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_UXV_UMV").get(1), + ItemList.WetTransformer_UXV_UMV.get(1), CustomItemList.eM_dynamoMulti16_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Quantium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 6)) @@ -592,7 +591,7 @@ public class Assembler implements Runnable { // Dynamo UXV 64A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_MAX_UXV").get(1), + ItemList.WetTransformer_MAX_UXV.get(1), CustomItemList.eM_dynamoMulti16_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.BlackPlutonium, 2), GT_OreDictUnificator @@ -670,7 +669,7 @@ public class Assembler implements Runnable { // Energy Hatch UHV 4A GT_Values.RA.stdBuilder() .itemInputs( - ItemList.Hatch_Energy_MAX.get(1), + ItemList.Hatch_Energy_UHV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2)) .itemOutputs(CustomItemList.eM_energyMulti4_UHV.get(1)) @@ -681,7 +680,7 @@ public class Assembler implements Runnable { // Energy Hatch UEV 4A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hatch_Energy_UEV").get(1), + ItemList.Hatch_Energy_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Draconium, 2), GT_OreDictUnificator .get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 2)) @@ -693,7 +692,7 @@ public class Assembler implements Runnable { // Energy Hatch UIV 4A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hatch_Energy_UIV").get(1), + ItemList.Hatch_Energy_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NetherStar, 2), GT_OreDictUnificator .get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 2)) @@ -705,7 +704,7 @@ public class Assembler implements Runnable { // Energy Hatch UMV 4A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hatch_Energy_UMV").get(1), + ItemList.Hatch_Energy_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Quantium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 2)) .itemOutputs(CustomItemList.eM_energyMulti4_UMV.get(1)) @@ -716,7 +715,7 @@ public class Assembler implements Runnable { // Energy Hatch UXV 4A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hatch_Energy_UXV").get(1), + ItemList.Hatch_Energy_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.BlackPlutonium, 2), GT_OreDictUnificator .get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1), @@ -795,7 +794,7 @@ public class Assembler implements Runnable { // Energy Hatch UHV 16A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Transformer_UEV_UHV").get(1), + ItemList.Transformer_UEV_UHV.get(1), CustomItemList.eM_energyMulti4_UHV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUHV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4)) @@ -807,7 +806,7 @@ public class Assembler implements Runnable { // Energy Hatch UEV 16A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Transformer_UIV_UEV").get(1), + ItemList.Transformer_UIV_UEV.get(1), CustomItemList.eM_energyMulti4_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Draconium, 2), GT_OreDictUnificator @@ -820,7 +819,7 @@ public class Assembler implements Runnable { // Energy Hatch UIV 16A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Transformer_UMV_UIV").get(1), + ItemList.Transformer_UMV_UIV.get(1), CustomItemList.eM_energyMulti4_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NetherStar, 2), GT_OreDictUnificator @@ -833,7 +832,7 @@ public class Assembler implements Runnable { // Energy Hatch UMV 16A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Transformer_UXV_UMV").get(1), + ItemList.Transformer_UXV_UMV.get(1), CustomItemList.eM_energyMulti4_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Quantium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 4)) @@ -845,7 +844,7 @@ public class Assembler implements Runnable { // Energy Hatch UXV 16A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Transformer_MAX_UXV").get(1), + ItemList.Transformer_MAX_UXV.get(1), CustomItemList.eM_energyMulti4_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.BlackPlutonium, 2), GT_OreDictUnificator @@ -864,7 +863,7 @@ public class Assembler implements Runnable { // Energy Hatch EV 64A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_IV_EV").get(1), + ItemList.WetTransformer_IV_EV.get(1), CustomItemList.eM_energyMulti16_EV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Aluminium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6)) @@ -876,7 +875,7 @@ public class Assembler implements Runnable { // Energy Hatch IV 64A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_LuV_IV").get(1), + ItemList.WetTransformer_LuV_IV.get(1), CustomItemList.eM_energyMulti16_IV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Tungsten, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6)) @@ -888,7 +887,7 @@ public class Assembler implements Runnable { // Energy Hatch LuV 64A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_ZPM_LuV").get(1), + ItemList.WetTransformer_ZPM_LuV.get(1), CustomItemList.eM_energyMulti16_LuV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2), GT_OreDictUnificator @@ -901,7 +900,7 @@ public class Assembler implements Runnable { // Energy Hatch ZPM 64A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_UV_ZPM").get(1), + ItemList.WetTransformer_UV_ZPM.get(1), CustomItemList.eM_energyMulti16_ZPM.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Naquadah, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6)) @@ -913,7 +912,7 @@ public class Assembler implements Runnable { // Energy Hatch UV 64A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_UHV_UV").get(1), + ItemList.WetTransformer_UHV_UV.get(1), CustomItemList.eM_energyMulti16_UV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NaquadahAlloy, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 6)) @@ -925,7 +924,7 @@ public class Assembler implements Runnable { // Energy Hatch UHV 64A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_UEV_UHV").get(1), + ItemList.WetTransformer_UEV_UHV.get(1), CustomItemList.eM_energyMulti16_UHV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.SuperconductorUHV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6)) @@ -937,7 +936,7 @@ public class Assembler implements Runnable { // Energy Hatch UEV 64A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_UIV_UEV").get(1), + ItemList.WetTransformer_UIV_UEV.get(1), CustomItemList.eM_energyMulti16_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Draconium, 2), GT_OreDictUnificator @@ -950,7 +949,7 @@ public class Assembler implements Runnable { // Energy Hatch UIV 64A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_UMV_UIV").get(1), + ItemList.WetTransformer_UMV_UIV.get(1), CustomItemList.eM_energyMulti16_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NetherStar, 2), GT_OreDictUnificator @@ -963,7 +962,7 @@ public class Assembler implements Runnable { // Energy Hatch UMV 64A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_UXV_UMV").get(1), + ItemList.WetTransformer_UXV_UMV.get(1), CustomItemList.eM_energyMulti16_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Quantium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 6)) @@ -975,7 +974,7 @@ public class Assembler implements Runnable { // Energy Hatch UXV 64A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_MAX_UXV").get(1), + ItemList.WetTransformer_MAX_UXV.get(1), CustomItemList.eM_energyMulti16_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.BlackPlutonium, 2), GT_OreDictUnificator @@ -999,7 +998,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4), - getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 2)) + new ItemStack(bw_realglas, 2, 2)) .itemOutputs(CustomItemList.Machine_BuckConverter_IV.get(1)) .fluidInputs(Materials.TungstenSteel.getMolten(288)) .duration(5 * SECONDS) @@ -1014,7 +1013,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator .get(OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NiobiumTitanium, 4), - getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 3)) + new ItemStack(bw_realglas, 2, 3)) .itemOutputs(CustomItemList.Machine_BuckConverter_LuV.get(1)) .fluidInputs(new FluidStack(FluidRegistry.getFluid("molten.rhodium-plated palladium"), 288)) .duration(5 * SECONDS) @@ -1028,7 +1027,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4), - getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 4)) + new ItemStack(bw_realglas, 2, 4)) .itemOutputs(CustomItemList.Machine_BuckConverter_ZPM.get(1)) .fluidInputs(Materials.Iridium.getMolten(288)) .duration(5 * SECONDS) @@ -1042,7 +1041,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 4), - getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 5)) + new ItemStack(bw_realglas, 2, 5)) .itemOutputs(CustomItemList.Machine_BuckConverter_UV.get(1)) .fluidInputs(Materials.Osmium.getMolten(288)) .duration(5 * SECONDS) @@ -1051,12 +1050,12 @@ public class Assembler implements Runnable { // Buck Converter UHV GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Transformer_UEV_UHV").get(1), + ItemList.Transformer_UEV_UHV.get(1), getItemContainer("Display").get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.ElectrumFlux, 4), - getModItem(BartWorks.ID, "BW_GlasBlocks", 4L, 5)) + new ItemStack(bw_realglas, 4, 5)) .itemOutputs(CustomItemList.Machine_BuckConverter_UHV.get(1)) .fluidInputs(Materials.Neutronium.getMolten(288)) .duration(5 * SECONDS) @@ -1065,12 +1064,12 @@ public class Assembler implements Runnable { // Buck Converter UEV GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Transformer_UIV_UEV").get(1), + ItemList.Transformer_UIV_UEV.get(1), getItemContainer("Display").get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Bedrockium, 4), - getModItem(BartWorks.ID, "BW_GlasBlocks", 8L, 5)) + new ItemStack(bw_realglas, 8, 5)) .itemOutputs(CustomItemList.Machine_BuckConverter_UEV.get(1)) .fluidInputs(getOrDefault("Bedrockium", Materials.Neutronium).getMolten(288)) .duration(5 * SECONDS) @@ -1079,12 +1078,12 @@ public class Assembler implements Runnable { // Buck Converter UIV GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Transformer_UMV_UIV").get(1), + ItemList.Transformer_UMV_UIV.get(1), getItemContainer("Display").get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UIV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Draconium, 4), - getModItem(BartWorks.ID, "BW_GlasBlocks", 16L, 5)) + new ItemStack(bw_realglas, 16, 5)) .itemOutputs(CustomItemList.Machine_BuckConverter_UIV.get(1)) .fluidInputs(getOrDefault("BlackPlutonium", Materials.Neutronium).getMolten(288)) .duration(10 * SECONDS) @@ -1157,7 +1156,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UEV").get(1), + ItemList.Hull_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Emitter_UEV.get(1), ItemList.Electric_Pump_UEV.get(1), @@ -1169,7 +1168,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UIV").get(1), + ItemList.Hull_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Emitter_UIV.get(1), ItemList.Electric_Pump_UIV.get(1), @@ -1181,7 +1180,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UMV").get(1), + ItemList.Hull_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Emitter_UMV.get(1), ItemList.Electric_Pump_UMV.get(1), @@ -1193,7 +1192,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UXV").get(1), + ItemList.Hull_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Emitter_UXV.get(1), ItemList.Electric_Pump_UXV.get(1), @@ -1258,7 +1257,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UEV").get(1), + ItemList.Hull_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Emitter_UEV.get(2), ItemList.Electric_Pump_UEV.get(2), @@ -1270,7 +1269,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UIV").get(1), + ItemList.Hull_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Emitter_UIV.get(2), ItemList.Electric_Pump_UIV.get(2), @@ -1282,7 +1281,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UMV").get(1), + ItemList.Hull_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Emitter_UMV.get(2), ItemList.Electric_Pump_UMV.get(2), @@ -1294,7 +1293,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UXV").get(1), + ItemList.Hull_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Emitter_UXV.get(2), ItemList.Electric_Pump_UXV.get(2), @@ -1347,7 +1346,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UEV").get(1), + ItemList.Hull_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_UEV.get(4), ItemList.Electric_Pump_UEV.get(4), @@ -1359,7 +1358,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UIV").get(1), + ItemList.Hull_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_UIV.get(4), ItemList.Electric_Pump_UIV.get(4), @@ -1371,7 +1370,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UMV").get(1), + ItemList.Hull_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_UMV.get(4), ItemList.Electric_Pump_UMV.get(4), @@ -1383,7 +1382,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UXV").get(1), + ItemList.Hull_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_UXV.get(4), ItemList.Electric_Pump_UXV.get(4), @@ -1424,7 +1423,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UEV").get(1), + ItemList.Hull_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Emitter_UEV.get(8), ItemList.Electric_Pump_UEV.get(8), @@ -1436,7 +1435,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UIV").get(1), + ItemList.Hull_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Emitter_UIV.get(8), ItemList.Electric_Pump_UIV.get(8), @@ -1448,7 +1447,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UMV").get(1), + ItemList.Hull_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_UMV.get(8), ItemList.Electric_Pump_UMV.get(8), @@ -1460,7 +1459,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UXV").get(1), + ItemList.Hull_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Emitter_UXV.get(8), ItemList.Electric_Pump_UXV.get(8), @@ -1489,7 +1488,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UEV").get(1), + ItemList.Hull_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Emitter_UEV.get(16), ItemList.Electric_Pump_UEV.get(16), @@ -1501,7 +1500,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UIV").get(1), + ItemList.Hull_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Emitter_UIV.get(16), ItemList.Electric_Pump_UIV.get(16), @@ -1513,7 +1512,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UMV").get(1), + ItemList.Hull_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Emitter_UMV.get(16), ItemList.Electric_Pump_UMV.get(16), @@ -1525,7 +1524,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UXV").get(1), + ItemList.Hull_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Emitter_UXV.get(16), ItemList.Electric_Pump_UXV.get(16), @@ -1542,7 +1541,7 @@ public class Assembler implements Runnable { { GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UEV").get(1), + ItemList.Hull_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Emitter_UEV.get(32), ItemList.Electric_Pump_UEV.get(32), @@ -1554,7 +1553,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UIV").get(1), + ItemList.Hull_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Emitter_UIV.get(32), ItemList.Electric_Pump_UIV.get(32), @@ -1566,7 +1565,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UMV").get(1), + ItemList.Hull_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Emitter_UMV.get(32), ItemList.Electric_Pump_UMV.get(32), @@ -1578,7 +1577,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UXV").get(1), + ItemList.Hull_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Emitter_UXV.get(32), ItemList.Electric_Pump_UXV.get(32), @@ -1595,7 +1594,7 @@ public class Assembler implements Runnable { { GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UIV").get(1), + ItemList.Hull_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_UIV.get(64), ItemList.Electric_Pump_UIV.get(64), @@ -1607,7 +1606,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UMV").get(1), + ItemList.Hull_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_UMV.get(64), ItemList.Electric_Pump_UMV.get(64), @@ -1619,7 +1618,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UXV").get(1), + ItemList.Hull_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_UXV.get(64), ItemList.Electric_Pump_UXV.get(64), @@ -1699,7 +1698,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UEV").get(1), + ItemList.Hull_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_UEV.get(1), ItemList.Electric_Pump_UEV.get(1), @@ -1711,7 +1710,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UIV").get(1), + ItemList.Hull_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_UIV.get(1), ItemList.Electric_Pump_UIV.get(1), @@ -1723,7 +1722,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UMV").get(1), + ItemList.Hull_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_UMV.get(1), ItemList.Electric_Pump_UMV.get(1), @@ -1735,7 +1734,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UXV").get(1), + ItemList.Hull_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_UXV.get(1), ItemList.Electric_Pump_UXV.get(1), @@ -1800,7 +1799,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UEV").get(1), + ItemList.Hull_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Sensor_UEV.get(2), ItemList.Electric_Pump_UEV.get(2), @@ -1812,7 +1811,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UIV").get(1), + ItemList.Hull_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Sensor_UIV.get(2), ItemList.Electric_Pump_UIV.get(2), @@ -1824,7 +1823,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UMV").get(1), + ItemList.Hull_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Sensor_UMV.get(2), ItemList.Electric_Pump_UMV.get(2), @@ -1836,7 +1835,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UXV").get(1), + ItemList.Hull_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 2), ItemList.Sensor_UXV.get(2), ItemList.Electric_Pump_UXV.get(2), @@ -1889,7 +1888,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UEV").get(1), + ItemList.Hull_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Sensor_UEV.get(4), ItemList.Electric_Pump_UEV.get(4), @@ -1901,7 +1900,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UIV").get(1), + ItemList.Hull_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 4), ItemList.Sensor_UIV.get(4), ItemList.Electric_Pump_UIV.get(4), @@ -1913,7 +1912,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UMV").get(1), + ItemList.Hull_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_UMV.get(4), ItemList.Electric_Pump_UMV.get(4), @@ -1925,7 +1924,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UXV").get(1), + ItemList.Hull_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1), ItemList.Sensor_UXV.get(4), ItemList.Electric_Pump_UXV.get(4), @@ -1966,7 +1965,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UEV").get(1), + ItemList.Hull_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Sensor_UEV.get(8), ItemList.Electric_Pump_UEV.get(8), @@ -1978,7 +1977,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UIV").get(1), + ItemList.Hull_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Sensor_UIV.get(8), ItemList.Electric_Pump_UIV.get(8), @@ -1990,7 +1989,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UMV").get(1), + ItemList.Hull_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Sensor_UMV.get(8), ItemList.Electric_Pump_UMV.get(8), @@ -2002,7 +2001,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UXV").get(1), + ItemList.Hull_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 8), ItemList.Sensor_UXV.get(8), ItemList.Electric_Pump_UXV.get(8), @@ -2031,7 +2030,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UEV").get(1), + ItemList.Hull_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Sensor_UEV.get(16), ItemList.Electric_Pump_UEV.get(16), @@ -2043,7 +2042,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UIV").get(1), + ItemList.Hull_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Sensor_UIV.get(16), ItemList.Electric_Pump_UIV.get(16), @@ -2055,7 +2054,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UMV").get(1), + ItemList.Hull_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Sensor_UMV.get(16), ItemList.Electric_Pump_UMV.get(16), @@ -2067,7 +2066,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UXV").get(1), + ItemList.Hull_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 16), ItemList.Sensor_UXV.get(16), ItemList.Electric_Pump_UXV.get(16), @@ -2084,7 +2083,7 @@ public class Assembler implements Runnable { { GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UEV").get(1), + ItemList.Hull_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Sensor_UEV.get(32), ItemList.Electric_Pump_UEV.get(32), @@ -2096,7 +2095,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UIV").get(1), + ItemList.Hull_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Sensor_UIV.get(32), ItemList.Electric_Pump_UIV.get(32), @@ -2108,7 +2107,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UMV").get(1), + ItemList.Hull_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Sensor_UMV.get(32), ItemList.Electric_Pump_UMV.get(32), @@ -2120,7 +2119,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UXV").get(1), + ItemList.Hull_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 32), ItemList.Sensor_UXV.get(32), ItemList.Electric_Pump_UXV.get(32), @@ -2137,7 +2136,7 @@ public class Assembler implements Runnable { { GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UIV").get(1), + ItemList.Hull_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_UIV.get(64), ItemList.Electric_Pump_UIV.get(64), @@ -2149,7 +2148,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UMV").get(1), + ItemList.Hull_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_UMV.get(64), ItemList.Electric_Pump_UMV.get(64), @@ -2161,7 +2160,7 @@ public class Assembler implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hull_UXV").get(1), + ItemList.Hull_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_UXV.get(64), ItemList.Electric_Pump_UXV.get(64), @@ -2846,7 +2845,7 @@ public class Assembler implements Runnable { // Active Transformer GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("WetTransformer_ZPM_LuV").get(1), + ItemList.WetTransformer_ZPM_LuV.get(1), getItemContainer("HighEnergyFlowCircuit").get(1), GT_OreDictUnificator .get(OrePrefixes.wireGt01, getOrDefault("SuperconductorLuV", Materials.SuperconductorUHV), 16), diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/AssemblyLine.java b/src/main/java/com/github/technus/tectech/loader/recipe/AssemblyLine.java index c5796cb2fd..deada849dd 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/AssemblyLine.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/AssemblyLine.java @@ -1,6 +1,5 @@ package com.github.technus.tectech.loader.recipe; -import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getItemContainer; import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getOrDefault; import static gregtech.api.util.GT_RecipeBuilder.HOURS; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; @@ -127,7 +126,7 @@ public class AssemblyLine implements Runnable { // Research Station GT_Values.RA.stdBuilder() - .metadata(RESEARCH_ITEM, getItemContainer("ScannerZPM").get(1)) + .metadata(RESEARCH_ITEM, ItemList.ScannerZPM.get(1)) .metadata(RESEARCH_TIME, 1 * HOURS + 6 * MINUTES + 40 * SECONDS) .itemInputs( CustomItemList.Machine_Multi_Switch.get(1), diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java index 1bc1678eae..6d63f76edf 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java @@ -2,23 +2,21 @@ package com.github.technus.tectech.loader.recipe; import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getItemContainer; import static com.google.common.math.LongMath.pow; +import static common.Blocks.lscLapotronicEnergyUnit; +import static goodgenerator.loader.Loaders.compactFusionCoil; +import static goodgenerator.loader.Loaders.yottaFluidTankCell; import static gregtech.api.enums.Mods.Avaritia; import static gregtech.api.enums.Mods.AvaritiaAddons; -import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.enums.Mods.BloodMagic; import static gregtech.api.enums.Mods.DraconicEvolution; import static gregtech.api.enums.Mods.EternalSingularity; import static gregtech.api.enums.Mods.ExtraUtilities; import static gregtech.api.enums.Mods.GTNHIntergalactic; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GTPlusPlusEverglades; import static gregtech.api.enums.Mods.GalaxySpace; -import static gregtech.api.enums.Mods.GoodGenerator; import static gregtech.api.enums.Mods.GraviSuite; import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.IndustrialCraft2; -import static gregtech.api.enums.Mods.KekzTech; -import static gregtech.api.enums.Mods.KubaTech; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.SGCraft; import static gregtech.api.enums.Mods.SuperSolarPanels; @@ -28,12 +26,32 @@ import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.INGOTS; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gtPlusPlus.core.material.ALLOY.ABYSSAL; +import static gtPlusPlus.core.material.ALLOY.CINOBITE; +import static gtPlusPlus.core.material.ALLOY.LAFIUM; +import static gtPlusPlus.core.material.ALLOY.LAURENIUM; +import static gtPlusPlus.core.material.ALLOY.PIKYONIUM; +import static gtPlusPlus.core.material.ALLOY.QUANTUM; +import static gtPlusPlus.core.material.ALLOY.TITANSTEEL; +import static gtPlusPlus.core.material.ALLOY.TRINIUM_REINFORCED_STEEL; +import static gtPlusPlus.core.material.ELEMENT.STANDALONE.ASTRAL_TITANIUM; +import static gtPlusPlus.core.material.ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN; +import static gtPlusPlus.core.material.ELEMENT.STANDALONE.CHRONOMATIC_GLASS; +import static gtPlusPlus.core.material.ELEMENT.STANDALONE.HYPOGEN; +import static kubatech.api.enums.ItemList.DEFCAwakenedSchematic; +import static kubatech.api.enums.ItemList.DEFCChaoticSchematic; +import static kubatech.api.enums.ItemList.DEFCDraconicSchematic; +import static kubatech.api.enums.ItemList.DEFCWyvernSchematic; +import static kubatech.api.enums.ItemList.DraconicEvolutionFusionCrafter; +import static kubatech.loaders.BlockLoader.defcCasingBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.technus.tectech.recipe.TT_recipeAdder; import com.github.technus.tectech.thing.CustomItemList; import com.rwtema.extrautils.ExtraUtils; @@ -50,6 +68,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -127,7 +146,7 @@ public class ResearchStationAssemblyLine implements Runnable { 32_000_000, 1, new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1L }, - GT_OreDictUnificator.get("wireGt02Hypogen", 8L), getModItem(GTPlusPlus.ID, "itemScrewHypogen", 8, 0), + GT_OreDictUnificator.get("wireGt02Hypogen", 8L), HYPOGEN.getScrew(8), getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), }, @@ -192,18 +211,18 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Electric_Pump_UHV.get(1L) }, new FluidStack[] { new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000), new FluidStack(solderIndalloy, 40 * 144) }, - ItemList.Hatch_Energy_MAX.get(1L), + ItemList.Hatch_Energy_UHV.get(1L), 1000, 2000000); // Energy Hatch UEV TT_recipeAdder.addResearchableAssemblylineRecipe( - ItemList.Hatch_Energy_MAX.get(1L), + ItemList.Hatch_Energy_UHV.get(1L), 48000, 32, 100000, 4, - new Object[] { getItemContainer("Hull_UEV").get(1L), + new Object[] { ItemList.Hull_UEV.get(1L), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUEV, 2L), ItemList.Circuit_Chip_QPIC.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.UEV), 2L }, ItemList.UHV_Coil.get(4L), ItemList.Reactor_Coolant_Sp_6.get(1L), @@ -211,18 +230,18 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Electric_Pump_UEV.get(1L) }, new FluidStack[] { new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000), new FluidStack(solderUEV, 20 * 144), Materials.UUMatter.getFluid(8000L) }, - getItemContainer("Hatch_Energy_UEV").get(1L), + ItemList.Hatch_Energy_UEV.get(1L), 1000, 8000000); // Energy Hatch UIV TT_recipeAdder.addResearchableAssemblylineRecipe( - getItemContainer("Hatch_Energy_UEV").get(1L), + ItemList.Hatch_Energy_UEV.get(1L), 96_000, 64, 200_000, 8, - new Object[] { getItemContainer("Hull_UIV").get(1L), + new Object[] { ItemList.Hull_UIV.get(1L), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUIV, 2L), ItemList.Circuit_Chip_QPIC.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.UIV), 2L }, ItemList.UHV_Coil.get(8L), ItemList.Reactor_Coolant_Sp_6.get(1L), @@ -231,18 +250,18 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Electric_Pump_UIV.get(1L) }, new FluidStack[] { Materials.SuperCoolant.getFluid(16_000L), new FluidStack(solderUEV, 20 * 144), Materials.UUMatter.getFluid(16_000L) }, - getItemContainer("Hatch_Energy_UIV").get(1L), + ItemList.Hatch_Energy_UIV.get(1L), 1000, 32_000_000); // Energy Hatch UMV TT_recipeAdder.addResearchableAssemblylineRecipe( - getItemContainer("Hatch_Energy_UIV").get(1L), + ItemList.Hatch_Energy_UIV.get(1L), 192000, 128, 400000, 16, - new Object[] { getItemContainer("Hull_UMV").get(1L), + new Object[] { ItemList.Hull_UMV.get(1L), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUMV, 2L), ItemList.Circuit_Chip_QPIC.get(4L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UMV, 2), ItemList.UHV_Coil.get(16L), @@ -253,18 +272,18 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Electric_Pump_UMV.get(1L) }, new FluidStack[] { Materials.SuperCoolant.getFluid(32_000L), new FluidStack(solderUEV, 40 * 144), Materials.UUMatter.getFluid(32000L) }, - getItemContainer("Hatch_Energy_UMV").get(1L), + ItemList.Hatch_Energy_UMV.get(1L), 1000, 128_000_000); // Energy Hatch UXV TT_recipeAdder.addResearchableAssemblylineRecipe( - getItemContainer("Hatch_Energy_UMV").get(1L), + ItemList.Hatch_Energy_UMV.get(1L), 384000, 256, 800000, 32, - new Object[] { getItemContainer("Hull_UXV").get(1L), + new Object[] { ItemList.Hull_UXV.get(1L), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUMV, 4L), ItemList.Circuit_Chip_QPIC.get(16L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, 2), ItemList.UHV_Coil.get(32L), @@ -276,7 +295,7 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Electric_Pump_UXV.get(1L) }, new FluidStack[] { Materials.SuperCoolant.getFluid(64_000L), new FluidStack(solderUEV, 80 * 144), Materials.UUMatter.getFluid(64000L) }, - getItemContainer("Hatch_Energy_UXV").get(1L), + ItemList.Hatch_Energy_UXV.get(1L), 1000, 512_000_000); } @@ -313,18 +332,18 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Electric_Pump_UHV.get(1L) }, new FluidStack[] { new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000), new FluidStack(solderIndalloy, 40 * 144) }, - ItemList.Hatch_Dynamo_MAX.get(1L), + ItemList.Hatch_Dynamo_UHV.get(1L), 1000, 2000000); // Dynamo Hatch UEV TT_recipeAdder.addResearchableAssemblylineRecipe( - ItemList.Hatch_Dynamo_MAX.get(1L), + ItemList.Hatch_Dynamo_UHV.get(1L), 96000, 64, 200000, 8, - new Object[] { getItemContainer("Hull_UEV").get(1L), + new Object[] { ItemList.Hull_UEV.get(1L), GT_OreDictUnificator.get(OrePrefixes.spring, Materials.SuperconductorUEVBase, 8L), ItemList.Circuit_Chip_QPIC.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.UEV), 2L }, ItemList.UHV_Coil.get(4L), ItemList.Reactor_Coolant_Sp_6.get(1L), @@ -332,18 +351,18 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Electric_Pump_UEV.get(1L) }, new FluidStack[] { new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000), new FluidStack(solderUEV, 20 * 144), Materials.UUMatter.getFluid(8000L) }, - getItemContainer("Hatch_Dynamo_UEV").get(1L), + ItemList.Hatch_Dynamo_UEV.get(1L), 1000, 8000000); // Dynamo Hatch UIV TT_recipeAdder.addResearchableAssemblylineRecipe( - getItemContainer("Hatch_Dynamo_UEV").get(1L), + ItemList.Hatch_Dynamo_UEV.get(1L), 192_000, 128, 400_000, 16, - new Object[] { getItemContainer("Hull_UIV").get(1L), + new Object[] { ItemList.Hull_UIV.get(1L), GT_OreDictUnificator.get(OrePrefixes.spring, Materials.SuperconductorUIVBase, 8L), ItemList.Circuit_Chip_QPIC.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.UIV), 2L }, ItemList.UHV_Coil.get(8L), ItemList.Reactor_Coolant_Sp_6.get(1L), @@ -352,18 +371,18 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Electric_Pump_UIV.get(1L) }, new FluidStack[] { Materials.SuperCoolant.getFluid(16_000L), new FluidStack(solderUEV, 20 * 144), Materials.UUMatter.getFluid(16_000L) }, - getItemContainer("Hatch_Dynamo_UIV").get(1L), + ItemList.Hatch_Dynamo_UIV.get(1L), 1000, 32_000_000); // Dynamo Hatch UMV TT_recipeAdder.addResearchableAssemblylineRecipe( - getItemContainer("Hatch_Dynamo_UIV").get(1L), + ItemList.Hatch_Dynamo_UIV.get(1L), 384000, 256, 800000, 32, - new Object[] { getItemContainer("Hull_UMV").get(1L), + new Object[] { ItemList.Hull_UMV.get(1L), GT_OreDictUnificator.get(OrePrefixes.spring, Materials.SuperconductorUMVBase, 8L), ItemList.Circuit_Chip_QPIC.get(4L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UMV, 2), ItemList.UHV_Coil.get(16L), @@ -374,18 +393,18 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Electric_Pump_UMV.get(1L) }, new FluidStack[] { Materials.SuperCoolant.getFluid(32_000L), new FluidStack(solderUEV, 40 * 144), Materials.UUMatter.getFluid(32000L) }, - getItemContainer("Hatch_Dynamo_UMV").get(1L), + ItemList.Hatch_Dynamo_UMV.get(1L), 1000, 128_000_000); // Dynamo Hatch UXV TT_recipeAdder.addResearchableAssemblylineRecipe( - getItemContainer("Hatch_Dynamo_UMV").get(1L), + ItemList.Hatch_Dynamo_UMV.get(1L), 384000, 256, 800000, 32, - new Object[] { getItemContainer("Hull_UXV").get(1L), + new Object[] { ItemList.Hull_UXV.get(1L), GT_OreDictUnificator.get(OrePrefixes.spring, Materials.SuperconductorUMVBase, 16L), ItemList.Circuit_Chip_QPIC.get(16L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, 2), ItemList.UHV_Coil.get(32L), @@ -397,7 +416,7 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Electric_Pump_UXV.get(1L) }, new FluidStack[] { Materials.SuperCoolant.getFluid(64_000L), new FluidStack(solderUEV, 80 * 144), Materials.UUMatter.getFluid(64000L) }, - getItemContainer("Hatch_Dynamo_UXV").get(1L), + ItemList.Hatch_Dynamo_UXV.get(1L), 1000, 512_000_000); } @@ -501,7 +520,7 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Circuit_Parts_InductorXSMD.get(16L), ItemList.Circuit_Parts_CapacitorXSMD.get(20L), ItemList.Circuit_Parts_ResistorXSMD.get(20L), ItemList.Circuit_Chip_NOR.get(32L), ItemList.Circuit_Chip_Ram.get(64L), - GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedwireFine", 24L, 10101), // Fine + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.wireFine), 24, 10101), // Fine // Lumiium // Wire new Object[] { OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L }, }, @@ -522,7 +541,7 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Circuit_Parts_TransistorXSMD.get(24L), ItemList.Circuit_Parts_ResistorXSMD.get(24L), ItemList.Circuit_Parts_CapacitorXSMD.get(24L), ItemList.Circuit_Parts_DiodeXSMD.get(24L), ItemList.Circuit_Chip_NOR.get(64L), ItemList.Circuit_Chip_SoC2.get(32L), - GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedwireFine", 32L, 10101), // Fine + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.wireFine), 32, 10101), // Fine // Lumiium // Wire new Object[] { OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L }, @@ -568,8 +587,8 @@ public class ResearchStationAssemblyLine implements Runnable { 40_000, 2, new Object[] { CustomItemList.eM_Power.get(1L), CustomItemList.LASERpipe.get(4L), - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDenseChromaticGlass", 1), - ItemList.Circuit_Chip_QPIC.get(2L), new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1L } }, + CHRONOMATIC_GLASS.getPlateDense(1), ItemList.Circuit_Chip_QPIC.get(2L), + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1L } }, new FluidStack[] { Materials.Grade4PurifiedWater.getFluid(4000L) }, CustomItemList.LASERpipeSmart.get(1L), 10 * 20, @@ -683,17 +702,14 @@ public class ResearchStationAssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmiridium, 64L), GT_OreDictUnificator.get("stickLongShirabon", 64), - getModItem(BartWorks.ID, "gt.bwMetaGeneratedstickLong", 64L, 39), - getModItem(GTPlusPlus.ID, "itemRodLongQuantum", 64L), - - getModItem(GTPlusPlus.ID, "itemRodLongHypogen", 64L), - getModItem(GTPlusPlus.ID, "itemRodLongCelestialTungsten", 64L), - getModItem(BartWorks.ID, "gt.bwMetaGeneratedstickLong", 64L, 10106), - getModItem(GTPlusPlus.ID, "itemRodLongAstralTitanium", 64L), + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.stickLong), 64, 39), QUANTUM.getLongRod(64), + HYPOGEN.getLongRod(64), CELESTIAL_TUNGSTEN.getLongRod(64), + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.stickLong), 64, 10106), + ASTRAL_TITANIUM.getLongRod(64), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SuperconductorUMVBase, 64L), GT_OreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.Universium, 64L), - getModItem(GTPlusPlus.ID, "itemRodLongAbyssalAlloy", 64L), + ABYSSAL.getLongRod(64), GT_OreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.TranscendentMetal, 64L), }, new FluidStack[] { Materials.Neutronium.getMolten(32_768_000L), MaterialsUEVplus.SpaceTime.getMolten(4 * 36864L), MaterialsUEVplus.Universium.getMolten(4 * 36864L), @@ -713,15 +729,14 @@ public class ResearchStationAssemblyLine implements Runnable { 4096, 32_000_000, 1, - new Object[] { ItemList.Casing_Dim_Bridge.get(4), - getModItem(GregTech.ID, "gt.blockmachines", 16L, 12730), - getItemContainer("Hatch_Energy_UEV").get(4L), + new Object[] { ItemList.Casing_Dim_Bridge.get(4), ItemRegistry.megaMachines[0], + ItemList.Hatch_Energy_UEV.get(4L), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 6), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), new Object[] { OrePrefixes.circuit.get(Materials.UIV), 20L }, ItemList.Field_Generator_UEV.get(4), getModItem(EternalSingularity.ID, "eternal_singularity", 4L), - getModItem(GTPlusPlus.ID, "MU-metaitem.01", 1L, 32105), + GregtechItemList.Laser_Lens_Special.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 64L), ItemList.Electric_Pump_UEV.get(4), ItemList.ZPM3.get(1), getModItem(IndustrialCraft2.ID, "blockMachine2", 1, 0) }, @@ -761,7 +776,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 4), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Ledox, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CallistoIce, 1), - ItemList.Reactor_Coolant_Sp_6.get(1L), getModItem(GTPlusPlus.ID, "itemScrewLaurenium", 12, 0), + ItemList.Reactor_Coolant_Sp_6.get(1L), LAURENIUM.getScrew(12), new Object[] { OrePrefixes.circuit.get(Materials.IV), 2L }, GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 2), ItemList.Super_Chest_IV.get(1), ItemList.Super_Tank_IV.get(1), @@ -780,7 +795,7 @@ public class ResearchStationAssemblyLine implements Runnable { 32_000_000, 1, new Object[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 6), - getModItem(GTPlusPlus.ID, "itemScrewLaurenium", 12, 0), ItemList.Reactor_Coolant_Sp_6.get(1L), + LAURENIUM.getScrew(12), ItemList.Reactor_Coolant_Sp_6.get(1L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 1), }, new FluidStack[] { new FluidStack(FluidRegistry.getFluid("oganesson"), 500), new FluidStack(solderUEV, 288), Materials.NaquadahEnriched.getMolten(144L) }, @@ -909,8 +924,7 @@ public class ResearchStationAssemblyLine implements Runnable { 1_280, 32_000_000, 32, - new Object[] { ELEMENT.STANDALONE.HYPOGEN.getPlateDouble(32), - ELEMENT.STANDALONE.HYPOGEN.getPlateDouble(32), + new Object[] { HYPOGEN.getPlateDouble(32), HYPOGEN.getPlateDouble(32), new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, @@ -970,7 +984,7 @@ public class ResearchStationAssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 4), ItemList.Field_Generator_UHV.get(2), ItemList.Circuit_Wafer_QPIC.get(64), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 32) }, - new FluidStack[] { Materials.UUMatter.getFluid(50000), ALLOY.CINOBITE.getFluidStack(9216), + new FluidStack[] { Materials.UUMatter.getFluid(50000), CINOBITE.getFluidStack(9216), ALLOY.OCTIRON.getFluidStack(9216), ELEMENT.STANDALONE.ASTRAL_TITANIUM.getFluidStack(9216), }, GregtechItemList.FusionComputer_UV2.get(1), 6000, @@ -988,7 +1002,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { OrePrefixes.circuit.get(Materials.UV), 8L }, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8), ItemList.Emitter_UHV.get(1), ItemList.Sensor_UHV.get(1), ItemList.Casing_Fusion_Coil.get(1L), }, - new FluidStack[] { Materials.UUMatter.getFluid(8000L), ALLOY.CINOBITE.getFluidStack(2304), + new FluidStack[] { Materials.UUMatter.getFluid(8000L), CINOBITE.getFluidStack(2304), ALLOY.OCTIRON.getFluidStack(2304), ELEMENT.STANDALONE.ASTRAL_TITANIUM.getFluidStack(2304), }, GregtechItemList.Casing_Fusion_Internal.get(1), 1200, @@ -1007,7 +1021,7 @@ public class ResearchStationAssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8), ItemList.Electric_Motor_UHV.get(2), ItemList.Electric_Piston_UHV.get(1), ItemList.Casing_Fusion2.get(1L), }, - new FluidStack[] { Materials.UUMatter.getFluid(1000L), ALLOY.CINOBITE.getFluidStack(576), + new FluidStack[] { Materials.UUMatter.getFluid(1000L), CINOBITE.getFluidStack(576), ALLOY.OCTIRON.getFluidStack(576), ELEMENT.STANDALONE.ASTRAL_TITANIUM.getFluidStack(576), }, GregtechItemList.Casing_Fusion_External.get(1), 300, @@ -1044,8 +1058,7 @@ public class ResearchStationAssemblyLine implements Runnable { 8, new Object[] { ItemList.Energy_Module.get(16), new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 16L }, new Object[] { OrePrefixes.circuit.get(Materials.UHV), 8L }, ELEMENT.STANDALONE.RHUGNOR.getPlate(8), - ItemList.Emitter_UEV.get(1), ItemList.Sensor_UEV.get(1), - getModItem(GoodGenerator.ID, "compactFusionCoil", 1, 2) }, + ItemList.Emitter_UEV.get(1), ItemList.Sensor_UEV.get(1), new ItemStack(compactFusionCoil, 1, 2) }, new FluidStack[] { ELEMENT.getInstance().NEPTUNIUM.getFluidStack(2304), ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getFluidStack(2304), ALLOY.ABYSSAL.getFluidStack(2304), ELEMENT.STANDALONE.DRAGON_METAL.getFluidStack(2304) }, @@ -1075,13 +1088,12 @@ public class ResearchStationAssemblyLine implements Runnable { if (BloodMagic.isModLoaded() && DraconicEvolution.isModLoaded()) { // Draconic Evolution Fusion Crafter Controller TT_recipeAdder.addResearchableAssemblylineRecipe( - getModItem(KubaTech.ID, "defc.casing", 1, 8), + new ItemStack(defcCasingBlock, 1, 8), 16_777_216, 1024, 2_000_000, 8, - new Object[] { getModItem(GregTech.ID, "gt.blockmachines", 1, 10783), - getModItem(KubaTech.ID, "defc.casing", 1, 8), + new Object[] { ItemList.AssemblingMachineUHV.get(1), new ItemStack(defcCasingBlock, 1, 8), GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsBotania.GaiaSpirit, 1L), ItemList.Casing_Coil_AwakenedDraconium.get(8L), ItemList.Electric_Motor_UHV.get(8L), ItemList.Robot_Arm_UHV.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.UHV), 4 }, @@ -1090,12 +1102,12 @@ public class ResearchStationAssemblyLine implements Runnable { getModItem(BloodMagic.ID, "bloodMagicBaseItems", 8, 28), }, new FluidStack[] { new FluidStack(solderIndalloy, 2880), Materials.Void.getMolten(2880L), Materials.DraconiumAwakened.getMolten(1440), }, - getModItem(GregTech.ID, "gt.blockmachines", 1, 5001), + DraconicEvolutionFusionCrafter.get(1), 1500, 8_000_000); // DE Schematics Cores Tier 1 TT_recipeAdder.addResearchableAssemblylineRecipe( - getModItem(KubaTech.ID, "defc.casing", 1, 9), + new ItemStack(defcCasingBlock, 1, 9), 5_000_000, 512, 1_000_000, @@ -1105,7 +1117,7 @@ public class ResearchStationAssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 1L), new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1 }, }, new FluidStack[] { Materials.Sunnarium.getMolten(14400L), Materials.Void.getMolten(28800L), }, - getModItem(KubaTech.ID, "kubaitems", 1, 38), + DEFCDraconicSchematic.get(1), 6000, 500_000); @@ -1121,7 +1133,7 @@ public class ResearchStationAssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 1L), new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1 }, }, new FluidStack[] { Materials.Neutronium.getMolten(14400L), Materials.Void.getMolten(57600L), }, - getModItem(KubaTech.ID, "kubaitems", 1, 39), + DEFCWyvernSchematic.get(1), 12000, 2_000_000); @@ -1137,7 +1149,7 @@ public class ResearchStationAssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 1L), new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1L } }, new FluidStack[] { Materials.Infinity.getMolten(14400L), Materials.Void.getMolten(115200L), }, - getModItem(KubaTech.ID, "kubaitems", 1, 40), + DEFCAwakenedSchematic.get(1), 24000, 8_000_000); @@ -1153,7 +1165,7 @@ public class ResearchStationAssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 1L), new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, }, new FluidStack[] { MaterialsUEVplus.SpaceTime.getMolten(14400L), Materials.Void.getMolten(230400L), }, - getModItem(KubaTech.ID, "kubaitems", 1, 41), + DEFCChaoticSchematic.get(1), 36000, 32_000_000); } @@ -1777,10 +1789,7 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Electric_Motor_UIV.get(1L), GT_OreDictUnificator.get(OrePrefixes.stick, MaterialsUEVplus.TranscendentMetal, 16L), ItemList.Gravistar.get(32L), new Object[] { OrePrefixes.circuit.get(Materials.UIV), 4L }, - getModItem(GTPlusPlus.ID, "itemFoilArceusAlloy2B", 64, 0), - getModItem(GTPlusPlus.ID, "itemFoilLafiumCompound", 64, 0), - getModItem(GTPlusPlus.ID, "itemFoilCinobiteA243", 64, 0), - getModItem(GTPlusPlus.ID, "itemFoilPikyonium64B", 64, 0), + TRINIUM_REINFORCED_STEEL.getFoil(64), LAFIUM.getFoil(64), CINOBITE.getFoil(64), PIKYONIUM.getFoil(64), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 7L) }, new FluidStack[] { fluid_0, fluid_1 }, ItemList.Emitter_UIV.get(1L), @@ -1801,10 +1810,7 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Electric_Motor_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.TranscendentMetal, 8L), ItemList.Gravistar.get(32), new Object[] { OrePrefixes.circuit.get(Materials.UIV), 4L }, - getModItem(GTPlusPlus.ID, "itemFoilArceusAlloy2B", 64, 0), - getModItem(GTPlusPlus.ID, "itemFoilLafiumCompound", 64, 0), - getModItem(GTPlusPlus.ID, "itemFoilCinobiteA243", 64, 0), - getModItem(GTPlusPlus.ID, "itemFoilPikyonium64B", 64, 0), + TRINIUM_REINFORCED_STEEL.getFoil(64), LAFIUM.getFoil(64), CINOBITE.getFoil(64), PIKYONIUM.getFoil(64), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 7L) }, new FluidStack[] { fluid_0, fluid_1 }, ItemList.Sensor_UIV.get(1L), @@ -1881,15 +1887,9 @@ public class ResearchStationAssemblyLine implements Runnable { new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TengamAttuned, 32L), GT_OreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.SpaceTime, 16L), GT_OreDictUnificator.get(OrePrefixes.ring, MaterialsUEVplus.SpaceTime, 8L), - GT_OreDictUnificator.get(OrePrefixes.round, MaterialsUEVplus.SpaceTime, 32L), - getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), - getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), - getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), - getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), - getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), - getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), - getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), - getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), + GT_OreDictUnificator.get(OrePrefixes.round, MaterialsUEVplus.SpaceTime, 32L), HYPOGEN.getFineWire(64), + HYPOGEN.getFineWire(64), HYPOGEN.getFineWire(64), HYPOGEN.getFineWire(64), HYPOGEN.getFineWire(64), + HYPOGEN.getFineWire(64), HYPOGEN.getFineWire(64), HYPOGEN.getFineWire(64), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 2L) }, new FluidStack[] { fluid_0, fluid_1, fluid_2, fluid_3 }, ItemList.Electric_Motor_UMV.get(1L), @@ -2000,11 +2000,8 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Electric_Motor_UMV.get(1L), GT_OreDictUnificator.get(OrePrefixes.stick, MaterialsUEVplus.SpaceTime, 16L), ItemList.Gravistar.get(64), new Object[] { OrePrefixes.circuit.get(Materials.UMV), 4L }, - getModItem(GTPlusPlus.ID, "itemFoilCelestialTungsten", 64, 0), - getModItem(GTPlusPlus.ID, "itemFoilQuantum", 64, 0), - getModItem(GTPlusPlus.ID, "itemFoilAstralTitanium", 64, 0), - getModItem(GTPlusPlus.ID, "itemFoilTitansteel", 64, 0), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 7L) }, + CELESTIAL_TUNGSTEN.getFoil(64), QUANTUM.getFoil(64), ASTRAL_TITANIUM.getFoil(64), + TITANSTEEL.getFoil(64), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 7L) }, new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Emitter_UMV.get(1L), crafting_time_in_ticks, @@ -2023,11 +2020,8 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1L), ItemList.Electric_Motor_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 8L), ItemList.Gravistar.get(64), - new Object[] { OrePrefixes.circuit.get(Materials.UMV), 4L }, - getModItem(GTPlusPlus.ID, "itemFoilCelestialTungsten", 64, 0), - getModItem(GTPlusPlus.ID, "itemFoilQuantum", 64, 0), - getModItem(GTPlusPlus.ID, "itemFoilAstralTitanium", 64, 0), - getModItem(GTPlusPlus.ID, "itemFoilTitansteel", 64, 0), + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 4L }, CELESTIAL_TUNGSTEN.getFoil(64), + QUANTUM.getFoil(64), ASTRAL_TITANIUM.getFoil(64), TITANSTEEL.getFoil(64), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 7L) }, new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Sensor_UMV.get(1L), @@ -2047,15 +2041,9 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 6L), ItemList.Gravistar.get(32L), ItemList.Emitter_UMV.get(4L), - new Object[] { OrePrefixes.circuit.get(Materials.UXV), 4 }, - getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), - getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), - getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), - getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), - getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), - getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), - getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), - getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 4 }, HYPOGEN.getFineWire(64), + HYPOGEN.getFineWire(64), HYPOGEN.getFineWire(64), HYPOGEN.getFineWire(64), HYPOGEN.getFineWire(64), + HYPOGEN.getFineWire(64), HYPOGEN.getFineWire(64), HYPOGEN.getFineWire(64), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 8L) }, new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Field_Generator_UMV.get(1L), @@ -2396,11 +2384,10 @@ public class ResearchStationAssemblyLine implements Runnable { CustomItemList.SpacetimeCompressionFieldGeneratorTier0.get(1), CustomItemList.StabilisationFieldGeneratorTier0.get(1), - CustomItemList.Machine_Multi_Computer.get(64), - // Ultimate Time Anomaly. - getModItem(GregTech.ID, "gt.blockmachines", 64, 11107), ItemList.Quantum_Chest_IV.get(64), + CustomItemList.Machine_Multi_Computer.get(64), ItemList.AcceleratorUV.get(1), + ItemList.Quantum_Chest_IV.get(64), // Void miner III. - getModItem(GregTech.ID, "gt.blockmachines", 64, 12739), + GT_Utility.copyAmount(64, ItemRegistry.voidminer[2]), ItemList.Field_Generator_UMV.get(16), ItemList.Robot_Arm_UMV.get(16), ItemList.ZPM4.get(4), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 64) }, @@ -2480,14 +2467,14 @@ public class ResearchStationAssemblyLine implements Runnable { (absoluteTier + 1) * 8, // amperage new Object[] { baseCasing, // T7 Yotta cell. - getModItem(GoodGenerator.ID, "yottaFluidTankCells", tier, (5 + set)), + new ItemStack(yottaFluidTankCell, tier, (5 + set)), // quantum tank V (max tier) ItemList.Quantum_Tank_IV.get(4 * (1 + absoluteTier)), // Inf chest getModItem(AvaritiaAddons.ID, "InfinityChest", absoluteTier + 1), // Cosmic fabric manipulator - getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", tier, 8), ME_Singularity, - plateList[absoluteTier], GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, set) }, + GregtechItemList.CosmicFabricManipulator.get(tier), ME_Singularity, plateList[absoluteTier], + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier] }, CustomItemList.SpacetimeCompressionFieldGeneratorTier0.get(1), @@ -2504,13 +2491,13 @@ public class ResearchStationAssemblyLine implements Runnable { (absoluteTier + 1) * 8, // amperage new Object[] { baseCasing, // T7 Yotta cell. - getModItem(GoodGenerator.ID, "yottaFluidTankCells", tier, (5 + set)), + new ItemStack(yottaFluidTankCell, tier, (5 + set)), // quantum tank V (max tier) ItemList.Quantum_Tank_IV.get(4 * (1 + absoluteTier)), // Inf chest getModItem(AvaritiaAddons.ID, "InfinityChest", absoluteTier + 1), // Cosmic fabric manipulator - getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", tier, 8), ME_Singularity, ME_Singularity, + GregtechItemList.CosmicFabricManipulator.get(tier), ME_Singularity, ME_Singularity, plateList[absoluteTier], GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier] }, @@ -2528,13 +2515,13 @@ public class ResearchStationAssemblyLine implements Runnable { (absoluteTier + 1) * 8, // amperage new Object[] { baseCasing, // T7 Yotta cell. - getModItem(GoodGenerator.ID, "yottaFluidTankCells", tier, (5 + set)), + new ItemStack(yottaFluidTankCell, tier, (5 + set)), // quantum tank V (max tier) ItemList.Quantum_Tank_IV.get(4 * (1 + absoluteTier)), // Inf chest getModItem(AvaritiaAddons.ID, "InfinityChest", absoluteTier + 1), // Cosmic fabric manipulator - getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", tier, 8), ME_Singularity, ME_Singularity, + GregtechItemList.CosmicFabricManipulator.get(tier), ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier], GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), @@ -2556,13 +2543,13 @@ public class ResearchStationAssemblyLine implements Runnable { (absoluteTier + 1) * 8, // amperage new Object[] { baseCasing, // T8 Yotta cell. - getModItem(GoodGenerator.ID, "yottaFluidTankCells", tier, (5 + set)), + new ItemStack(yottaFluidTankCell, tier, (5 + set)), // quantum tank V (max tier) ItemList.Quantum_Tank_IV.get(4 * (1 + absoluteTier)), // Inf chest getModItem(AvaritiaAddons.ID, "InfinityChest", absoluteTier + 1), // Infinity infused manipulator - getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", tier, 9), ME_Singularity, ME_Singularity, + GregtechItemList.InfinityInfusedManipulator.get(tier), ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier], GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), @@ -2581,13 +2568,13 @@ public class ResearchStationAssemblyLine implements Runnable { (absoluteTier + 1) * 8, // amperage new Object[] { baseCasing, // T8 Yotta cell. - getModItem(GoodGenerator.ID, "yottaFluidTankCells", tier, (5 + set)), + new ItemStack(yottaFluidTankCell, tier, (5 + set)), // quantum tank V (max tier) ItemList.Quantum_Tank_IV.get(4 * (1 + absoluteTier)), // Inf chest getModItem(AvaritiaAddons.ID, "InfinityChest", absoluteTier + 1), // Infinity infused manipulator - getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", tier, 9), ME_Singularity, ME_Singularity, + GregtechItemList.InfinityInfusedManipulator.get(tier), ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier], GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), @@ -2606,13 +2593,13 @@ public class ResearchStationAssemblyLine implements Runnable { (absoluteTier + 1) * 8, // amperage new Object[] { baseCasing, // T8 Yotta cell. - getModItem(GoodGenerator.ID, "yottaFluidTankCells", tier, (5 + set)), + new ItemStack(yottaFluidTankCell, tier, (5 + set)), // quantum tank V (max tier) ItemList.Quantum_Tank_IV.get(4 * (1 + absoluteTier)), // Inf chest getModItem(AvaritiaAddons.ID, "InfinityChest", absoluteTier + 1), // Infinity infused manipulator - getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", tier, 9), ME_Singularity, ME_Singularity, + GregtechItemList.InfinityInfusedManipulator.get(tier), ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier], GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), @@ -2634,14 +2621,14 @@ public class ResearchStationAssemblyLine implements Runnable { (absoluteTier + 1) * 8, // amperage new Object[] { baseCasing, // T9 Yotta cell. - getModItem(GoodGenerator.ID, "yottaFluidTankCells", tier, (5 + set)), + new ItemStack(yottaFluidTankCell, tier, (5 + set)), // quantum tank V (max tier) ItemList.Quantum_Tank_IV.get(4 * (1 + absoluteTier)), // Inf chest getModItem(AvaritiaAddons.ID, "InfinityChest", absoluteTier + 1), // Spacetime continuum ripper - getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", tier, 10), ME_Singularity, - ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, + GregtechItemList.SpaceTimeContinuumRipper.get(tier), ME_Singularity, ME_Singularity, + ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier], GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], }, @@ -2659,16 +2646,15 @@ public class ResearchStationAssemblyLine implements Runnable { (absoluteTier + 1) * 8, // amperage new Object[] { baseCasing, // T9 Yotta cell. - getModItem(GoodGenerator.ID, "yottaFluidTankCells", tier, (5 + set)), + new ItemStack(yottaFluidTankCell, tier, (5 + set)), // quantum tank V (max tier) ItemList.Quantum_Tank_IV.get(4 * (1 + absoluteTier)), // Inf chest getModItem(AvaritiaAddons.ID, "InfinityChest", absoluteTier + 1), // Spacetime continuum ripper - getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", tier, 10), ME_Singularity, + GregtechItemList.SpaceTimeContinuumRipper.get(tier), ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, - ME_Singularity, plateList[absoluteTier], - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, set) }, + plateList[absoluteTier], GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], }, CustomItemList.SpacetimeCompressionFieldGeneratorTier7.get(1), @@ -2685,15 +2671,15 @@ public class ResearchStationAssemblyLine implements Runnable { (absoluteTier + 1) * 8, // amperage new Object[] { baseCasing, // T9 Yotta cell. - getModItem(GoodGenerator.ID, "yottaFluidTankCells", tier, (5 + set)), + new ItemStack(yottaFluidTankCell, tier, (5 + set)), // quantum tank V (max tier) ItemList.Quantum_Tank_IV.get(4 * (1 + absoluteTier)), // Inf chest getModItem(AvaritiaAddons.ID, "InfinityChest", absoluteTier + 1), // Spacetime continuum ripper - getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.5", tier, 10), ME_Singularity, + GregtechItemList.SpaceTimeContinuumRipper.get(tier), ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, ME_Singularity, - ME_Singularity, ME_Singularity, plateList[absoluteTier], + ME_Singularity, plateList[absoluteTier], GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, set) }, new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))), MaterialsUEVplus.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], }, @@ -2723,19 +2709,14 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.FusionComputer_ZPMV.get(2), ItemList.FusionComputer_ZPMV.get(3), ItemList.FusionComputer_UV.get(1), ItemList.FusionComputer_UV.get(2), ItemList.FusionComputer_UV.get(3), // MK4 Fusion Computer. - getModItem(GregTech.ID, "gt.blockmachines", 1, 965), - getModItem(GregTech.ID, "gt.blockmachines", 2, 965), - getModItem(GregTech.ID, "gt.blockmachines", 3, 965) }; - - final ItemStack[] fusionCoils = new ItemStack[] { getModItem(GoodGenerator.ID, "compactFusionCoil", 1, 1), - getModItem(GoodGenerator.ID, "compactFusionCoil", 2, 1), - getModItem(GoodGenerator.ID, "compactFusionCoil", 3, 1), - getModItem(GoodGenerator.ID, "compactFusionCoil", 1, 2), - getModItem(GoodGenerator.ID, "compactFusionCoil", 2, 2), - getModItem(GoodGenerator.ID, "compactFusionCoil", 3, 2), - getModItem(GoodGenerator.ID, "compactFusionCoil", 1, 3), - getModItem(GoodGenerator.ID, "compactFusionCoil", 2, 3), - getModItem(GoodGenerator.ID, "compactFusionCoil", 3, 3) }; + GregtechItemList.FusionComputer_UV2.get(1), GregtechItemList.FusionComputer_UV2.get(2), + GregtechItemList.FusionComputer_UV2.get(3) }; + + final ItemStack[] fusionCoils = new ItemStack[] { new ItemStack(compactFusionCoil, 1, 1), + new ItemStack(compactFusionCoil, 2, 1), new ItemStack(compactFusionCoil, 3, 1), + new ItemStack(compactFusionCoil, 1, 2), new ItemStack(compactFusionCoil, 2, 2), + new ItemStack(compactFusionCoil, 3, 2), new ItemStack(compactFusionCoil, 1, 3), + new ItemStack(compactFusionCoil, 2, 3), new ItemStack(compactFusionCoil, 3, 3) }; final ItemStack[] researchStuff = new ItemStack[] { baseCasing, CustomItemList.TimeAccelerationFieldGeneratorTier0.get(1), @@ -2783,8 +2764,7 @@ public class ResearchStationAssemblyLine implements Runnable { getModItem(GalaxySpace.ID, "dysonswarmparts", (absoluteTier + 1) * 4, 2), // Dyson Swarm Energy Receiver Dish Block getModItem(GalaxySpace.ID, "dysonswarmparts", (absoluteTier + 1) * 4, 1), - // Ultimate Time Anomaly. - getModItem(GregTech.ID, "gt.blockmachines", (absoluteTier + 1) * 4, 11107), + ItemList.AcceleratorUV.get((absoluteTier + 1) * 4), ItemList.Energy_Module.get(absoluteTier + 1), GT_OreDictUnificator .get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, (absoluteTier + 1) * 4), @@ -2896,8 +2876,7 @@ public class ResearchStationAssemblyLine implements Runnable { // EOH Reinforced Temporal casings { TT_recipeAdder.addResearchableAssemblylineRecipe( - // Ultimate Time Anomaly. - getModItem(GregTech.ID, "gt.blockmachines", 1, 11107), + ItemList.AcceleratorUV.get(1), 256_000_000, // total comp 16_384, // comp/s (int) TierEU.RECIPE_MAX, // eu/t @@ -2914,7 +2893,7 @@ public class ResearchStationAssemblyLine implements Runnable { // UV Solar panel getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1, 0), // Ultimate Time Anomaly. - getModItem(GregTech.ID, "gt.blockmachines", 4, 11107), + ItemList.AcceleratorUV.get(4), // Gravitation Engine. getModItem(GraviSuite.ID, "itemSimpleItem", 64, 3), ItemList.EnergisedTesseract.get(1) }, @@ -2938,7 +2917,7 @@ public class ResearchStationAssemblyLine implements Runnable { // UV Solar panel getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1, 0), // UHV Capacitor block - getModItem(KekzTech.ID, "kekztech_lapotronicenergyunit_block", 1, 5), + new ItemStack(lscLapotronicEnergyUnit, 1, 5), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 4), CustomItemList.Machine_Multi_Transformer.get(16), ItemList.Wireless_Hatch_Energy_UMV.get(4), @@ -3012,9 +2991,8 @@ public class ResearchStationAssemblyLine implements Runnable { ItemStack[] energyHatches = { ItemList.Hatch_Energy_ULV.get(1), ItemList.Hatch_Energy_LV.get(1), ItemList.Hatch_Energy_MV.get(1), ItemList.Hatch_Energy_HV.get(1), ItemList.Hatch_Energy_EV.get(1), ItemList.Hatch_Energy_IV.get(1), ItemList.Hatch_Energy_LuV.get(1), ItemList.Hatch_Energy_ZPM.get(1), - ItemList.Hatch_Energy_UV.get(1), ItemList.Hatch_Energy_MAX.get(1), - getItemContainer("Hatch_Energy_UEV").get(1L), getItemContainer("Hatch_Energy_UIV").get(1L), - getItemContainer("Hatch_Energy_UMV").get(1L), getItemContainer("Hatch_Energy_UXV").get(1L) }; + ItemList.Hatch_Energy_UV.get(1), ItemList.Hatch_Energy_UHV.get(1), ItemList.Hatch_Energy_UEV.get(1L), + ItemList.Hatch_Energy_UIV.get(1L), ItemList.Hatch_Energy_UMV.get(1L), ItemList.Hatch_Energy_UXV.get(1L) }; ItemStack[] energyHatches_4A = { CustomItemList.eM_energyMulti4_EV.get(1), CustomItemList.eM_energyMulti4_IV.get(1), CustomItemList.eM_energyMulti4_LuV.get(1), @@ -3046,9 +3024,8 @@ public class ResearchStationAssemblyLine implements Runnable { ItemStack[] dynamoHatches = { ItemList.Hatch_Dynamo_ULV.get(1), ItemList.Hatch_Dynamo_LV.get(1), ItemList.Hatch_Dynamo_MV.get(1), ItemList.Hatch_Dynamo_HV.get(1), ItemList.Hatch_Dynamo_EV.get(1), ItemList.Hatch_Dynamo_IV.get(1), ItemList.Hatch_Dynamo_LuV.get(1), ItemList.Hatch_Dynamo_ZPM.get(1), - ItemList.Hatch_Dynamo_UV.get(1), ItemList.Hatch_Dynamo_MAX.get(1), - getItemContainer("Hatch_Dynamo_UEV").get(1L), getItemContainer("Hatch_Dynamo_UIV").get(1L), - getItemContainer("Hatch_Dynamo_UMV").get(1L), getItemContainer("Hatch_Dynamo_UXV").get(1L) }; + ItemList.Hatch_Dynamo_UV.get(1), ItemList.Hatch_Dynamo_UHV.get(1), ItemList.Hatch_Dynamo_UEV.get(1L), + ItemList.Hatch_Dynamo_UIV.get(1L), ItemList.Hatch_Dynamo_UMV.get(1L), ItemList.Hatch_Dynamo_UXV.get(1L) }; Object[] circuitsTierPlusTwo = { new Object[] { OrePrefixes.circuit.get(Materials.MV), 1L }, new Object[] { OrePrefixes.circuit.get(Materials.HV), 1L }, @@ -3125,7 +3102,7 @@ public class ResearchStationAssemblyLine implements Runnable { compPerSecond, researchEuPerTick, researchAmperage, - new Object[] { energyHatches[i], getModItem(GoodGenerator.ID, "compactFusionCoil", 1), + new Object[] { energyHatches[i], new ItemStack(compactFusionCoil, 1), ItemList.Casing_Coil_Superconductor.get(1), CustomItemList.Machine_Multi_Transformer.get(1), CustomItemList.eM_Power.get(2), GT_OreDictUnificator.get(OrePrefixes.wireGt01, MaterialsUEVplus.SpaceTime, 2), @@ -3147,7 +3124,7 @@ public class ResearchStationAssemblyLine implements Runnable { compPerSecond * 4, researchEuPerTick, researchAmperage * 2, - new Object[] { energyHatches_4A[i], getModItem(GoodGenerator.ID, "compactFusionCoil", 1, 1), + new Object[] { energyHatches_4A[i], new ItemStack(compactFusionCoil, 1, 1), ItemList.Casing_Coil_Superconductor.get(1), CustomItemList.Machine_Multi_Transformer.get(1), CustomItemList.eM_Power.get(4), GT_OreDictUnificator.get(OrePrefixes.wireGt01, MaterialsUEVplus.SpaceTime, 4), @@ -3171,7 +3148,7 @@ public class ResearchStationAssemblyLine implements Runnable { compPerSecond * 16, researchEuPerTick, researchAmperage * 4, - new Object[] { energyHatches_16A[i], getModItem(GoodGenerator.ID, "compactFusionCoil", 1, 2), + new Object[] { energyHatches_16A[i], new ItemStack(compactFusionCoil, 1, 2), ItemList.Casing_Coil_Superconductor.get(1), CustomItemList.Machine_Multi_Transformer.get(1), CustomItemList.eM_Power.get(16), GT_OreDictUnificator.get(OrePrefixes.wireGt01, MaterialsUEVplus.SpaceTime, 16), @@ -3195,7 +3172,7 @@ public class ResearchStationAssemblyLine implements Runnable { compPerSecond * 64, researchEuPerTick, researchAmperage * 8, - new Object[] { energyHatches_64A[i], getModItem(GoodGenerator.ID, "compactFusionCoil", 1, 3), + new Object[] { energyHatches_64A[i], new ItemStack(compactFusionCoil, 1, 3), ItemList.Casing_Coil_Superconductor.get(1), CustomItemList.Machine_Multi_Transformer.get(1), CustomItemList.eM_Power.get(64), GT_OreDictUnificator.get(OrePrefixes.wireGt01, MaterialsUEVplus.SpaceTime, 64), @@ -3219,7 +3196,7 @@ public class ResearchStationAssemblyLine implements Runnable { compPerSecond * 64, researchEuPerTick * 4, researchAmperage * 16, - new Object[] { laserTargets_UXV[i], getModItem(GoodGenerator.ID, "compactFusionCoil", 1, 4), + new Object[] { laserTargets_UXV[i], new ItemStack(compactFusionCoil, 1, 4), // Dyson Swarm Module Deployment Unit Superconducting Magnet getModItem(GalaxySpace.ID, "dysonswarmparts", 1, 4), CustomItemList.Machine_Multi_Transformer.get(1), CustomItemList.eM_Power.get(64), @@ -3245,8 +3222,7 @@ public class ResearchStationAssemblyLine implements Runnable { compPerSecond * 48, researchEuPerTick * 3, researchAmperage * 16, - new Object[] { getItemContainer("Hull_UMV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), + new Object[] { ItemList.Hull_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_UMV.get(64), ItemList.Emitter_UMV.get(64), ItemList.Electric_Pump_UMV.get(64), ItemList.Electric_Pump_UMV.get(64), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Quantium, 32) }, @@ -3262,8 +3238,7 @@ public class ResearchStationAssemblyLine implements Runnable { compPerSecond * 64, researchEuPerTick * 4, researchAmperage * 16, - new Object[] { getItemContainer("Hull_UXV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), + new Object[] { ItemList.Hull_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_UXV.get(64), ItemList.Sensor_UXV.get(64), ItemList.Electric_Pump_UXV.get(64), ItemList.Electric_Pump_UXV.get(64), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.BlackPlutonium, 32) }, @@ -3279,8 +3254,7 @@ public class ResearchStationAssemblyLine implements Runnable { compPerSecond * 64, researchEuPerTick * 4, researchAmperage * 16, - new Object[] { getItemContainer("Hull_UXV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), + new Object[] { ItemList.Hull_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_UXV.get(64), @@ -3300,8 +3274,7 @@ public class ResearchStationAssemblyLine implements Runnable { compPerSecond * 48, researchEuPerTick * 3, researchAmperage * 16, - new Object[] { getItemContainer("Hull_UMV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), + new Object[] { ItemList.Hull_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_UMV.get(64), ItemList.Sensor_UMV.get(64), ItemList.Electric_Pump_UMV.get(64), ItemList.Electric_Pump_UMV.get(64), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Quantium, 32) }, @@ -3317,8 +3290,7 @@ public class ResearchStationAssemblyLine implements Runnable { compPerSecond * 64, researchEuPerTick * 4, researchAmperage * 16, - new Object[] { getItemContainer("Hull_UXV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), + new Object[] { ItemList.Hull_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Sensor_UXV.get(64), ItemList.Sensor_UXV.get(64), ItemList.Electric_Pump_UXV.get(64), ItemList.Electric_Pump_UXV.get(64), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.BlackPlutonium, 32) }, @@ -3334,8 +3306,7 @@ public class ResearchStationAssemblyLine implements Runnable { compPerSecond * 64, researchEuPerTick * 4, researchAmperage * 16, - new Object[] { getItemContainer("Hull_UXV").get(1), - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), + new Object[] { ItemList.Hull_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 64), ItemList.Emitter_UXV.get(64), @@ -3358,7 +3329,7 @@ public class ResearchStationAssemblyLine implements Runnable { compPerSecond, researchEuPerTick, researchAmperage, - new Object[] { dynamoHatches[i], getModItem(GoodGenerator.ID, "compactFusionCoil", 1), + new Object[] { dynamoHatches[i], new ItemStack(compactFusionCoil, 1), ItemList.Casing_Coil_Superconductor.get(1), CustomItemList.Machine_Multi_Transformer.get(1), CustomItemList.eM_Power.get(2), GT_OreDictUnificator.get(OrePrefixes.wireGt01, MaterialsUEVplus.SpaceTime, 2), diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java index 4f64213d4e..014579bdd1 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java @@ -309,6 +309,305 @@ import static com.github.technus.tectech.thing.CustomItemList.hatch_CreativeUnce import static com.github.technus.tectech.thing.CustomItemList.holder_Hatch; import static com.github.technus.tectech.thing.CustomItemList.rack_Hatch; import static com.github.technus.tectech.util.CommonValues.V; +import static gregtech.api.enums.MetaTileEntityIDs.ActiveTransformer; +import static gregtech.api.enums.MetaTileEntityIDs.AdvancedTeslaTransceiver1by1; +import static gregtech.api.enums.MetaTileEntityIDs.AdvancedTeslaTransceiver2by2; +import static gregtech.api.enums.MetaTileEntityIDs.AdvancedTeslaTransceiver3by3; +import static gregtech.api.enums.MetaTileEntityIDs.AdvancedTeslaTransceiver4by4; +import static gregtech.api.enums.MetaTileEntityIDs.AssemblylineSlaveConnector; +import static gregtech.api.enums.MetaTileEntityIDs.AutoTapingMaintenanceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.BasicTeslaTransceiver1by1; +import static gregtech.api.enums.MetaTileEntityIDs.BasicTeslaTransceiver2by2; +import static gregtech.api.enums.MetaTileEntityIDs.BasicTeslaTransceiver3by3; +import static gregtech.api.enums.MetaTileEntityIDs.BasicTeslaTransceiver4by4; +import static gregtech.api.enums.MetaTileEntityIDs.CapacitorHatch; +import static gregtech.api.enums.MetaTileEntityIDs.CloudComputationClientHatch; +import static gregtech.api.enums.MetaTileEntityIDs.CloudComputationServerHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ComputerRack; +import static gregtech.api.enums.MetaTileEntityIDs.DataBank; +import static gregtech.api.enums.MetaTileEntityIDs.DataBankMasterConnector; +import static gregtech.api.enums.MetaTileEntityIDs.DebugDataHatch; +import static gregtech.api.enums.MetaTileEntityIDs.DebugPollutionGenerator; +import static gregtech.api.enums.MetaTileEntityIDs.DebugPowerGenerator; +import static gregtech.api.enums.MetaTileEntityIDs.DebugStructureWriter; +import static gregtech.api.enums.MetaTileEntityIDs.EV16ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.EV16AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.EV16AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.EV4ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.EV4AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.EV4AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.EV64ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.EV64AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.EV64AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyInfuser; +import static gregtech.api.enums.MetaTileEntityIDs.EpycTeslaTransceiver1by1; +import static gregtech.api.enums.MetaTileEntityIDs.EpycTeslaTransceiver2by2; +import static gregtech.api.enums.MetaTileEntityIDs.EpycTeslaTransceiver3by3; +import static gregtech.api.enums.MetaTileEntityIDs.EpycTeslaTransceiver4by4; +import static gregtech.api.enums.MetaTileEntityIDs.ExtendedMegaUltimateBuckConverter; +import static gregtech.api.enums.MetaTileEntityIDs.ExtremelyUltimateBuckConverter; +import static gregtech.api.enums.MetaTileEntityIDs.EyeofHarmony; +import static gregtech.api.enums.MetaTileEntityIDs.ForgeoftheGods; +import static gregtech.api.enums.MetaTileEntityIDs.HelioflarePowerForge; +import static gregtech.api.enums.MetaTileEntityIDs.HeliofluxMeltingCore; +import static gregtech.api.enums.MetaTileEntityIDs.HeliofusionExoticizer; +import static gregtech.api.enums.MetaTileEntityIDs.HeliothermalPlasmaFabricator; +import static gregtech.api.enums.MetaTileEntityIDs.HighlyUltimateBuckConverter; +import static gregtech.api.enums.MetaTileEntityIDs.IV1024AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV1024AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV1048576AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV1048576AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV16384AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV16384AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV16ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV16AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV16AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV256AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV256AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV262144AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV262144AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV4096AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV4096AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV4ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV4AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV4AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV64ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV64AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV64AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV65536AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.IV65536AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.InsaneBuckConverter; +import static gregtech.api.enums.MetaTileEntityIDs.InsaneTeslaTransceiver1by1; +import static gregtech.api.enums.MetaTileEntityIDs.InsaneTeslaTransceiver2by2; +import static gregtech.api.enums.MetaTileEntityIDs.InsaneTeslaTransceiver3by3; +import static gregtech.api.enums.MetaTileEntityIDs.InsaneTeslaTransceiver4by4; +import static gregtech.api.enums.MetaTileEntityIDs.InsanelyUltimateBuckConverter; +import static gregtech.api.enums.MetaTileEntityIDs.LaserVacuumMirror; +import static gregtech.api.enums.MetaTileEntityIDs.LaserVacuumPipe; +import static gregtech.api.enums.MetaTileEntityIDs.LaserVacuumPipeCasing; +import static gregtech.api.enums.MetaTileEntityIDs.LegendaryLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LegendaryLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV1024AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV1024AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV1048576AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV1048576AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV16384AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV16384AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV16ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV16AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV16AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV256AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV256AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV262144AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV262144AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV4096AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV4096AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV4ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV4AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV4AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV64ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV64AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV64AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV65536AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LuV65536AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LudicrousBuckConverter; +import static gregtech.api.enums.MetaTileEntityIDs.MAX16AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.MAX4AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.MAX64AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.MegaUltimateBuckConverter; +import static gregtech.api.enums.MetaTileEntityIDs.MicrowaveGrinder; +import static gregtech.api.enums.MetaTileEntityIDs.NetworkSwitchWithQoS; +import static gregtech.api.enums.MetaTileEntityIDs.ObjectHolder; +import static gregtech.api.enums.MetaTileEntityIDs.OpticalFiberCable; +import static gregtech.api.enums.MetaTileEntityIDs.OpticalFiberCableCasing; +import static gregtech.api.enums.MetaTileEntityIDs.OpticalMasterConnector; +import static gregtech.api.enums.MetaTileEntityIDs.OpticalSlaveConnector; +import static gregtech.api.enums.MetaTileEntityIDs.Ownerdetector; +import static gregtech.api.enums.MetaTileEntityIDs.Parametrizer; +import static gregtech.api.enums.MetaTileEntityIDs.ParametrizerX; +import static gregtech.api.enums.MetaTileEntityIDs.ParametrizertXt; +import static gregtech.api.enums.MetaTileEntityIDs.QuantumComputer; +import static gregtech.api.enums.MetaTileEntityIDs.Researchstation; +import static gregtech.api.enums.MetaTileEntityIDs.TeslaTower; +import static gregtech.api.enums.MetaTileEntityIDs.UEV1024AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV1024AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV1048576AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV1048576AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV16384AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV16384AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV16ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV16AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV16AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV256AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV256AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV262144AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV262144AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV4096AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV4096AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV4ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV4AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV4AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV64ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV64AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV64AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV65536AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UEV65536AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV1024AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV1024AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV1048576AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV1048576AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV16384AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV16384AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV16ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV16AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV16AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV256AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV256AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV262144AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV262144AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV4096AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV4096AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV4ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV4AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV4AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV64ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV64AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV64AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV65536AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UHV65536AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV1024AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV1024AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV1048576AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV1048576AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV16384AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV16384AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV16ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV16AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV16AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV256AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV256AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV262144AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV262144AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV4096AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV4096AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV4ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV4AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV4AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV64ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV64AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV64AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV65536AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UIV65536AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV1024AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV1024AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV1048576AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV1048576AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV16384AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV16384AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV16ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV16AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV16AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV256AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV256AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV262144AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV262144AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV4096AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV4096AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV4ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV4AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV4AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV64ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV64AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV64AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV65536AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UMV65536AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV1024AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV1024AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV1048576AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV1048576AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV16384AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV16384AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV16ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV16AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV16AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV256AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV256AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV262144AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV262144AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV4096AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV4096AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV4ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV4AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV4AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV64ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV64AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV64AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV65536AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UV65536AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV1024AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV1024AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV1024AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV1048576AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV1048576AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV1048576AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV16384AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV16384AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV16384AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV16ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV16AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV16AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV256AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV256AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV256AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV262144AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV262144AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV262144AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV4096AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV4096AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV4096AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV4ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV4AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV4AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV64ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV64AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV64AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV65536AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV65536AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UXV65536AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.UltimatePowerBuckConverter; +import static gregtech.api.enums.MetaTileEntityIDs.UltimatePowerTeslaTransceiver1by1; +import static gregtech.api.enums.MetaTileEntityIDs.UltimatePowerTeslaTransceiver2by2; +import static gregtech.api.enums.MetaTileEntityIDs.UltimatePowerTeslaTransceiver3by3; +import static gregtech.api.enums.MetaTileEntityIDs.UltimatePowerTeslaTransceiver4by4; +import static gregtech.api.enums.MetaTileEntityIDs.UncertaintyResolution; +import static gregtech.api.enums.MetaTileEntityIDs.UncertaintyResolver; +import static gregtech.api.enums.MetaTileEntityIDs.UncertaintyResolverX; +import static gregtech.api.enums.MetaTileEntityIDs.WirelessAssemblylineSlaveConnector; +import static gregtech.api.enums.MetaTileEntityIDs.WirelessDataBankMasterConnector; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM1024AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM1024AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM1048576AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM1048576AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM16384AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM16384AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM16ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM16AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM16AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM256AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM256AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM262144AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM262144AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM4096AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM4096AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM4ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM4AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM4AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM64ADynamoHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM64AEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM64AWirelessEnergyHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM65536AtLaserSourceHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPM65536AtLaserTargetHatch; +import static gregtech.api.enums.MetaTileEntityIDs.ZPMVoltageBuckConverter; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import net.minecraft.init.Blocks; @@ -376,132 +675,220 @@ public class MachineLoader implements Runnable { // Multi AMP Power INPUTS // =================================================================================================== eM_energyMulti4_EV.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15109, "hatch.energymulti04.tier.04", "EV 4A Energy Hatch", 4, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + EV4AEnergyHatch.ID, + "hatch.energymulti04.tier.04", + "EV 4A Energy Hatch", + 4, + 4).getStackForm(1L)); eM_energyMulti16_EV.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15119, "hatch.energymulti16.tier.04", "EV 16A Energy Hatch", 4, 16) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + EV16AEnergyHatch.ID, + "hatch.energymulti16.tier.04", + "EV 16A Energy Hatch", + 4, + 16).getStackForm(1L)); eM_energyMulti64_EV.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15129, "hatch.energymulti64.tier.04", "EV 64A Energy Hatch", 4, 64) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + EV64AEnergyHatch.ID, + "hatch.energymulti64.tier.04", + "EV 64A Energy Hatch", + 4, + 64).getStackForm(1L)); eM_energyMulti4_IV.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15100, "hatch.energymulti04.tier.05", "IV 4A Energy Hatch", 5, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + IV4AEnergyHatch.ID, + "hatch.energymulti04.tier.05", + "IV 4A Energy Hatch", + 5, + 4).getStackForm(1L)); eM_energyMulti16_IV.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15110, "hatch.energymulti16.tier.05", "IV 16A Energy Hatch", 5, 16) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + IV16AEnergyHatch.ID, + "hatch.energymulti16.tier.05", + "IV 16A Energy Hatch", + 5, + 16).getStackForm(1L)); eM_energyMulti64_IV.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15120, "hatch.energymulti64.tier.05", "IV 64A Energy Hatch", 5, 64) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + IV64AEnergyHatch.ID, + "hatch.energymulti64.tier.05", + "IV 64A Energy Hatch", + 5, + 64).getStackForm(1L)); eM_energyMulti4_LuV.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15101, "hatch.energymulti04.tier.06", "LuV 4A Energy Hatch", 6, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + LuV4AEnergyHatch.ID, + "hatch.energymulti04.tier.06", + "LuV 4A Energy Hatch", + 6, + 4).getStackForm(1L)); eM_energyMulti16_LuV.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15111, "hatch.energymulti16.tier.06", "LuV 16A Energy Hatch", 6, 16) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + LuV16AEnergyHatch.ID, + "hatch.energymulti16.tier.06", + "LuV 16A Energy Hatch", + 6, + 16).getStackForm(1L)); eM_energyMulti64_LuV.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15121, "hatch.energymulti64.tier.06", "LuV 64A Energy Hatch", 6, 64) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + LuV64AEnergyHatch.ID, + "hatch.energymulti64.tier.06", + "LuV 64A Energy Hatch", + 6, + 64).getStackForm(1L)); eM_energyMulti4_ZPM.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15102, "hatch.energymulti04.tier.07", "ZPM 4A Energy Hatch", 7, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + ZPM4AEnergyHatch.ID, + "hatch.energymulti04.tier.07", + "ZPM 4A Energy Hatch", + 7, + 4).getStackForm(1L)); eM_energyMulti16_ZPM.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15112, "hatch.energymulti16.tier.07", "ZPM 16A Energy Hatch", 7, 16) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + ZPM16AEnergyHatch.ID, + "hatch.energymulti16.tier.07", + "ZPM 16A Energy Hatch", + 7, + 16).getStackForm(1L)); eM_energyMulti64_ZPM.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15122, "hatch.energymulti64.tier.07", "ZPM 64A Energy Hatch", 7, 64) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + ZPM64AEnergyHatch.ID, + "hatch.energymulti64.tier.07", + "ZPM 64A Energy Hatch", + 7, + 64).getStackForm(1L)); eM_energyMulti4_UV.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15103, "hatch.energymulti04.tier.08", "UV 4A Energy Hatch", 8, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + UV4AEnergyHatch.ID, + "hatch.energymulti04.tier.08", + "UV 4A Energy Hatch", + 8, + 4).getStackForm(1L)); eM_energyMulti16_UV.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15113, "hatch.energymulti16.tier.08", "UV 16A Energy Hatch", 8, 16) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + UV16AEnergyHatch.ID, + "hatch.energymulti16.tier.08", + "UV 16A Energy Hatch", + 8, + 16).getStackForm(1L)); eM_energyMulti64_UV.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15123, "hatch.energymulti64.tier.08", "UV 64A Energy Hatch", 8, 64) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + UV64AEnergyHatch.ID, + "hatch.energymulti64.tier.08", + "UV 64A Energy Hatch", + 8, + 64).getStackForm(1L)); eM_energyMulti4_UHV.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15104, "hatch.energymulti04.tier.09", "UHV 4A Energy Hatch", 9, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + UHV4AEnergyHatch.ID, + "hatch.energymulti04.tier.09", + "UHV 4A Energy Hatch", + 9, + 4).getStackForm(1L)); eM_energyMulti16_UHV.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15114, "hatch.energymulti16.tier.09", "UHV 16A Energy Hatch", 9, 16) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + UHV16AEnergyHatch.ID, + "hatch.energymulti16.tier.09", + "UHV 16A Energy Hatch", + 9, + 16).getStackForm(1L)); eM_energyMulti64_UHV.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15124, "hatch.energymulti64.tier.09", "UHV 64A Energy Hatch", 9, 64) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + UHV64AEnergyHatch.ID, + "hatch.energymulti64.tier.09", + "UHV 64A Energy Hatch", + 9, + 64).getStackForm(1L)); eM_energyMulti4_UEV.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15105, "hatch.energymulti04.tier.10", "UEV 4A Energy Hatch", 10, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + UEV4AEnergyHatch.ID, + "hatch.energymulti04.tier.10", + "UEV 4A Energy Hatch", + 10, + 4).getStackForm(1L)); eM_energyMulti16_UEV.set( new GT_MetaTileEntity_Hatch_EnergyMulti( - 15115, + UEV16AEnergyHatch.ID, "hatch.energymulti16.tier.10", "UEV 16A Energy Hatch", 10, 16).getStackForm(1L)); eM_energyMulti64_UEV.set( new GT_MetaTileEntity_Hatch_EnergyMulti( - 15125, + UEV64AEnergyHatch.ID, "hatch.energymulti64.tier.10", "UEV 64A Energy Hatch", 10, 64).getStackForm(1L)); eM_energyMulti4_UIV.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15106, "hatch.energymulti04.tier.11", "UIV 4A Energy Hatch", 11, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + UIV4AEnergyHatch.ID, + "hatch.energymulti04.tier.11", + "UIV 4A Energy Hatch", + 11, + 4).getStackForm(1L)); eM_energyMulti16_UIV.set( new GT_MetaTileEntity_Hatch_EnergyMulti( - 15116, + UIV16AEnergyHatch.ID, "hatch.energymulti16.tier.11", "UIV 16A Energy Hatch", 11, 16).getStackForm(1L)); eM_energyMulti64_UIV.set( new GT_MetaTileEntity_Hatch_EnergyMulti( - 15126, + UIV64AEnergyHatch.ID, "hatch.energymulti64.tier.11", "UIV 64A Energy Hatch", 11, 64).getStackForm(1L)); eM_energyMulti4_UMV.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15107, "hatch.energymulti04.tier.12", "UMV 4A Energy Hatch", 12, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + UMV4AEnergyHatch.ID, + "hatch.energymulti04.tier.12", + "UMV 4A Energy Hatch", + 12, + 4).getStackForm(1L)); eM_energyMulti16_UMV.set( new GT_MetaTileEntity_Hatch_EnergyMulti( - 15117, + UMV16AEnergyHatch.ID, "hatch.energymulti16.tier.12", "UMV 16A Energy Hatch", 12, 16).getStackForm(1L)); eM_energyMulti64_UMV.set( new GT_MetaTileEntity_Hatch_EnergyMulti( - 15127, + UMV64AEnergyHatch.ID, "hatch.energymulti64.tier.12", "UMV 64A Energy Hatch", 12, 64).getStackForm(1L)); eM_energyMulti4_UXV.set( - new GT_MetaTileEntity_Hatch_EnergyMulti(15108, "hatch.energymulti04.tier.13", "UXV 4A Energy Hatch", 13, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_EnergyMulti( + UXV4AEnergyHatch.ID, + "hatch.energymulti04.tier.13", + "UXV 4A Energy Hatch", + 13, + 4).getStackForm(1L)); eM_energyMulti16_UXV.set( new GT_MetaTileEntity_Hatch_EnergyMulti( - 15118, + UXV16AEnergyHatch.ID, "hatch.energymulti16.tier.13", "UXV 16A Energy Hatch", 13, 16).getStackForm(1L)); eM_energyMulti64_UXV.set( new GT_MetaTileEntity_Hatch_EnergyMulti( - 15128, + UXV64AEnergyHatch.ID, "hatch.energymulti64.tier.13", "UXV 64A Energy Hatch", 13, @@ -511,281 +898,280 @@ public class MachineLoader implements Runnable { // =================================================================================================== eM_energyWirelessMulti4_EV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15065, + EV4AWirelessEnergyHatch.ID, "hatch.energywirelessmulti04.tier.04", "EV 4A Wireless Energy Hatch", 4, 4).getStackForm(1L)); eM_energyWirelessMulti16_EV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15066, + EV16AWirelessEnergyHatch.ID, "hatch.energywirelessmulti16.tier.04", "EV 16A Wireless Energy Hatch", 4, 16).getStackForm(1L)); eM_energyWirelessMulti64_EV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15067, + EV64AWirelessEnergyHatch.ID, "hatch.energywirelessmulti64.tier.04", "EV 64A Wireless Energy Hatch", 4, 64).getStackForm(1L)); eM_energyWirelessMulti4_IV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15068, + IV4AWirelessEnergyHatch.ID, "hatch.energywirelessmulti04.tier.05", "IV 4A Wireless Energy Hatch", 5, 4).getStackForm(1L)); eM_energyWirelessMulti16_IV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15069, + IV16AWirelessEnergyHatch.ID, "hatch.energywirelessmulti16.tier.05", "IV 16A Wireless Energy Hatch", 5, 16).getStackForm(1L)); eM_energyWirelessMulti64_IV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15070, + IV64AWirelessEnergyHatch.ID, "hatch.energywirelessmulti64.tier.05", "IV 64A Wireless Energy Hatch", 5, 64).getStackForm(1L)); eM_energyWirelessMulti4_LuV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15071, + LuV4AWirelessEnergyHatch.ID, "hatch.energywirelessmulti04.tier.06", "LuV 4A Wireless Energy Hatch", 6, 4).getStackForm(1L)); eM_energyWirelessMulti16_LuV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15072, + LuV16AWirelessEnergyHatch.ID, "hatch.energywirelessmulti16.tier.06", "LuV 16A Wireless Energy Hatch", 6, 16).getStackForm(1L)); eM_energyWirelessMulti64_LuV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15073, + LuV64AWirelessEnergyHatch.ID, "hatch.energywirelessmulti64.tier.06", "LuV 64A Wireless Energy Hatch", 6, 64).getStackForm(1L)); eM_energyWirelessMulti4_ZPM.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15074, + ZPM4AWirelessEnergyHatch.ID, "hatch.energywirelessmulti04.tier.07", "ZPM 4A Wireless Energy Hatch", 7, 4).getStackForm(1L)); eM_energyWirelessMulti16_ZPM.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15075, + ZPM16AWirelessEnergyHatch.ID, "hatch.energywirelessmulti16.tier.07", "ZPM 16A Wireless Energy Hatch", 7, 16).getStackForm(1L)); eM_energyWirelessMulti64_ZPM.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15076, + ZPM64AWirelessEnergyHatch.ID, "hatch.energywirelessmulti64.tier.07", "ZPM 64A Wireless Energy Hatch", 7, 64).getStackForm(1L)); eM_energyWirelessMulti4_UV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15077, + UV4AWirelessEnergyHatch.ID, "hatch.energywirelessmulti04.tier.08", "UV 4A Wireless Energy Hatch", 8, 4).getStackForm(1L)); eM_energyWirelessMulti16_UV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15078, + UV16AWirelessEnergyHatch.ID, "hatch.energywirelessmulti16.tier.08", "UV 16A Wireless Energy Hatch", 8, 16).getStackForm(1L)); eM_energyWirelessMulti64_UV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15079, + UV64AWirelessEnergyHatch.ID, "hatch.energywirelessmulti64.tier.08", "UV 64A Wireless Energy Hatch", 8, 64).getStackForm(1L)); eM_energyWirelessMulti4_UHV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15080, + UHV4AWirelessEnergyHatch.ID, "hatch.energywirelessmulti04.tier.09", "UHV 4A Wireless Energy Hatch", 9, 4).getStackForm(1L)); eM_energyWirelessMulti16_UHV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15081, + UHV16AWirelessEnergyHatch.ID, "hatch.energywirelessmulti16.tier.09", "UHV 16A Wireless Energy Hatch", 9, 16).getStackForm(1L)); eM_energyWirelessMulti64_UHV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15082, + UHV64AWirelessEnergyHatch.ID, "hatch.energywirelessmulti64.tier.09", "UHV 64A Wireless Energy Hatch", 9, 64).getStackForm(1L)); eM_energyWirelessMulti4_UEV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15083, + UEV4AWirelessEnergyHatch.ID, "hatch.energywirelessmulti04.tier.10", "UEV 4A Wireless Energy Hatch", 10, 4).getStackForm(1L)); eM_energyWirelessMulti16_UEV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15084, + UEV16AWirelessEnergyHatch.ID, "hatch.energywirelessmulti16.tier.10", "UEV 16A Wireless Energy Hatch", 10, 16).getStackForm(1L)); eM_energyWirelessMulti64_UEV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15085, + UEV64AWirelessEnergyHatch.ID, "hatch.energywirelessmulti64.tier.10", "UEV 64A Wireless Energy Hatch", 10, 64).getStackForm(1L)); eM_energyWirelessMulti4_UIV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15086, + UIV4AWirelessEnergyHatch.ID, "hatch.energywirelessmulti04.tier.11", "UIV 4A Wireless Energy Hatch", 11, 4).getStackForm(1L)); eM_energyWirelessMulti16_UIV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15087, + UIV16AWirelessEnergyHatch.ID, "hatch.energywirelessmulti16.tier.11", "UIV 16A Wireless Energy Hatch", 11, 16).getStackForm(1L)); eM_energyWirelessMulti64_UIV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15088, + UIV64AWirelessEnergyHatch.ID, "hatch.energywirelessmulti64.tier.11", "UIV 64A Wireless Energy Hatch", 11, 64).getStackForm(1L)); eM_energyWirelessMulti4_UMV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15089, + UMV4AWirelessEnergyHatch.ID, "hatch.energywirelessmulti04.tier.12", "UMV 4A Wireless Energy Hatch", 12, 4).getStackForm(1L)); eM_energyWirelessMulti16_UMV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15090, + UMV16AWirelessEnergyHatch.ID, "hatch.energywirelessmulti16.tier.12", "UMV 16A Wireless Energy Hatch", 12, 16).getStackForm(1L)); eM_energyWirelessMulti64_UMV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15091, + UMV64AWirelessEnergyHatch.ID, "hatch.energywirelessmulti64.tier.12", "UMV 64A Wireless Energy Hatch", 12, 64).getStackForm(1L)); eM_energyWirelessMulti4_UXV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15092, + UXV4AWirelessEnergyHatch.ID, "hatch.energywirelessmulti04.tier.13", "UXV 4A Wireless Energy Hatch", 13, 4).getStackForm(1L)); eM_energyWirelessMulti16_UXV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15093, + UXV16AWirelessEnergyHatch.ID, "hatch.energywirelessmulti16.tier.13", "UXV 16A Wireless Energy Hatch", 13, 16).getStackForm(1L)); eM_energyWirelessMulti64_UXV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15094, + UXV64AWirelessEnergyHatch.ID, "hatch.energywirelessmulti64.tier.13", "UXV 64A Wireless Energy Hatch", 13, 64).getStackForm(1L)); eM_energyWirelessMulti4_MAX.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15095, + MAX4AWirelessEnergyHatch.ID, "hatch.energywirelessmulti04.tier.14", "MAX 4A Wireless Energy Hatch", 14, 4).getStackForm(1L)); eM_energyWirelessMulti16_MAX.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15096, + MAX16AWirelessEnergyHatch.ID, "hatch.energywirelessmulti16.tier.14", "MAX 16A Wireless Energy Hatch", 14, 16).getStackForm(1L)); eM_energyWirelessMulti64_MAX.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15097, + MAX64AWirelessEnergyHatch.ID, "hatch.energywirelessmulti64.tier.14", "MAX 64A Wireless Energy Hatch", 14, 64).getStackForm(1L)); - eM_energyWirelessTunnel1_UXV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15500, + UXV256AWirelessEnergyHatch.ID, "hatch.energywirelesstunnel1.tier.13", "UXV 256A Wireless Energy Hatch", 13, 256).getStackForm(1L)); eM_energyWirelessTunnel2_UXV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15501, + UXV1024AWirelessEnergyHatch.ID, "hatch.energywirelesstunnel2.tier.13", "UXV 1,024A Wireless Energy Hatch", 13, 1024).getStackForm(1L)); eM_energyWirelessTunnel3_UXV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15502, + UXV4096AWirelessEnergyHatch.ID, "hatch.energywirelesstunnel3.tier.13", "UXV 4,096A Wireless Energy Hatch", 13, 4096).getStackForm(1L)); eM_energyWirelessTunnel4_UXV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15503, + UXV16384AWirelessEnergyHatch.ID, "hatch.energywirelesstunnel4.tier.13", "UXV 16,384A Wireless Energy Hatch", 13, 16384).getStackForm(1L)); eM_energyWirelessTunnel5_UXV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15504, + UXV65536AWirelessEnergyHatch.ID, "hatch.energywirelesstunnel5.tier.13", "UXV 65,536A Wireless Energy Hatch", 13, 65536).getStackForm(1L)); eM_energyWirelessTunnel6_UXV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15505, + UXV262144AWirelessEnergyHatch.ID, "hatch.energywirelesstunnel6.tier.13", "UXV 262,144A Wireless Energy Hatch", 13, 262144).getStackForm(1L)); eM_energyWirelessTunnel7_UXV.set( new GT_MetaTileEntity_Hatch_WirelessMulti( - 15506, + UXV1048576AWirelessEnergyHatch.ID, "hatch.energywirelesstunnel7.tier.13", "UXV 1,048,576A Wireless Energy Hatch", 13, @@ -810,7 +1196,7 @@ public class MachineLoader implements Runnable { eM_energyTunnel1_IV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15130, + IV256AtLaserTargetHatch.ID, "hatch.energytunnel1.tier.05", "IV 256A/t Laser Target Hatch", 5, @@ -818,7 +1204,7 @@ public class MachineLoader implements Runnable { eM_energyTunnel2_IV .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15140, + IV1024AtLaserTargetHatch.ID, "hatch.energytunnel2.tier.05", "IV 1,024A/t Laser Target Hatch", 5, @@ -827,7 +1213,7 @@ public class MachineLoader implements Runnable { eM_energyTunnel3_IV .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15150, + IV4096AtLaserTargetHatch.ID, "hatch.energytunnel3.tier.05", "IV 4,096A/t Laser Target Hatch", 5, @@ -836,7 +1222,7 @@ public class MachineLoader implements Runnable { eM_energyTunnel4_IV .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15160, + IV16384AtLaserTargetHatch.ID, "hatch.energytunnel4.tier.05", "IV 16,384A/t Laser Target Hatch", 5, @@ -845,7 +1231,7 @@ public class MachineLoader implements Runnable { eM_energyTunnel5_IV .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15170, + IV65536AtLaserTargetHatch.ID, "hatch.energytunnel5.tier.05", "IV 65,536A/t Laser Target Hatch", 5, @@ -854,7 +1240,7 @@ public class MachineLoader implements Runnable { eM_energyTunnel6_IV .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15180, + IV262144AtLaserTargetHatch.ID, "hatch.energytunnel6.tier.05", "IV 262,144A/t Laser Target Hatch", 5, @@ -863,7 +1249,7 @@ public class MachineLoader implements Runnable { eM_energyTunnel7_IV .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15190, + IV1048576AtLaserTargetHatch.ID, "hatch.energytunnel7.tier.05", "IV 1,048,576A/t Laser Target Hatch", 5, @@ -872,14 +1258,14 @@ public class MachineLoader implements Runnable { eM_energyTunnel1_LuV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15131, + LuV256AtLaserTargetHatch.ID, "hatch.energytunnel1.tier.06", "LuV 256A/t Laser Target Hatch", 6, 256).getStackForm(1L)); eM_energyTunnel2_LuV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15141, + LuV1024AtLaserTargetHatch.ID, "hatch.energytunnel2.tier.06", "LuV 1,024A/t Laser Target Hatch", 6, @@ -887,7 +1273,7 @@ public class MachineLoader implements Runnable { eM_energyTunnel3_LuV .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15151, + LuV4096AtLaserTargetHatch.ID, "hatch.energytunnel3.tier.06", "LuV 4,096A/t Laser Target Hatch", 6, @@ -896,7 +1282,7 @@ public class MachineLoader implements Runnable { eM_energyTunnel4_LuV .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15161, + LuV16384AtLaserTargetHatch.ID, "hatch.energytunnel4.tier.06", "LuV 16,384A/t Laser Target Hatch", 6, @@ -905,7 +1291,7 @@ public class MachineLoader implements Runnable { eM_energyTunnel5_LuV .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15171, + LuV65536AtLaserTargetHatch.ID, "hatch.energytunnel5.tier.06", "LuV 65,536A/t Laser Target Hatch", 6, @@ -914,7 +1300,7 @@ public class MachineLoader implements Runnable { eM_energyTunnel6_LuV .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15181, + LuV262144AtLaserTargetHatch.ID, "hatch.energytunnel6.tier.06", "LuV 262,144A/t Laser Target Hatch", 6, @@ -923,30 +1309,29 @@ public class MachineLoader implements Runnable { eM_energyTunnel7_LuV .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15191, + LuV1048576AtLaserTargetHatch.ID, "hatch.energytunnel7.tier.06", "LuV 1,048,576A/t Laser Target Hatch", 6, 1048576).getStackForm(1L)) .hidden(); - eM_energyTunnel1_ZPM.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15132, + ZPM256AtLaserTargetHatch.ID, "hatch.energytunnel1.tier.07", "ZPM 256A/t Laser Target Hatch", 7, 256).getStackForm(1L)); eM_energyTunnel2_ZPM.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15142, + ZPM1024AtLaserTargetHatch.ID, "hatch.energytunnel2.tier.07", "ZPM 1,024A/t Laser Target Hatch", 7, 1024).getStackForm(1L)); eM_energyTunnel3_ZPM.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15152, + ZPM4096AtLaserTargetHatch.ID, "hatch.energytunnel3.tier.07", "ZPM 4,096A/t Laser Target Hatch", 7, @@ -954,7 +1339,7 @@ public class MachineLoader implements Runnable { eM_energyTunnel4_ZPM .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15162, + ZPM16384AtLaserTargetHatch.ID, "hatch.energytunnel4.tier.07", "ZPM 16,384A/t Laser Target Hatch", 7, @@ -963,7 +1348,7 @@ public class MachineLoader implements Runnable { eM_energyTunnel5_ZPM .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15172, + ZPM65536AtLaserTargetHatch.ID, "hatch.energytunnel5.tier.07", "ZPM 65,536A/t Laser Target Hatch", 7, @@ -972,7 +1357,7 @@ public class MachineLoader implements Runnable { eM_energyTunnel6_ZPM .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15182, + ZPM262144AtLaserTargetHatch.ID, "hatch.energytunnel6.tier.07", "ZPM 262,144A/t Laser Target Hatch", 7, @@ -981,37 +1366,36 @@ public class MachineLoader implements Runnable { eM_energyTunnel7_ZPM .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15192, + ZPM1048576AtLaserTargetHatch.ID, "hatch.energytunnel7.tier.07", "ZPM 1,048,576A/t Laser Target Hatch", 7, 1048576).getStackForm(1L)) .hidden(); - eM_energyTunnel1_UV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15133, + UV256AtLaserTargetHatch.ID, "hatch.energytunnel1.tier.08", "UV 256A/t Laser Target Hatch", 8, 256).getStackForm(1L)); eM_energyTunnel2_UV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15143, + UV1024AtLaserTargetHatch.ID, "hatch.energytunnel2.tier.08", "UV 1,024A/t Laser Target Hatch", 8, 1024).getStackForm(1L)); eM_energyTunnel3_UV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15153, + UV4096AtLaserTargetHatch.ID, "hatch.energytunnel3.tier.08", "UV 4,096A/t Laser Target Hatch", 8, 4096).getStackForm(1L)); eM_energyTunnel4_UV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15163, + UV16384AtLaserTargetHatch.ID, "hatch.energytunnel4.tier.08", "UV 16,384A/t Laser Target Hatch", 8, @@ -1019,7 +1403,7 @@ public class MachineLoader implements Runnable { eM_energyTunnel5_UV .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15173, + UV65536AtLaserTargetHatch.ID, "hatch.energytunnel5.tier.08", "UV 65,536A/t Laser Target Hatch", 8, @@ -1028,7 +1412,7 @@ public class MachineLoader implements Runnable { eM_energyTunnel6_UV .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15183, + UV262144AtLaserTargetHatch.ID, "hatch.energytunnel6.tier.08", "UV 262,144A/t Laser Target Hatch", 8, @@ -1037,44 +1421,43 @@ public class MachineLoader implements Runnable { eM_energyTunnel7_UV .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15193, + UV1048576AtLaserTargetHatch.ID, "hatch.energytunnel7.tier.08", "UV 1,048,576A/t Laser Target Hatch", 8, 1048576).getStackForm(1L)) .hidden(); - eM_energyTunnel1_UHV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15134, + UHV256AtLaserTargetHatch.ID, "hatch.energytunnel1.tier.09", "UHV 256A/t Laser Target Hatch", 9, 256).getStackForm(1L)); eM_energyTunnel2_UHV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15144, + UHV1024AtLaserTargetHatch.ID, "hatch.energytunnel2.tier.09", "UHV 1,024A/t Laser Target Hatch", 9, 1024).getStackForm(1L)); eM_energyTunnel3_UHV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15154, + UHV4096AtLaserTargetHatch.ID, "hatch.energytunnel3.tier.09", "UHV 4,096A/t Laser Target Hatch", 9, 4096).getStackForm(1L)); eM_energyTunnel4_UHV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15164, + UHV16384AtLaserTargetHatch.ID, "hatch.energytunnel4.tier.09", "UHV 16,384A/t Laser Target Hatch", 9, 16384).getStackForm(1L)); eM_energyTunnel5_UHV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15174, + UHV65536AtLaserTargetHatch.ID, "hatch.energytunnel5.tier.09", "UHV 65,536A/t Laser Target Hatch", 9, @@ -1082,7 +1465,7 @@ public class MachineLoader implements Runnable { eM_energyTunnel6_UHV .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15184, + UHV262144AtLaserTargetHatch.ID, "hatch.energytunnel6.tier.09", "UHV 262,144A/t Laser Target Hatch", 9, @@ -1091,7 +1474,7 @@ public class MachineLoader implements Runnable { eM_energyTunnel7_UHV .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15194, + UHV1048576AtLaserTargetHatch.ID, "hatch.energytunnel7.tier.09", "UHV 1,048,576A/t Laser Target Hatch", 9, @@ -1100,42 +1483,42 @@ public class MachineLoader implements Runnable { eM_energyTunnel1_UEV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15135, + UEV256AtLaserTargetHatch.ID, "hatch.energytunnel1.tier.10", "UEV 256A/t Laser Target Hatch", 10, 256).getStackForm(1L)); eM_energyTunnel2_UEV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15145, + UEV1024AtLaserTargetHatch.ID, "hatch.energytunnel2.tier.10", "UEV 1,024A/t Laser Target Hatch", 10, 1024).getStackForm(1L)); eM_energyTunnel3_UEV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15155, + UEV4096AtLaserTargetHatch.ID, "hatch.energytunnel3.tier.10", "UEV 4,096A/t Laser Target Hatch", 10, 4096).getStackForm(1L)); eM_energyTunnel4_UEV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15165, + UEV16384AtLaserTargetHatch.ID, "hatch.energytunnel4.tier.10", "UEV 16,384A/t Laser Target Hatch", 10, 16384).getStackForm(1L)); eM_energyTunnel5_UEV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15175, + UEV65536AtLaserTargetHatch.ID, "hatch.energytunnel5.tier.10", "UEV 65,536A/t Laser Target Hatch", 10, 65536).getStackForm(1L)); eM_energyTunnel6_UEV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15185, + UEV262144AtLaserTargetHatch.ID, "hatch.energytunnel6.tier.10", "UEV 262,144A/t Laser Target Hatch", 10, @@ -1143,108 +1526,106 @@ public class MachineLoader implements Runnable { eM_energyTunnel7_UEV .set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15195, + UEV1048576AtLaserTargetHatch.ID, "hatch.energytunnel7.tier.10", "UEV 1,048,576A/t Laser Target Hatch", 10, 1048576).getStackForm(1L)) .hidden(); - eM_energyTunnel1_UIV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15136, + UIV256AtLaserTargetHatch.ID, "hatch.energytunnel1.tier.11", "UIV 256A/t Laser Target Hatch", 11, 256).getStackForm(1L)); eM_energyTunnel2_UIV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15146, + UIV1024AtLaserTargetHatch.ID, "hatch.energytunnel2.tier.11", "UIV 1,024A/t Laser Target Hatch", 11, 1024).getStackForm(1L)); eM_energyTunnel3_UIV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15156, + UIV4096AtLaserTargetHatch.ID, "hatch.energytunnel3.tier.11", "UIV 4,096A/t Laser Target Hatch", 11, 4096).getStackForm(1L)); eM_energyTunnel4_UIV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15166, + UIV16384AtLaserTargetHatch.ID, "hatch.energytunnel4.tier.11", "UIV 16,384A/t Laser Target Hatch", 11, 16384).getStackForm(1L)); eM_energyTunnel5_UIV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15176, + UIV65536AtLaserTargetHatch.ID, "hatch.energytunnel5.tier.11", "UIV 65,536A/t Laser Target Hatch", 11, 65536).getStackForm(1L)); eM_energyTunnel6_UIV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15186, + UIV262144AtLaserTargetHatch.ID, "hatch.energytunnel6.tier.11", "UIV 262,144A/t Laser Target Hatch", 11, 262144).getStackForm(1L)); eM_energyTunnel7_UIV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15196, + UIV1048576AtLaserTargetHatch.ID, "hatch.energytunnel7.tier.11", "UIV 1,048,576A/t Laser Target Hatch", 11, 1048576).getStackForm(1L)); - eM_energyTunnel1_UMV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15137, + UMV256AtLaserTargetHatch.ID, "hatch.energytunnel1.tier.12", "UMV 256A/t Laser Target Hatch", 12, 256).getStackForm(1L)); eM_energyTunnel2_UMV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15147, + UMV1024AtLaserTargetHatch.ID, "hatch.energytunnel2.tier.12", "UMV 1,024A/t Laser Target Hatch", 12, 1024).getStackForm(1L)); eM_energyTunnel3_UMV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15157, + UMV4096AtLaserTargetHatch.ID, "hatch.energytunnel3.tier.12", "UMV 4,096A/t Laser Target Hatch", 12, 4096).getStackForm(1L)); eM_energyTunnel4_UMV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15167, + UMV16384AtLaserTargetHatch.ID, "hatch.energytunnel4.tier.12", "UMV 16,384A/t Laser Target Hatch", 12, 16384).getStackForm(1L)); eM_energyTunnel5_UMV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15177, + UMV65536AtLaserTargetHatch.ID, "hatch.energytunnel5.tier.12", "UMV 65,536A/t Laser Target Hatch", 12, 65536).getStackForm(1L)); eM_energyTunnel6_UMV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15187, + UMV262144AtLaserTargetHatch.ID, "hatch.energytunnel6.tier.12", "UMV 262,144A/t Laser Target Hatch", 12, 262144).getStackForm(1L)); eM_energyTunnel7_UMV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15197, + UMV1048576AtLaserTargetHatch.ID, "hatch.energytunnel7.tier.12", "UMV 1,048,576A/t Laser Target Hatch", 12, @@ -1256,52 +1637,51 @@ public class MachineLoader implements Runnable { "UMV 4,194,304A/t Laser Target Hatch", 12, 4194304).getStackForm(1L)); - eM_energyTunnel1_UXV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15138, + UXV256AtLaserTargetHatch.ID, "hatch.energytunnel1.tier.13", "UXV 256A/t Laser Target Hatch", 13, 256).getStackForm(1L)); eM_energyTunnel2_UXV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15148, + UXV1024AtLaserTargetHatch.ID, "hatch.energytunnel2.tier.13", "UXV 1,024A/t Laser Target Hatch", 13, 1024).getStackForm(1L)); eM_energyTunnel3_UXV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15158, + UXV4096AtLaserTargetHatch.ID, "hatch.energytunnel3.tier.13", "UXV 4,096A/t Laser Target Hatch", 13, 4096).getStackForm(1L)); eM_energyTunnel4_UXV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15168, + UXV16384AtLaserTargetHatch.ID, "hatch.energytunnel4.tier.13", "UXV 16,384A/t Laser Target Hatch", 13, 16384).getStackForm(1L)); eM_energyTunnel5_UXV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15178, + UXV65536AtLaserTargetHatch.ID, "hatch.energytunnel5.tier.13", "UXV 65,536A/t Laser Target Hatch", 13, 65536).getStackForm(1L)); eM_energyTunnel6_UXV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15188, + UXV262144AtLaserTargetHatch.ID, "hatch.energytunnel6.tier.13", "UXV 262,144A/t Laser Target Hatch", 13, 262144).getStackForm(1L)); eM_energyTunnel7_UXV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15198, + UXV1048576AtLaserTargetHatch.ID, "hatch.energytunnel7.tier.13", "UXV 1,048,576A/t Laser Target Hatch", 13, @@ -1322,7 +1702,7 @@ public class MachineLoader implements Runnable { 16777216).getStackForm(1L)); eM_energyTunnel9001.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( - 15199, + LegendaryLaserTargetHatch.ID, "hatch.energytunnel.tier.14", "Legendary Laser Target Hatch", 13, @@ -1332,132 +1712,211 @@ public class MachineLoader implements Runnable { // Multi AMP Power OUTPUTS // =================================================================================================== eM_dynamoMulti4_EV.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15209, "hatch.dynamomulti04.tier.04", "EV 4A Dynamo Hatch", 4, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_DynamoMulti( + EV4ADynamoHatch.ID, + "hatch.dynamomulti04.tier.04", + "EV 4A Dynamo Hatch", + 4, + 4).getStackForm(1L)); eM_dynamoMulti16_EV.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15219, "hatch.dynamomulti16.tier.04", "EV 16A Dynamo Hatch", 4, 16) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_DynamoMulti( + EV16ADynamoHatch.ID, + "hatch.dynamomulti16.tier.04", + "EV 16A Dynamo Hatch", + 4, + 16).getStackForm(1L)); eM_dynamoMulti64_EV.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15229, "hatch.dynamomulti64.tier.04", "EV 64A Dynamo Hatch", 4, 64) - .getStackForm(1L)); - + new GT_MetaTileEntity_Hatch_DynamoMulti( + EV64ADynamoHatch.ID, + "hatch.dynamomulti64.tier.04", + "EV 64A Dynamo Hatch", + 4, + 64).getStackForm(1L)); eM_dynamoMulti4_IV.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15200, "hatch.dynamomulti04.tier.05", "IV 4A Dynamo Hatch", 5, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_DynamoMulti( + IV4ADynamoHatch.ID, + "hatch.dynamomulti04.tier.05", + "IV 4A Dynamo Hatch", + 5, + 4).getStackForm(1L)); eM_dynamoMulti16_IV.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15210, "hatch.dynamomulti16.tier.05", "IV 16A Dynamo Hatch", 5, 16) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_DynamoMulti( + IV16ADynamoHatch.ID, + "hatch.dynamomulti16.tier.05", + "IV 16A Dynamo Hatch", + 5, + 16).getStackForm(1L)); eM_dynamoMulti64_IV.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15220, "hatch.dynamomulti64.tier.05", "IV 64A Dynamo Hatch", 5, 64) - .getStackForm(1L)); - + new GT_MetaTileEntity_Hatch_DynamoMulti( + IV64ADynamoHatch.ID, + "hatch.dynamomulti64.tier.05", + "IV 64A Dynamo Hatch", + 5, + 64).getStackForm(1L)); eM_dynamoMulti4_LuV.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15201, "hatch.dynamomulti04.tier.06", "LuV 4A Dynamo Hatch", 6, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_DynamoMulti( + LuV4ADynamoHatch.ID, + "hatch.dynamomulti04.tier.06", + "LuV 4A Dynamo Hatch", + 6, + 4).getStackForm(1L)); eM_dynamoMulti16_LuV.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15211, "hatch.dynamomulti16.tier.06", "LuV 16A Dynamo Hatch", 6, 16) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_DynamoMulti( + LuV16ADynamoHatch.ID, + "hatch.dynamomulti16.tier.06", + "LuV 16A Dynamo Hatch", + 6, + 16).getStackForm(1L)); eM_dynamoMulti64_LuV.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15221, "hatch.dynamomulti64.tier.06", "LuV 64A Dynamo Hatch", 6, 64) - .getStackForm(1L)); - + new GT_MetaTileEntity_Hatch_DynamoMulti( + LuV64ADynamoHatch.ID, + "hatch.dynamomulti64.tier.06", + "LuV 64A Dynamo Hatch", + 6, + 64).getStackForm(1L)); eM_dynamoMulti4_ZPM.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15202, "hatch.dynamomulti04.tier.07", "ZPM 4A Dynamo Hatch", 7, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_DynamoMulti( + ZPM4ADynamoHatch.ID, + "hatch.dynamomulti04.tier.07", + "ZPM 4A Dynamo Hatch", + 7, + 4).getStackForm(1L)); eM_dynamoMulti16_ZPM.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15212, "hatch.dynamomulti16.tier.07", "ZPM 16A Dynamo Hatch", 7, 16) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_DynamoMulti( + ZPM16ADynamoHatch.ID, + "hatch.dynamomulti16.tier.07", + "ZPM 16A Dynamo Hatch", + 7, + 16).getStackForm(1L)); eM_dynamoMulti64_ZPM.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15222, "hatch.dynamomulti64.tier.07", "ZPM 64A Dynamo Hatch", 7, 64) - .getStackForm(1L)); - + new GT_MetaTileEntity_Hatch_DynamoMulti( + ZPM64ADynamoHatch.ID, + "hatch.dynamomulti64.tier.07", + "ZPM 64A Dynamo Hatch", + 7, + 64).getStackForm(1L)); eM_dynamoMulti4_UV.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15203, "hatch.dynamomulti04.tier.08", "UV 4A Dynamo Hatch", 8, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_DynamoMulti( + UV4ADynamoHatch.ID, + "hatch.dynamomulti04.tier.08", + "UV 4A Dynamo Hatch", + 8, + 4).getStackForm(1L)); eM_dynamoMulti16_UV.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15213, "hatch.dynamomulti16.tier.08", "UV 16A Dynamo Hatch", 8, 16) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_DynamoMulti( + UV16ADynamoHatch.ID, + "hatch.dynamomulti16.tier.08", + "UV 16A Dynamo Hatch", + 8, + 16).getStackForm(1L)); eM_dynamoMulti64_UV.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15223, "hatch.dynamomulti64.tier.08", "UV 64A Dynamo Hatch", 8, 64) - .getStackForm(1L)); - + new GT_MetaTileEntity_Hatch_DynamoMulti( + UV64ADynamoHatch.ID, + "hatch.dynamomulti64.tier.08", + "UV 64A Dynamo Hatch", + 8, + 64).getStackForm(1L)); eM_dynamoMulti4_UHV.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15204, "hatch.dynamomulti04.tier.09", "UHV 4A Dynamo Hatch", 9, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_DynamoMulti( + UHV4ADynamoHatch.ID, + "hatch.dynamomulti04.tier.09", + "UHV 4A Dynamo Hatch", + 9, + 4).getStackForm(1L)); eM_dynamoMulti16_UHV.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15214, "hatch.dynamomulti16.tier.09", "UHV 16A Dynamo Hatch", 9, 16) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_DynamoMulti( + UHV16ADynamoHatch.ID, + "hatch.dynamomulti16.tier.09", + "UHV 16A Dynamo Hatch", + 9, + 16).getStackForm(1L)); eM_dynamoMulti64_UHV.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15224, "hatch.dynamomulti64.tier.09", "UHV 64A Dynamo Hatch", 9, 64) - .getStackForm(1L)); - + new GT_MetaTileEntity_Hatch_DynamoMulti( + UHV64ADynamoHatch.ID, + "hatch.dynamomulti64.tier.09", + "UHV 64A Dynamo Hatch", + 9, + 64).getStackForm(1L)); eM_dynamoMulti4_UEV.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15205, "hatch.dynamomulti04.tier.10", "UEV 4A Dynamo Hatch", 10, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_DynamoMulti( + UEV4ADynamoHatch.ID, + "hatch.dynamomulti04.tier.10", + "UEV 4A Dynamo Hatch", + 10, + 4).getStackForm(1L)); eM_dynamoMulti16_UEV.set( new GT_MetaTileEntity_Hatch_DynamoMulti( - 15215, + UEV16ADynamoHatch.ID, "hatch.dynamomulti16.tier.10", "UEV 16A Dynamo Hatch", 10, 16).getStackForm(1L)); eM_dynamoMulti64_UEV.set( new GT_MetaTileEntity_Hatch_DynamoMulti( - 15225, + UEV64ADynamoHatch.ID, "hatch.dynamomulti64.tier.10", "UEV 64A Dynamo Hatch", 10, 64).getStackForm(1L)); - eM_dynamoMulti4_UIV.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15206, "hatch.dynamomulti04.tier.11", "UIV 4A Dynamo Hatch", 11, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_DynamoMulti( + UIV4ADynamoHatch.ID, + "hatch.dynamomulti04.tier.11", + "UIV 4A Dynamo Hatch", + 11, + 4).getStackForm(1L)); eM_dynamoMulti16_UIV.set( new GT_MetaTileEntity_Hatch_DynamoMulti( - 15216, + UIV16ADynamoHatch.ID, "hatch.dynamomulti16.tier.11", "UIV 16A Dynamo Hatch", 11, 16).getStackForm(1L)); eM_dynamoMulti64_UIV.set( new GT_MetaTileEntity_Hatch_DynamoMulti( - 15226, + UIV64ADynamoHatch.ID, "hatch.dynamomulti64.tier.11", "UIV 64A Dynamo Hatch", 11, 64).getStackForm(1L)); - eM_dynamoMulti4_UMV.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15207, "hatch.dynamomulti04.tier.12", "UMV 4A Dynamo Hatch", 12, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_DynamoMulti( + UMV4ADynamoHatch.ID, + "hatch.dynamomulti04.tier.12", + "UMV 4A Dynamo Hatch", + 12, + 4).getStackForm(1L)); eM_dynamoMulti16_UMV.set( new GT_MetaTileEntity_Hatch_DynamoMulti( - 15217, + UMV16ADynamoHatch.ID, "hatch.dynamomulti16.tier.12", "UMV 16A Dynamo Hatch", 12, 16).getStackForm(1L)); eM_dynamoMulti64_UMV.set( new GT_MetaTileEntity_Hatch_DynamoMulti( - 15227, + UMV64ADynamoHatch.ID, "hatch.dynamomulti64.tier.12", "UMV 64A Dynamo Hatch", 12, 64).getStackForm(1L)); - eM_dynamoMulti4_UXV.set( - new GT_MetaTileEntity_Hatch_DynamoMulti(15208, "hatch.dynamomulti04.tier.13", "UXV 4A Dynamo Hatch", 13, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_DynamoMulti( + UXV4ADynamoHatch.ID, + "hatch.dynamomulti04.tier.13", + "UXV 4A Dynamo Hatch", + 13, + 4).getStackForm(1L)); eM_dynamoMulti16_UXV.set( new GT_MetaTileEntity_Hatch_DynamoMulti( - 15218, + UXV16ADynamoHatch.ID, "hatch.dynamomulti16.tier.13", "UXV 16A Dynamo Hatch", 13, 16).getStackForm(1L)); eM_dynamoMulti64_UXV.set( new GT_MetaTileEntity_Hatch_DynamoMulti( - 15228, + UXV64ADynamoHatch.ID, "hatch.dynamomulti64.tier.13", "UXV 64A Dynamo Hatch", 13, @@ -1469,7 +1928,7 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel1_IV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15230, + IV256AtLaserSourceHatch.ID, "hatch.dynamotunnel1.tier.05", "IV 256A/t Laser Source Hatch", 5, @@ -1477,7 +1936,7 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel2_IV .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15240, + IV1024AtLaserSourceHatch.ID, "hatch.dynamotunnel2.tier.05", "IV 1,024A/t Laser Source Hatch", 5, @@ -1486,7 +1945,7 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel3_IV .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15250, + IV4096AtLaserSourceHatch.ID, "hatch.dynamotunnel3.tier.05", "IV 4,096A/t Laser Source Hatch", 5, @@ -1495,7 +1954,7 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel4_IV .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15260, + IV16384AtLaserSourceHatch.ID, "hatch.dynamotunnel4.tier.05", "IV 16,384A/t Laser Source Hatch", 5, @@ -1504,7 +1963,7 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel5_IV .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15270, + IV65536AtLaserSourceHatch.ID, "hatch.dynamotunnel5.tier.05", "IV 65,536A/t Laser Source Hatch", 5, @@ -1513,7 +1972,7 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel6_IV .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15280, + IV262144AtLaserSourceHatch.ID, "hatch.dynamotunnel6.tier.05", "IV 262,144A/t Laser Source Hatch", 5, @@ -1522,23 +1981,22 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel7_IV .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15290, + IV1048576AtLaserSourceHatch.ID, "hatch.dynamotunnel7.tier.05", "IV 1,048,576A/t Laser Source Hatch", 5, 1048576).getStackForm(1L)) .hidden(); - eM_dynamoTunnel1_LuV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15231, + LuV256AtLaserSourceHatch.ID, "hatch.dynamotunnel1.tier.06", "LuV 256A/t Laser Source Hatch", 6, 256).getStackForm(1L)); eM_dynamoTunnel2_LuV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15241, + LuV1024AtLaserSourceHatch.ID, "hatch.dynamotunnel2.tier.06", "LuV 1,024A/t Laser Source Hatch", 6, @@ -1546,7 +2004,7 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel3_LuV .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15251, + LuV4096AtLaserSourceHatch.ID, "hatch.dynamotunnel3.tier.06", "LuV 4,096A/t Laser Source Hatch", 6, @@ -1555,7 +2013,7 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel4_LuV .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15261, + LuV16384AtLaserSourceHatch.ID, "hatch.dynamotunnel4.tier.06", "LuV 16,384A/t Laser Source Hatch", 6, @@ -1564,7 +2022,7 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel5_LuV .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15271, + LuV65536AtLaserSourceHatch.ID, "hatch.dynamotunnel5.tier.06", "LuV 65,536A/t Laser Source Hatch", 6, @@ -1573,7 +2031,7 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel6_LuV .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15281, + LuV262144AtLaserSourceHatch.ID, "hatch.dynamotunnel6.tier.06", "LuV 262,144A/t Laser Source Hatch", 6, @@ -1582,30 +2040,29 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel7_LuV .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15291, + LuV1048576AtLaserSourceHatch.ID, "hatch.dynamotunnel7.tier.06", "LuV 1,048,576A/t Laser Source Hatch", 6, 1048576).getStackForm(1L)) .hidden(); - eM_dynamoTunnel1_ZPM.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15232, + ZPM256AtLaserSourceHatch.ID, "hatch.dynamotunnel1.tier.07", "ZPM 256A/t Laser Source Hatch", 7, 256).getStackForm(1L)); eM_dynamoTunnel2_ZPM.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15242, + ZPM1024AtLaserSourceHatch.ID, "hatch.dynamotunnel2.tier.07", "ZPM 1,024A/t Laser Source Hatch", 7, 1024).getStackForm(1L)); eM_dynamoTunnel3_ZPM.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15252, + ZPM4096AtLaserSourceHatch.ID, "hatch.dynamotunnel3.tier.07", "ZPM 4,096A/t Laser Source Hatch", 7, @@ -1613,7 +2070,7 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel4_ZPM .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15262, + ZPM16384AtLaserSourceHatch.ID, "hatch.dynamotunnel4.tier.07", "ZPM 16,384A/t Laser Source Hatch", 7, @@ -1622,7 +2079,7 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel5_ZPM .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15272, + ZPM65536AtLaserSourceHatch.ID, "hatch.dynamotunnel5.tier.07", "ZPM 65,536A/t Laser Source Hatch", 7, @@ -1631,7 +2088,7 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel6_ZPM .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15282, + ZPM262144AtLaserSourceHatch.ID, "hatch.dynamotunnel6.tier.07", "ZPM 262,144A/t Laser Source Hatch", 7, @@ -1640,7 +2097,7 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel7_ZPM .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15292, + ZPM1048576AtLaserSourceHatch.ID, "hatch.dynamotunnel7.tier.07", "ZPM 1,048,576A/t Laser Source Hatch", 7, @@ -1649,28 +2106,28 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel1_UV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15233, + UV256AtLaserSourceHatch.ID, "hatch.dynamotunnel1.tier.08", "UV 256A/t Laser Source Hatch", 8, 256).getStackForm(1L)); eM_dynamoTunnel2_UV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15243, + UV1024AtLaserSourceHatch.ID, "hatch.dynamotunnel2.tier.08", "UV 1,024A/t Laser Source Hatch", 8, 1024).getStackForm(1L)); eM_dynamoTunnel3_UV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15253, + UV4096AtLaserSourceHatch.ID, "hatch.dynamotunnel3.tier.08", "UV 4,096A/t Laser Source Hatch", 8, 4096).getStackForm(1L)); eM_dynamoTunnel4_UV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15263, + UV16384AtLaserSourceHatch.ID, "hatch.dynamotunnel4.tier.08", "UV 16,384A/t Laser Source Hatch", 8, @@ -1678,7 +2135,7 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel5_UV .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15273, + UV65536AtLaserSourceHatch.ID, "hatch.dynamotunnel5.tier.08", "UV 65,536A/t Laser Source Hatch", 8, @@ -1687,7 +2144,7 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel6_UV .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15283, + UV262144AtLaserSourceHatch.ID, "hatch.dynamotunnel6.tier.08", "UV 262,144A/t Laser Source Hatch", 8, @@ -1696,44 +2153,43 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel7_UV .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15293, + UV1048576AtLaserSourceHatch.ID, "hatch.dynamotunnel7.tier.08", "UV 1,048,576A/t Laser Source Hatch", 8, 1048576).getStackForm(1L)) .hidden(); - eM_dynamoTunnel1_UHV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15234, + UHV256AtLaserSourceHatch.ID, "hatch.dynamotunnel1.tier.09", "UHV 256A/t Laser Source Hatch", 9, 256).getStackForm(1L)); eM_dynamoTunnel2_UHV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15244, + UHV1024AtLaserSourceHatch.ID, "hatch.dynamotunnel2.tier.09", "UHV 1,024A/t Laser Source Hatch", 9, 1024).getStackForm(1L)); eM_dynamoTunnel3_UHV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15254, + UHV4096AtLaserSourceHatch.ID, "hatch.dynamotunnel3.tier.09", "UHV 4,096A/t Laser Source Hatch", 9, 4096).getStackForm(1L)); eM_dynamoTunnel4_UHV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15264, + UHV16384AtLaserSourceHatch.ID, "hatch.dynamotunnel4.tier.09", "UHV 16,384A/t Laser Source Hatch", 9, 16384).getStackForm(1L)); eM_dynamoTunnel5_UHV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15274, + UHV65536AtLaserSourceHatch.ID, "hatch.dynamotunnel5.tier.09", "UHV 65,536A/t Laser Source Hatch", 9, @@ -1741,7 +2197,7 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel6_UHV .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15284, + UHV262144AtLaserSourceHatch.ID, "hatch.dynamotunnel6.tier.09", "UHV 262,144A/t Laser Source Hatch", 9, @@ -1750,51 +2206,50 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel7_UHV .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15294, + UHV1048576AtLaserSourceHatch.ID, "hatch.dynamotunnel7.tier.09", "UHV 1,048,576A/t Laser Source Hatch", 9, 1048576).getStackForm(1L)) .hidden(); - eM_dynamoTunnel1_UEV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15235, + UEV256AtLaserSourceHatch.ID, "hatch.dynamotunnel1.tier.10", "UEV 256A/t Laser Source Hatch", 10, 256).getStackForm(1L)); eM_dynamoTunnel2_UEV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15245, + UEV1024AtLaserSourceHatch.ID, "hatch.dynamotunnel2.tier.10", "UEV 1,024A/t Laser Source Hatch", 10, 1024).getStackForm(1L)); eM_dynamoTunnel3_UEV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15255, + UEV4096AtLaserSourceHatch.ID, "hatch.dynamotunnel3.tier.10", "UEV 4,096A/t Laser Source Hatch", 10, 4096).getStackForm(1L)); eM_dynamoTunnel4_UEV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15265, + UEV16384AtLaserSourceHatch.ID, "hatch.dynamotunnel4.tier.10", "UEV 16,384A/t Laser Source Hatch", 10, 16384).getStackForm(1L)); eM_dynamoTunnel5_UEV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15275, + UEV65536AtLaserSourceHatch.ID, "hatch.dynamotunnel5.tier.10", "UEV 65,536A/t Laser Source Hatch", 10, 65536).getStackForm(1L)); eM_dynamoTunnel6_UEV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15285, + UEV262144AtLaserSourceHatch.ID, "hatch.dynamotunnel6.tier.10", "UEV 262,144A/t Laser Source Hatch", 10, @@ -1802,7 +2257,7 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel7_UEV .set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15295, + UEV1048576AtLaserSourceHatch.ID, "hatch.dynamotunnel7.tier.10", "UEV 1,048,576A/t Laser Source Hatch", 10, @@ -1811,49 +2266,49 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel1_UIV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15236, + UIV256AtLaserSourceHatch.ID, "hatch.dynamotunnel1.tier.11", "UIV 256A/t Laser Source Hatch", 11, 256).getStackForm(1L)); eM_dynamoTunnel2_UIV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15246, + UIV1024AtLaserSourceHatch.ID, "hatch.dynamotunnel2.tier.11", "UIV 1,024A/t Laser Source Hatch", 11, 1024).getStackForm(1L)); eM_dynamoTunnel3_UIV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15256, + UIV4096AtLaserSourceHatch.ID, "hatch.dynamotunnel3.tier.11", "UIV 4,096A/t Laser Source Hatch", 11, 4096).getStackForm(1L)); eM_dynamoTunnel4_UIV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15266, + UIV16384AtLaserSourceHatch.ID, "hatch.dynamotunnel4.tier.11", "UIV 16,384A/t Laser Source Hatch", 11, 16384).getStackForm(1L)); eM_dynamoTunnel5_UIV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15276, + UIV65536AtLaserSourceHatch.ID, "hatch.dynamotunnel5.tier.11", "UIV 65,536A/t Laser Source Hatch", 11, 65536).getStackForm(1L)); eM_dynamoTunnel6_UIV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15286, + UIV262144AtLaserSourceHatch.ID, "hatch.dynamotunnel6.tier.11", "UIV 262,144A/t Laser Source Hatch", 11, 262144).getStackForm(1L)); eM_dynamoTunnel7_UIV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15296, + UIV1048576AtLaserSourceHatch.ID, "hatch.dynamotunnel7.tier.11", "UIV 1,048,576A/t Laser Source Hatch", 11, @@ -1861,49 +2316,49 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel1_UMV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15237, + UMV256AtLaserSourceHatch.ID, "hatch.dynamotunnel1.tier.12", "UMV 256A/t Laser Source Hatch", 12, 256).getStackForm(1L)); eM_dynamoTunnel2_UMV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15247, + UMV1024AtLaserSourceHatch.ID, "hatch.dynamotunnel2.tier.12", "UMV 1,024A/t Laser Source Hatch", 12, 1024).getStackForm(1L)); eM_dynamoTunnel3_UMV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15257, + UMV4096AtLaserSourceHatch.ID, "hatch.dynamotunnel3.tier.12", "UMV 4,096A/t Laser Source Hatch", 12, 4096).getStackForm(1L)); eM_dynamoTunnel4_UMV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15267, + UMV16384AtLaserSourceHatch.ID, "hatch.dynamotunnel4.tier.12", "UMV 16,384A/t Laser Source Hatch", 12, 16384).getStackForm(1L)); eM_dynamoTunnel5_UMV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15277, + UMV65536AtLaserSourceHatch.ID, "hatch.dynamotunnel5.tier.12", "UMV 65,536A/t Laser Source Hatch", 12, 65536).getStackForm(1L)); eM_dynamoTunnel6_UMV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15287, + UMV262144AtLaserSourceHatch.ID, "hatch.dynamotunnel6.tier.12", "UMV 262,144A/t Laser Source Hatch", 12, 262144).getStackForm(1L)); eM_dynamoTunnel7_UMV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15297, + UMV1048576AtLaserSourceHatch.ID, "hatch.dynamotunnel7.tier.12", "UMV 1,048,576A/t Laser Source Hatch", 12, @@ -1918,49 +2373,49 @@ public class MachineLoader implements Runnable { eM_dynamoTunnel1_UXV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15238, + UXV256AtLaserSourceHatch.ID, "hatch.dynamotunnel1.tier.13", "UXV 256A/t Laser Source Hatch", 13, 256).getStackForm(1L)); eM_dynamoTunnel2_UXV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15248, + UXV1024AtLaserSourceHatch.ID, "hatch.dynamotunnel2.tier.13", "UXV 1,024A/t Laser Source Hatch", 13, 1024).getStackForm(1L)); eM_dynamoTunnel3_UXV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15258, + UXV4096AtLaserSourceHatch.ID, "hatch.dynamotunnel3.tier.13", "UXV 4,096A/t Laser Source Hatch", 13, 4096).getStackForm(1L)); eM_dynamoTunnel4_UXV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15268, + UXV16384AtLaserSourceHatch.ID, "hatch.dynamotunnel4.tier.13", "UXV 16,384A/t Laser Source Hatch", 13, 16384).getStackForm(1L)); eM_dynamoTunnel5_UXV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15278, + UXV65536AtLaserSourceHatch.ID, "hatch.dynamotunnel5.tier.13", "UXV 65,536A/t Laser Source Hatch", 13, 65536).getStackForm(1L)); eM_dynamoTunnel6_UXV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15288, + UXV262144AtLaserSourceHatch.ID, "hatch.dynamotunnel6.tier.13", "UXV 262,144A/t Laser Source Hatch", 13, 262144).getStackForm(1L)); eM_dynamoTunnel7_UXV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15298, + UXV1048576AtLaserSourceHatch.ID, "hatch.dynamotunnel7.tier.13", "UXV 1,048,576A/t Laser Source Hatch", 13, @@ -1981,7 +2436,7 @@ public class MachineLoader implements Runnable { 16777216).getStackForm(1L)); eM_dynamoTunnel9001.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( - 15299, + LegendaryLaserSourceHatch.ID, "hatch.dynamotunnel.tier.14", "Legendary Laser Source Hatch", 13, @@ -1992,160 +2447,177 @@ public class MachineLoader implements Runnable { // =================================================================================================== Machine_Multi_Transformer.set( - new GT_MetaTileEntity_EM_transformer(15300, "multimachine.em.transformer", "Active Transformer") - .getStackForm(1L)); + new GT_MetaTileEntity_EM_transformer( + ActiveTransformer.ID, + "multimachine.em.transformer", + "Active Transformer").getStackForm(1L)); Machine_Multi_Microwave.set( - new GT_MetaTileEntity_TM_microwave(15312, "multimachine.tm.microwave", "Microwave Grinder") + new GT_MetaTileEntity_TM_microwave(MicrowaveGrinder.ID, "multimachine.tm.microwave", "Microwave Grinder") .getStackForm(1L)); Machine_Multi_TeslaCoil.set( - new GT_MetaTileEntity_TM_teslaCoil(15314, "multimachine.tm.teslaCoil", "Tesla Tower").getStackForm(1L)); - - Machine_Multi_Switch.set( - new GT_MetaTileEntity_EM_switch(15310, "multimachine.em.switch", "Network Switch With QoS") + new GT_MetaTileEntity_TM_teslaCoil(TeslaTower.ID, "multimachine.tm.teslaCoil", "Tesla Tower") .getStackForm(1L)); + Machine_Multi_Switch.set( + new GT_MetaTileEntity_EM_switch( + NetworkSwitchWithQoS.ID, + "multimachine.em.switch", + "Network Switch With QoS").getStackForm(1L)); Machine_Multi_Computer.set( - new GT_MetaTileEntity_EM_computer(15311, "multimachine.em.computer", "Quantum Computer").getStackForm(1L)); - - Machine_Multi_DataBank - .set(new GT_MetaTileEntity_EM_dataBank(15313, "multimachine.em.databank", "Data Bank").getStackForm(1L)); - + new GT_MetaTileEntity_EM_computer(QuantumComputer.ID, "multimachine.em.computer", "Quantum Computer") + .getStackForm(1L)); + Machine_Multi_DataBank.set( + new GT_MetaTileEntity_EM_dataBank(DataBank.ID, "multimachine.em.databank", "Data Bank").getStackForm(1L)); Machine_Multi_Research.set( - new GT_MetaTileEntity_EM_research(15331, "multimachine.em.research", "Research station").getStackForm(1L)); - - Machine_Multi_Infuser - .set(new GT_MetaTileEntity_EM_infuser(15350, "multimachine.em.infuser", "Energy Infuser").getStackForm(1)); - + new GT_MetaTileEntity_EM_research(Researchstation.ID, "multimachine.em.research", "Research station") + .getStackForm(1L)); + Machine_Multi_Infuser.set( + new GT_MetaTileEntity_EM_infuser(EnergyInfuser.ID, "multimachine.em.infuser", "Energy Infuser") + .getStackForm(1)); Machine_Multi_EyeOfHarmony.set( - new GT_MetaTileEntity_EM_EyeOfHarmony(15410, "multimachine.em.eye_of_harmony", "Eye of Harmony") + new GT_MetaTileEntity_EM_EyeOfHarmony(EyeofHarmony.ID, "multimachine.em.eye_of_harmony", "Eye of Harmony") .getStackForm(1L)); if (!NewHorizonsCoreMod.isModLoaded()) { Machine_Multi_ForgeOfGods.set( - new GT_MetaTileEntity_EM_ForgeOfGods(15411, "multimachine.em.forge_of_gods", "Forge of the Gods") - .getStackForm(1L)); + new GT_MetaTileEntity_EM_ForgeOfGods( + ForgeoftheGods.ID, + "multimachine.em.forge_of_gods", + "Forge of the Gods").getStackForm(1L)); Machine_Multi_SmeltingModule.set( new GT_MetaTileEntity_EM_SmeltingModule( - 15412, + HelioflarePowerForge.ID, "multimachine.em.smelting_module", "Helioflare Power Forge").getStackForm(1L)); Machine_Multi_MoltenModule.set( - new GT_MetaTileEntity_EM_MoltenModule(15413, "multimachine.em.molten_module", "Helioflux Melting Core") - .getStackForm(1L)); + new GT_MetaTileEntity_EM_MoltenModule( + HeliofluxMeltingCore.ID, + "multimachine.em.molten_module", + "Helioflux Melting Core").getStackForm(1L)); Machine_Multi_PlasmaModule.set( new GT_MetaTileEntity_EM_PlasmaModule( - 15414, + HeliothermalPlasmaFabricator.ID, "multimachine.em.plasma_module", "Heliothermal Plasma Fabricator").getStackForm(1L)); Machine_Multi_QuarkGluonPlasmaModule.set( - new GT_MetaTileEntity_EM_ExoticModule(15415, "multimachine.em.exotic_module", "Heliofusion Exoticizer") - .getStackForm(1L)); + new GT_MetaTileEntity_EM_ExoticModule( + HeliofusionExoticizer.ID, + "multimachine.em.exotic_module", + "Heliofusion Exoticizer").getStackForm(1L)); } // =================================================================================================== // Hatches // =================================================================================================== - Parametrizer_Hatch - .set(new GT_MetaTileEntity_Hatch_Param(15420, "hatch.param.tier.05", "Parametrizer", 5).getStackForm(1L)); // TODO - // refactor - // aName - // to - // hatch.param.tier.04 - // and - // aTier - // to - // 4, - // check - // recipe - // for - // NH - ParametrizerX_Hatch - .set(new GT_MetaTileEntity_Hatch_Param(15421, "hatch.param.tier.07", "Parametrizer X", 7).getStackForm(1L)); + Parametrizer_Hatch.set( + new GT_MetaTileEntity_Hatch_Param(Parametrizer.ID, "hatch.param.tier.05", "Parametrizer", 5) + .getStackForm(1L)); // TODO refactor aName to hatch.param.tier.04 and aTier to 4, check recipe for NH + ParametrizerX_Hatch.set( + new GT_MetaTileEntity_Hatch_Param(ParametrizerX.ID, "hatch.param.tier.07", "Parametrizer X", 7) + .getStackForm(1L)); ParametrizerTXT_Hatch.set( - new GT_MetaTileEntity_Hatch_ParamText(15422, "hatch.param.tier.10", "Parametrizer tXt", 10) + new GT_MetaTileEntity_Hatch_ParamText(ParametrizertXt.ID, "hatch.param.tier.10", "Parametrizer tXt", 10) .getStackForm(1L)); // TODO check recipe for NH - Uncertainty_Hatch.set( - new GT_MetaTileEntity_Hatch_Uncertainty(15430, "hatch.certain.tier.07", "Uncertainty Resolver", 7) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Uncertainty( + UncertaintyResolver.ID, + "hatch.certain.tier.07", + "Uncertainty Resolver", + 7).getStackForm(1L)); UncertaintyX_Hatch.set( - new GT_MetaTileEntity_Hatch_Uncertainty(15431, "hatch.certain.tier.10", "Uncertainty Resolver X", 10) - .getStackForm(1L)); - + new GT_MetaTileEntity_Hatch_Uncertainty( + UncertaintyResolverX.ID, + "hatch.certain.tier.10", + "Uncertainty Resolver X", + 10).getStackForm(1L)); dataIn_Hatch.set( - new GT_MetaTileEntity_Hatch_InputData(15440, "hatch.datain.tier.07", "Optical Slave Connector", 7) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_InputData( + OpticalSlaveConnector.ID, + "hatch.datain.tier.07", + "Optical Slave Connector", + 7).getStackForm(1L)); dataOut_Hatch.set( - new GT_MetaTileEntity_Hatch_OutputData(15441, "hatch.dataout.tier.07", "Optical Master Connector", 7) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_OutputData( + OpticalMasterConnector.ID, + "hatch.dataout.tier.07", + "Optical Master Connector", + 7).getStackForm(1L)); dataInAss_Hatch.set( new GT_MetaTileEntity_Hatch_InputDataItems( - 15442, + AssemblylineSlaveConnector.ID, "hatch.datainass.tier.07", "Assembly line Slave Connector", 7).getStackForm(1L)); dataOutAss_Hatch.set( new GT_MetaTileEntity_Hatch_OutputDataItems( - 15443, + DataBankMasterConnector.ID, "hatch.dataoutass.tier.07", "Data Bank Master Connector", 7).getStackForm(1L)); dataOut_Wireless_Hatch.set( new GT_MetaTileEntity_Hatch_WirelessComputation_Output( - 15444, + CloudComputationServerHatch.ID, "hatch.dataout.wireless.tier.12", "Cloud Computation Server Hatch", 12).getStackForm(1L)); dataIn_Wireless_Hatch.set( new GT_MetaTileEntity_Hatch_WirelessComputation_Input( - 15445, + CloudComputationClientHatch.ID, "hatch.datain.wireless.tier.12", "Cloud Computation Client Hatch", 12).getStackForm(1L)); dataInAss_Wireless_Hatch.set( new GT_MetaTileEntity_Hatch_WirelessInputDataItems( - 15446, + WirelessAssemblylineSlaveConnector.ID, "hatch.datainass.wireless.tier.12", "Wireless Assembly line Slave Connector", 12).getStackForm(1L)); dataOutAss_Wireless_Hatch.set( new GT_MetaTileEntity_Hatch_WirelessOutputDataItems( - 15447, + WirelessDataBankMasterConnector.ID, "hatch.dataoutass.wireless.tier.12", "Wireless Data Bank Master Connector", 12).getStackForm(1L)); - rack_Hatch - .set(new GT_MetaTileEntity_Hatch_Rack(15450, "hatch.rack.tier.08", "Computer Rack", 8).getStackForm(1L)); + rack_Hatch.set( + new GT_MetaTileEntity_Hatch_Rack(ComputerRack.ID, "hatch.rack.tier.08", "Computer Rack", 8) + .getStackForm(1L)); holder_Hatch.set( - new GT_MetaTileEntity_Hatch_Holder(15451, "hatch.holder.tier.09", "Object Holder", 8).getStackForm(1L)); - + new GT_MetaTileEntity_Hatch_Holder(ObjectHolder.ID, "hatch.holder.tier.09", "Object Holder", 8) + .getStackForm(1L)); capacitor_Hatch.set( - new GT_MetaTileEntity_Hatch_Capacitor(15452, "hatch.capacitor.tier.03", "Capacitor Hatch", 3) + new GT_MetaTileEntity_Hatch_Capacitor(CapacitorHatch.ID, "hatch.capacitor.tier.03", "Capacitor Hatch", 3) .getStackForm(1L)); // =================================================================================================== // Pipes // =================================================================================================== - LASERpipe - .set(new GT_MetaTileEntity_Pipe_Energy(15465, "pipe.energystream", "Laser Vacuum Pipe").getStackForm(1L)); + LASERpipe.set( + new GT_MetaTileEntity_Pipe_Energy(LaserVacuumPipe.ID, "pipe.energystream", "Laser Vacuum Pipe") + .getStackForm(1L)); LASERpipeSmart.set( - new GT_MetaTileEntity_Pipe_EnergyMirror(15466, "pipe.energymirror", "Laser Vacuum Mirror") + new GT_MetaTileEntity_Pipe_EnergyMirror(LaserVacuumMirror.ID, "pipe.energymirror", "Laser Vacuum Mirror") + .getStackForm(1L)); + DATApipe.set( + new GT_MetaTileEntity_Pipe_Data(OpticalFiberCable.ID, "pipe.datastream", "Optical Fiber Cable") .getStackForm(1L)); - DATApipe.set(new GT_MetaTileEntity_Pipe_Data(15470, "pipe.datastream", "Optical Fiber Cable").getStackForm(1L)); LASERpipeBlock.set( - new GT_MetaTileEntity_PipeBlock_Energy(15472, "pipe.energystream.block", "Laser Vacuum Pipe Casing") - .getStackForm(1L)); + new GT_MetaTileEntity_PipeBlock_Energy( + LaserVacuumPipeCasing.ID, + "pipe.energystream.block", + "Laser Vacuum Pipe Casing").getStackForm(1L)); DATApipeBlock.set( - new GT_MetaTileEntity_PipeBlock_Data(15473, "pipe.datastream.block", "Optical Fiber Cable Casing") - .getStackForm(1L)); + new GT_MetaTileEntity_PipeBlock_Data( + OpticalFiberCableCasing.ID, + "pipe.datastream.block", + "Optical Fiber Cable Casing").getStackForm(1L)); // =================================================================================================== // Single Blocks // =================================================================================================== Machine_OwnerDetector.set( - new GT_MetaTileEntity_OwnerDetector(15480, "machine.tt.ownerdetector", "Owner detector", 3) + new GT_MetaTileEntity_OwnerDetector(Ownerdetector.ID, "machine.tt.ownerdetector", "Owner detector", 3) .getStackForm(1L)); // =================================================================================================== @@ -2153,32 +2625,56 @@ public class MachineLoader implements Runnable { // =================================================================================================== Machine_BuckConverter_IV.set( - new GT_MetaTileEntity_BuckConverter(15485, "machine.tt.buck.05", "Insane Buck Converter", 5) - .getStackForm(1L)); + new GT_MetaTileEntity_BuckConverter( + InsaneBuckConverter.ID, + "machine.tt.buck.05", + "Insane Buck Converter", + 5).getStackForm(1L)); Machine_BuckConverter_LuV.set( - new GT_MetaTileEntity_BuckConverter(15486, "machine.tt.buck.06", "Ludicrous Buck Converter", 6) - .getStackForm(1L)); + new GT_MetaTileEntity_BuckConverter( + LudicrousBuckConverter.ID, + "machine.tt.buck.06", + "Ludicrous Buck Converter", + 6).getStackForm(1L)); Machine_BuckConverter_ZPM.set( - new GT_MetaTileEntity_BuckConverter(15487, "machine.tt.buck.07", "ZPM Voltage Buck Converter", 7) - .getStackForm(1L)); + new GT_MetaTileEntity_BuckConverter( + ZPMVoltageBuckConverter.ID, + "machine.tt.buck.07", + "ZPM Voltage Buck Converter", + 7).getStackForm(1L)); Machine_BuckConverter_UV.set( - new GT_MetaTileEntity_BuckConverter(15488, "machine.tt.buck.08", "Ultimate Power Buck Converter", 8) - .getStackForm(1L)); + new GT_MetaTileEntity_BuckConverter( + UltimatePowerBuckConverter.ID, + "machine.tt.buck.08", + "Ultimate Power Buck Converter", + 8).getStackForm(1L)); Machine_BuckConverter_UHV.set( - new GT_MetaTileEntity_BuckConverter(15489, "machine.tt.buck.09", "Highly Ultimate Buck Converter", 9) - .getStackForm(1L)); + new GT_MetaTileEntity_BuckConverter( + HighlyUltimateBuckConverter.ID, + "machine.tt.buck.09", + "Highly Ultimate Buck Converter", + 9).getStackForm(1L)); Machine_BuckConverter_UEV.set( - new GT_MetaTileEntity_BuckConverter(15490, "machine.tt.buck.10", "Extremely Ultimate Buck Converter", 10) - .getStackForm(1L)); + new GT_MetaTileEntity_BuckConverter( + ExtremelyUltimateBuckConverter.ID, + "machine.tt.buck.10", + "Extremely Ultimate Buck Converter", + 10).getStackForm(1L)); Machine_BuckConverter_UIV.set( - new GT_MetaTileEntity_BuckConverter(15491, "machine.tt.buck.11", "Insanely Ultimate Buck Converter", 11) - .getStackForm(1L)); + new GT_MetaTileEntity_BuckConverter( + InsanelyUltimateBuckConverter.ID, + "machine.tt.buck.11", + "Insanely Ultimate Buck Converter", + 11).getStackForm(1L)); Machine_BuckConverter_UMV.set( - new GT_MetaTileEntity_BuckConverter(15492, "machine.tt.buck.12", "Mega Ultimate Buck Converter", 12) - .getStackForm(1L)); + new GT_MetaTileEntity_BuckConverter( + MegaUltimateBuckConverter.ID, + "machine.tt.buck.12", + "Mega Ultimate Buck Converter", + 12).getStackForm(1L)); Machine_BuckConverter_UXV.set( new GT_MetaTileEntity_BuckConverter( - 15493, + ExtendedMegaUltimateBuckConverter.ID, "machine.tt.buck.13", "Extended Mega Ultimate Buck Converter", 13).getStackForm(1L)); @@ -2188,93 +2684,186 @@ public class MachineLoader implements Runnable { // =================================================================================================== Machine_TeslaCoil_1by1_LV.set( - new GT_MetaTileEntity_TeslaCoil(16000, "machine.tt.tesla.01", "Basic Tesla Transceiver", 1, 1) - .getStackForm(1L)); + new GT_MetaTileEntity_TeslaCoil( + BasicTeslaTransceiver1by1.ID, + "machine.tt.tesla.01", + "Basic Tesla Transceiver", + 1, + 1).getStackForm(1L)); Machine_TeslaCoil_1by1_MV.set( - new GT_MetaTileEntity_TeslaCoil(16001, "machine.tt.tesla.02", "Advanced Tesla Transceiver", 2, 1) - .getStackForm(1L)); + new GT_MetaTileEntity_TeslaCoil( + AdvancedTeslaTransceiver1by1.ID, + "machine.tt.tesla.02", + "Advanced Tesla Transceiver", + 2, + 1).getStackForm(1L)); Machine_TeslaCoil_1by1_HV.set( - new GT_MetaTileEntity_TeslaCoil(16002, "machine.tt.tesla.03", "Epyc Tesla Transceiver", 3, 1) - .getStackForm(1L)); + new GT_MetaTileEntity_TeslaCoil( + EpycTeslaTransceiver1by1.ID, + "machine.tt.tesla.03", + "Epyc Tesla Transceiver", + 3, + 1).getStackForm(1L)); Machine_TeslaCoil_1by1_EV.set( - new GT_MetaTileEntity_TeslaCoil(16003, "machine.tt.tesla.04", "Ultimate Power Tesla Transceiver", 4, 1) - .getStackForm(1L)); + new GT_MetaTileEntity_TeslaCoil( + UltimatePowerTeslaTransceiver1by1.ID, + "machine.tt.tesla.04", + "Ultimate Power Tesla Transceiver", + 4, + 1).getStackForm(1L)); Machine_TeslaCoil_1by1_IV.set( - new GT_MetaTileEntity_TeslaCoil(16004, "machine.tt.tesla.05", "Insane Tesla Transceiver", 5, 1) - .getStackForm(1L)); + new GT_MetaTileEntity_TeslaCoil( + InsaneTeslaTransceiver1by1.ID, + "machine.tt.tesla.05", + "Insane Tesla Transceiver", + 5, + 1).getStackForm(1L)); Machine_TeslaCoil_2by2_LV.set( - new GT_MetaTileEntity_TeslaCoil(16005, "machine.tt.tesla.01", "Basic Tesla Transceiver", 1, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_TeslaCoil( + BasicTeslaTransceiver2by2.ID, + "machine.tt.tesla.01", + "Basic Tesla Transceiver", + 1, + 4).getStackForm(1L)); Machine_TeslaCoil_2by2_MV.set( - new GT_MetaTileEntity_TeslaCoil(16006, "machine.tt.tesla.02", "Advanced Tesla Transceiver", 2, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_TeslaCoil( + AdvancedTeslaTransceiver2by2.ID, + "machine.tt.tesla.02", + "Advanced Tesla Transceiver", + 2, + 4).getStackForm(1L)); Machine_TeslaCoil_2by2_HV.set( - new GT_MetaTileEntity_TeslaCoil(16007, "machine.tt.tesla.03", "Epyc Tesla Transceiver", 3, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_TeslaCoil( + EpycTeslaTransceiver2by2.ID, + "machine.tt.tesla.03", + "Epyc Tesla Transceiver", + 3, + 4).getStackForm(1L)); Machine_TeslaCoil_2by2_EV.set( - new GT_MetaTileEntity_TeslaCoil(16008, "machine.tt.tesla.04", "Ultimate Power Tesla Transceiver", 4, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_TeslaCoil( + UltimatePowerTeslaTransceiver2by2.ID, + "machine.tt.tesla.04", + "Ultimate Power Tesla Transceiver", + 4, + 4).getStackForm(1L)); Machine_TeslaCoil_2by2_IV.set( - new GT_MetaTileEntity_TeslaCoil(16009, "machine.tt.tesla.05", "Insane Tesla Transceiver", 5, 4) - .getStackForm(1L)); + new GT_MetaTileEntity_TeslaCoil( + InsaneTeslaTransceiver2by2.ID, + "machine.tt.tesla.05", + "Insane Tesla Transceiver", + 5, + 4).getStackForm(1L)); Machine_TeslaCoil_3by3_LV.set( - new GT_MetaTileEntity_TeslaCoil(16010, "machine.tt.tesla.01", "Basic Tesla Transceiver", 1, 9) - .getStackForm(1L)); + new GT_MetaTileEntity_TeslaCoil( + BasicTeslaTransceiver3by3.ID, + "machine.tt.tesla.01", + "Basic Tesla Transceiver", + 1, + 9).getStackForm(1L)); Machine_TeslaCoil_3by3_MV.set( - new GT_MetaTileEntity_TeslaCoil(16011, "machine.tt.tesla.02", "Advanced Tesla Transceiver", 2, 9) - .getStackForm(1L)); + new GT_MetaTileEntity_TeslaCoil( + AdvancedTeslaTransceiver3by3.ID, + "machine.tt.tesla.02", + "Advanced Tesla Transceiver", + 2, + 9).getStackForm(1L)); Machine_TeslaCoil_3by3_HV.set( - new GT_MetaTileEntity_TeslaCoil(16012, "machine.tt.tesla.03", "Epyc Tesla Transceiver", 3, 9) - .getStackForm(1L)); + new GT_MetaTileEntity_TeslaCoil( + EpycTeslaTransceiver3by3.ID, + "machine.tt.tesla.03", + "Epyc Tesla Transceiver", + 3, + 9).getStackForm(1L)); Machine_TeslaCoil_3by3_EV.set( - new GT_MetaTileEntity_TeslaCoil(16013, "machine.tt.tesla.04", "Ultimate Power Tesla Transceiver", 4, 9) - .getStackForm(1L)); + new GT_MetaTileEntity_TeslaCoil( + UltimatePowerTeslaTransceiver3by3.ID, + "machine.tt.tesla.04", + "Ultimate Power Tesla Transceiver", + 4, + 9).getStackForm(1L)); Machine_TeslaCoil_3by3_IV.set( - new GT_MetaTileEntity_TeslaCoil(16014, "machine.tt.tesla.05", "Insane Tesla Transceiver", 5, 9) - .getStackForm(1L)); + new GT_MetaTileEntity_TeslaCoil( + InsaneTeslaTransceiver3by3.ID, + "machine.tt.tesla.05", + "Insane Tesla Transceiver", + 5, + 9).getStackForm(1L)); Machine_TeslaCoil_4by4_LV.set( - new GT_MetaTileEntity_TeslaCoil(16015, "machine.tt.tesla.01", "Basic Tesla Transceiver", 1, 16) - .getStackForm(1L)); + new GT_MetaTileEntity_TeslaCoil( + BasicTeslaTransceiver4by4.ID, + "machine.tt.tesla.01", + "Basic Tesla Transceiver", + 1, + 16).getStackForm(1L)); Machine_TeslaCoil_4by4_MV.set( - new GT_MetaTileEntity_TeslaCoil(16016, "machine.tt.tesla.02", "Advanced Tesla Transceiver", 2, 16) - .getStackForm(1L)); + new GT_MetaTileEntity_TeslaCoil( + AdvancedTeslaTransceiver4by4.ID, + "machine.tt.tesla.02", + "Advanced Tesla Transceiver", + 2, + 16).getStackForm(1L)); Machine_TeslaCoil_4by4_HV.set( - new GT_MetaTileEntity_TeslaCoil(16017, "machine.tt.tesla.03", "Epyc Tesla Transceiver", 3, 16) - .getStackForm(1L)); + new GT_MetaTileEntity_TeslaCoil( + EpycTeslaTransceiver4by4.ID, + "machine.tt.tesla.03", + "Epyc Tesla Transceiver", + 3, + 16).getStackForm(1L)); Machine_TeslaCoil_4by4_EV.set( - new GT_MetaTileEntity_TeslaCoil(16018, "machine.tt.tesla.04", "Ultimate Power Tesla Transceiver", 4, 16) - .getStackForm(1L)); + new GT_MetaTileEntity_TeslaCoil( + UltimatePowerTeslaTransceiver4by4.ID, + "machine.tt.tesla.04", + "Ultimate Power Tesla Transceiver", + 4, + 16).getStackForm(1L)); Machine_TeslaCoil_4by4_IV.set( - new GT_MetaTileEntity_TeslaCoil(16019, "machine.tt.tesla.05", "Insane Tesla Transceiver", 5, 16) - .getStackForm(1L)); + new GT_MetaTileEntity_TeslaCoil( + InsaneTeslaTransceiver4by4.ID, + "machine.tt.tesla.05", + "Insane Tesla Transceiver", + 5, + 16).getStackForm(1L)); // =================================================================================================== // Debug Stuff // =================================================================================================== Machine_DebugPollutor.set( - new GT_MetaTileEntity_DebugPollutor(15495, "debug.tt.pollutor", "Debug Pollution Generator", 14) - .getStackForm(1)); + new GT_MetaTileEntity_DebugPollutor( + DebugPollutionGenerator.ID, + "debug.tt.pollutor", + "Debug Pollution Generator", + 14).getStackForm(1)); hatch_CreativeData.set( - new GT_MetaTileEntity_Hatch_CreativeData(15496, "debug.tt.data", "Debug Data Hatch", 14).getStackForm(1)); + new GT_MetaTileEntity_Hatch_CreativeData(DebugDataHatch.ID, "debug.tt.data", "Debug Data Hatch", 14) + .getStackForm(1)); hatch_CreativeMaintenance.set( new GT_MetaTileEntity_Hatch_CreativeMaintenance( - 15497, + AutoTapingMaintenanceHatch.ID, "debug.tt.maintenance", "Auto-Taping Maintenance Hatch", 14).getStackForm(1L)); Machine_DebugGenny.set( - new GT_MetaTileEntity_DebugPowerGenerator(15498, "debug.tt.genny", "Debug Power Generator", 14) - .getStackForm(1L)); + new GT_MetaTileEntity_DebugPowerGenerator( + DebugPowerGenerator.ID, + "debug.tt.genny", + "Debug Power Generator", + 14).getStackForm(1L)); Machine_DebugWriter.set( - new GT_MetaTileEntity_DebugStructureWriter(15499, "debug.tt.writer", "Debug Structure Writer", 14) - .getStackForm(1L)); + new GT_MetaTileEntity_DebugStructureWriter( + DebugStructureWriter.ID, + "debug.tt.writer", + "Debug Structure Writer", + 14).getStackForm(1L)); UnusedStuff.set(new ItemStack(Blocks.air)); hatch_CreativeUncertainty.set( - new GT_MetaTileEntity_Hatch_CreativeUncertainty(15510, "debug.tt.certain", "Uncertainty Resolution", 14) - .getStackForm(1)); + new GT_MetaTileEntity_Hatch_CreativeUncertainty( + UncertaintyResolution.ID, + "debug.tt.certain", + "Uncertainty Resolution", + 14).getStackForm(1)); // =================================================================================================== // MetaTE init diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java index 97facf1046..ab73cba63e 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java @@ -9,6 +9,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +@Deprecated public class GT_MetaTileEntity_WetTransformer extends GT_MetaTileEntity_TT_Transformer { public GT_MetaTileEntity_WetTransformer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { diff --git a/src/main/java/common/recipeLoaders/AssemblyLine.java b/src/main/java/common/recipeLoaders/AssemblyLine.java index d48de45d58..bc19db42ab 100644 --- a/src/main/java/common/recipeLoaders/AssemblyLine.java +++ b/src/main/java/common/recipeLoaders/AssemblyLine.java @@ -1,10 +1,9 @@ package common.recipeLoaders; +import static goodgenerator.loader.Loaders.huiCircuit; import static gregtech.api.enums.Mods.Avaritia; import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.EternalSingularity; -import static gregtech.api.enums.Mods.GTPlusPlus; -import static gregtech.api.enums.Mods.GoodGenerator; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.UniversalSingularities; import static gregtech.api.util.GT_RecipeBuilder.HOURS; @@ -13,6 +12,7 @@ import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeConstants.AssemblyLine; import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM; import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME; +import static gtPlusPlus.core.material.ELEMENT.STANDALONE.HYPOGEN; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; @@ -95,7 +95,7 @@ public class AssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.InfinityCatalyst, 6), ItemList.Field_Generator_ZPM.get(16), ItemList.Field_Generator_UV.get(4), - GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 2), + new ItemStack(huiCircuit, 4, 2), GT_ModHandler.getModItem(UniversalSingularities.ID, "universal.tinkersConstruct.singularity", 1, 4)) .fluidInputs(Materials.CrystallinePinkSlime.getMolten(4320), new FluidStack(radoxPoly, 2880)) .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 8)) @@ -113,10 +113,10 @@ public class AssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 6), GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 3), ItemList.EnergisedTesseract.get(1), - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemRotorHypogen", 6), + HYPOGEN.getRotor(6), ItemList.Field_Generator_UHV.get(16), ItemList.Field_Generator_UEV.get(4), - GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 3), + new ItemStack(huiCircuit, 4, 3), GT_ModHandler.getModItem(UniversalSingularities.ID, "universal.tinkersConstruct.singularity", 1, 4)) .fluidInputs(Materials.MelodicAlloy.getMolten(5760), new FluidStack(radoxPoly, 3456)) .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 9)) @@ -138,8 +138,8 @@ public class AssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.rotor, MaterialsUEVplus.SpaceTime, 6), ItemList.Field_Generator_UEV.get(16), ItemList.Field_Generator_UIV.get(4), - GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 4), - GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 4), + new ItemStack(huiCircuit, 4, 4), + new ItemStack(huiCircuit, 4, 4), GT_ModHandler.getModItem(EnderIO.ID, "itemBasicCapacitor", 64, 6), GT_ModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 1)) .fluidInputs(Materials.StellarAlloy.getMolten(7200), new FluidStack(radoxPoly, 4608)) diff --git a/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java b/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java index 7e20cb4ee2..c71e0c07b9 100644 --- a/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java +++ b/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java @@ -1,7 +1,8 @@ package common.recipeLoaders; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gtPlusPlus.core.material.ELEMENT.STANDALONE.DRAGON_METAL; +import static gtPlusPlus.core.material.ELEMENT.STANDALONE.HYPOGEN; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; @@ -61,8 +62,7 @@ public class ResearchableAssemblyLine implements Runnable { 32, new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 4), GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 24), - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleHypogen", 32), - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleHypogen", 32), + HYPOGEN.getPlateDouble(32), HYPOGEN.getPlateDouble(32), new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, @@ -88,8 +88,7 @@ public class ResearchableAssemblyLine implements Runnable { 64, new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 4), GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 24), - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleDragonblood", 32), - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleDragonblood", 32), + DRAGON_METAL.getPlateDouble(32), DRAGON_METAL.getPlateDouble(32), new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, diff --git a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java index 9ae0b911a7..cfc57ccf21 100644 --- a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java +++ b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java @@ -172,7 +172,8 @@ public class Research { new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 256), new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 128))) }); ItemStack broad = new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6); - if (NewHorizonsCoreMod.isModLoaded()) broad = GT_ModHandler.getModItem("dreamcraft", "item.ArcaneSlate", 1); + if (NewHorizonsCoreMod.isModLoaded()) + broad = GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ArcaneSlate", 1); GregTech_API.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_BLANK", "Upgrade your generator", @@ -316,7 +317,8 @@ public class Research { new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 128))), "research.ESSENTIA_UPGRADE_UNSTABLE.page.1", "research.ESSENTIA_UPGRADE_UNSTABLE.page.2" }); ItemStack meatDust = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1); - if (NewHorizonsCoreMod.isModLoaded()) meatDust = GT_ModHandler.getModItem("dreamcraft", "GTNHBioItems", 1, 2); + if (NewHorizonsCoreMod.isModLoaded()) + meatDust = GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "GTNHBioItems", 1, 2); GregTech_API.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_VICTUS", "Essentia: VICTUS", @@ -515,21 +517,21 @@ public class Research { "research.ESSENTIA_UPGRADE_ELECTRIC.page.1" }); ItemStack nodeLinkDevice = ThaumicBases.isModLoaded() - ? GT_ModHandler.getModItem("thaumicbases", "nodeLinker", 1, 0) + ? GT_ModHandler.getModItem(ThaumicBases.ID, "nodeLinker", 1, 0) : new ItemStack(ConfigBlocks.blockStoneDevice, 1, 11); ItemStack alchemicalFurnace = ThaumicBases.isModLoaded() - ? GT_ModHandler.getModItem("thaumicbases", "advAlchFurnace", 1, 0) + ? GT_ModHandler.getModItem(ThaumicBases.ID, "advAlchFurnace", 1, 0) : new ItemStack(ConfigBlocks.blockStoneDevice, 1, 0); ItemStack nitor = ThaumicTinkerer.isModLoaded() - ? GT_ModHandler.getModItem("ThaumicTinkerer", "brightNitor", 1, 0) + ? GT_ModHandler.getModItem(ThaumicTinkerer.ID, "brightNitor", 1, 0) : new ItemStack(ConfigItems.itemResource, 1, 1); - ItemStack alchemicalBoiler = Automagy.isModLoaded() ? GT_ModHandler.getModItem("Automagy", "blockBoiler", 1, 0) + ItemStack alchemicalBoiler = Automagy.isModLoaded() ? GT_ModHandler.getModItem(Automagy.ID, "blockBoiler", 1, 0) : new ItemStack(ConfigBlocks.blockStoneDevice, 1, 1); ItemStack essentiaLocus = Automagy.isModLoaded() - ? GT_ModHandler.getModItem("Automagy", "blockEssentiaLocus", 1, 0) + ? GT_ModHandler.getModItem(Automagy.ID, "blockEssentiaLocus", 1, 0) : new ItemStack(ConfigBlocks.blockJar, 1, 1); ItemStack thauminiteBlock = ThaumicBases.isModLoaded() - ? GT_ModHandler.getModItem("thaumicbases", "thauminiteBlock", 1, 0) + ? GT_ModHandler.getModItem(ThaumicBases.ID, "thauminiteBlock", 1, 0) : new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 4); GregTech_API.sThaumcraftCompat .addResearch( @@ -613,10 +615,10 @@ public class Research { if (ThaumicEnergistics.isModLoaded()) { ItemStack essentiaPump = WitchingGadgets.isModLoaded() - ? GT_ModHandler.getModItem("WitchingGadgets", "WG_MetalDevice", 1, 0) + ? GT_ModHandler.getModItem(WitchingGadgets.ID, "WG_MetalDevice", 1, 0) : new ItemStack(ConfigBlocks.blockTube, 1, 4); ItemStack inter = ThaumicTinkerer.isModLoaded() - ? GT_ModHandler.getModItem("ThaumicTinkerer", "interface", 1, 0) + ? GT_ModHandler.getModItem(ThaumicTinkerer.ID, "interface", 1, 0) : new ItemStack(ConfigItems.itemResource, 1, 15); GregTech_API.sThaumcraftCompat.addResearch( "ESSENTIA_OUTPUT_HATCH_ME", @@ -642,7 +644,7 @@ public class Research { ItemRefer.Essentia_Output_Hatch.get(1), new ItemStack[] { GT_ModHandler - .getModItem("thaumicenergistics", "thaumicenergistics.block.essentia.provider", 1), + .getModItem(ThaumicEnergistics.ID, "thaumicenergistics.block.essentia.provider", 1), new ItemStack(ConfigBlocks.blockEssentiaReservoir, 1, 0), essentiaPump, inter, }, ItemRefer.Essentia_Output_Hatch_ME.get(1), 8, diff --git a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java index b4195c13f1..79787fa567 100644 --- a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java @@ -4,11 +4,11 @@ import static goodgenerator.api.recipe.GoodGeneratorRecipeMaps.naquadahFuelRefin import static goodgenerator.api.recipe.GoodGeneratorRecipeMaps.naquadahReactorFuels; import static goodgenerator.main.GG_Config_Loader.NaquadahFuelTime; import static goodgenerator.main.GG_Config_Loader.NaquadahFuelVoltage; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static gregtech.api.util.GT_RecipeConstants.LNG_BASIC_OUTPUT; import static gregtech.api.util.GT_RecipeConstants.NFR_COIL_TIER; +import static gtPlusPlus.core.material.ELEMENT.STANDALONE.CHRONOMATIC_GLASS; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -21,7 +21,6 @@ import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.material.ELEMENT; @@ -75,7 +74,7 @@ public class FuelRecipeLoader { GT_Values.RA.stdBuilder() .itemInputs( MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 8), - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustChromaticGlass", 9), + CHRONOMATIC_GLASS.getDust(9), ItemRefer.High_Density_Uranium.get(2), ItemRefer.High_Density_Plutonium.get(1)) .fluidInputs( diff --git a/src/main/java/goodgenerator/loader/IDs_GoodGenerator.java b/src/main/java/goodgenerator/loader/IDs_GoodGenerator.java deleted file mode 100644 index a6dc54e3e1..0000000000 --- a/src/main/java/goodgenerator/loader/IDs_GoodGenerator.java +++ /dev/null @@ -1,46 +0,0 @@ -package goodgenerator.loader; - -public enum IDs_GoodGenerator { - - DieselGeneratorEV(1113), - DieselGeneratorIV(1114), - MultiNqGenerator(12732), - FuelRefineFactory(16999), - PipeIncoloy903(30995), - UniversalChemicalFuelEngine(32001), - LargeEssentiaGenerator(32002), - NeutronAcceleratorULV(32003), - NeutronAcceleratorLV(32004), - NeutronAcceleratorMV(32005), - NeutronAcceleratorHV(32006), - NeutronAcceleratorEV(32007), - NeutronAcceleratorIV(32008), - NeutronAcceleratorLuV(32009), - NeutronAcceleratorZPM(32010), - NeutronAcceleratorUV(32011), - NeutronSensor(32012), - NeutronActivator(32013), - YottaFluidTank(32014), - YottaHatch(32015), - SupercriticalFluidTurbine(32016), - ExtremeHeatExchanger(32017), - PreciseAssembler(32018), - LargeFusionComputer1(32019), - LargeFusionComputer2(32020), - LargeFusionComputer3(32021), - LargeFusionComputer4(32022), - LargeFusionComputer5(32023), - LargeEssentiaSmeltery(32024), - CoolantTower(32025), - ComponentAssemblyLine(32026), - WireSignalium(32749), - WireLumiium(32737), - - ; - - public final int ID; - - IDs_GoodGenerator(int ID) { - this.ID = ID; - } -} diff --git a/src/main/java/goodgenerator/loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java index 51f0202aa1..d72ee2fabb 100644 --- a/src/main/java/goodgenerator/loader/Loaders.java +++ b/src/main/java/goodgenerator/loader/Loaders.java @@ -53,6 +53,7 @@ import goodgenerator.util.CrackRecipeAdder; import goodgenerator.util.MaterialFix; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; +import gregtech.api.enums.MetaTileEntityIDs; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.render.TextureFactory; @@ -266,19 +267,19 @@ public class Loaders { // public static Item Isotope = new NuclearMetaItemGenerator(); public static void GTMetaTileRegister() { - Loaders.MAR = new MultiNqGenerator(IDs_GoodGenerator.MultiNqGenerator.ID, "NaG", "Large Naquadah Reactor") + Loaders.MAR = new MultiNqGenerator(MetaTileEntityIDs.MultiNqGenerator.ID, "NaG", "Large Naquadah Reactor") .getStackForm(1L); - Loaders.FRF = new FuelRefineFactory(IDs_GoodGenerator.FuelRefineFactory.ID, "FRF", "Naquadah Fuel Refinery") + Loaders.FRF = new FuelRefineFactory(MetaTileEntityIDs.FuelRefineFactory.ID, "FRF", "Naquadah Fuel Refinery") .getStackForm(1L); Loaders.UCFE = new UniversalChemicalFuelEngine( - IDs_GoodGenerator.UniversalChemicalFuelEngine.ID, + MetaTileEntityIDs.UniversalChemicalFuelEngine.ID, "UniversalChemicalFuelEngine", "Universal Chemical Fuel Engine").getStackForm(1L); - int[] neutronAcceleratorIDs = new int[] { IDs_GoodGenerator.NeutronAcceleratorULV.ID, - IDs_GoodGenerator.NeutronAcceleratorLV.ID, IDs_GoodGenerator.NeutronAcceleratorMV.ID, - IDs_GoodGenerator.NeutronAcceleratorHV.ID, IDs_GoodGenerator.NeutronAcceleratorEV.ID, - IDs_GoodGenerator.NeutronAcceleratorIV.ID, IDs_GoodGenerator.NeutronAcceleratorLuV.ID, - IDs_GoodGenerator.NeutronAcceleratorZPM.ID, IDs_GoodGenerator.NeutronAcceleratorUV.ID, }; + int[] neutronAcceleratorIDs = new int[] { MetaTileEntityIDs.NeutronAcceleratorULV.ID, + MetaTileEntityIDs.NeutronAcceleratorLV.ID, MetaTileEntityIDs.NeutronAcceleratorMV.ID, + MetaTileEntityIDs.NeutronAcceleratorHV.ID, MetaTileEntityIDs.NeutronAcceleratorEV.ID, + MetaTileEntityIDs.NeutronAcceleratorIV.ID, MetaTileEntityIDs.NeutronAcceleratorLuV.ID, + MetaTileEntityIDs.NeutronAcceleratorZPM.ID, MetaTileEntityIDs.NeutronAcceleratorUV.ID, }; for (int i = 0; i < 9; i++) { Loaders.NeutronAccelerators[i] = new NeutronAccelerator( neutronAcceleratorIDs[i], @@ -286,67 +287,67 @@ public class Loaders { "Neutron Accelerator " + GT_Values.VN[i], i).getStackForm(1L); } - Loaders.NS = new NeutronSensor(IDs_GoodGenerator.NeutronSensor.ID, "Neutron Sensor", "Neutron Sensor", 5) + Loaders.NS = new NeutronSensor(MetaTileEntityIDs.NeutronSensor.ID, "Neutron Sensor", "Neutron Sensor", 5) .getStackForm(1L); Loaders.NA = new NeutronActivator( - IDs_GoodGenerator.NeutronActivator.ID, + MetaTileEntityIDs.NeutronActivator.ID, "NeutronActivator", "Neutron Activator").getStackForm(1L); - Loaders.YFT = new YottaFluidTank(IDs_GoodGenerator.YottaFluidTank.ID, "YottaFluidTank", "YOTTank") + Loaders.YFT = new YottaFluidTank(MetaTileEntityIDs.YottaFluidTank.ID, "YottaFluidTank", "YOTTank") .getStackForm(1L); - Loaders.YFH = new YOTTAHatch(IDs_GoodGenerator.YottaHatch.ID, "YottaFluidTankHatch", "YOTHatch", 5) + Loaders.YFH = new YOTTAHatch(MetaTileEntityIDs.YottaHatch.ID, "YottaFluidTankHatch", "YOTHatch", 5) .getStackForm(1L); Loaders.SCTurbine = new SupercriticalFluidTurbine( - IDs_GoodGenerator.SupercriticalFluidTurbine.ID, + MetaTileEntityIDs.SupercriticalFluidTurbine.ID, "SupercriticalSteamTurbine", "SC Steam Turbine").getStackForm(1L); Loaders.XHE = new ExtremeHeatExchanger( - IDs_GoodGenerator.ExtremeHeatExchanger.ID, + MetaTileEntityIDs.ExtremeHeatExchanger.ID, "ExtremeHeatExchanger", "Extreme Heat Exchanger").getStackForm(1L); Loaders.PA = new PreciseAssembler( - IDs_GoodGenerator.PreciseAssembler.ID, + MetaTileEntityIDs.PreciseAssembler.ID, "PreciseAssembler", "Precise Auto-Assembler MT-3662").getStackForm(1L); Loaders.LFC[0] = new LargeFusionComputer1( - IDs_GoodGenerator.LargeFusionComputer1.ID, + MetaTileEntityIDs.LargeFusionComputer1.ID, "LargeFusionComputer1", "Compact Fusion Computer MK-I Prototype").getStackForm(1); Loaders.LFC[1] = new LargeFusionComputer2( - IDs_GoodGenerator.LargeFusionComputer2.ID, + MetaTileEntityIDs.LargeFusionComputer2.ID, "LargeFusionComputer2", "Compact Fusion Computer MK-II").getStackForm(1L); Loaders.LFC[2] = new LargeFusionComputer3( - IDs_GoodGenerator.LargeFusionComputer3.ID, + MetaTileEntityIDs.LargeFusionComputer3.ID, "LargeFusionComputer3", "Compact Fusion Computer MK-III").getStackForm(1L); Loaders.LFC[3] = new LargeFusionComputer4( - IDs_GoodGenerator.LargeFusionComputer4.ID, + MetaTileEntityIDs.LargeFusionComputer4.ID, "LargeFusionComputer4", "Compact Fusion Computer MK-IV Prototype").getStackForm(1L); Loaders.LFC[4] = new LargeFusionComputer5( - IDs_GoodGenerator.LargeFusionComputer5.ID, + MetaTileEntityIDs.LargeFusionComputer5.ID, "LargeFusionComputer5", "Compact Fusion Computer MK-V").getStackForm(1L); Loaders.Generator_Diesel[0] = new DieselGenerator( - IDs_GoodGenerator.DieselGeneratorEV.ID, + MetaTileEntityIDs.DieselGeneratorEV.ID, "basicgenerator.diesel.tier.04", "Turbo Supercharging Combustion Generator", 4).getStackForm(1L); Loaders.Generator_Diesel[1] = new DieselGenerator( - IDs_GoodGenerator.DieselGeneratorIV.ID, + MetaTileEntityIDs.DieselGeneratorIV.ID, "basicgenerator.diesel.tier.05", "Ultimate Chemical Energy Releaser", 5).getStackForm(1L); - Loaders.CT = new CoolantTower(IDs_GoodGenerator.CoolantTower.ID, "CoolantTower", "Coolant Tower") + Loaders.CT = new CoolantTower(MetaTileEntityIDs.CoolantTower.ID, "CoolantTower", "Coolant Tower") .getStackForm(1L); Loaders.CompAssline = new ComponentAssemblyLine( - IDs_GoodGenerator.ComponentAssemblyLine.ID, + MetaTileEntityIDs.ComponentAssemblyLine.ID, "ComponentAssemblyLine", "Component Assembly Line").getStackForm(1L); - CrackRecipeAdder.registerPipe(IDs_GoodGenerator.PipeIncoloy903.ID, MyMaterial.incoloy903, 15000, 8000, true); - CrackRecipeAdder.registerWire(IDs_GoodGenerator.WireSignalium.ID, MyMaterial.signalium, 12, 131072, 16, true); - CrackRecipeAdder.registerWire(IDs_GoodGenerator.WireLumiium.ID, MyMaterial.lumiium, 8, 524288, 64, true); + CrackRecipeAdder.registerPipe(MetaTileEntityIDs.PipeIncoloy903.ID, MyMaterial.incoloy903, 15000, 8000, true); + CrackRecipeAdder.registerWire(MetaTileEntityIDs.WireSignalium.ID, MyMaterial.signalium, 12, 131072, 16, true); + CrackRecipeAdder.registerWire(MetaTileEntityIDs.WireLumiium.ID, MyMaterial.lumiium, 8, 524288, 64, true); } public static void Register() { @@ -416,11 +417,11 @@ public class Loaders { GameRegistry.registerTileEntity(EssentiaOutputHatch.class, "EssentiaOutputHatch"); GameRegistry.registerTileEntity(EssentiaOutputHatch_ME.class, "EssentiaOutputHatch_ME"); Loaders.LEG = new LargeEssentiaGenerator( - IDs_GoodGenerator.LargeEssentiaGenerator.ID, + MetaTileEntityIDs.LargeEssentiaGenerator.ID, "LargeEssentiaGenerator", "Large Essentia Generator - Marked for Deprecation").getStackForm(1L); Loaders.LES = new LargeEssentiaSmeltery( - IDs_GoodGenerator.LargeEssentiaSmeltery.ID, + MetaTileEntityIDs.LargeEssentiaSmeltery.ID, "LargeEssentiaSmeltery", "Large Essentia Smeltery").getStackForm(1L); essentiaHatch = new TEBlock("essentiaHatch", new String[] { GoodGenerator.MOD_ID + ":essentiaHatch" }, 1); diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java index d6f1682da9..261ecc69cc 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader.java @@ -1044,7 +1044,7 @@ public class RecipeLoader { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Multifiberglass_Elite.get(1), - GT_ModHandler.getModItem("dreamcraft", "item.EngravedGoldChip", 16), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedGoldChip", 16), ItemList.Circuit_Chip_SoC2.get(8), ItemList.Circuit_Chip_NOR.get(32), MyMaterial.signalium.get(OrePrefixes.bolt, 32), @@ -1059,7 +1059,7 @@ public class RecipeLoader { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Multifiberglass_Elite.get(1), - GT_ModHandler.getModItem("dreamcraft", "item.EngravedGoldChip", 16), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedGoldChip", 16), ItemList.Circuit_Chip_SoC2.get(8), ItemList.Circuit_Chip_NOR.get(32), MyMaterial.signalium.get(OrePrefixes.bolt, 32), diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java index 472612c901..e7411f3c6c 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java @@ -4,7 +4,9 @@ import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getItemC import static goodgenerator.api.recipe.GoodGeneratorRecipeMaps.neutronActivatorRecipes; import static goodgenerator.api.recipe.GoodGeneratorRecipeMaps.preciseAssemblerRecipes; import static goodgenerator.util.MyRecipeAdder.computeRangeNKE; -import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.Avaritia; +import static gregtech.api.enums.Mods.GalacticraftMars; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; @@ -244,7 +246,7 @@ public class RecipeLoader_02 { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hatch_Output_IV.get(1), - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 440), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 440), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CertusQuartz, 8), GT_Utility.getIntegratedCircuit(1)) .fluidInputs(Materials.Plastic.getMolten(144)) @@ -344,7 +346,7 @@ public class RecipeLoader_02 { ItemList.Electric_Pump_HV.get(8), ItemList.Quantum_Tank_LV.get(1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmium, 8), - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 1L, 6), + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 1L, 6), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polycaprolactam, 32)) .fluidInputs(new FluidStack(solderIndalloy, 2304), Materials.Lubricant.getFluid(4000)) .itemOutputs(ItemRefer.Fluid_Storage_Core_T3.get(1)) @@ -360,7 +362,7 @@ public class RecipeLoader_02 { ItemList.Electric_Pump_EV.get(8), ItemList.Quantum_Tank_LV.get(4), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 8), - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 4L, 6), + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 4L, 6), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.StyreneButadieneRubber, 64), GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 64)) .fluidInputs(new FluidStack(solderIndalloy, 18432), Materials.Lubricant.getFluid(16000)) @@ -377,7 +379,7 @@ public class RecipeLoader_02 { ItemList.Electric_Pump_IV.get(8), ItemList.Quantum_Tank_HV.get(8), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 8), - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 16L, 6), + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 16L, 6), GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Polycaprolactam, 24), GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Titanium, 64)) .fluidInputs( @@ -398,7 +400,7 @@ public class RecipeLoader_02 { ItemList.Quantum_Tank_EV.get(16), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 16), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 16), - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6), + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 64L, 6), ItemList.Machine_IV_Compressor.get(64)) .fluidInputs( Materials.Draconium.getMolten(2304), @@ -413,9 +415,9 @@ public class RecipeLoader_02 { .metadata(RESEARCH_ITEM, ItemRefer.Fluid_Storage_Core_T6.get(1)) .metadata(RESEARCH_TIME, 4 * HOURS + 30 * MINUTES) .itemInputs( - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6), + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 64L, 6), ItemList.Electric_Pump_ZPM.get(8), - GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 1L, 0), + GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 1L, 0), ItemList.Quantum_Tank_EV.get(32), GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 8), GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.InfinityCatalyst, 8), @@ -433,9 +435,9 @@ public class RecipeLoader_02 { .metadata(RESEARCH_ITEM, ItemRefer.Fluid_Storage_Core_T7.get(1)) .metadata(RESEARCH_TIME, 9 * HOURS) .itemInputs( - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6), + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 64L, 6), ItemList.Electric_Pump_UV.get(8), - GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 2L, 0), + GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 2L, 0), ItemList.Quantum_Tank_EV.get(64), GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 16), GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 24), @@ -453,9 +455,9 @@ public class RecipeLoader_02 { .metadata(RESEARCH_ITEM, ItemRefer.Fluid_Storage_Core_T8.get(1)) .metadata(RESEARCH_TIME, 180 * HOURS) .itemInputs( - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6), + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 64L, 6), ItemList.Electric_Pump_UHV.get(8), - GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 2L, 0), + GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 2L, 0), ItemList.Quantum_Tank_IV.get(8), GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 32), GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 36), @@ -474,9 +476,9 @@ public class RecipeLoader_02 { .metadata(RESEARCH_ITEM, ItemRefer.Fluid_Storage_Core_T9.get(1)) .metadata(RESEARCH_TIME, 360 * HOURS) .itemInputs( - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6), + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 64L, 6), ItemList.Electric_Pump_UEV.get(8), - GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 4L, 0), + GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 4L, 0), ItemList.Quantum_Tank_IV.get(16), GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 32), GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.CosmicNeutronium, 24), @@ -1194,7 +1196,7 @@ public class RecipeLoader_02 { GT_Values.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T1.get(2), - GT_ModHandler.getModItem("dreamcraft", "item.EngravedDiamondCrystalChip", 8), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedDiamondCrystalChip", 8), ItemList.Circuit_Chip_NAND.get(16), GT_ModHandler.getIC2Item("reactorVentCore", 1L, 1)) .itemOutputs(ItemRefer.HiC_T2.get(1)) @@ -1211,7 +1213,7 @@ public class RecipeLoader_02 { GT_Values.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T1.get(2), - GT_ModHandler.getModItem("dreamcraft", "item.EngravedDiamondCrystalChip", 8), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedDiamondCrystalChip", 8), ItemList.Circuit_Chip_NAND.get(16), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Aluminium, 2)) .itemOutputs(ItemRefer.HiC_T2.get(1)) @@ -1262,7 +1264,7 @@ public class RecipeLoader_02 { GT_Values.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T3.get(2), - GT_ModHandler.getModItem("dreamcraft", "item.EngravedEnergyChip", 8), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedEnergyChip", 8), ItemList.Circuit_Chip_QuantumCPU.get(16), GT_ModHandler.getIC2Item("reactorVentGold", 1L, 1)) .itemOutputs(ItemRefer.HiC_T4.get(1)) @@ -1279,7 +1281,7 @@ public class RecipeLoader_02 { GT_Values.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T3.get(2), - GT_ModHandler.getModItem("dreamcraft", "item.EngravedEnergyChip", 8), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedEnergyChip", 8), ItemList.Circuit_Chip_QuantumCPU.get(16), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.EnergeticAlloy, 2)) .itemOutputs(ItemRefer.HiC_T4.get(1)) @@ -1296,7 +1298,7 @@ public class RecipeLoader_02 { GT_Values.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T4.get(2), - GT_ModHandler.getModItem("dreamcraft", "item.EngravedManyullynCrystalChip", 8), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedManyullynCrystalChip", 8), ItemList.Circuit_Chip_BioCPU.get(1), Ic2Items.reactorVentSpread) .itemOutputs(ItemRefer.HiC_T5.get(1)) @@ -1313,7 +1315,7 @@ public class RecipeLoader_02 { GT_Values.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T4.get(2), - GT_ModHandler.getModItem("dreamcraft", "item.EngravedManyullynCrystalChip", 8), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedManyullynCrystalChip", 8), ItemList.Circuit_Chip_BioCPU.get(1), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenCarbide, 2)) .itemOutputs(ItemRefer.HiC_T5.get(1)) @@ -1510,10 +1512,7 @@ public class RecipeLoader_02 { // Compact MK4 Fusion Coil GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.3", 3, 13), - ItemRefer.HiC_T5.get(1), - GT_ModHandler.getModItem(GTPlusPlus.ID, "item.itemBufferCore4", 1)) + .itemInputs(GregtechItemList.Casing_Fusion_Internal.get(3), ItemRefer.HiC_T5.get(1), CI.getEnergyCore(4, 1)) .itemOutputs(ItemRefer.Compact_Fusion_Coil_T3.get(1)) .fluidInputs( FluidRegistry.getFluidStack("molten.energycrystal", 1152), diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java index b0e48a46bb..a27c5ee43b 100644 --- a/src/main/java/gregtech/api/enums/GT_Values.java +++ b/src/main/java/gregtech/api/enums/GT_Values.java @@ -201,65 +201,7 @@ public class GT_Values { * most of the time I don't know what kind of Data Type the "null" stands for */ public static final FluidStack NF = null; - /** - * MOD ID Strings, since they are very common Parameters. - */ - @Deprecated - public static final String MOD_ID = "gregtech"; - @Deprecated - public static final String MOD_ID_IC2 = "IC2"; - @Deprecated - public static final String MOD_ID_NC = "IC2NuclearControl"; - @Deprecated - public static final String MOD_ID_TC = "Thaumcraft"; - @Deprecated - public static final String MOD_ID_TF = "TwilightForest"; - @Deprecated - public static final String MOD_ID_RC = "Railcraft"; - @Deprecated - public static final String MOD_ID_TE = "ThermalExpansion"; - @Deprecated - public static final String MOD_ID_AE = "appliedenergistics2"; - @Deprecated - public static final String MOD_ID_TFC = "terrafirmacraft"; - @Deprecated - public static final String MOD_ID_PFAA = "PFAAGeologica"; - @Deprecated - public static final String MOD_ID_FR = "Forestry"; - @Deprecated - public static final String MOD_ID_HaC = "harvestcraft"; - @Deprecated - public static final String MOD_ID_APC = "AppleCore"; - @Deprecated - public static final String MOD_ID_MaCr = "magicalcrops"; - @Deprecated - public static final String MOD_ID_GaEn = "ganysend"; - @Deprecated - public static final String MOD_ID_GaSu = "ganyssurface"; - @Deprecated - public static final String MOD_ID_GaNe = "ganysnether"; - @Deprecated - public static final String MOD_ID_BC_SILICON = "BuildCraft|Silicon"; - @Deprecated - public static final String MOD_ID_BC_TRANSPORT = "BuildCraft|Transport"; - @Deprecated - public static final String MOD_ID_BC_FACTORY = "BuildCraft|Factory"; - @Deprecated - public static final String MOD_ID_BC_ENERGY = "BuildCraft|Energy"; - @Deprecated - public static final String MOD_ID_BC_BUILDERS = "BuildCraft|Builders"; - @Deprecated - public static final String MOD_ID_BC_CORE = "BuildCraft|Core"; - @Deprecated - public static final String MOD_ID_GC_CORE = "GalacticraftCore"; - @Deprecated - public static final String MOD_ID_GC_MARS = "GalacticraftMars"; - @Deprecated - public static final String MOD_ID_GC_PLANETS = "GalacticraftPlanets"; - @Deprecated - public static final String MOD_ID_DC = "dreamcraft"; - @Deprecated - public static final String MOD_ID_GTPP = "miscutils"; + /** * File Paths and Resource Paths */ @@ -522,6 +464,63 @@ public class GT_Values { */ public static boolean allow_broken_recipemap = false; /** + * This will set the blacklist for the world accelerator in TE mode. + */ + public static String[] blacklistedTileEntiyClassNamesForWA = new String[] { + "com.rwtema.extrautils.tileentity.enderquarry.TileEntityEnderQuarry", + "advsolar.common.tiles.TileEntityUltimateSolarPanel", "advsolar.common.tiles.TileEntitySolarPanel", + "advsolar.common.tiles.TileEntityQuantumSolarPanel", "advsolar.common.tiles.TileEntityHybridSolarPanel", + "advsolar.common.tiles.TileEntityAdvancedSolarPanel", "com.supsolpans.tiles.TileAdminSolarPanel", + "com.supsolpans.tiles.TilePhotonicSolarPanel", "com.supsolpans.tiles.TileSingularSolarPanel", + "com.supsolpans.tiles.TileSpectralSolarPanel", "emt.tile.solar.air.TileEntityAirSolar", + "emt.tile.solar.air.TileEntityDoubleAirSolar", "emt.tile.solar.air.TileEntityTripleAirSolar", + "emt.tile.solar.air.TileEntityQuadrupleAirSolar", "emt.tile.solar.air.TileEntityQuintupleAirSolar", + "emt.tile.solar.air.TileEntitySextupleAirSolar", "emt.tile.solar.air.TileEntitySeptupleAirSolar", + "emt.tile.solar.air.TileEntityOctupleAirSolar", "emt.tile.solar.compressed.TileEntityCompressedSolar", + "emt.tile.solar.compressed.TileEntityDoubleCompressedSolar", + "emt.tile.solar.compressed.TileEntityTripleCompressedSolar", + "emt.tile.solar.compressed.TileEntityQuadrupleAirSolar", + "emt.tile.solar.compressed.TileEntityQuintupleAirSolar", "emt.tile.solar.compressed.TileEntitySextupleAirSolar", + "emt.tile.solar.compressed.TileEntitySeptupleAirSolar", "emt.tile.solar.compressed.TileEntityOctupleAirSolar", + "emt.tile.solar.dark.TileEntityDarkSolar", "emt.tile.solar.dark.TileEntityDoubleDarkSolar", + "emt.tile.solar.dark.TileEntityTripleDarkSolar", "emt.tile.solar.dark.TileEntityQuadrupleAirSolar", + "emt.tile.solar.dark.TileEntityQuintupleAirSolar", "emt.tile.solar.dark.TileEntitySextupleAirSolar", + "emt.tile.solar.dark.TileEntitySeptupleAirSolar", "emt.tile.solar.dark.TileEntityOctupleAirSolar", + "emt.tile.solar.earth.TileEntityDoubleEarthSolar", "emt.tile.solar.earth.TileEntityEarthSolar", + "emt.tile.solar.earth.TileEntityTripleEarthSolar", "emt.tile.solar.earth.TileEntityQuadrupleAirSolar", + "emt.tile.solar.earth.TileEntityQuintupleAirSolar", "emt.tile.solar.earth.TileEntitySextupleAirSolar", + "emt.tile.solar.earth.TileEntitySeptupleAirSolar", "emt.tile.solar.earth.TileEntityOctupleAirSolar", + "emt.tile.solar.fire.TileEntityDoubleFireSolar", "emt.tile.solar.fire.TileEntityFireSolar", + "emt.tile.solar.fire.TileEntityTripleFireSolar", "emt.tile.solar.fire.TileEntityQuadrupleAirSolar", + "emt.tile.solar.fire.TileEntityQuintupleAirSolar", "emt.tile.solar.fire.TileEntitySextupleAirSolar", + "emt.tile.solar.fire.TileEntitySeptupleAirSolar", "emt.tile.solar.fire.TileEntityOctupleAirSolar", + "emt.tile.solar.order.TileEntityDoubleOrderSolar", "emt.tile.solar.order.TileEntityOrderSolar", + "emt.tile.solar.order.TileEntityTripleOrderSolar", "emt.tile.solar.order.TileEntityQuadrupleAirSolar", + "emt.tile.solar.order.TileEntityQuintupleAirSolar", "emt.tile.solar.order.TileEntitySextupleAirSolar", + "emt.tile.solar.order.TileEntitySeptupleAirSolar", "emt.tile.solar.order.TileEntityOctupleAirSolar", + "emt.tile.solar.water.TileEntityDoubleWaterSolar", "emt.tile.solar.water.TileEntityTripleWaterSolar", + "emt.tile.solar.water.TileEntityWaterSolar", "emt.tile.solar.water.TileEntityQuadrupleAirSolar", + "emt.tile.solar.water.TileEntityQuintupleAirSolar", "emt.tile.solar.water.TileEntitySextupleAirSolar", + "emt.tile.solar.water.TileEntitySeptupleAirSolar", "emt.tile.solar.water.TileEntityOctupleAirSolar", + "com.lulan.compactkineticgenerators.tileentity.TileCkgE", + "com.lulan.compactkineticgenerators.tileentity.TileCkgH", + "com.lulan.compactkineticgenerators.tileentity.TileCkgL", + "com.lulan.compactkineticgenerators.tileentity.TileCkgM", + "com.lulan.compactkineticgenerators.tileentity.TileCkwaE", + "com.lulan.compactkineticgenerators.tileentity.TileCkwaH", + "com.lulan.compactkineticgenerators.tileentity.TileCkwaL", + "com.lulan.compactkineticgenerators.tileentity.TileCkwaM", + "com.lulan.compactkineticgenerators.tileentity.TileCkwmE", + "com.lulan.compactkineticgenerators.tileentity.TileCkwmH", + "com.lulan.compactkineticgenerators.tileentity.TileCkwmL", + "com.lulan.compactkineticgenerators.tileentity.TileCkwmM", "com.supsolpans.tiles.TileSpectralSolarPanel", + "com.supsolpans.tiles.TileSingularSolarPanel", "com.supsolpans.tiles.TileAdminSolarPanel", + "com.supsolpans.tiles.TilePhotonicSolarPanel", "gtPlusPlus.core.tileentities.general.TileEntityFishTrap", + "gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest", + "net.bdew.gendustry.machines.apiary.TileApiary", "goodgenerator.blocks.tileEntity.EssentiaHatch", + "magicbees.tileentity.TileEntityApimancersDrainerCommon", + "magicbees.tileentity.TileEntityApimancersDrainerGT" }; + /** * This will set the percentage how much ReinforcedGlass is Allowed in Cleanroom Walls. */ public static float cleanroomGlass = 5.0f; diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 4ab1261289..77fc88bd30 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -917,7 +917,7 @@ public enum ItemList implements IItemContainer { Automation_ChestBuffer_LuV, Automation_ChestBuffer_ZPM, Automation_ChestBuffer_UV, - Automation_ChestBuffer_MAX, + Automation_ChestBuffer_UHV, Automation_SuperBuffer_ULV, Automation_SuperBuffer_LV, @@ -972,7 +972,7 @@ public enum ItemList implements IItemContainer { Hatch_Dynamo_LuV, Hatch_Dynamo_ZPM, Hatch_Dynamo_UV, - Hatch_Dynamo_MAX, + Hatch_Dynamo_UHV, Hatch_Energy_ULV, Hatch_Energy_LV, @@ -983,7 +983,7 @@ public enum ItemList implements IItemContainer { Hatch_Energy_LuV, Hatch_Energy_ZPM, Hatch_Energy_UV, - Hatch_Energy_MAX, + Hatch_Energy_UHV, Wireless_Hatch_Energy_ULV, Wireless_Hatch_Energy_LV, @@ -1026,7 +1026,7 @@ public enum ItemList implements IItemContainer { Hatch_Input_LuV, Hatch_Input_ZPM, Hatch_Input_UV, - Hatch_Input_MAX, + Hatch_Input_UHV, Hatch_Input_Multi_2x2_EV, Hatch_Input_Multi_2x2_IV, @@ -1060,7 +1060,7 @@ public enum ItemList implements IItemContainer { Hatch_Output_LuV, Hatch_Output_ZPM, Hatch_Output_UV, - Hatch_Output_MAX, + Hatch_Output_UHV, Hatch_Output_Bus_ULV, Hatch_Output_Bus_LV, @@ -1097,7 +1097,7 @@ public enum ItemList implements IItemContainer { Battery_Buffer_1by1_LuV, Battery_Buffer_1by1_ZPM, Battery_Buffer_1by1_UV, - Battery_Buffer_1by1_MAX, + Battery_Buffer_1by1_UHV, Battery_Buffer_2by2_ULV, Battery_Buffer_2by2_LV, @@ -1108,7 +1108,7 @@ public enum ItemList implements IItemContainer { Battery_Buffer_2by2_LuV, Battery_Buffer_2by2_ZPM, Battery_Buffer_2by2_UV, - Battery_Buffer_2by2_MAX, + Battery_Buffer_2by2_UHV, Battery_Buffer_3by3_ULV, Battery_Buffer_3by3_LV, @@ -1119,7 +1119,7 @@ public enum ItemList implements IItemContainer { Battery_Buffer_3by3_LuV, Battery_Buffer_3by3_ZPM, Battery_Buffer_3by3_UV, - Battery_Buffer_3by3_MAX, + Battery_Buffer_3by3_UHV, Battery_Buffer_4by4_ULV, Battery_Buffer_4by4_LV, @@ -1130,7 +1130,7 @@ public enum ItemList implements IItemContainer { Battery_Buffer_4by4_LuV, Battery_Buffer_4by4_ZPM, Battery_Buffer_4by4_UV, - Battery_Buffer_4by4_MAX, + Battery_Buffer_4by4_UHV, Locker_ULV, Locker_LV, @@ -1545,9 +1545,9 @@ public enum ItemList implements IItemContainer { Casing_Fusion, Casing_Fusion2, + Generator_Plasma_EV, Generator_Plasma_IV, Generator_Plasma_LuV, - Generator_Plasma_ZPMV, MagicEnergyConverter_LV, MagicEnergyConverter_MV, @@ -1749,7 +1749,7 @@ public enum ItemList implements IItemContainer { Battery_Charger_4by4_LuV, Battery_Charger_4by4_ZPM, Battery_Charger_4by4_UV, - Battery_Charger_4by4_MAX, + Battery_Charger_4by4_UHV, MicroTransmitter_HV, MicroTransmitter_EV, @@ -2075,7 +2075,450 @@ public enum ItemList implements IItemContainer { GlassQuarkContainment, BlockQuarkPipe, BlockQuarkReleaseChamber, - BlockQuarkContainmentCasing; + BlockQuarkContainmentCasing, + AcceleratorLV, + AcceleratorMV, + AcceleratorHV, + AcceleratorEV, + AcceleratorIV, + AcceleratorLuV, + AcceleratorZPM, + AcceleratorUV, + Hatch_Dynamo_UEV, + Hatch_Dynamo_UIV, + Hatch_Dynamo_UMV, + Hatch_Dynamo_UXV, + Hatch_Energy_UEV, + Hatch_Energy_UIV, + Hatch_Energy_UMV, + Hatch_Energy_UXV, + Hatch_Input_UEV, + Hatch_Input_UIV, + Hatch_Input_UMV, + Hatch_Input_UXV, + Hatch_Input_MAX, + Hatch_Output_UEV, + Hatch_Output_UIV, + Hatch_Output_UMV, + Hatch_Output_UXV, + Hatch_Output_MAX, + Battery_TurboCharger_4by4_ULV, + Battery_TurboCharger_4by4_LV, + Battery_TurboCharger_4by4_MV, + Battery_TurboCharger_4by4_HV, + Battery_TurboCharger_4by4_EV, + Battery_TurboCharger_4by4_IV, + Battery_TurboCharger_4by4_LuV, + Battery_TurboCharger_4by4_ZPM, + Battery_TurboCharger_4by4_UV, + Battery_TurboCharger_4by4_UHV, + Battery_Charger_4by4_UEV, + Battery_Charger_4by4_UIV, + Battery_Charger_4by4_UMV, + Battery_Charger_4by4_UXV, + Battery_Buffer_1by1_UEV, + Battery_Buffer_1by1_UIV, + Battery_Buffer_1by1_UMV, + Battery_Buffer_1by1_UXV, + Battery_Buffer_1by1_MAXV, + Battery_Buffer_2by2_UEV, + Battery_Buffer_2by2_UIV, + Battery_Buffer_2by2_UMV, + Battery_Buffer_2by2_UXV, + Battery_Buffer_2by2_MAXV, + Battery_Buffer_3by3_UEV, + Battery_Buffer_3by3_UIV, + Battery_Buffer_3by3_UMV, + Battery_Buffer_3by3_UXV, + Battery_Buffer_3by3_MAXV, + Battery_Buffer_4by4_UEV, + Battery_Buffer_4by4_UIV, + Battery_Buffer_4by4_UMV, + Battery_Buffer_4by4_UXV, + Battery_Buffer_4by4_MAXV, + Hull_UEV, + Hull_UIV, + Hull_UMV, + Hull_UXV, + Hull_MAXV, + // todo: move them from gt.blockcasingsNH in NHCore to here + Casing_UEV, + Casing_UIV, + Casing_UMV, + Casing_UXV, + Casing_MAXV, + // + Transformer_UEV_UHV, + Transformer_UIV_UEV, + Transformer_UMV_UIV, + Transformer_UXV_UMV, + Transformer_MAX_UXV, + WetTransformer_LV_ULV, + WetTransformer_MV_LV, + WetTransformer_HV_MV, + WetTransformer_EV_HV, + WetTransformer_IV_EV, + WetTransformer_LuV_IV, + WetTransformer_ZPM_LuV, + WetTransformer_UV_ZPM, + WetTransformer_UHV_UV, + WetTransformer_UEV_UHV, + WetTransformer_UIV_UEV, + WetTransformer_UMV_UIV, + WetTransformer_UXV_UMV, + WetTransformer_MAX_UXV, + Transformer_HA_UEV_UHV, + Transformer_HA_UIV_UEV, + Transformer_HA_UMV_UIV, + Transformer_HA_UXV_UMV, + Transformer_HA_MAX_UXV, + BatteryHull_EV, + BatteryHull_IV, + BatteryHull_LuV, + BatteryHull_ZPM, + BatteryHull_UV, + BatteryHull_UHV, + BatteryHull_UEV, + BatteryHull_UIV, + BatteryHull_UMV, + BatteryHull_UxV, + BatteryHull_EV_Full, + BatteryHull_IV_Full, + BatteryHull_LuV_Full, + BatteryHull_ZPM_Full, + BatteryHull_UV_Full, + BatteryHull_UHV_Full, + BatteryHull_UEV_Full, + BatteryHull_UIV_Full, + BatteryHull_UMV_Full, + BatteryHull_UxV_Full, + + Generator_Plasma_ZPMV, + Generator_Plasma_UV, + Generator_Plasma_UHV, + Generator_Plasma_UEV, + Generator_Plasma_UIV, + Generator_Plasma_UMV, + AlloySmelterLuV, + AlloySmelterZPM, + AlloySmelterUV, + AlloySmelterUHV, + AlloySmelterUEV, + AlloySmelterUIV, + AlloySmelterUMV, + AmplifabricatorLuV, + AmplifabricatorZPM, + AmplifabricatorUV, + AmplifabricatorUHV, + AmplifabricatorUEV, + AmplifabricatorUIV, + AmplifabricatorUMV, + ArcFurnaceLuV, + ArcFurnaceZPM, + ArcFurnaceUV, + ArcFurnaceUHV, + ArcFurnaceUEV, + ArcFurnaceUIV, + ArcFurnaceUMV, + AssemblingMachineLuV, + AssemblingMachineZPM, + AssemblingMachineUV, + AssemblingMachineUHV, + AssemblingMachineUEV, + AssemblingMachineUIV, + AssemblingMachineUMV, + AutoclaveLuV, + AutoclaveZPM, + AutoclaveUV, + AutoclaveUHV, + AutoclaveUEV, + AutoclaveUIV, + AutoclaveUMV, + BendingMachineLuV, + BendingMachineZPM, + BendingMachineUV, + BendingMachineUHV, + BendingMachineUEV, + BendingMachineUIV, + BendingMachineUMV, + BreweryLuV, + BreweryZPM, + BreweryUV, + BreweryUHV, + BreweryUEV, + BreweryUIV, + BreweryUMV, + CanningMachineLuV, + CanningMachineZPM, + CanningMachineUV, + CanningMachineUHV, + CanningMachineUEV, + CanningMachineUIV, + CanningMachineUMV, + CentrifugeLuV, + CentrifugeZPM, + CentrifugeUV, + CentrifugeUHV, + CentrifugeUEV, + CentrifugeUIV, + CentrifugeUMV, + ChemicalBathLuV, + ChemicalBathZPM, + ChemicalBathUV, + ChemicalBathUHV, + ChemicalBathUEV, + ChemicalBathUIV, + ChemicalBathUMV, + ChemicalReactorLuV, + ChemicalReactorZPM, + ChemicalReactorUV, + ChemicalReactorUHV, + ChemicalReactorUEV, + ChemicalReactorUIV, + ChemicalReactorUMV, + CircuitAssemblerUHV, + CircuitAssemblerUEV, + CircuitAssemblerUIV, + CircuitAssemblerUMV, + CircuitAssemblerUXV, + CircuitAssemblerMAX, + CompressorLuV, + CompressorZPM, + CompressorUV, + CompressorUHV, + CompressorUEV, + CompressorUIV, + CompressorUMV, + CuttingMachineLuV, + CuttingMachineZPM, + CuttingMachineUV, + CuttingMachineUHV, + CuttingMachineUEV, + CuttingMachineUIV, + CuttingMachineUMV, + DistilleryLuV, + DistilleryZPM, + DistilleryUV, + DistilleryUHV, + DistilleryUEV, + DistilleryUIV, + DistilleryUMV, + ElectricFurnaceLuV, + ElectricFurnaceZPM, + ElectricFurnaceUV, + ElectricFurnaceUHV, + ElectricFurnaceUEV, + ElectricFurnaceUIV, + ElectricFurnaceUMV, + ElectricOvenLuV, + ElectricOvenZPM, + ElectricOvenUV, + ElectricOvenUHV, + ElectricOvenUEV, + ElectricOvenUIV, + ElectricOvenUMV, + ElectrolyzerLuV, + ElectrolyzerZPM, + ElectrolyzerUV, + ElectrolyzerUHV, + ElectrolyzerUEV, + ElectrolyzerUIV, + ElectrolyzerUMV, + ElectromagneticSeparatorLuV, + ElectromagneticSeparatorZPM, + ElectromagneticSeparatorUV, + ElectromagneticSeparatorUHV, + ElectromagneticSeparatorUEV, + ElectromagneticSeparatorUIV, + ElectromagneticSeparatorUMV, + ExtractorLuV, + ExtractorZPM, + ExtractorUV, + ExtractorUHV, + ExtractorUEV, + ExtractorUIV, + ExtractorUMV, + ExtruderLuV, + ExtruderZPM, + ExtruderUV, + ExtruderUHV, + ExtruderUEV, + ExtruderUIV, + ExtruderUMV, + FermenterLuV, + FermenterZPM, + FermenterUV, + FermenterUHV, + FermenterUEV, + FermenterUIV, + FermenterUMV, + FluidCannerLuV, + FluidCannerZPM, + FluidCannerUV, + FluidCannerUHV, + FluidCannerUEV, + FluidCannerUIV, + FluidCannerUMV, + FluidExtractorLuV, + FluidExtractorZPM, + FluidExtractorUV, + FluidExtractorUHV, + FluidExtractorUEV, + FluidExtractorUIV, + FluidExtractorUMV, + FluidHeaterLuV, + FluidHeaterZPM, + FluidHeaterUV, + FluidHeaterUHV, + FluidHeaterUEV, + FluidHeaterUIV, + FluidHeaterUMV, + FluidSolidifierLuV, + FluidSolidifierZPM, + FluidSolidifierUV, + FluidSolidifierUHV, + FluidSolidifierUEV, + FluidSolidifierUIV, + FluidSolidifierUMV, + FormingPressLuV, + FormingPressZPM, + FormingPressUV, + FormingPressUHV, + FormingPressUEV, + FormingPressUIV, + FormingPressUMV, + ForgeHammerLuV, + ForgeHammerZPM, + ForgeHammerUV, + ForgeHammerUHV, + ForgeHammerUEV, + ForgeHammerUIV, + ForgeHammerUMV, + LatheLuV, + LatheZPM, + LatheUV, + LatheUHV, + LatheUEV, + LatheUIV, + LatheUMV, + PrecisionLaserEngraverLuV, + PrecisionLaserEngraverZPM, + PrecisionLaserEngraverUV, + PrecisionLaserEngraverUHV, + PrecisionLaserEngraverUEV, + PrecisionLaserEngraverUIV, + PrecisionLaserEngraverUMV, + MaceratorLuV, + MaceratorZPM, + MaceratorUV, + MaceratorUHV, + MaceratorUEV, + MaceratorUIV, + MaceratorUMV, + MassFabricatorLuV, + MassFabricatorZPM, + MassFabricatorUV, + MassFabricatorUHV, + MassFabricatorUEV, + MassFabricatorUIV, + MassFabricatorUMV, + MicrowaveLuV, + MicrowaveZPM, + MicrowaveUV, + MicrowaveUHV, + MicrowaveUEV, + MicrowaveUIV, + MicrowaveUMV, + MixerLuV, + MixerZPM, + MixerUV, + MixerUHV, + MixerUEV, + MixerUIV, + MixerUMV, + OreWashingPlantLuV, + OreWashingPlantZPM, + OreWashingPlantUV, + OreWashingPlantUHV, + OreWashingPlantUEV, + OreWashingPlantUIV, + OreWashingPlantUMV, + PlasmaArcFurnaceLuV, + PlasmaArcFurnaceZPM, + PlasmaArcFurnaceUV, + PlasmaArcFurnaceUHV, + PlasmaArcFurnaceUEV, + PlasmaArcFurnaceUIV, + PlasmaArcFurnaceUMV, + PolarizerLuV, + PolarizerZPM, + PolarizerUV, + PolarizerUHV, + PolarizerUEV, + PolarizerUIV, + PolarizerUMV, + RockBreakerLuV, + RockBreakerZPM, + RockBreakerUV, + RockBreakerUHV, + RockBreakerUEV, + RockBreakerUIV, + RockBreakerUMV, + RecyclerLuV, + RecyclerZPM, + RecyclerUV, + RecyclerUHV, + RecyclerUEV, + RecyclerUIV, + RecyclerUMV, + ReplicatorLuV, + ReplicatorZPM, + ReplicatorUV, + ReplicatorUHV, + ReplicatorUEV, + ReplicatorUIV, + ReplicatorUMV, + ScannerLuV, + ScannerZPM, + ScannerUV, + ScannerUHV, + ScannerUEV, + ScannerUIV, + ScannerUMV, + SiftingMachineLuV, + SiftingMachineZPM, + SiftingMachineUV, + SiftingMachineUHV, + SiftingMachineUEV, + SiftingMachineUIV, + SiftingMachineUMV, + SlicingMachineLuV, + SlicingMachineZPM, + SlicingMachineUV, + SlicingMachineUHV, + SlicingMachineUEV, + SlicingMachineUIV, + SlicingMachineUMV, + ThermalCentrifugeLuV, + ThermalCentrifugeZPM, + ThermalCentrifugeUV, + ThermalCentrifugeUHV, + ThermalCentrifugeUEV, + ThermalCentrifugeUIV, + ThermalCentrifugeUMV, + WiremillLuV, + WiremillZPM, + WiremillUV, + WiremillUHV, + WiremillUEV, + WiremillUIV, + WiremillUMV, + PumpLuV, + PumpZPM, + Automation_ChestBuffer_UEV, + Automation_ChestBuffer_UIV, + Automation_ChestBuffer_UMV, + Automation_ChestBuffer_UXV,; public static final ItemList[] DYE_ONLY_ITEMS = { Color_00, Color_01, Color_02, Color_03, Color_04, Color_05, Color_06, Color_07, Color_08, Color_09, Color_10, Color_11, Color_12, Color_13, Color_14, Color_15 }, @@ -2091,16 +2534,16 @@ public enum ItemList implements IItemContainer { MACHINE_HULLS = { Hull_ULV, Hull_LV, Hull_MV, Hull_HV, Hull_EV, Hull_IV, Hull_LuV, Hull_ZPM, Hull_UV, Hull_MAX }, HATCHES_DYNAMO = { Hatch_Dynamo_ULV, Hatch_Dynamo_LV, Hatch_Dynamo_MV, Hatch_Dynamo_HV, Hatch_Dynamo_EV, - Hatch_Dynamo_IV, Hatch_Dynamo_LuV, Hatch_Dynamo_ZPM, Hatch_Dynamo_UV, Hatch_Dynamo_MAX }, + Hatch_Dynamo_IV, Hatch_Dynamo_LuV, Hatch_Dynamo_ZPM, Hatch_Dynamo_UV, Hatch_Dynamo_UHV }, HATCHES_ENERGY = { Hatch_Energy_ULV, Hatch_Energy_LV, Hatch_Energy_MV, Hatch_Energy_HV, Hatch_Energy_EV, - Hatch_Energy_IV, Hatch_Energy_LuV, Hatch_Energy_ZPM, Hatch_Energy_UV, Hatch_Energy_MAX }, + Hatch_Energy_IV, Hatch_Energy_LuV, Hatch_Energy_ZPM, Hatch_Energy_UV, Hatch_Energy_UHV }, HATCHES_INPUT = { Hatch_Input_ULV, Hatch_Input_LV, Hatch_Input_MV, Hatch_Input_HV, Hatch_Input_EV, - Hatch_Input_IV, Hatch_Input_LuV, Hatch_Input_ZPM, Hatch_Input_UV, Hatch_Input_MAX }, + Hatch_Input_IV, Hatch_Input_LuV, Hatch_Input_ZPM, Hatch_Input_UV, Hatch_Input_UHV }, HATCHES_INPUT_BUS = { Hatch_Input_Bus_ULV, Hatch_Input_Bus_LV, Hatch_Input_Bus_MV, Hatch_Input_Bus_HV, Hatch_Input_Bus_EV, Hatch_Input_Bus_IV, Hatch_Input_Bus_LuV, Hatch_Input_Bus_ZPM, Hatch_Input_Bus_UV, Hatch_Input_Bus_MAX }, HATCHES_OUTPUT = { Hatch_Output_ULV, Hatch_Output_LV, Hatch_Output_MV, Hatch_Output_HV, Hatch_Output_EV, - Hatch_Output_IV, Hatch_Output_LuV, Hatch_Output_ZPM, Hatch_Output_UV, Hatch_Output_MAX }, + Hatch_Output_IV, Hatch_Output_LuV, Hatch_Output_ZPM, Hatch_Output_UV, Hatch_Output_UHV }, HATCHES_OUTPUT_BUS = { Hatch_Output_Bus_ULV, Hatch_Output_Bus_LV, Hatch_Output_Bus_MV, Hatch_Output_Bus_HV, Hatch_Output_Bus_EV, Hatch_Output_Bus_IV, Hatch_Output_Bus_LuV, Hatch_Output_Bus_ZPM, Hatch_Output_Bus_UV, Hatch_Output_Bus_MAX }, diff --git a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java index a81d0f902d..6772f4dc12 100644 --- a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java +++ b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java @@ -517,6 +517,8 @@ public enum MetaTileEntityIDs { COMBUSTION_GENERATOR_LV(1110), COMBUSTION_GENERATOR_MV(1111), COMBUSTION_GENERATOR_HV(1112), + DieselGeneratorEV(1113), + DieselGeneratorIV(1114), GAS_TURBINE_LV(1115), GAS_TURBINE_MV(1116), GAS_TURBINE_HV(1117), @@ -591,9 +593,9 @@ public enum MetaTileEntityIDs { FUSION_CONTROLLER_MKI(1193), FUSION_CONTROLLER_MKII(1194), FUSION_CONTROLLER_MKIII(1195), - PLASMA_GENERATOR_IV(1196), - PLASMA_GENERATOR_LuV(1197), - PLASMA_GENERATOR_ZPM(1198), + PLASMA_GENERATOR_EV(1196), + PLASMA_GENERATOR_IV(1197), + PLASMA_GENERATOR_LuV(1198), PROCESSING_ARRAY_CONTROLLER(1199), ADVANCED_SEISMIC_PROSPECTOR_LV(2102), ADVANCED_SEISMIC_PROSPECTOR_MV(2103), @@ -611,6 +613,7 @@ public enum MetaTileEntityIDs { INPUT_HATCH_ME(2717), INPUT_BUS_ME(2718), INDUSTRIAL_LASER_ENGRAVER_CONTROLLER(3004), + DraconicEvolutionFusionCrafterController(5001), CHEST_BUFFER_ULV(9230), CHEST_BUFFER_LV(9231), CHEST_BUFFER_MV(9232), @@ -697,12 +700,910 @@ public enum MetaTileEntityIDs { PURIFICATION_UNIT_DEGASIFIER(9412), HATCH_DEGASIFIER_CONTROL(9413), PURIFICATION_UNIT_PARTICLE_EXTRACTOR(9414), + PLASMA_GENERATOR_ZPM(10752), + PLASMA_GENERATOR_UV(10753), + ALLOY_SMELTER_LuV(10760), + ALLOY_SMELTER_ZPM(10761), + ALLOY_SMELTER_UV(10762), + ALLOY_SMELTER_UHV(10763), + ALLOY_SMELTER_UEV(10764), + ALLOY_SMELTER_UIV(10765), + ALLOY_SMELTER_UMV(10766), + MATTER_AMPLIFIER_LuV(10770), + MATTER_AMPLIFIER_ZPM(10771), + MATTER_AMPLIFIER_UV(10772), + MATTER_AMPLIFIER_UHV(10773), + MATTER_AMPLIFIER_UEV(10774), + MATTER_AMPLIFIER_UIV(10775), + MATTER_AMPLIFIER_UMV(10776), + ASSEMBLING_MACHINE_LuV(10780), + ASSEMBLING_MACHINE_ZPM(10781), + ASSEMBLING_MACHINE_UV(10782), + ASSEMBLING_MACHINE_UHV(10783), + ASSEMBLING_MACHINE_UEV(10784), + ASSEMBLING_MACHINE_UIV(10785), + ASSEMBLING_MACHINE_UMV(10786), + AUTOCLAVE_LuV(10790), + AUTOCLAVE_ZPM(10791), + AUTOCLAVE_UV(10792), + AUTOCLAVE_UHV(10793), + AUTOCLAVE_UEV(10794), + AUTOCLAVE_UIV(10795), + AUTOCLAVE_UMV(10796), + BENDING_MACHINE_LuV(10800), + BENDING_MACHINE_ZPM(10801), + BENDING_MACHINE_UV(10802), + BENDING_MACHINE_UHV(10803), + BENDING_MACHINE_UEV(10804), + BENDING_MACHINE_UIV(10805), + BENDING_MACHINE_UMV(10806), + COMPRESSOR_LuV(10810), + COMPRESSOR_ZPM(10811), + COMPRESSOR_UV(10812), + COMPRESSOR_UHV(10813), + COMPRESSOR_UEV(10814), + COMPRESSOR_UIV(10815), + COMPRESSOR_UMV(10816), + CUTTING_MACHINE_LuV(10820), + CUTTING_MACHINE_ZPM(10821), + CUTTING_MACHINE_UV(10822), + CUTTING_MACHINE_UHV(10823), + CUTTING_MACHINE_UEV(10824), + CUTTING_MACHINE_UIV(10825), + CUTTING_MACHINE_UMV(10826), + DISTILLERY_LuV(10830), + DISTILLERY_ZPM(10831), + DISTILLERY_UV(10832), + DISTILLERY_UHV(10833), + DISTILLERY_UEV(10834), + DISTILLERY_UIV(10835), + DISTILLERY_UMV(10836), + ELECTRIC_FURNACE_LuV(10840), + ELECTRIC_FURNACE_ZPM(10841), + ELECTRIC_FURNACE_UV(10842), + ELECTRIC_FURNACE_UHV(10843), + ELECTRIC_FURNACE_UEV(10844), + ELECTRIC_FURNACE_UIV(10845), + ELECTRIC_FURNACE_UMV(10846), + ELECTROLYZER_LuV(10850), + ELECTROLYZER_ZPM(10851), + ELECTROLYZER_UV(10852), + ELECTROLYZER_UHV(10853), + ELECTROLYZER_UEV(10854), + ELECTROLYZER_UIV(10855), + ELECTROLYZER_UMV(10856), + ELECTROMAGNETIC_SEPARATOR_LuV(10860), + ELECTROMAGNETIC_SEPARATOR_ZPM(10861), + ELECTROMAGNETIC_SEPARATOR_UV(10862), + ELECTROMAGNETIC_SEPARATOR_UHV(10863), + ELECTROMAGNETIC_SEPARATOR_UEV(10864), + ELECTROMAGNETIC_SEPARATOR_UIV(10865), + ELECTROMAGNETIC_SEPARATOR_UMV(10866), + EXTRACTOR_LuV(10870), + EXTRACTOR_ZPM(10871), + EXTRACTOR_UV(10872), + EXTRACTOR_UHV(10873), + EXTRACTOR_UEV(10874), + EXTRACTOR_UIV(10875), + EXTRACTOR_UMV(10876), + EXTRUDER_LuV(10880), + EXTRUDER_ZPM(10881), + EXTRUDER_UV(10882), + EXTRUDER_UHV(10883), + EXTRUDER_UEV(10884), + EXTRUDER_UIV(10885), + EXTRUDER_UMV(10886), + FLUID_SOLIDIFIER_LuV(10890), + FLUID_SOLIDIFIER_ZPM(10891), + FLUID_SOLIDIFIER_UV(10892), + FLUID_SOLIDIFIER_UHV(10893), + FLUID_SOLIDIFIER_UEV(10894), + FLUID_SOLIDIFIER_UIV(10895), + FLUID_SOLIDIFIER_UMV(10896), + FORMING_PRESS_LuV(10900), + FORMING_PRESS_ZPM(10901), + FORMING_PRESS_UV(10902), + FORMING_PRESS_UHV(10903), + FORMING_PRESS_UEV(10904), + FORMING_PRESS_UIV(10905), + FORMING_PRESS_UMV(10906), + FORGE_HAMMER_LuV(10910), + FORGE_HAMMER_ZPM(10911), + FORGE_HAMMER_UV(10912), + FORGE_HAMMER_UHV(10913), + FORGE_HAMMER_UEV(10914), + FORGE_HAMMER_UIV(10915), + FORGE_HAMMER_UMV(10916), + LATHE_LuV(10920), + LATHE_ZPM(10921), + LATHE_UV(10922), + LATHE_UHV(10923), + LATHE_UEV(10924), + LATHE_UIV(10925), + LATHE_UMV(10926), + PRECISION_LASER_ENGRAVER_LuV(10930), + PRECISION_LASER_ENGRAVER_ZPM(10931), + PRECISION_LASER_ENGRAVER_UV(10932), + PRECISION_LASER_ENGRAVER_UHV(10933), + PRECISION_LASER_ENGRAVER_UEV(10934), + PRECISION_LASER_ENGRAVER_UIV(10935), + PRECISION_LASER_ENGRAVER_UMV(10936), + MACERATOR_LuV(10940), + MACERATOR_ZPM(10941), + MACERATOR_UV(10942), + MACERATOR_UHV(10943), + MACERATOR_UEV(10944), + MACERATOR_UIV(10945), + MACERATOR_UMV(10946), + MATTER_FABRICATOR_LuV(10950), + MATTER_FABRICATOR_ZPM(10951), + MATTER_FABRICATOR_UV(10952), + MATTER_FABRICATOR_UHV(10953), + MATTER_FABRICATOR_UEV(10954), + MATTER_FABRICATOR_UIV(10955), + MATTER_FABRICATOR_UMV(10956), + MICROWAVE_LuV(10960), + MICROWAVE_ZPM(10961), + MICROWAVE_UV(10962), + MICROWAVE_UHV(10963), + MICROWAVE_UEV(10964), + MICROWAVE_UIV(10965), + MICROWAVE_UMV(10966), + ORE_WASHING_PLANT_LuV(10970), + ORE_WASHING_PLANT_ZPM(10971), + ORE_WASHING_PLANT_UV(10972), + ORE_WASHING_PLANT_UHV(10973), + ORE_WASHING_PLANT_UEV(10974), + ORE_WASHING_PLANT_UIV(10975), + ORE_WASHING_PLANT_UMV(10976), + POLARIZER_LuV(10980), + POLARIZER_ZPM(10981), + POLARIZER_UV(10982), + POLARIZER_UHV(10983), + POLARIZER_UEV(10984), + POLARIZER_UIV(10985), + POLARIZER_UMV(10986), + RECYCLER_LuV(10990), + RECYCLER_ZPM(10991), + RECYCLER_UV(10992), + RECYCLER_UHV(10993), + RECYCLER_UEV(10994), + RECYCLER_UIV(10995), + RECYCLER_UMV(10996), + MATTER_REPLICATOR_LuV(11000), + MATTER_REPLICATOR_ZPM(11001), + MATTER_REPLICATOR_UV(11002), + MATTER_REPLICATOR_UHV(11003), + MATTER_REPLICATOR_UEV(11004), + MATTER_REPLICATOR_UIV(11005), + MATTER_REPLICATOR_UMV(11006), + SCANNER_LuV(11010), + SCANNER_ZPM(11011), + SCANNER_UV(11012), + SCANNER_UHV(11013), + SCANNER_UEV(11014), + SCANNER_UIV(11015), + SCANNER_UMV(11016), + SIFTING_MACHINE_LuV(11020), + SIFTING_MACHINE_ZPM(11021), + SIFTING_MACHINE_UV(11022), + SIFTING_MACHINE_UHV(11023), + SIFTING_MACHINE_UEV(11024), + SIFTING_MACHINE_UIV(11025), + SIFTING_MACHINE_UMV(11026), + SLICING_MACHINE_LuV(11028), + SLICING_MACHINE_ZPM(11029), + SLICING_MACHINE_UV(11030), + SLICING_MACHINE_UHV(11033), + SLICING_MACHINE_UEV(11034), + SLICING_MACHINE_UIV(11035), + SLICING_MACHINE_UMV(11036), + THERMAL_CENTRIFUGE_LuV(11040), + THERMAL_CENTRIFUGE_ZPM(11041), + THERMAL_CENTRIFUGE_UV(11042), + THERMAL_CENTRIFUGE_UHV(11043), + THERMAL_CENTRIFUGE_UEV(11044), + THERMAL_CENTRIFUGE_UIV(11045), + THERMAL_CENTRIFUGE_UMV(11046), + WIREMILL_LuV(11050), + WIREMILL_ZPM(11051), + WIREMILL_UV(11052), + WIREMILL_UHV(11053), + WIREMILL_UEV(11054), + WIREMILL_UIV(11055), + WIREMILL_UMV(11056), + PUMP_LuV(11060), + PUMP_ZPM(11061), + ARC_FURNACE_LuV(11070), + ARC_FURNACE_ZPM(11071), + ARC_FURNACE_UV(11072), + ARC_FURNACE_UHV(11073), + ARC_FURNACE_UEV(11074), + ARC_FURNACE_UIV(11075), + ARC_FURNACE_UMV(11076), + CENTRIFUGE_LuV(11080), + CENTRIFUGE_ZPM(11081), + CENTRIFUGE_UV(11082), + CENTRIFUGE_UHV(11083), + CENTRIFUGE_UEV(11084), + CENTRIFUGE_UIV(11085), + CENTRIFUGE_UMV(11086), + PLASMA_ARC_FURNACE_LuV(11090), + PLASMA_ARC_FURNACE_ZPM(11091), + PLASMA_ARC_FURNACE_UV(11092), + PLASMA_ARC_FURNACE_UHV(11093), + PLASMA_ARC_FURNACE_UEV(11094), + PLASMA_ARC_FURNACE_UIV(11095), + PLASMA_ARC_FURNACE_UMV(11096), + WORLD_ACCELERATOR_LV(11100), + WORLD_ACCELERATOR_MV(11101), + WORLD_ACCELERATOR_HV(11102), + WORLD_ACCELERATOR_EV(11103), + WORLD_ACCELERATOR_IV(11104), + WORLD_ACCELERATOR_LuV(11105), + WORLD_ACCELERATOR_ZPM(11106), + WORLD_ACCELERATOR_UV(11107), + BREWERY_LuV(11120), + BREWERY_ZPM(11121), + BREWERY_UV(11122), + BREWERY_UHV(11123), + BREWERY_UEV(11124), + BREWERY_UIV(11125), + BREWERY_UMV(11126), + CANNING_MACHINE_LuV(11130), + CANNING_MACHINE_ZPM(11131), + CANNING_MACHINE_UV(11132), + CANNING_MACHINE_UHV(11133), + CANNING_MACHINE_UEV(11134), + CANNING_MACHINE_UIV(11135), + CANNING_MACHINE_UMV(11136), + CHEMICAL_BATH_LuV(11140), + CHEMICAL_BATH_ZPM(11141), + CHEMICAL_BATH_UV(11142), + CHEMICAL_BATH_UHV(11143), + CHEMICAL_BATH_UEV(11144), + CHEMICAL_BATH_UIV(11145), + CHEMICAL_BATH_UMV(11146), + CHEMICAL_REACTOR_LuV(11150), + CHEMICAL_REACTOR_ZPM(11151), + CHEMICAL_REACTOR_UV(11152), + CHEMICAL_REACTOR_UHV(11153), + CHEMICAL_REACTOR_UEV(11154), + CHEMICAL_REACTOR_UIV(11155), + CHEMICAL_REACTOR_UMV(11156), + FERMENTER_LuV(11170), + FERMENTER_ZPM(11171), + FERMENTER_UV(11172), + FERMENTER_UHV(11173), + FERMENTER_UEV(11174), + FERMENTER_UIV(11175), + FERMENTER_UMV(11176), + FLUID_CANNER_LuV(11180), + FLUID_CANNER_ZPM(11181), + FLUID_CANNER_UV(11182), + FLUID_CANNER_UHV(11183), + FLUID_CANNER_UEV(11184), + FLUID_CANNER_UIV(11185), + FLUID_CANNER_UMV(11186), + FLUID_EXTRACTOR_LuV(11190), + FLUID_EXTRACTOR_ZPM(11191), + FLUID_EXTRACTOR_UV(11192), + FLUID_EXTRACTOR_UHV(11193), + FLUID_EXTRACTOR_UEV(11194), + FLUID_EXTRACTOR_UIV(11195), + FLUID_EXTRACTOR_UMV(11196), + FLUID_HEATER_LuV(11200), + FLUID_HEATER_ZPM(11201), + FLUID_HEATER_UV(11202), + FLUID_HEATER_UHV(11203), + FLUID_HEATER_UEV(11204), + FLUID_HEATER_UIV(11205), + FLUID_HEATER_UMV(11206), + MIXER_LuV(11210), + MIXER_ZPM(11211), + MIXER_UV(11212), + MIXER_UHV(11213), + MIXER_UEV(11214), + MIXER_UIV(11215), + MIXER_UMV(11216), + TRANSFORMER_UEV_UHV(11220), + TRANSFORMER_UIV_UEV(11221), + TRANSFORMER_UMV_UIV(11222), + TRANSFORMER_UXV_UMV(11223), + TRANSFORMER_MAX_UXV(11224), + HULL_UEV(11230), + HULL_UIV(11231), + HULL_UMV(11232), + HULL_UXV(11233), + HULL_MAX(11234), + BATTERY_BUFFER_4_BY_4_UEV(11240), + BATTERY_BUFFER_4_BY_4_UIV(11241), + BATTERY_BUFFER_4_BY_4_UMV(11242), + BATTERY_BUFFER_4_BY_4_UXV(11243), + BATTERY_BUFFER_4_BY_4_MAX(11245), + BATTERY_BUFFER_3_BY_3_UEV(11250), + BATTERY_BUFFER_3_BY_3_UIV(11251), + BATTERY_BUFFER_3_BY_3_UMV(11252), + BATTERY_BUFFER_3_BY_3_UXV(11253), + BATTERY_BUFFER_3_BY_3_MAX(11255), + BATTERY_BUFFER_2_BY_2_UEV(11260), + BATTERY_BUFFER_2_BY_2_UIV(11261), + BATTERY_BUFFER_2_BY_2_UMV(11262), + BATTERY_BUFFER_2_BY_2_UXV(11263), + BATTERY_BUFFER_2_BY_2_MAX(11265), + BATTERY_BUFFER_1_BY_1_UEV(11270), + BATTERY_BUFFER_1_BY_1_UIV(11271), + BATTERY_BUFFER_1_BY_1_UMV(11272), + BATTERY_BUFFER_1_BY_1_UXV(11273), + BATTERY_BUFFER_1_BY_1_MAX(11275), + BATTERY_CHARGER_4_4_UEV(11280), + BATTERY_CHARGER_4_4_UIV(11281), + BATTERY_CHARGER_4_4_UMV(11282), + BATTERY_CHARGER_4_4_UXV(11283), + DYNAMO_HATCH_UEV(11290), + DYNAMO_HATCH_UIV(11291), + DYNAMO_HATCH_UMV(11292), + DYNAMO_HATCH_UXV(11293), + ENERGY_HATCH_UEV(11300), + ENERGY_HATCH_UIV(11301), + ENERGY_HATCH_UMV(11302), + ENERGY_HATCH_UXV(11303), + HIGH_AMP_TRANSFORMER_UIV_UEV(11910), + HIGH_AMP_TRANSFORMER_UMV_UIV(11911), + HIGH_AMP_TRANSFORMER_UXV_UMV(11912), + HIGH_AMP_TRANSFORMER_MAX_UXV(11913), + HIGH_AMP_TRANSFORMER_UEV_UHV(11989), + WET_TRANSFORMER_LV_ULV(12000), + WET_TRANSFORMER_MV_LV(12001), + WET_TRANSFORMER_HV_MV(12002), + WET_TRANSFORMER_EV_HV(12003), + WET_TRANSFORMER_IV_EV(12004), + WET_TRANSFORMER_LuV_IV(12005), + WET_TRANSFORMER_ZPM_LuV(12006), + WET_TRANSFORMER_UV_ZPM(12007), + WET_TRANSFORMER_UHV_UV(12008), + WET_TRANSFORMER_UEV_UHV(12009), + WET_TRANSFORMER_UIV_UEV(12010), + WET_TRANSFORMER_UMV_UIV(12011), + WET_TRANSFORMER_UXV_UMV(12012), + WET_TRANSFORMER_MAX_UXV(12013), + AIR_FILTER_CONTROLLER_T1(12020), + AIR_FILTER_CONTROLLER_T2(12021), + AIR_FILTER_CONTROLLER_T3(12022), + TURBO_CHARGER_ULV(12040), + TURBO_CHARGER_LV(12041), + TURBO_CHARGER_MV(12042), + TURBO_CHARGER_HV(12043), + TURBO_CHARGER_EV(12044), + TURBO_CHARGER_IV(12045), + TURBO_CHARGER_LuV(12046), + TURBO_CHARGER_ZPM(12047), + TURBO_CHARGER_UV(12048), + TURBO_CHARGER_UHV(12049), + CHEST_BUFFER_UEV(12060), + CHEST_BUFFER_UIV(12061), + CHEST_BUFFER_UMV(12062), + NAME_REMOVER(12070), + ROCK_BREAKER_LuV(12080), + ROCK_BREAKER_ZPM(12081), + ROCK_BREAKER_UV(12082), + ROCK_BREAKER_UHV(12083), + ROCK_BREAKER_UEV(12084), + ROCK_BREAKER_UIV(12085), + ROCK_BREAKER_UMV(12086), + CIRCUIT_ASSEMBLER_UHV(12090), + CIRCUIT_ASSEMBLER_UEV(12091), + CIRCUIT_ASSEMBLER_UIV(12092), + CIRCUIT_ASSEMBLER_UMV(12093), + CIRCUIT_ASSEMBLER_UXV(12094), + CIRCUIT_ASSEMBLER_MAX(12096), + INPUT_HATCH_UEV(12097), + INPUT_HATCH_UIV(12098), + INPUT_HATCH_UMV(12099), + INPUT_HATCH_UXV(12100), + INPUT_HATCH_MAX(12102), + OUTPUT_HATCH_UEV(12103), + OUTPUT_HATCH_UIV(12104), + OUTPUT_HATCH_UMV(12105), + OUTPUT_HATCH_UXV(12106), + OUTPUT_HATCH_MAX(12108), + LESU(12600), + EnergyDistributor_ULV(12601), + EnergyDistributor_LV(12602), + EnergyDistributor_MV(12603), + EnergyDistributor_HV(12604), + EnergyDistributor_EV(12605), + EnergyDistributor_IV(12606), + EnergyDistributor_LuV(12607), + EnergyDistributor_ZPM(12608), + EnergyDistributor_UV(12609), + EnergyDistributor_UHV(12610), + EnergyDistributor_UEV(12611), + EnergyDistributor_UIV(12612), + EnergyDistributor_UMV(12613), + EnergyDistributor_UXV(12614), + EnergyDistributor_MAX(12615), + Diode2A_ULV(12617), + Diode2A_LV(12618), + Diode2A_MV(12619), + Diode2A_HV(12620), + Diode2A_EV(12621), + Diode2A_IV(12622), + Diode2A_LuV(12623), + Diode2A_ZPM(12624), + Diode2A_UV(12625), + Diode2A_UHV(12626), + Diode2A_UEV(12627), + Diode2A_UIV(12628), + Diode2A_UMV(12629), + Diode2A_UXV(12630), + Diode2A_MAX(12631), + Diode4A_ULV(12633), + Diode4A_LV(12634), + Diode4A_MV(12635), + Diode4A_HV(12636), + Diode4A_EV(12637), + Diode4A_IV(12638), + Diode4A_LuV(12639), + Diode4A_ZPM(12640), + Diode4A_UV(12641), + Diode4A_UHV(12642), + Diode4A_UEV(12643), + Diode4A_UIV(12644), + Diode4A_UMV(12645), + Diode4A_UXV(12646), + Diode4A_MAX(12647), + Diode8A_ULV(12649), + Diode8A_LV(12650), + Diode8A_MV(12651), + Diode8A_HV(12652), + Diode8A_EV(12653), + Diode8A_IV(12654), + Diode8A_LuV(12655), + Diode8A_ZPM(12656), + Diode8A_UV(12657), + Diode8A_UHV(12658), + Diode8A_UEV(12659), + Diode8A_UIV(12660), + Diode8A_UMV(12661), + Diode8A_UXV(12662), + Diode8A_MAX(12663), + Diode12A_ULV(12665), + Diode12A_LV(12666), + Diode12A_MV(12667), + Diode12A_HV(12668), + Diode12A_EV(12669), + Diode12A_IV(12670), + Diode12A_LuV(12671), + Diode12A_ZPM(12672), + Diode12A_UV(12673), + Diode12A_UHV(12674), + Diode12A_UEV(12675), + Diode12A_UIV(12676), + Diode12A_UMV(12677), + Diode12A_UXV(12678), + Diode12A_MAX(12679), + Diode16A_ULV(12681), + Diode16A_LV(12682), + Diode16A_MV(12683), + Diode16A_HV(12684), + Diode16A_EV(12685), + Diode16A_IV(12686), + Diode16A_LuV(12687), + Diode16A_ZPM(12688), + Diode16A_UV(12689), + Diode16A_UHV(12690), + Diode16A_UEV(12691), + Diode16A_UIV(12692), + Diode16A_UMV(12693), + Diode16A_UXV(12694), + Diode16A_MAX(12695), + ManualTrafo(12697), + Windmill(12698), + BioLab_HV(12699), + BioLab_EV(12700), + BioLab_IV(12701), + BioLab_LuV(12702), + BioLab_ZPM(12703), + BioLab_UV(12704), + BioLab_UHV(12705), + BioLab_UEV(12706), + BioLab_UIV(12707), + BioLab_UMV(12708), + BioLab_UXV(12709), + BioLab_MAX(12710), + BioVat(12712), + RadioHatch_HV(12713), + RadioHatch_EV(12714), + RadioHatch_IV(12715), + RadioHatch_LuV(12716), + RadioHatch_ZPM(12717), + RadioHatch_UV(12718), + RadioHatch_UHV(12719), + RadioHatch_UEV(12720), + RadioHatch_UIV(12721), + RadioHatch_UMV(12722), + RadioHatch_UXV(12723), + RadioHatch_MAX(12724), + AcidGeneratorMV(12726), + AcidGeneratorHV(12727), + AcidGeneratorEV(12728), + DeepEarthHeatingPump(12729), + MegaBlastFurnace(12730), + MegaVacuumFreezer(12731), + MultiNqGenerator(12732), + ThoriumHighTemperatureReactor(12733), + ElectricImplosionCompressor(12734), + CircuitAssemblyLine(12735), + CompressedFluidHatch(12736), + GiantOutputHatch(12737), + MegaDistillationTower(12738), + VoidMinerIII(12739), + VoidMinerII(12740), + VoidMinerI(12741), + LowPowerLaserPipe(12742), + LowPowerLaserConverter32A_EV(12743), + LowPowerLaserConverter32A_IV(12744), + LowPowerLaserConverter32A_LuV(12745), + LowPowerLaserConverter32A_ZPM(12746), + LowPowerLaserConverter64A_EV(12747), + LowPowerLaserConverter64A_IV(12748), + LowPowerLaserConverter64A_LuV(12749), + LowPowerLaserConverter64A_ZPM(12750), + LowPowerLaserConverter96A_EV(12751), + LowPowerLaserConverter96A_IV(12752), + LowPowerLaserConverter96A_LuV(12753), + LowPowerLaserConverter96A_ZPM(12754), + LowPowerLaserConverter128A_EV(12755), + LowPowerLaserConverter128A_IV(12756), + LowPowerLaserConverter128A_LuV(12757), + LowPowerLaserConverter128A_ZPM(12758), + LowPowerLaserTargetHatch32A_EV(12759), + LowPowerLaserTargetHatch32A_IV(12760), + LowPowerLaserTargetHatch32A_LuV(12761), + LowPowerLaserTargetHatch32A_ZPM(12762), + LowPowerLaserTargetHatch64A_EV(12763), + LowPowerLaserTargetHatch64A_IV(12764), + LowPowerLaserTargetHatch64A_LuV(12765), + LowPowerLaserTargetHatch64A_ZPM(12766), + LowPowerLaserTargetHatch96A_EV(12767), + LowPowerLaserTargetHatch96A_IV(12768), + LowPowerLaserTargetHatch96A_LuV(12769), + LowPowerLaserTargetHatch96A_ZPM(12770), + LowPowerLaserTargetHatch128A_EV(12771), + LowPowerLaserTargetHatch128A_IV(12772), + LowPowerLaserTargetHatch128A_LuV(12773), + LowPowerLaserTargetHatch128A_ZPM(12774), + LowPowerLaserSourceHatch32A_EV(12775), + LowPowerLaserSourceHatch32A_IV(12776), + LowPowerLaserSourceHatch32A_LuV(12777), + LowPowerLaserSourceHatch32A_ZPM(12778), + LowPowerLaserSourceHatch64A_EV(12779), + LowPowerLaserSourceHatch64A_IV(12780), + LowPowerLaserSourceHatch64A_LuV(12781), + LowPowerLaserSourceHatch64A_ZPM(12782), + LowPowerLaserSourceHatch96A_EV(12783), + LowPowerLaserSourceHatch96A_IV(12784), + LowPowerLaserSourceHatch96A_LuV(12785), + LowPowerLaserSourceHatch96A_ZPM(12786), + LowPowerLaserSourceHatch128A_EV(12787), + LowPowerLaserSourceHatch128A_IV(12788), + LowPowerLaserSourceHatch128A_LuV(12789), + LowPowerLaserSourceHatch128A_ZPM(12790), + HighTemperatureGasCooledReactor(12791), + ExtremeIndustrialGreenhouseController(12792), + AcidGeneratorLV(12793), + HumongousInputHatch(12799), + CreativeScanner(12800), sofc1(13101), sofc2(13102), tfft(13104), lsc(13106), tfftHatch(13109), WORMHOLE_GENERATOR_CONTROLLER(13115), + MegaChemicalReactor(13366), + MegaOilCracker(13367), + ExtremeEntityCrusherController(14201), + ExtremeIndustrialApiaryController(14202), + EV4AWirelessEnergyHatch(15065), + EV16AWirelessEnergyHatch(15066), + EV64AWirelessEnergyHatch(15067), + IV4AWirelessEnergyHatch(15068), + IV16AWirelessEnergyHatch(15069), + IV64AWirelessEnergyHatch(15070), + LuV4AWirelessEnergyHatch(15071), + LuV16AWirelessEnergyHatch(15072), + LuV64AWirelessEnergyHatch(15073), + ZPM4AWirelessEnergyHatch(15074), + ZPM16AWirelessEnergyHatch(15075), + ZPM64AWirelessEnergyHatch(15076), + UV4AWirelessEnergyHatch(15077), + UV16AWirelessEnergyHatch(15078), + UV64AWirelessEnergyHatch(15079), + UHV4AWirelessEnergyHatch(15080), + UHV16AWirelessEnergyHatch(15081), + UHV64AWirelessEnergyHatch(15082), + UEV4AWirelessEnergyHatch(15083), + UEV16AWirelessEnergyHatch(15084), + UEV64AWirelessEnergyHatch(15085), + UIV4AWirelessEnergyHatch(15086), + UIV16AWirelessEnergyHatch(15087), + UIV64AWirelessEnergyHatch(15088), + UMV4AWirelessEnergyHatch(15089), + UMV16AWirelessEnergyHatch(15090), + UMV64AWirelessEnergyHatch(15091), + UXV4AWirelessEnergyHatch(15092), + UXV16AWirelessEnergyHatch(15093), + UXV64AWirelessEnergyHatch(15094), + MAX4AWirelessEnergyHatch(15095), + MAX16AWirelessEnergyHatch(15096), + MAX64AWirelessEnergyHatch(15097), + IV4AEnergyHatch(15100), + LuV4AEnergyHatch(15101), + ZPM4AEnergyHatch(15102), + UV4AEnergyHatch(15103), + UHV4AEnergyHatch(15104), + UEV4AEnergyHatch(15105), + UIV4AEnergyHatch(15106), + UMV4AEnergyHatch(15107), + UXV4AEnergyHatch(15108), + EV4AEnergyHatch(15109), + IV16AEnergyHatch(15110), + LuV16AEnergyHatch(15111), + ZPM16AEnergyHatch(15112), + UV16AEnergyHatch(15113), + UHV16AEnergyHatch(15114), + UEV16AEnergyHatch(15115), + UIV16AEnergyHatch(15116), + UMV16AEnergyHatch(15117), + UXV16AEnergyHatch(15118), + EV16AEnergyHatch(15119), + IV64AEnergyHatch(15120), + LuV64AEnergyHatch(15121), + ZPM64AEnergyHatch(15122), + UV64AEnergyHatch(15123), + UHV64AEnergyHatch(15124), + UEV64AEnergyHatch(15125), + UIV64AEnergyHatch(15126), + UMV64AEnergyHatch(15127), + UXV64AEnergyHatch(15128), + EV64AEnergyHatch(15129), + IV256AtLaserTargetHatch(15130), + LuV256AtLaserTargetHatch(15131), + ZPM256AtLaserTargetHatch(15132), + UV256AtLaserTargetHatch(15133), + UHV256AtLaserTargetHatch(15134), + UEV256AtLaserTargetHatch(15135), + UIV256AtLaserTargetHatch(15136), + UMV256AtLaserTargetHatch(15137), + UXV256AtLaserTargetHatch(15138), + IV1024AtLaserTargetHatch(15140), + LuV1024AtLaserTargetHatch(15141), + ZPM1024AtLaserTargetHatch(15142), + UV1024AtLaserTargetHatch(15143), + UHV1024AtLaserTargetHatch(15144), + UEV1024AtLaserTargetHatch(15145), + UIV1024AtLaserTargetHatch(15146), + UMV1024AtLaserTargetHatch(15147), + UXV1024AtLaserTargetHatch(15148), + IV4096AtLaserTargetHatch(15150), + LuV4096AtLaserTargetHatch(15151), + ZPM4096AtLaserTargetHatch(15152), + UV4096AtLaserTargetHatch(15153), + UHV4096AtLaserTargetHatch(15154), + UEV4096AtLaserTargetHatch(15155), + UIV4096AtLaserTargetHatch(15156), + UMV4096AtLaserTargetHatch(15157), + UXV4096AtLaserTargetHatch(15158), + IV16384AtLaserTargetHatch(15160), + LuV16384AtLaserTargetHatch(15161), + ZPM16384AtLaserTargetHatch(15162), + UV16384AtLaserTargetHatch(15163), + UHV16384AtLaserTargetHatch(15164), + UEV16384AtLaserTargetHatch(15165), + UIV16384AtLaserTargetHatch(15166), + UMV16384AtLaserTargetHatch(15167), + UXV16384AtLaserTargetHatch(15168), + IV65536AtLaserTargetHatch(15170), + LuV65536AtLaserTargetHatch(15171), + ZPM65536AtLaserTargetHatch(15172), + UV65536AtLaserTargetHatch(15173), + UHV65536AtLaserTargetHatch(15174), + UEV65536AtLaserTargetHatch(15175), + UIV65536AtLaserTargetHatch(15176), + UMV65536AtLaserTargetHatch(15177), + UXV65536AtLaserTargetHatch(15178), + IV262144AtLaserTargetHatch(15180), + LuV262144AtLaserTargetHatch(15181), + ZPM262144AtLaserTargetHatch(15182), + UV262144AtLaserTargetHatch(15183), + UHV262144AtLaserTargetHatch(15184), + UEV262144AtLaserTargetHatch(15185), + UIV262144AtLaserTargetHatch(15186), + UMV262144AtLaserTargetHatch(15187), + UXV262144AtLaserTargetHatch(15188), + IV1048576AtLaserTargetHatch(15190), + LuV1048576AtLaserTargetHatch(15191), + ZPM1048576AtLaserTargetHatch(15192), + UV1048576AtLaserTargetHatch(15193), + UHV1048576AtLaserTargetHatch(15194), + UEV1048576AtLaserTargetHatch(15195), + UIV1048576AtLaserTargetHatch(15196), + UMV1048576AtLaserTargetHatch(15197), + UXV1048576AtLaserTargetHatch(15198), + LegendaryLaserTargetHatch(15199), + IV4ADynamoHatch(15200), + LuV4ADynamoHatch(15201), + ZPM4ADynamoHatch(15202), + UV4ADynamoHatch(15203), + UHV4ADynamoHatch(15204), + UEV4ADynamoHatch(15205), + UIV4ADynamoHatch(15206), + UMV4ADynamoHatch(15207), + UXV4ADynamoHatch(15208), + EV4ADynamoHatch(15209), + IV16ADynamoHatch(15210), + LuV16ADynamoHatch(15211), + ZPM16ADynamoHatch(15212), + UV16ADynamoHatch(15213), + UHV16ADynamoHatch(15214), + UEV16ADynamoHatch(15215), + UIV16ADynamoHatch(15216), + UMV16ADynamoHatch(15217), + UXV16ADynamoHatch(15218), + EV16ADynamoHatch(15219), + IV64ADynamoHatch(15220), + LuV64ADynamoHatch(15221), + ZPM64ADynamoHatch(15222), + UV64ADynamoHatch(15223), + UHV64ADynamoHatch(15224), + UEV64ADynamoHatch(15225), + UIV64ADynamoHatch(15226), + UMV64ADynamoHatch(15227), + UXV64ADynamoHatch(15228), + EV64ADynamoHatch(15229), + IV256AtLaserSourceHatch(15230), + LuV256AtLaserSourceHatch(15231), + ZPM256AtLaserSourceHatch(15232), + UV256AtLaserSourceHatch(15233), + UHV256AtLaserSourceHatch(15234), + UEV256AtLaserSourceHatch(15235), + UIV256AtLaserSourceHatch(15236), + UMV256AtLaserSourceHatch(15237), + UXV256AtLaserSourceHatch(15238), + IV1024AtLaserSourceHatch(15240), + LuV1024AtLaserSourceHatch(15241), + ZPM1024AtLaserSourceHatch(15242), + UV1024AtLaserSourceHatch(15243), + UHV1024AtLaserSourceHatch(15244), + UEV1024AtLaserSourceHatch(15245), + UIV1024AtLaserSourceHatch(15246), + UMV1024AtLaserSourceHatch(15247), + UXV1024AtLaserSourceHatch(15248), + IV4096AtLaserSourceHatch(15250), + LuV4096AtLaserSourceHatch(15251), + ZPM4096AtLaserSourceHatch(15252), + UV4096AtLaserSourceHatch(15253), + UHV4096AtLaserSourceHatch(15254), + UEV4096AtLaserSourceHatch(15255), + UIV4096AtLaserSourceHatch(15256), + UMV4096AtLaserSourceHatch(15257), + UXV4096AtLaserSourceHatch(15258), + IV16384AtLaserSourceHatch(15260), + LuV16384AtLaserSourceHatch(15261), + ZPM16384AtLaserSourceHatch(15262), + UV16384AtLaserSourceHatch(15263), + UHV16384AtLaserSourceHatch(15264), + UEV16384AtLaserSourceHatch(15265), + UIV16384AtLaserSourceHatch(15266), + UMV16384AtLaserSourceHatch(15267), + UXV16384AtLaserSourceHatch(15268), + IV65536AtLaserSourceHatch(15270), + LuV65536AtLaserSourceHatch(15271), + ZPM65536AtLaserSourceHatch(15272), + UV65536AtLaserSourceHatch(15273), + UHV65536AtLaserSourceHatch(15274), + UEV65536AtLaserSourceHatch(15275), + UIV65536AtLaserSourceHatch(15276), + UMV65536AtLaserSourceHatch(15277), + UXV65536AtLaserSourceHatch(15278), + IV262144AtLaserSourceHatch(15280), + LuV262144AtLaserSourceHatch(15281), + ZPM262144AtLaserSourceHatch(15282), + UV262144AtLaserSourceHatch(15283), + UHV262144AtLaserSourceHatch(15284), + UEV262144AtLaserSourceHatch(15285), + UIV262144AtLaserSourceHatch(15286), + UMV262144AtLaserSourceHatch(15287), + UXV262144AtLaserSourceHatch(15288), + IV1048576AtLaserSourceHatch(15290), + LuV1048576AtLaserSourceHatch(15291), + ZPM1048576AtLaserSourceHatch(15292), + UV1048576AtLaserSourceHatch(15293), + UHV1048576AtLaserSourceHatch(15294), + UEV1048576AtLaserSourceHatch(15295), + UIV1048576AtLaserSourceHatch(15296), + UMV1048576AtLaserSourceHatch(15297), + UXV1048576AtLaserSourceHatch(15298), + LegendaryLaserSourceHatch(15299), + ActiveTransformer(15300), + NetworkSwitchWithQoS(15310), + QuantumComputer(15311), + MicrowaveGrinder(15312), + DataBank(15313), + TeslaTower(15314), + Researchstation(15331), + EnergyInfuser(15350), + EyeofHarmony(15410), + ForgeoftheGods(15411), + HelioflarePowerForge(15412), + HeliofluxMeltingCore(15413), + HeliothermalPlasmaFabricator(15414), + HeliofusionExoticizer(15415), + Parametrizer(15420), + ParametrizerX(15421), + ParametrizertXt(15422), + UncertaintyResolver(15430), + UncertaintyResolverX(15431), + OpticalSlaveConnector(15440), + OpticalMasterConnector(15441), + AssemblylineSlaveConnector(15442), + DataBankMasterConnector(15443), + CloudComputationServerHatch(15444), + CloudComputationClientHatch(15445), + WirelessAssemblylineSlaveConnector(15446), + WirelessDataBankMasterConnector(15447), + ComputerRack(15450), + ObjectHolder(15451), + CapacitorHatch(15452), + LaserVacuumPipe(15465), + LaserVacuumMirror(15466), + OpticalFiberCable(15470), + LaserVacuumPipeCasing(15472), + OpticalFiberCableCasing(15473), + Ownerdetector(15480), + InsaneBuckConverter(15485), + LudicrousBuckConverter(15486), + ZPMVoltageBuckConverter(15487), + UltimatePowerBuckConverter(15488), + HighlyUltimateBuckConverter(15489), + ExtremelyUltimateBuckConverter(15490), + InsanelyUltimateBuckConverter(15491), + MegaUltimateBuckConverter(15492), + ExtendedMegaUltimateBuckConverter(15493), + DebugPollutionGenerator(15495), + DebugDataHatch(15496), + AutoTapingMaintenanceHatch(15497), + DebugPowerGenerator(15498), + DebugStructureWriter(15499), + UXV256AWirelessEnergyHatch(15500), + UXV1024AWirelessEnergyHatch(15501), + UXV4096AWirelessEnergyHatch(15502), + UXV16384AWirelessEnergyHatch(15503), + UXV65536AWirelessEnergyHatch(15504), + UXV262144AWirelessEnergyHatch(15505), + UXV1048576AWirelessEnergyHatch(15506), + UncertaintyResolution(15510), + BasicTeslaTransceiver1by1(16000), + AdvancedTeslaTransceiver1by1(16001), + EpycTeslaTransceiver1by1(16002), + UltimatePowerTeslaTransceiver1by1(16003), + InsaneTeslaTransceiver1by1(16004), + BasicTeslaTransceiver2by2(16005), + AdvancedTeslaTransceiver2by2(16006), + EpycTeslaTransceiver2by2(16007), + UltimatePowerTeslaTransceiver2by2(16008), + InsaneTeslaTransceiver2by2(16009), + BasicTeslaTransceiver3by3(16010), + AdvancedTeslaTransceiver3by3(16011), + EpycTeslaTransceiver3by3(16012), + UltimatePowerTeslaTransceiver3by3(16013), + InsaneTeslaTransceiver3by3(16014), + BasicTeslaTransceiver4by4(16015), + AdvancedTeslaTransceiver4by4(16016), + EpycTeslaTransceiver4by4(16017), + UltimatePowerTeslaTransceiver4by4(16018), + InsaneTeslaTransceiver4by4(16019), LASER_SOURCE_UMV8(16020), LASER_SOURCE_UXV8(16021), LASER_SOURCE_UXV9(16022), @@ -710,7 +1611,37 @@ public enum MetaTileEntityIDs { LASER_TARGET_UXV8(16024), LASER_TARGET_UXV9(16025), WIRELESS_LASER_UXV8(16026), - WIRELESS_LASER_UXV9(16027); + WIRELESS_LASER_UXV9(16027), + FuelRefineFactory(16999), + PipeIncoloy903(30995), + UniversalChemicalFuelEngine(32001), + LargeEssentiaGenerator(32002), + NeutronAcceleratorULV(32003), + NeutronAcceleratorLV(32004), + NeutronAcceleratorMV(32005), + NeutronAcceleratorHV(32006), + NeutronAcceleratorEV(32007), + NeutronAcceleratorIV(32008), + NeutronAcceleratorLuV(32009), + NeutronAcceleratorZPM(32010), + NeutronAcceleratorUV(32011), + NeutronSensor(32012), + NeutronActivator(32013), + YottaFluidTank(32014), + YottaHatch(32015), + SupercriticalFluidTurbine(32016), + ExtremeHeatExchanger(32017), + PreciseAssembler(32018), + LargeFusionComputer1(32019), + LargeFusionComputer2(32020), + LargeFusionComputer3(32021), + LargeFusionComputer4(32022), + LargeFusionComputer5(32023), + LargeEssentiaSmeltery(32024), + CoolantTower(32025), + ComponentAssemblyLine(32026), + WireLumiium(32737), + WireSignalium(32749),; public final int ID; diff --git a/src/main/java/gregtech/api/enums/Mods.java b/src/main/java/gregtech/api/enums/Mods.java index 05d5da27ae..28ed17d299 100644 --- a/src/main/java/gregtech/api/enums/Mods.java +++ b/src/main/java/gregtech/api/enums/Mods.java @@ -72,6 +72,7 @@ public enum Mods { Forestry(Names.FORESTRY), ForgeMicroblocks(Names.FORGE_MICROBLOCKS), ForgeRelocation(Names.FORGE_RELOCATION), + GGFab(Names.G_G_FAB), GTNHIntergalactic(Names.G_T_N_H_INTERGALACTIC), GTNHLanthanides(Names.G_T_N_H_LANTHANIDES), GTPlusPlus(Names.G_T_PLUS_PLUS), @@ -256,6 +257,7 @@ public enum Mods { public static final String FORESTRY = "Forestry"; public static final String FORGE_MICROBLOCKS = "ForgeMicroblock"; public static final String FORGE_RELOCATION = "ForgeRelocation"; + public static final String G_G_FAB = "ggfab"; public static final String G_T_N_H_INTERGALACTIC = "gtnhintergalactic"; public static final String G_T_N_H_LANTHANIDES = "gtnhlanth"; public static final String G_T_PLUS_PLUS = "miscutils"; diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_WetTransformer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_WetTransformer.java new file mode 100644 index 0000000000..f865a5ea8a --- /dev/null +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_WetTransformer.java @@ -0,0 +1,93 @@ +package gregtech.api.metatileentity.implementations; + +import static gregtech.api.enums.GT_Values.V; + +import net.minecraft.util.EnumChatFormatting; + +import org.apache.commons.lang3.ArrayUtils; + +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + +public class GT_MetaTileEntity_WetTransformer extends GT_MetaTileEntity_Transformer { + + public GT_MetaTileEntity_WetTransformer(int aID, String aName, String aNameRegional, int aTier, + String aDescription) { + super(aID, aName, aNameRegional, aTier, aDescription); + } + + public GT_MetaTileEntity_WetTransformer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + super(aName, aTier, aDescription, aTextures); + } + + @Override + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_WetTransformer(mName, mTier, mDescriptionArray, mTextures); + } + + @Override + public ITexture[][][] getTextureSet(ITexture[] aTextures) { + ITexture[][][] rTextures = new ITexture[12][17][]; + for (byte b = -1; b < 16; b++) { + rTextures[0][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier] }; + rTextures[1][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier] }; + rTextures[2][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier] }; + rTextures[3][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_IN_POWER[mTier + 1] }; + rTextures[4][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_IN_POWER[mTier + 1] }; + rTextures[5][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_IN_POWER[mTier + 1] }; + rTextures[6][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier] }; + rTextures[7][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier] }; + rTextures[8][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[mTier] }; + rTextures[9][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_OUT_POWER[mTier + 1] }; + rTextures[10][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_OUT_POWER[mTier + 1] }; + rTextures[11][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_OUT_POWER[mTier + 1] }; + } + return rTextures; + } + + @Override + public String[] getDescription() { + return ArrayUtils.addAll( + mDescriptionArray, + "Accepts 16A and outputs 64A", + EnumChatFormatting.BLUE + "Tec" + + EnumChatFormatting.DARK_BLUE + + "Tech" + + EnumChatFormatting.BLUE + + ": Interdimensional"); + } + + @Override + public long getMinimumStoredEU() { + return V[mTier + 1]; + } + + @Override + public long maxEUStore() { + return 512L + V[mTier + 1] * 128L; + } + + @Override + public long maxAmperesOut() { + return getBaseMetaTileEntity().isAllowedToWork() ? 64 : 16; + } + + @Override + public long maxAmperesIn() { + return getBaseMetaTileEntity().isAllowedToWork() ? 16 : 64; + } +} diff --git a/src/main/java/gregtech/api/recipe/RecipeMaps.java b/src/main/java/gregtech/api/recipe/RecipeMaps.java index a2f053922c..ff60504e8d 100644 --- a/src/main/java/gregtech/api/recipe/RecipeMaps.java +++ b/src/main/java/gregtech/api/recipe/RecipeMaps.java @@ -1,7 +1,6 @@ package gregtech.api.recipe; import static gregtech.api.enums.Mods.GTNHIntergalactic; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.NEICustomDiagrams; import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.util.GT_RecipeConstants.ADDITIVE_AMOUNT; @@ -85,6 +84,7 @@ import gregtech.nei.formatter.FuelSpecialValueFormatter; import gregtech.nei.formatter.FusionSpecialValueFormatter; import gregtech.nei.formatter.HeatingCoilSpecialValueFormatter; import gregtech.nei.formatter.SimpleSpecialValueFormatter; +import gtPlusPlus.core.item.ModItems; import mods.railcraft.common.blocks.aesthetics.cube.EnumCube; import mods.railcraft.common.items.RailcraftToolItems; @@ -673,8 +673,8 @@ public final class RecipeMaps { .setOutputs(aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount / 2)) .setDuration(aDuration * 2 / 3); } - ItemStack cactusCoke = GT_ModHandler.getModItem(GTPlusPlus.ID, "itemCactusCoke", aCoalAmount * 2L); - ItemStack sugarCoke = GT_ModHandler.getModItem(GTPlusPlus.ID, "itemSugarCoke", aCoalAmount * 2L); + ItemStack cactusCoke = new ItemStack(ModItems.itemCactusCoke, aCoalAmount * 2); + ItemStack sugarCoke = new ItemStack(ModItems.itemSugarCoke, aCoalAmount * 2); coll.derive() .setInputs(aInput1, aInput2, cactusCoke) .setOutputs(aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2)) diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index ed54ccf91e..cde7a66229 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -48,12 +48,35 @@ import static gregtech.client.GT_TooltipHandler.Tier.LV; import static gregtech.client.GT_TooltipHandler.Tier.LuV; import static gregtech.client.GT_TooltipHandler.Tier.MAX; import static gregtech.client.GT_TooltipHandler.Tier.MV; +import static gregtech.client.GT_TooltipHandler.Tier.UEV; +import static gregtech.client.GT_TooltipHandler.Tier.UHV; +import static gregtech.client.GT_TooltipHandler.Tier.UIV; import static gregtech.client.GT_TooltipHandler.Tier.ULV; import static gregtech.client.GT_TooltipHandler.Tier.UMV; import static gregtech.client.GT_TooltipHandler.Tier.UV; import static gregtech.client.GT_TooltipHandler.Tier.UXV; import static gregtech.client.GT_TooltipHandler.Tier.ZPM; import static gregtech.client.GT_TooltipHandler.registerTieredTooltip; +import static gregtech.common.items.ID_MetaItem_01.BatteryHull_EV; +import static gregtech.common.items.ID_MetaItem_01.BatteryHull_EV_Full; +import static gregtech.common.items.ID_MetaItem_01.BatteryHull_IV; +import static gregtech.common.items.ID_MetaItem_01.BatteryHull_IV_Full; +import static gregtech.common.items.ID_MetaItem_01.BatteryHull_LuV; +import static gregtech.common.items.ID_MetaItem_01.BatteryHull_LuV_Full; +import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UEV; +import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UEV_Full; +import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UHV; +import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UHV_Full; +import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UIV; +import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UIV_Full; +import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UMV; +import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UMV_Full; +import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UV; +import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UV_Full; +import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UxV; +import static gregtech.common.items.ID_MetaItem_01.BatteryHull_UxV_Full; +import static gregtech.common.items.ID_MetaItem_01.BatteryHull_ZPM; +import static gregtech.common.items.ID_MetaItem_01.BatteryHull_ZPM_Full; import static gregtech.common.items.ID_MetaItem_01.Battery_Hull_HV; import static gregtech.common.items.ID_MetaItem_01.Battery_Hull_LV; import static gregtech.common.items.ID_MetaItem_01.Battery_Hull_MV; @@ -3120,6 +3143,199 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { EnumChatFormatting.GREEN + "Tengam Electromagnet", MagnetTiers.buildMagnetTooltip(MagnetTiers.Tengam), new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 40))); + + // Empty battery hulls + ItemList.BatteryHull_EV.set( + addItem( + BatteryHull_EV.ID, + "Small Sunnarium Battery (Empty)", + "An empty EV Battery Container", + new ItemData(Materials.BlueSteel, OrePrefixes.plate.mMaterialAmount * 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 8L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 8L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 8L))); + ItemList.BatteryHull_IV.set( + addItem( + BatteryHull_IV.ID, + "Medium Sunnarium Battery (Empty)", + "An empty IV Battery Container", + new ItemData(Materials.RoseGold, OrePrefixes.plate.mMaterialAmount * 6L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 16L))); + ItemList.BatteryHull_LuV.set( + addItem( + BatteryHull_LuV.ID, + "Large Sunnarium Battery (Empty)", + "An empty LuV Battery Container", + new ItemData(Materials.RedSteel, OrePrefixes.plate.mMaterialAmount * 18L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 32L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 32L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 32L))); + ItemList.BatteryHull_ZPM.set( + addItem( + BatteryHull_ZPM.ID, + "Medium Naquadria Battery (Empty)", + "An empty ZPM Energy Storage", + new ItemData(Materials.Europium, OrePrefixes.plate.mMaterialAmount * 6L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 64L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 64L))); + ItemList.BatteryHull_UV.set( + addItem( + BatteryHull_UV.ID, + "Large Naquadria Battery (Empty)", + "An empty UV Energy Storage", + new ItemData(Materials.Americium, OrePrefixes.plate.mMaterialAmount * 18L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 128L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 128L))); + ItemList.BatteryHull_UHV.set( + addItem( + BatteryHull_UHV.ID, + "Small Neutronium Battery (Empty)", + "An empty UHV Energy Storage", + new ItemData(Materials.Naquadah, OrePrefixes.plate.mMaterialAmount * 24L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 256L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 256L))); + ItemList.BatteryHull_UEV.set( + addItem( + BatteryHull_UEV.ID, + "Medium Neutronium Battery (Empty)", + "An empty UEV Energy Storage", + new ItemData(Materials.NaquadahEnriched, OrePrefixes.plate.mMaterialAmount * 36L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 512L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 512L))); + ItemList.BatteryHull_UIV.set( + addItem( + BatteryHull_UIV.ID, + "Large Neutronium Battery (Empty)", + "An empty UIV Energy Storage", + new ItemData(Materials.NaquadahAlloy, OrePrefixes.plate.mMaterialAmount * 48L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1024L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1024L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 1024L))); + ItemList.BatteryHull_UMV.set( + addItem( + BatteryHull_UMV.ID, + "Medium Plasma Battery (Empty)", + "An empty UMV Energy Storage", + new ItemData(Materials.Neutronium, OrePrefixes.plate.mMaterialAmount * 56L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2048L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2048L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 2048L))); + ItemList.BatteryHull_UxV.set( + addItem( + BatteryHull_UxV.ID, + "Large Plasma Battery (Empty)", + "An empty UXV Energy Storage", + new ItemData(Materials.DraconiumAwakened, OrePrefixes.plate.mMaterialAmount * 64L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4096L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4096L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 4096L))); + + ItemList.BatteryHull_EV_Full.set( + addItem( + BatteryHull_EV_Full.ID, + "Small Sunnarium Battery", + "Reusable", + "batteryEV", + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L))); + + ItemList.BatteryHull_IV_Full.set( + addItem( + BatteryHull_IV_Full.ID, + "Medium Sunnarium Battery", + "Reusable", + "batteryIV", + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L))); + + ItemList.BatteryHull_LuV_Full.set( + addItem( + BatteryHull_LuV_Full.ID, + "Large Sunnarium Battery", + "Reusable", + "batteryLuV", + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L))); + + ItemList.BatteryHull_ZPM_Full.set( + addItem( + BatteryHull_ZPM_Full.ID, + "Medium Naquadria Battery", + "Reusable", + "batteryZPM", + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L))); + + ItemList.BatteryHull_UV_Full.set( + addItem( + BatteryHull_UV_Full.ID, + "Large Naquadria Battery", + "Reusable", + "batteryUV", + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L))); + + ItemList.BatteryHull_UHV_Full.set( + addItem( + BatteryHull_UHV_Full.ID, + "Small Neutronium Battery", + "Reusable", + "batteryUHV", + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L))); + + ItemList.BatteryHull_UEV_Full.set( + addItem( + BatteryHull_UEV_Full.ID, + "Medium Neutronium Battery", + "Reusable", + "batteryUEV", + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L))); + + ItemList.BatteryHull_UIV_Full.set( + addItem( + BatteryHull_UIV_Full.ID, + "Large Neutronium Battery", + "Reusable", + "batteryUIV", + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L))); + + ItemList.BatteryHull_UMV_Full.set( + addItem( + BatteryHull_UMV_Full.ID, + "Medium Infinity Battery", + "Reusable", + "batteryUMV", + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L))); + + ItemList.BatteryHull_UxV_Full.set( + addItem( + BatteryHull_UxV_Full.ID, + "Large Infinity Battery", + "Reusable", + "batteryUXV", + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 32L))); + removeRecipes(); setBurnValues(); oredictBlacklistEntries(); @@ -4054,6 +4270,106 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { .duration(5 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 2L)) + .itemOutputs(ItemList.BatteryHull_EV.get(1L)) + .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(144L)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Platinum, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RoseGold, 6L)) + .itemOutputs(ItemList.BatteryHull_IV.get(1L)) + .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(288L)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 18L)) + .itemOutputs(ItemList.BatteryHull_LuV.get(1L)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(144L)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 6L)) + .itemOutputs(ItemList.BatteryHull_ZPM.get(1L)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(288L)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.ElectrumFlux, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 18L)) + .itemOutputs(ItemList.BatteryHull_UV.get(1L)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(576L)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.ElectrumFlux, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 24L)) + .itemOutputs(ItemList.BatteryHull_UHV.get(1L)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(1152L)) + .duration(5 * SECONDS) + .eut(500000) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.ElectrumFlux, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahEnriched, 36L)) + .itemOutputs(ItemList.BatteryHull_UEV.get(1L)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(2304L)) + .duration(10 * SECONDS) + .eut(2000000) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.ElectrumFlux, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 48L)) + .itemOutputs(ItemList.BatteryHull_UIV.get(1L)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(4608L)) + .duration(15 * SECONDS) + .eut(2000000) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 56L)) + .itemOutputs(ItemList.BatteryHull_UMV.get(1L)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(9216L)) + .duration(30 * SECONDS) + .eut(2000000) + .addTo(assemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 2L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 64L)) + .itemOutputs(ItemList.BatteryHull_UxV.get(1L)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(18432L)) + .duration(60 * SECONDS) + .eut(2000000) + .addTo(assemblerRecipes); } private void cannerRecipes() { @@ -4129,6 +4445,107 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { .duration(1 * MINUTES + 20 * SECONDS) .eut(2) .addTo(cannerRecipes); + // Recipes to actually fill the empty hulls with content + // IV 2048 + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 4L), + ItemList.BatteryHull_EV.get(1L)) + .itemOutputs(ItemList.BatteryHull_EV_Full.get(1L)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(cannerRecipes); + // EV 8192 + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 16L), + ItemList.BatteryHull_IV.get(1L)) + .itemOutputs(ItemList.BatteryHull_IV_Full.get(1L)) + .duration(7 * SECONDS + 10 * TICKS) + .eut(1024) + .addTo(cannerRecipes); + // LuV 32768 + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 32L), + ItemList.BatteryHull_LuV.get(1L)) + .itemOutputs(ItemList.BatteryHull_LuV_Full.get(1L)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(cannerRecipes); + // ZPM 131072 + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 16L), + ItemList.BatteryHull_ZPM.get(1L)) + .itemOutputs(ItemList.BatteryHull_ZPM_Full.get(1L)) + .duration(12 * SECONDS + 10 * TICKS) + .eut(4096) + .addTo(cannerRecipes); + // UV 524288 + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 32L), + ItemList.BatteryHull_UV.get(1L)) + .itemOutputs(ItemList.BatteryHull_UV_Full.get(1L)) + .duration(15 * SECONDS) + .eut(7860) + .addTo(cannerRecipes); + // UHV 2097152 + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 16L), + ItemList.BatteryHull_UHV.get(1L)) + .itemOutputs(ItemList.BatteryHull_UHV_Full.get(1L)) + .duration(17 * SECONDS + 10 * TICKS) + .eut(15720) + .addTo(cannerRecipes); + // UEV 8388608 + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 32L), + ItemList.BatteryHull_UEV.get(1L)) + .itemOutputs(ItemList.BatteryHull_UEV_Full.get(1L)) + .duration(20 * SECONDS) + .eut(31440) + .addTo(cannerRecipes); + // UIV 33554432 + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 64L), + ItemList.BatteryHull_UIV.get(1L)) + .itemOutputs(ItemList.BatteryHull_UIV_Full.get(1L)) + .duration(22 * SECONDS + 10 * TICKS) + .eut(62880) + .addTo(cannerRecipes); + // UMV 134217728 + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 4L), + ItemList.BatteryHull_UMV.get(1L)) + .itemOutputs(ItemList.BatteryHull_UMV_Full.get(1L)) + .duration(25 * SECONDS) + .eut(125760) + .addTo(cannerRecipes); + // UxV 536870912 + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 8L), + ItemList.BatteryHull_UxV.get(1L)) + .itemOutputs(ItemList.BatteryHull_UxV_Full.get(1L)) + .duration(30 * SECONDS) + .eut(251520) + .addTo(cannerRecipes); } private void packagerRecipes() { @@ -4239,6 +4656,67 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { .duration(15 * SECONDS) .eut(2) .addTo(extractorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.BatteryHull_EV_Full.get(1L)) + .itemOutputs(ItemList.BatteryHull_EV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.BatteryHull_IV_Full.get(1L)) + .itemOutputs(ItemList.BatteryHull_IV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.BatteryHull_LuV_Full.get(1L)) + .itemOutputs(ItemList.BatteryHull_LuV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.BatteryHull_ZPM_Full.get(1L)) + .itemOutputs(ItemList.BatteryHull_ZPM.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.BatteryHull_UV_Full.get(1L)) + .itemOutputs(ItemList.BatteryHull_UV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.BatteryHull_UHV_Full.get(1L)) + .itemOutputs(ItemList.BatteryHull_UHV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.BatteryHull_UEV_Full.get(1L)) + .itemOutputs(ItemList.BatteryHull_UEV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.BatteryHull_UIV_Full.get(1L)) + .itemOutputs(ItemList.BatteryHull_UIV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.BatteryHull_UMV_Full.get(1L)) + .itemOutputs(ItemList.BatteryHull_UMV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.BatteryHull_UxV_Full.get(1L)) + .itemOutputs(ItemList.BatteryHull_UxV.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(extractorRecipes); } private void craftingShapedRecipes() { @@ -4884,6 +5362,16 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { setElectricStats(32000 + Tool_Cover_Copy_Paste.ID, 400000L, GT_Values.V[2], 2L, -1L, false); setElectricStats(32000 + Tool_Cheat.ID, -2000000000L, 1000000000L, -1L, -3L, false); setElectricStats(32000 + Tool_Scanner.ID, 400000L, GT_Values.V[2], 2L, -1L, false); + setElectricStats(32000 + BatteryHull_EV_Full.ID, 6400000L, GT_Values.V[4], 4L, -3L, true); + setElectricStats(32000 + BatteryHull_IV_Full.ID, 25600000L, GT_Values.V[5], 5L, -3L, true); + setElectricStats(32000 + BatteryHull_LuV_Full.ID, 102400000L, GT_Values.V[6], 6L, -3L, true); + setElectricStats(32000 + BatteryHull_ZPM_Full.ID, 409600000L, GT_Values.V[7], 7L, -3L, true); + setElectricStats(32000 + BatteryHull_UV_Full.ID, 1638400000L, GT_Values.V[8], 8L, -3L, true); + setElectricStats(32000 + BatteryHull_UHV_Full.ID, 6553600000L, GT_Values.V[9], 9L, -3L, true); + setElectricStats(32000 + BatteryHull_UEV_Full.ID, 26214400000L, GT_Values.V[10], 10L, -3L, true); + setElectricStats(32000 + BatteryHull_UIV_Full.ID, 104857600000L, GT_Values.V[11], 11L, -3L, true); + setElectricStats(32000 + BatteryHull_UMV_Full.ID, 419430400000L, GT_Values.V[12], 12L, -3L, true); + setElectricStats(32000 + BatteryHull_UxV_Full.ID, 1677721600000L, GT_Values.V[13], 13L, -3L, true); } private void registerTieredTooltips() { @@ -4920,6 +5408,16 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_Data.get(1), EV); registerTieredTooltip(ItemList.Circuit_Elite.get(1), IV); registerTieredTooltip(ItemList.Circuit_Master.get(1), LuV); + registerTieredTooltip(ItemList.BatteryHull_EV_Full.get(1), EV); + registerTieredTooltip(ItemList.BatteryHull_IV_Full.get(1), IV); + registerTieredTooltip(ItemList.BatteryHull_LuV_Full.get(1), LuV); + registerTieredTooltip(ItemList.BatteryHull_ZPM_Full.get(1), ZPM); + registerTieredTooltip(ItemList.BatteryHull_UV_Full.get(1), UV); + registerTieredTooltip(ItemList.BatteryHull_UHV_Full.get(1), UHV); + registerTieredTooltip(ItemList.BatteryHull_UEV_Full.get(1), UEV); + registerTieredTooltip(ItemList.BatteryHull_UIV_Full.get(1), UIV); + registerTieredTooltip(ItemList.BatteryHull_UMV_Full.get(1), UMV); + registerTieredTooltip(ItemList.BatteryHull_UxV_Full.get(1), UXV); } } diff --git a/src/main/java/gregtech/common/items/ID_MetaItem_01.java b/src/main/java/gregtech/common/items/ID_MetaItem_01.java index fd6f1cc78d..308b154aae 100644 --- a/src/main/java/gregtech/common/items/ID_MetaItem_01.java +++ b/src/main/java/gregtech/common/items/ID_MetaItem_01.java @@ -219,6 +219,11 @@ public enum ID_MetaItem_01 { Battery_Hull_LV(500), Battery_Hull_MV(501), Battery_Hull_HV(502), + BatteryHull_EV(503), + BatteryHull_IV(504), + BatteryHull_LuV(505), + BatteryHull_ZPM(506), + BatteryHull_UV(507), Battery_SU_LV_Sulfuric_Acid(510), Battery_SU_LV_Mercury(511), Battery_RE_LV_Cadmium(517), @@ -234,7 +239,22 @@ public enum ID_MetaItem_01 { Battery_RE_HV_Cadmium(537), Battery_RE_HV_Lithium(538), Battery_RE_HV_Sodium(539), + BatteryHull_EV_Full(540), + BatteryHull_IV_Full(545), + BatteryHull_LuV_Full(550), + BatteryHull_ZPM_Full(555), + BatteryHull_UV_Full(560), + BatteryHull_UHV(561), + BatteryHull_UEV(562), + BatteryHull_UIV(563), + BatteryHull_UMV(564), + BatteryHull_UxV(565), + BatteryHull_UHV_Full(570), + BatteryHull_UEV_Full(575), Cover_FLuidStorageMonitor(577), + BatteryHull_UIV_Full(580), + BatteryHull_UMV_Full(585), + BatteryHull_UxV_Full(590), ZPM4(594), Electric_Motor_UEV(595), Electric_Motor_UHV(596), diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_TurboCharger.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_TurboCharger.java new file mode 100644 index 0000000000..a098e635f0 --- /dev/null +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_TurboCharger.java @@ -0,0 +1,146 @@ +package gregtech.common.tileentities.machines.basic; + +import static gregtech.api.enums.GT_Values.V; + +import net.minecraft.item.ItemStack; + +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.BaseMetaTileEntity; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_Utility; + +/** + * Created by danie_000 on 15.10.2016. + */ +public class GT_MetaTileEntity_TurboCharger extends GT_MetaTileEntity_Charger { + + public GT_MetaTileEntity_TurboCharger(int aID, String aName, String aNameRegional, int aTier, String aDescription, + int aSlotCount) { + super(aID, aName, aNameRegional, aTier, aDescription, aSlotCount); + } + + public GT_MetaTileEntity_TurboCharger(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, + int aSlotCount) { + super(aName, aTier, aDescription, aTextures, aSlotCount); + } + + @Override + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_TurboCharger(mName, mTier, mDescriptionArray, mTextures, mInventory.length); + } + + @Override + public ITexture[][][] getTextureSet(ITexture[] aTextures) { + ITexture[][][] rTextures = new ITexture[2][17][]; + for (byte b = -1; b < 16; b++) { + rTextures[0][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1] }; + rTextures[1][b + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], + Textures.BlockIcons.OVERLAYS_ENERGY_OUT_POWER[mTier] }; + } + return rTextures; + } + + @Override + public long getMinimumStoredEU() { + return V[mTier] * 1536L * mInventory.length; + } + + @Override + public long maxEUStore() { + return V[mTier] * 6144L * mInventory.length; + } + + @Override + public long maxAmperesIn() { + return 16L * mInventory.length; + } + + @Override + public long maxAmperesOut() { + return 4L * mInventory.length; + } + + @Override + public long maxEUInput() { + return V[mTier]; + } + + @Override + public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { + if (aBaseMetaTileEntity.isServerSide()) { + + mCharge = aBaseMetaTileEntity.getStoredEU() / 2 > aBaseMetaTileEntity.getEUCapacity() / 3 + || !aBaseMetaTileEntity.isAllowedToWork(); + mDecharge = aBaseMetaTileEntity.getStoredEU() < aBaseMetaTileEntity.getEUCapacity() / 3 + && aBaseMetaTileEntity.isAllowedToWork(); + mBatteryCount = 0; + mChargeableCount = 0; + for (ItemStack tStack : mInventory) { + if (GT_ModHandler.isElectricItem(tStack, mTier)) { + if (GT_ModHandler.isChargerItem(tStack)) { + mBatteryCount++; + } + mChargeableCount++; + } + } + + if (getBaseMetaTileEntity() instanceof BaseMetaTileEntity) { + BaseMetaTileEntity mBaseMetaTileEntity = (BaseMetaTileEntity) getBaseMetaTileEntity(); + if (mBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity) { + MetaTileEntity mMetaTileEntity = (MetaTileEntity) mBaseMetaTileEntity.getMetaTileEntity(); + if (mMetaTileEntity.dechargerSlotCount() > 0 + && mBaseMetaTileEntity.getStoredEU() < mBaseMetaTileEntity.getEUCapacity()) { + for (int i = mMetaTileEntity.dechargerSlotStartIndex(), + k = mMetaTileEntity.dechargerSlotCount() + i; i < k; i++) { + if (mMetaTileEntity.mInventory[i] != null + && mBaseMetaTileEntity.getStoredEU() < mBaseMetaTileEntity.getEUCapacity()) { + // CODE + mBaseMetaTileEntity.increaseStoredEnergyUnits( + GT_ModHandler.dischargeElectricItem( + mMetaTileEntity.mInventory[i], + GT_Utility.safeInt( + Math.min( + V[mTier] * 120, + mBaseMetaTileEntity.getEUCapacity() + - mBaseMetaTileEntity.getStoredEU())), + (int) Math.min(Integer.MAX_VALUE, mMetaTileEntity.getInputTier()), + true, + false, + false), + true); + if (mMetaTileEntity.mInventory[i].stackSize <= 0) { + mMetaTileEntity.mInventory[i] = null; + } + } + } + } + if (mMetaTileEntity.rechargerSlotCount() > 0 && mBaseMetaTileEntity.getStoredEU() > 0) { + for (int i = mMetaTileEntity.rechargerSlotStartIndex(), + k = mMetaTileEntity.rechargerSlotCount() + i; i < k; i++) { + if (mBaseMetaTileEntity.getStoredEU() > 0 && mMetaTileEntity.mInventory[i] != null) { + // CODE + mBaseMetaTileEntity + .decreaseStoredEU( + GT_ModHandler.chargeElectricItem( + mMetaTileEntity.mInventory[i], + GT_Utility + .safeInt(Math.min(V[mTier] * 120, mBaseMetaTileEntity.getStoredEU())), + (int) Math.min(Integer.MAX_VALUE, mMetaTileEntity.getOutputTier()), + true, + false), + true); + if (mMetaTileEntity.mInventory[i].stackSize <= 0) { + mMetaTileEntity.mInventory[i] = null; + } + } + } + } + } + } + } + } +} diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java new file mode 100644 index 0000000000..1b0048f2ec --- /dev/null +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java @@ -0,0 +1,470 @@ +package gregtech.common.tileentities.machines.basic; + +import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.Mods.GregTech; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import eu.usrv.yamcore.auxiliary.PlayerChatHelper; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GT_Log; + +public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_TieredMachineBlock { + + // simple name is rather expensive to compute and it's not cached + // see https://stackoverflow.com/q/17369304 + private static final ClassValue<String> simpleNameCache = new ClassValue<String>() { + + @Override + protected String computeValue(Class<?> type) { + return type.getSimpleName(); + } + }; + private static final HashSet<Class<? extends TileEntity>> _mBlacklistedTiles = new HashSet<>(); + + public static boolean addTileToBlacklist(Class<? extends TileEntity> clazz) { + return _mBlacklistedTiles.add(clazz); + } + + public static boolean addTileToBlacklist(TileEntity tileEntity) { + return _mBlacklistedTiles.add(tileEntity.getClass()); + } + + public static HashSet<Class<? extends TileEntity>> get_mBlacklistedTiles() { + return _mBlacklistedTiles; + } + + private int _mRadiusTierOverride = -1; + private int _mSpeedTierOverride = -1; + + private int getRadiusTierOverride() { + if (_mRadiusTierOverride == -1) _mRadiusTierOverride = mTier; + return _mRadiusTierOverride; + } + + private int getSpeedTierOverride() { + if (_mSpeedTierOverride == -1) _mSpeedTierOverride = mTier; + return _mSpeedTierOverride; + } + + private int incSpeedTierOverride() { + _mSpeedTierOverride = getSpeedTierOverride() + 1; + if (_mSpeedTierOverride > mTier) _mSpeedTierOverride = 1; + + return _mSpeedTierOverride; + } + + private int incRadiusTierOverride() { + // Make sure we get the Override value first, as we check it for initial -1 + _mRadiusTierOverride = getRadiusTierOverride() + 1; + if (_mRadiusTierOverride > mTier) _mRadiusTierOverride = 1; + + return _mRadiusTierOverride; + } + + private byte mMode = 0; // 0: RandomTicks around 1: TileEntities with range 1 + private static Textures.BlockIcons.CustomIcon _mGTIco_Norm_Idle; + private static Textures.BlockIcons.CustomIcon _mGTIco_Norm_Active; + private static Textures.BlockIcons.CustomIcon _mGTIco_TE_Idle; + private static Textures.BlockIcons.CustomIcon _mGTIco_TE_Active; + private static int[] mAccelerateStatic = { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 512, 512, 512, 512, 512, 512 }; + private static final int AMPERAGE_NORMAL = 3; + private static final int AMPERAGE_TE = 6; + + @Override + public void registerIcons(IIconRegister aBlockIconRegister) { + super.registerIcons(aBlockIconRegister); + _mGTIco_Norm_Idle = new Textures.BlockIcons.CustomIcon("iconsets/OVERLAY_ACCELERATOR"); + _mGTIco_Norm_Active = new Textures.BlockIcons.CustomIcon("iconsets/OVERLAY_ACCELERATOR_ACTIVE"); + _mGTIco_TE_Idle = new Textures.BlockIcons.CustomIcon("iconsets/OVERLAY_ACCELERATOR_TE"); + _mGTIco_TE_Active = new Textures.BlockIcons.CustomIcon("iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE"); + } + + @SideOnly(Side.CLIENT) + @Override + public void onValueUpdate(byte aValue) { + mMode = aValue; + } + + @Override + public byte getUpdateData() { + return mMode; + } + + public GT_MetaTileEntity_WorldAccelerator(int pID, String pName, String pNameRegional, int pTier) { + super(pID, pName, pNameRegional, pTier, 0, ""); + } + + @Override + public String[] getDescription() { + return new String[] { + String + .format("Accelerating things (Max Radius: %d | Max Speed Bonus: x%d)", mTier, mAccelerateStatic[mTier]), + "Use a screwdriver to change mode, sneak to change Radius", "Use a wrench to change speed", + "To accelerate TileEntities, this machine has to be adjacent to it", + String.format("Normal mode consumes up to %s amperage, depending on radius", AMPERAGE_NORMAL), + String.format("TE mode consumes %s amperage", AMPERAGE_TE) }; + } + + @Override + public boolean isGivingInformation() { + return true; + } + + @Override + public String[] getInfoData() { + List<String> tInfoDisplay = new ArrayList<>(); + + tInfoDisplay.add(String.format("Accelerator running in %s mode", mModeStr[mMode])); + tInfoDisplay.add( + String.format( + "Speed setting: [%d / %d]", + mAccelerateStatic[getSpeedTierOverride()], + mAccelerateStatic[mTier])); + tInfoDisplay.add( + String.format( + "Consuming %d EU/t", + getEnergyDemand(getSpeedTierOverride(), getRadiusTierOverride(), mMode == 1))); + + // Don't show radius setting if in TE Mode + if (mMode == 0) tInfoDisplay.add(String.format("Radius setting: [%d / %d]", getRadiusTierOverride(), mTier)); + + return tInfoDisplay.toArray(new String[0]); + } + + public GT_MetaTileEntity_WorldAccelerator(String pName, int pTier, int pInvSlotCount, String[] pDescription, + ITexture[][][] pTextures) { + super(pName, pTier, pInvSlotCount, pDescription, pTextures); + } + + @Override + public MetaTileEntity newMetaEntity(IGregTechTileEntity pTileEntity) { + return new GT_MetaTileEntity_WorldAccelerator(mName, mTier, mInventory.length, mDescriptionArray, mTextures); + } + + @Override + public ITexture[][][] getTextureSet(ITexture[] pTextures) { + return null; + } + + @Override + public ITexture[] getTexture(IGregTechTileEntity pBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, + int colorIndex, boolean pActive, boolean pRedstone) { + if (mMode == 0) { + return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][colorIndex + 1], side.offsetY != 0 ? null + : pActive ? new GT_RenderedTexture(_mGTIco_Norm_Active) : new GT_RenderedTexture(_mGTIco_Norm_Idle) }; + } else { + return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][colorIndex + 1], side.offsetY != 0 ? null + : pActive ? new GT_RenderedTexture(_mGTIco_TE_Active) : new GT_RenderedTexture(_mGTIco_TE_Idle) }; + } + } + + @Override + public boolean allowPullStack(IGregTechTileEntity pBaseMetaTileEntity, int pIndex, ForgeDirection side, + ItemStack pStack) { + return false; + } + + @Override + public boolean allowPutStack(IGregTechTileEntity pBaseMetaTileEntity, int pIndex, ForgeDirection side, + ItemStack pStack) { + return false; + } + + @Override + public void saveNBTData(NBTTagCompound pNBT) { + pNBT.setByte("mAccelMode", mMode); + + // SpeedOverride can never be larger than mTier; Which will never exceed 255, so it's safe to cast here + pNBT.setByte("mSpeed", (byte) getSpeedTierOverride()); + pNBT.setByte("mRadius", (byte) getRadiusTierOverride()); + } + + public long getEnergyDemand(int pSpeedTier, int pRangeTier, boolean pIsAcceleratingTEs) { + // TE mode does not need to consider range setting + if (pIsAcceleratingTEs) return V[pSpeedTier] * AMPERAGE_TE; + + // Include range setting into power calculation + float multiplier = 100.0F / (float) mTier * (float) pRangeTier / 100.0F; + long demand = V[pSpeedTier] * AMPERAGE_NORMAL; + + float tDemand = demand * multiplier; + + return (int) tDemand; + } + + @Override + public void loadNBTData(NBTTagCompound pNBT) { + mMode = pNBT.getByte("mAccelMode"); + + // Make sure we're not crashing with old Accelerator Machines + if (pNBT.hasKey("mSpeed")) _mSpeedTierOverride = pNBT.getByte("mSpeed"); + if (pNBT.hasKey("mRadius")) _mRadiusTierOverride = pNBT.getByte("mRadius"); + } + + @Override + public boolean isAccessAllowed(EntityPlayer pPlayer) { + return true; + } + + @Override + public boolean isSimpleMachine() { + return false; + } + + @Override + public boolean isFacingValid(ForgeDirection facing) { + return true; + } + + @Override + public boolean isEnetInput() { + return true; + } + + @Override + public boolean isInputFacing(ForgeDirection side) { + return true; + } + + @Override + public boolean isTeleporterCompatible() { + return false; + } + + @Override + public long getMinimumStoredEU() { + return 512; + } + + @Override + public long maxEUStore() { + return 512 + V[mTier] * 50; + } + + @Override + public long maxEUInput() { + return V[mTier]; + } + + @Override + public long maxAmperesIn() { + return 8; + } + + private static String[] mModeStr = { "Blocks", "TileEntities" }; + + // This uses the Wrench as second tool to cycle speeds + @Override + public boolean onWrenchRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer pPlayer, float aX, + float aY, float aZ) { + incSpeedTierOverride(); + + markDirty(); + PlayerChatHelper.SendInfo( + pPlayer, + String.format("Machine acceleration changed to x%d", mAccelerateStatic[getSpeedTierOverride()])); + + return true; + } + + @Override + public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer pPlayer, float pX, float pY, float pZ) { + if (pPlayer.isSneaking()) { + if (mMode == 0) { + incRadiusTierOverride(); + + markDirty(); + PlayerChatHelper + .SendInfo(pPlayer, String.format("Machine radius changed to %d Blocks", getRadiusTierOverride())); + } else PlayerChatHelper + .SendError(pPlayer, String.format("Can't change radius; Machine is in TileEntity Mode!")); + } else { + mMode = (byte) (mMode == 0x00 ? 0x01 : 0x00); + markDirty(); + PlayerChatHelper.SendInfo(pPlayer, String.format("Switched mode to: %s", mModeStr[mMode])); + } + } + + @Override + public void onPostTick(IGregTechTileEntity pBaseMetaTileEntity, long pTick) { + try { + if (!pBaseMetaTileEntity.isServerSide()) { + return; + } + + long tEnergyDemand = getEnergyDemand(getSpeedTierOverride(), getRadiusTierOverride(), mMode == 1); + + // Do we have enough energy to run? Or are we not allowed to run? + if (pBaseMetaTileEntity.getStoredEU() < tEnergyDemand || !pBaseMetaTileEntity.isAllowedToWork()) { + // Check if machine was active before + if (pBaseMetaTileEntity.isActive()) { + pBaseMetaTileEntity.setActive(false); // Then disable it now + } + } else { + // Continue to drain power + if (pBaseMetaTileEntity.decreaseStoredEnergyUnits(tEnergyDemand, false)) { + World tWorld = pBaseMetaTileEntity.getWorld(); + // Limit the random ticks to once per second + if (mMode == 0) { + if (pTick % 20 == 0) { + doAccelerateNormalBlocks(pBaseMetaTileEntity, tWorld); + } + } else { + doAccelerateTileEntities(pBaseMetaTileEntity, tWorld); + } + + } else { + // Energy drain failed. Disable machine + if (pBaseMetaTileEntity.isActive()) { + pBaseMetaTileEntity.setActive(false); // Then disable it now + } + } + } + } catch (Exception e) { + GT_Log.err.println("GT_MetaTileEntity_WorldAccelerator.onPostTick.crash\n" + e.getMessage()); + } + } + + private void doAccelerateTileEntities(IGregTechTileEntity pBaseMetaTileEntity, World pWorld) { + try { + if (!pBaseMetaTileEntity.isActive()) { + getBaseMetaTileEntity().setActive(true); + } + + for (ForgeDirection tDir : ForgeDirection.VALID_DIRECTIONS) { + TileEntity tTile = pBaseMetaTileEntity.getTileEntityAtSide(tDir); + if (isTEBlackListed(tTile)) { + continue; + } + + long tMaxTime = System.nanoTime() + 1000000; + for (int j = 0; j < mAccelerateStatic[getSpeedTierOverride()]; j++) { + tTile.updateEntity(); + if (System.nanoTime() > tMaxTime) { + break; + } + } + } + } catch (Exception e) { + GT_Log.err.println("GT_MetaTileEntity_WorldAccelerator.doAccelerateTileEntities.crash\n" + e.getMessage()); + } + } + + // Inspired by ChromatiCraft's TileAccelerator + private boolean isTEBlackListed(TileEntity pTile) { + if (pTile == null) { + return true; // Obvious + } + if (!pTile.canUpdate()) { + return true; // Skip if TE can't update at all + } + if (pTile.isInvalid()) { + return true; // Obvious + } + + String tSimpleClassName = simpleNameCache.get(pTile.getClass()); + String tCanonicalName = pTile.getClass() + .getCanonicalName() + .toLowerCase(); + if (tSimpleClassName.contains("conduit") || tSimpleClassName.contains("wire") + || tSimpleClassName.contains("cable")) { + return true; + } + if (tCanonicalName.contains("appeng") || tCanonicalName.contains(GregTech.ID)) // Don't accelerate ANY gregtech + // machines + { + return true; + } + if (tSimpleClassName.contains("solar") || tCanonicalName.contains("solar")) // Don't accelerate ANY solars + { + return true; + } + + for (String tS : GT_Values.blacklistedTileEntiyClassNamesForWA) { + if (tCanonicalName.equalsIgnoreCase(tS)) { + return true; + } + } + + return GT_MetaTileEntity_WorldAccelerator._mBlacklistedTiles.stream() + .map(Class::getCanonicalName) + .map(String::toLowerCase) + .anyMatch(tCanonicalName::equalsIgnoreCase); + } + + /** + * Accelerate normal blocks. Eats some power and adds randomTicks to every block within its working area + * (Tier-Number = radius) This does only affect blocks that implement the "RandomTick" method; Which is mostly used + * for grass growth and plants. + * + * @param pBaseMetaTileEntity + */ + private void doAccelerateNormalBlocks(IGregTechTileEntity pBaseMetaTileEntity, World pWorld) { + if (!pBaseMetaTileEntity.isActive()) { + getBaseMetaTileEntity().setActive(true); + } + + Random rnd = new Random(); + int tX = pBaseMetaTileEntity.getXCoord(); + int tY = pBaseMetaTileEntity.getYCoord(); + int tZ = pBaseMetaTileEntity.getZCoord(); + + int tX1 = tX - getRadiusTierOverride(); + int tX2 = tX + getRadiusTierOverride(); + int tY1 = Math.max(tY - getRadiusTierOverride(), 0); // Limit to bedrock + int tY2 = Math.min(tY + getRadiusTierOverride(), 255); // Limit to build height + int tZ1 = tZ - getRadiusTierOverride(); + int tZ2 = tZ + getRadiusTierOverride(); + + for (int xi = tX1; xi <= tX2; xi++) { + for (int yi = tY1; yi <= tY2; yi++) { + for (int zi = tZ1; zi <= tZ2; zi++) { + tryTickBlock(pWorld, xi, yi, zi, rnd); + } + } + } + } + + /** + * Send a tick to the target block + * + * @param pWorld + * @param pX + * @param pY + * @param pZ + * @param pRnd + */ + private void tryTickBlock(World pWorld, int pX, int pY, int pZ, Random pRnd) { + try { + for (int j = 0; j < getSpeedTierOverride(); j++) { + Block tBlock = pWorld.getBlock(pX, pY, pZ); + if (tBlock.getTickRandomly()) { + tBlock.updateTick(pWorld, pX, pY, pZ, pRnd); + } + } + } catch (Exception e) { + GT_Log.err.println("GT_MetaTileEntity_WorldAccelerator.tryTickBlock.crash\n" + e.getMessage()); + } + } +} diff --git a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java index b77685cf18..fa9e015138 100644 --- a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java +++ b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java @@ -5539,7 +5539,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt01.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest }); GT_ModHandler.addCraftingRecipe( - ItemList.Battery_Buffer_1by1_MAX.get(1L), + ItemList.Battery_Buffer_1by1_UHV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest }); @@ -5590,7 +5590,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest }); GT_ModHandler.addCraftingRecipe( - ItemList.Battery_Buffer_2by2_MAX.get(1L), + ItemList.Battery_Buffer_2by2_UHV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest }); @@ -5641,7 +5641,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt08.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest }); GT_ModHandler.addCraftingRecipe( - ItemList.Battery_Buffer_3by3_MAX.get(1L), + ItemList.Battery_Buffer_3by3_UHV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt08.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest }); @@ -5692,7 +5692,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt16.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest }); GT_ModHandler.addCraftingRecipe( - ItemList.Battery_Buffer_4by4_MAX.get(1L), + ItemList.Battery_Buffer_4by4_UHV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt16.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest }); @@ -5752,7 +5752,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { OrePrefixes.wireGt16.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest, 'B', ItemList.ZPM2, 'C', OrePrefixes.circuit.get(Materials.UV) }); GT_ModHandler.addCraftingRecipe( - ItemList.Battery_Charger_4by4_MAX.get(1L), + ItemList.Battery_Charger_4by4_UHV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt16.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest, 'B', @@ -5797,7 +5797,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { GT_ModHandler.addCraftingRecipe( ItemList.Locker_MAX.get(1L), bitsd, - new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_MAX, 'T', OreDictNames.craftingChest }); + new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_UHV, 'T', OreDictNames.craftingChest }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_LV_Scanner.get(1L), @@ -6190,19 +6190,19 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { ItemList.Neutron_Reflector }); GT_ModHandler.addCraftingRecipe( - ItemList.Generator_Plasma_IV.get(1L), + ItemList.Generator_Plasma_EV.get(1L), bitsd, new Object[] { "UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_LuV, 'F', ItemList.Field_Generator_HV, 'C', OrePrefixes.circuit.get(Materials.IV), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten), 'U', OrePrefixes.stick.get(Materials.Plutonium241) }); GT_ModHandler.addCraftingRecipe( - ItemList.Generator_Plasma_LuV.get(1L), + ItemList.Generator_Plasma_IV.get(1L), bitsd, new Object[] { "UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_ZPM, 'F', ItemList.Field_Generator_EV, 'C', OrePrefixes.circuit.get(Materials.LuV), 'W', OrePrefixes.wireGt04.get(Materials.VanadiumGallium), 'U', OrePrefixes.stick.get(Materials.Europium) }); GT_ModHandler.addCraftingRecipe( - ItemList.Generator_Plasma_ZPMV.get(1L), + ItemList.Generator_Plasma_LuV.get(1L), bitsd, new Object[] { "UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_UV, 'F', ItemList.Field_Generator_IV, 'C', OrePrefixes.circuit.get(Materials.ZPM), 'W', OrePrefixes.wireGt04.get(Materials.Naquadah), 'U', @@ -6736,7 +6736,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { new Object[] { "CMV", " X ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.UV) }); GT_ModHandler.addCraftingRecipe( - ItemList.Automation_ChestBuffer_MAX.get(1L), + ItemList.Automation_ChestBuffer_UHV.get(1L), bits, new Object[] { "CMV", " X ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UHV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.UHV) }); @@ -6972,7 +6972,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { GT_ModHandler.addCraftingRecipe( ItemList.Automation_SuperBuffer_MAX.get(1L), bits, - new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_MAX, 'V', ItemList.Conveyor_Module_UHV, 'D', + new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_UHV, 'V', ItemList.Conveyor_Module_UHV, 'D', ItemList.Tool_DataOrb }); GT_ModHandler.addCraftingRecipe( diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 9ec6d442f3..7747711cd8 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -349,12 +349,12 @@ public class GT_Achievements { false); registerAchievement("conducting", 14, 6, ItemList.Casing_Coil_Superconductor.get(1), "upgrade3", false); registerAchievement("fusion", 15, 7, ItemList.FusionComputer_LuV.get(1), "tungstensteel", false); - registerAchievement("higherefficency", 15, 9, ItemList.Generator_Plasma_IV.get(1), "fusion", false); + registerAchievement("higherefficency", 15, 9, ItemList.Generator_Plasma_EV.get(1), "fusion", false); registerAchievement("advancing", 13, 7, ItemList.FusionComputer_ZPMV.get(1), "fusion", false); - registerAchievement("stargateliquid", 11, 9, ItemList.Generator_Plasma_LuV.get(1), "advancing", false); - registerAchievement("tothelimit", 13, 9, ItemList.Generator_Plasma_LuV.get(1), "advancing", false); - registerAchievement("fullefficiency", 12, 10, ItemList.Generator_Plasma_ZPMV.get(1), "tothelimit", false); + registerAchievement("stargateliquid", 11, 9, ItemList.Generator_Plasma_IV.get(1), "advancing", false); + registerAchievement("tothelimit", 13, 9, ItemList.Generator_Plasma_IV.get(1), "advancing", false); + registerAchievement("fullefficiency", 12, 10, ItemList.Generator_Plasma_LuV.get(1), "tothelimit", false); registerAchievement("upgrade5", 9, 9, ItemList.Casing_Coil_Naquadah.get(1), "stargateliquid", false); registerAchievement( "alienmetallurgy", diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index 216c659be7..04591f11e7 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -1,6 +1,5 @@ package gregtech.loaders.postload; -import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Mods.GraviSuite; import static gregtech.api.enums.Mods.IndustrialCraft2; @@ -15,6 +14,8 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; + import gregtech.GT_Mod; import gregtech.api.enums.Dyes; import gregtech.api.enums.GT_Values; @@ -2015,7 +2016,7 @@ public class GT_CraftingRecipeLoader implements Runnable { ItemList.Casing_Advanced_Rhodium_Palladium.get(1L), bits, new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', - GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 1L, 88), 'F', + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.plate), 1, 88), 'F', OrePrefixes.frameGt.get(Materials.Chrome) }); if (Forestry.isModLoaded()) { diff --git a/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java b/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java index 35b18769f0..70bb18527c 100644 --- a/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java @@ -1,5 +1,6 @@ package gregtech.loaders.postload; +import static gregtech.api.enums.Mods.Chisel; import static gregtech.api.util.GT_ModHandler.addToRecyclerBlackList; import net.minecraft.init.Blocks; @@ -90,12 +91,12 @@ public class GT_RecyclerBlacklistLoader implements Runnable { addToRecyclerBlackList(GT_ModHandler.getRecipeOutput(new ItemStack(Blocks.glass, 1, 0))); addToRecyclerBlackList( GT_ModHandler.getRecipeOutput(new ItemStack(Blocks.glass, 1, 0), new ItemStack(Blocks.glass, 1, 0))); - if (Mods.Chisel.isModLoaded()) { + if (Chisel.isModLoaded()) { for (int i = 1; i <= 15; i++) { - addToRecyclerBlackList(GT_ModHandler.getModItem("chisel", "cobblestone", 1, i)); + addToRecyclerBlackList(GT_ModHandler.getModItem(Chisel.ID, "cobblestone", 1, i)); } for (int i = 0; i <= 15; i++) { - addToRecyclerBlackList(GT_ModHandler.getModItem("chisel", "stonebricksmooth", 1, i)); + addToRecyclerBlackList(GT_ModHandler.getModItem(Chisel.ID, "stonebricksmooth", 1, i)); } } if (Mods.AE2FluidCraft.isModLoaded()) { diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java index 7143c8e7e1..266f7198e6 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java @@ -1,8 +1,6 @@ package gregtech.loaders.postload.chains; -import static gregtech.api.enums.Mods.BartWorks; -import static gregtech.api.enums.Mods.GTPlusPlus; -import static gregtech.api.enums.Mods.GoodGenerator; +import static goodgenerator.loader.Loaders.huiCircuit; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.recipe.RecipeMaps.nanoForgeRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; @@ -13,12 +11,15 @@ import static gregtech.api.util.GT_RecipeConstants.AssemblyLine; import static gregtech.api.util.GT_RecipeConstants.NANO_FORGE_TIER; import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM; import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME; +import static gtPlusPlus.core.block.ModBlocks.blockCompressedObsidian; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -26,6 +27,7 @@ import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; import gregtech.api.util.GT_OreDictUnificator; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class GT_NaniteChain { @@ -89,7 +91,7 @@ public class GT_NaniteChain { GT_Values.RA.stdBuilder() .itemInputs( aUVTierLens, - getModItem(BartWorks.ID, "bw.werkstoffblockscasingadvanced.01", 8, 31776), + new ItemStack(WerkstoffLoader.BWBlockCasingsAdvanced, 8, 31776), ItemList.Circuit_Chip_SoC.get(64)) .itemOutputs(Materials.Carbon.getNanite(64)) .fluidInputs(Materials.UUMatter.getFluid(200_000)) @@ -126,8 +128,8 @@ public class GT_NaniteChain { GT_Values.RA.stdBuilder() .itemInputs( aUEVTierLens, - getModItem(GTPlusPlus.ID, "blockCompressedObsidian", 8, 7), // Double compressed glowstone blocks (yes, - // it's not obsidian) + new ItemStack(blockCompressedObsidian, 8, 7), // Double compressed glowstone blocks (yes, + // it's not obsidian) ItemList.Circuit_Chip_SoC2.get(64)) .itemOutputs(Materials.Glowstone.getNanite(64)) .fluidInputs(Materials.UUMatter.getFluid(50_000)) @@ -165,12 +167,12 @@ public class GT_NaniteChain { GT_Values.RA.stdBuilder() .itemInputs( aUMVTierLens, - getModItem(BartWorks.ID, "gt.bwMetaGeneratedlens", 0, 36), // Magneto lens - getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any better - // naming + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.lens), 0, 36), // Magneto lens + GregtechItemList.Laser_Lens_Special.get(0), // Quantum Anomaly, couldn't find any better + // naming MaterialsUEVplus.WhiteDwarfMatter.getBlocks(8), getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32), - getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit + new ItemStack(huiCircuit, 1, 4) // Paradox circuit ) .itemOutputs(MaterialsUEVplus.WhiteDwarfMatter.getNanite(4)) .fluidInputs( @@ -186,12 +188,12 @@ public class GT_NaniteChain { GT_Values.RA.stdBuilder() .itemInputs( aUMVTierLens, - getModItem(BartWorks.ID, "gt.bwMetaGeneratedlens", 0, 36), // Magneto lens - getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any better - // naming + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.lens), 0, 36), // Magneto lens + GregtechItemList.Laser_Lens_Special.get(0), // Quantum Anomaly, couldn't find any better + // naming MaterialsUEVplus.BlackDwarfMatter.getBlocks(8), getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32), - getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit + new ItemStack(huiCircuit, 1, 4) // Paradox circuit ) .itemOutputs(MaterialsUEVplus.BlackDwarfMatter.getNanite(4)) .fluidInputs( @@ -208,11 +210,11 @@ public class GT_NaniteChain { .itemInputs( aUMVTierLens, // Quantum Anomaly, couldn't find any better naming. - getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), + GregtechItemList.Laser_Lens_Special.get(0), MaterialsUEVplus.Universium.getBlocks(8), ItemList.Optically_Perfected_CPU.get(16), ItemList.Optically_Compatible_Memory.get(16), - getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit + new ItemStack(huiCircuit, 1, 4) // Paradox circuit ) .itemOutputs(MaterialsUEVplus.Universium.getNanite(2)) .fluidInputs( @@ -229,7 +231,7 @@ public class GT_NaniteChain { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Forcicium, 0, false), // Quantum Anomaly - getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), + GregtechItemList.Laser_Lens_Special.get(0), MaterialsUEVplus.TranscendentMetal.getNanite(1), MaterialsUEVplus.Eternity.getBlocks(8), getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32), diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java index c9dafacf52..6be4ab534e 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java @@ -1,7 +1,5 @@ package gregtech.loaders.postload.chains; -import static gregtech.api.enums.Mods.BartWorks; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.metadata.PCBFactoryUpgrade.BIO; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; @@ -9,6 +7,9 @@ import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeConstants.AssemblyLine; import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM; import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME; +import static gtPlusPlus.core.material.ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN; +import static gtPlusPlus.core.material.ELEMENT.STANDALONE.CHRONOMATIC_GLASS; +import static gtPlusPlus.core.material.ELEMENT.STANDALONE.HYPOGEN; import java.util.ArrayList; import java.util.List; @@ -18,6 +19,8 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -27,7 +30,6 @@ import gregtech.api.enums.TierEU; import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.metadata.PCBFactoryTierKey; import gregtech.api.recipe.metadata.PCBFactoryUpgradeKey; -import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_PCBFactoryManager; import gregtech.api.util.GT_Utility; @@ -77,7 +79,7 @@ public class GT_PCBFactoryRecipes { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtCelestialTungsten", 1), + CELESTIAL_TUNGSTEN.getFrameBox(1), Materials.get("Quantum") .getPlates(6)) .itemOutputs(ItemList.RadiationProofPhotolithographicFrameworkCasing.get(1)) @@ -86,7 +88,7 @@ public class GT_PCBFactoryRecipes { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtHypogen", 1), + HYPOGEN.getFrameBox(1), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2), Materials.Thulium.getPlates(6)) .itemOutputs(ItemList.InfinityCooledCasing.get(1)) @@ -609,12 +611,13 @@ public class GT_PCBFactoryRecipes { GT_Utility.getIntegratedCircuit(1), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), - GT_ModHandler - .getModItem(BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), + new ItemStack( + WerkstoffLoader.items.get(OrePrefixes.foil), + (int) (16 * (Math.sqrt(tier - 6))), + 10106), GT_OreDictUnificator .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), - GT_ModHandler - .getModItem(GTPlusPlus.ID, "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) + CHRONOMATIC_GLASS.getFoil((int) (16 * (Math.sqrt(tier - 6))))) .fluidInputs( Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), @@ -639,12 +642,13 @@ public class GT_PCBFactoryRecipes { GT_Utility.getNaniteAsCatalyst(Materials.Silver), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), - GT_ModHandler - .getModItem(BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), + new ItemStack( + WerkstoffLoader.items.get(OrePrefixes.foil), + (int) (16 * (Math.sqrt(tier - 6))), + 10106), GT_OreDictUnificator .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), - GT_ModHandler - .getModItem(GTPlusPlus.ID, "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) + CHRONOMATIC_GLASS.getFoil((int) (16 * (Math.sqrt(tier - 6))))) .fluidInputs( Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), @@ -669,12 +673,13 @@ public class GT_PCBFactoryRecipes { GT_Utility.getNaniteAsCatalyst(Materials.Gold), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), - GT_ModHandler - .getModItem(BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), + new ItemStack( + WerkstoffLoader.items.get(OrePrefixes.foil), + (int) (16 * (Math.sqrt(tier - 6))), + 10106), GT_OreDictUnificator .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), - GT_ModHandler - .getModItem(GTPlusPlus.ID, "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) + CHRONOMATIC_GLASS.getFoil((int) (16 * (Math.sqrt(tier - 6))))) .fluidInputs( Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index fd26573eff..1881f19b9e 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -5,7 +5,6 @@ import static gregtech.api.enums.Mods.AvaritiaAddons; import static gregtech.api.enums.Mods.BuildCraftFactory; import static gregtech.api.enums.Mods.ExtraUtilities; import static gregtech.api.enums.Mods.Forestry; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GalacticraftCore; import static gregtech.api.enums.Mods.GalacticraftMars; import static gregtech.api.enums.Mods.GalaxySpace; @@ -27,6 +26,7 @@ import static gregtech.api.util.GT_RecipeBuilder.QUARTER_INGOT; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static gregtech.loaders.postload.GT_MachineRecipeLoader.solderingMats; +import static gtPlusPlus.core.material.ALLOY.INCONEL_690; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -3983,7 +3983,7 @@ public class AssemblerRecipes implements Runnable { { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Hull_MAX.get(1), ItemList.Super_Tank_MV.get(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_MAX.get(1)) + .itemOutputs(ItemList.Hatch_Input_UHV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getMolten(16 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_UHV) @@ -4278,7 +4278,7 @@ public class AssemblerRecipes implements Runnable { { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Hull_MAX.get(1), ItemList.Super_Tank_MV.get(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_MAX.get(1)) + .itemOutputs(ItemList.Hatch_Output_UHV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getMolten(16 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_UHV) @@ -6659,7 +6659,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( ItemList.Electric_Pump_EV.get(4), ItemList.Field_Generator_EV.get(4), - getModItem(GTPlusPlus.ID, "itemPlateInconel690", 4), + INCONEL_690.getPlate(4), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 16), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.BorosilicateGlass, 16), GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2), diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java index bea7f75a4f..2b4e957d34 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java @@ -1,6 +1,5 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.util.GT_RecipeBuilder.HOURS; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; @@ -14,6 +13,8 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import com.github.technus.tectech.thing.CustomItemList; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -873,7 +874,7 @@ public class AssemblyLineRecipes implements Runnable { ItemList.Field_Generator_UV.get(16), ItemList.Gravistar.get(8), ItemList.Emitter_UV.get(4), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 16, 15497), + CustomItemList.hatch_CreativeMaintenance.get(16), ItemList.Energy_Cluster.get(8), ItemList.Cover_WirelessNeedsMaintainance.get(1)) .itemOutputs(ItemList.TierdDrone2.get(1)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java index 36bfb67de5..1a71f037fd 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java @@ -1,9 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; import static gregtech.api.recipe.RecipeMaps.primitiveBlastRecipes; -import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -14,6 +12,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; + import gregtech.GT_Mod; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -642,7 +642,9 @@ public class BlastFurnaceRecipes implements Runnable { // Rh + 3Cl = RhCl3 GT_Values.RA.stdBuilder() - .itemInputs(getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 1L, 78), GT_Utility.getIntegratedCircuit(2)) + .itemInputs( + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.dust), 1, 78), + GT_Utility.getIntegratedCircuit(2)) .itemOutputs(MaterialsKevlar.RhodiumChloride.getDust(4)) .fluidInputs(Materials.Chlorine.getGas(3000)) .duration(30 * SECONDS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java index b9375ebb1d..9d7927b074 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java @@ -2,7 +2,6 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.enums.Mods.ExtraUtilities; -import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Mods.ThaumicTinkerer; import static gregtech.api.enums.Mods.TwilightForest; @@ -11,6 +10,7 @@ import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.loaders.misc.GT_Bees.combs; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; import net.minecraft.init.Blocks; @@ -705,7 +705,7 @@ public class CentrifugeRecipes implements Runnable { // air GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 144), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 144), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedAir, 1)) .duration(51 * SECONDS + 4 * TICKS) .eut(12) @@ -714,7 +714,7 @@ public class CentrifugeRecipes implements Runnable { // fire GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 146), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 146), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedFire, 1)) .duration(51 * SECONDS + 4 * TICKS) .eut(12) @@ -723,7 +723,7 @@ public class CentrifugeRecipes implements Runnable { // aqua GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 147), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 147), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedWater, 1)) .duration(51 * SECONDS + 4 * TICKS) .eut(12) @@ -732,7 +732,7 @@ public class CentrifugeRecipes implements Runnable { // terra GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 145), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 145), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEarth, 1)) .duration(51 * SECONDS + 4 * TICKS) .eut(12) @@ -741,7 +741,7 @@ public class CentrifugeRecipes implements Runnable { // ordo GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 148), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 148), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedOrder, 1)) .duration(51 * SECONDS + 4 * TICKS) .eut(12) @@ -750,7 +750,7 @@ public class CentrifugeRecipes implements Runnable { // perditio GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 149), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 149), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEntropy, 1)) .duration(51 * SECONDS + 4 * TICKS) .eut(12) @@ -759,7 +759,7 @@ public class CentrifugeRecipes implements Runnable { // Nethershard GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 152), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 152), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 6)) .duration(6 * SECONDS + 8 * TICKS) .eut(512) @@ -768,7 +768,7 @@ public class CentrifugeRecipes implements Runnable { // Endshard GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 153), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 153), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 7)) .duration(6 * SECONDS + 8 * TICKS) .eut(512) @@ -779,7 +779,7 @@ public class CentrifugeRecipes implements Runnable { // Caelestis red GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 154), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 154), GT_Utility.getIntegratedCircuit(1)) .itemOutputs( getModItem(ExtraUtilities.ID, "greenscreen", 1L, 2), getModItem(ExtraUtilities.ID, "greenscreen", 1L, 10), @@ -794,7 +794,7 @@ public class CentrifugeRecipes implements Runnable { // Caelestis green GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 155), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 155), GT_Utility.getIntegratedCircuit(1)) .itemOutputs( getModItem(ExtraUtilities.ID, "greenscreen", 1L, 13), getModItem(ExtraUtilities.ID, "greenscreen", 1L, 5), @@ -808,7 +808,7 @@ public class CentrifugeRecipes implements Runnable { // Caelestis blue GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 156), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 156), GT_Utility.getIntegratedCircuit(1)) .itemOutputs( getModItem(ExtraUtilities.ID, "greenscreen", 1L, 3), getModItem(ExtraUtilities.ID, "greenscreen", 1L, 9), diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java index 9a8ce44947..e4d316e101 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java @@ -1,6 +1,5 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GalaxySpace; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; @@ -12,6 +11,8 @@ import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +import static gtPlusPlus.core.material.MISC_MATERIALS.CALCIUM_CHLORIDE; +import static gtPlusPlus.core.material.MISC_MATERIALS.SODIUM_NITRATE; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; import net.minecraft.init.Blocks; @@ -21,6 +22,9 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; + +import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -30,6 +34,7 @@ import gregtech.api.enums.TierEU; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; +import gtPlusPlus.core.item.ModItems; public class ChemicalRecipes implements Runnable { @@ -3706,7 +3711,7 @@ public class ChemicalRecipes implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 2), - getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 3L, 63)) + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.dust), 3, 63)) .fluidInputs(Materials.HydrochloricAcid.getFluid(2000)) .fluidOutputs(Materials.Hydrogen.getGas(2000)) .duration(45 * SECONDS) @@ -3721,7 +3726,7 @@ public class ChemicalRecipes implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), - getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 6L, 10052)) + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.dust), 6, 10052)) .fluidInputs(Materials.SiliconTetrachloride.getFluid(1000)) .duration(20 * SECONDS) .eut(30) @@ -3743,8 +3748,9 @@ public class ChemicalRecipes implements Runnable { // 4CH2O + C2H4O =NaOH= C5H12O4 + CO GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(GTPlusPlus.ID, "Formaldehyde", 4), + .itemInputs( // very poor way of looking for it, but getModItem on GT++ within GT5U jar is prohibited now, + // and i don't feel like reworking GT++ cell registration for now + GameRegistry.findItemStack(GTPlusPlus.ID, "Formaldehyde", 4), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21), @@ -3776,7 +3782,7 @@ public class ChemicalRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CalciumCarbide, 3), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(GTPlusPlus.ID, "itemDustCalciumHydroxide", 5)) + .itemOutputs(new ItemStack(ModItems.dustCalciumHydroxide, 5)) .fluidInputs(Materials.Water.getFluid(2000)) .fluidOutputs(MaterialsKevlar.Acetylene.getGas(1000)) .duration(15 * SECONDS) @@ -3789,9 +3795,7 @@ public class ChemicalRecipes implements Runnable { .itemInputs( MaterialsKevlar.CobaltIINitrate.getDust(9), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 6)) - .itemOutputs( - MaterialsKevlar.CobaltIIHydroxide.getDust(5), - getModItem(GTPlusPlus.ID, "itemDustSodiumNitrate", 10)) + .itemOutputs(MaterialsKevlar.CobaltIIHydroxide.getDust(5), SODIUM_NITRATE.getDust(10)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(UniversalChemical); @@ -5852,7 +5856,7 @@ public class ChemicalRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_Utility.getIntegratedCircuit(1), - getModItem(GTPlusPlus.ID, "itemDustCalciumChloride", 1), + CALCIUM_CHLORIDE.getDust(1), GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 9), GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 9)) .fluidInputs(MaterialsKevlar.NMethylIIPyrrolidone.getFluid(1000)) @@ -5866,7 +5870,7 @@ public class ChemicalRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_Utility.getIntegratedCircuit(9), - getModItem(GTPlusPlus.ID, "itemDustCalciumChloride", 7), + CALCIUM_CHLORIDE.getDust(7), GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 63), GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 63)) .fluidInputs(MaterialsKevlar.NMethylIIPyrrolidone.getFluid(7000)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java index ef7441c13b..675143d43a 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java @@ -1,11 +1,11 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.AppliedEnergistics2; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator.sapling_Rainforest; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -25,7 +25,7 @@ public class CompressorRecipes implements Runnable { @Override public void run() { GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GTPlusPlus.ID, "blockRainforestOakSapling", 8, 0)) + .itemInputs(new ItemStack(sapling_Rainforest, 8)) .itemOutputs(ItemList.IC2_Plantball.get(1)) .duration(15 * SECONDS) .eut(2) diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java index e0ad96abe3..532c592b78 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java @@ -1,7 +1,6 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.Forestry; -import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.Railcraft; @@ -10,6 +9,7 @@ import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.loaders.misc.GT_Bees.combs; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; import net.minecraft.init.Blocks; @@ -541,7 +541,7 @@ public class FluidExtractorRecipes implements Runnable { // Beecombs fluid extractor recipes // xenon GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 134)) + .itemInputs(new ItemStack(combs, 1, 134)) .fluidOutputs(getFluidStack("xenon", 250)) .duration(2 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_IV) @@ -549,7 +549,7 @@ public class FluidExtractorRecipes implements Runnable { // neon GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 135)) + .itemInputs(new ItemStack(combs, 1, 135)) .fluidOutputs(getFluidStack("neon", 250)) .duration(15 * TICKS) .eut(TierEU.RECIPE_IV) @@ -557,7 +557,7 @@ public class FluidExtractorRecipes implements Runnable { // krpton GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 136)) + .itemInputs(new ItemStack(combs, 1, 136)) .fluidOutputs(getFluidStack("krypton", 250)) .duration(1 * SECONDS + 5 * TICKS) .eut(TierEU.RECIPE_IV) diff --git a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java index 85b03f64c3..4ebb4b8da6 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java @@ -1,6 +1,5 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.HardcoreEnderExpansion; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; @@ -18,6 +17,7 @@ import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; import gregtech.api.util.GT_OreDictUnificator; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class ForgeHammerRecipes implements Runnable { @@ -137,7 +137,7 @@ public class ForgeHammerRecipes implements Runnable { .addTo(hammerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Tesseract.get(1L), getModItem(GTPlusPlus.ID, "MU-metaitem.01", 1, 32105)) + .itemInputs(ItemList.Tesseract.get(1L), GregtechItemList.Laser_Lens_Special.get(1)) .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(2880L)) .fluidOutputs(MaterialsUEVplus.Space.getMolten(1440L), MaterialsUEVplus.Time.getMolten(1440L)) .duration(10 * SECONDS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java index fe0f7c7ed5..2763bb8d77 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java @@ -1,18 +1,21 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.Mods.GTPlusPlus; -import static gregtech.api.enums.Mods.GoodGenerator; +import static goodgenerator.loader.Loaders.huiCircuit; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.recipe.RecipeMaps.plasmaForgeRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.TierEU; +import gtPlusPlus.core.item.ModItems; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class PlasmaForgeRecipes implements Runnable { @@ -36,11 +39,11 @@ public class PlasmaForgeRecipes implements Runnable { // Quantum anomaly recipe bypass for UEV+. Avoids RNG. GT_Values.RA.stdBuilder() .itemInputs( - getModItem(GTPlusPlus.ID, "particleBase", 1, 24), + new ItemStack(ModItems.itemStandarParticleBase, 1, 24), getModItem(NewHorizonsCoreMod.ID, "item.ChromaticLens", 0), - getModItem(GoodGenerator.ID, "huiCircuit", 0, 4)) + new ItemStack(huiCircuit, 0, 4)) .fluidInputs(MaterialsUEVplus.ExcitedDTRC.getFluid(92), Materials.Duranium.getMolten(144)) - .itemOutputs(getModItem(GTPlusPlus.ID, "MU-metaitem.01", 1, 32105)) + .itemOutputs(GregtechItemList.Laser_Lens_Special.get(1)) .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(46)) .duration(60 * SECONDS) .eut((int) TierEU.RECIPE_UEV) diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index d3644c5efe..c77e74eb1f 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -6,7 +6,35 @@ import static gregtech.api.enums.MetaTileEntityIDs.ADVANCED_SEISMIC_PROSPECTOR_E import static gregtech.api.enums.MetaTileEntityIDs.ADVANCED_SEISMIC_PROSPECTOR_HV; import static gregtech.api.enums.MetaTileEntityIDs.ADVANCED_SEISMIC_PROSPECTOR_LV; import static gregtech.api.enums.MetaTileEntityIDs.ADVANCED_SEISMIC_PROSPECTOR_MV; +import static gregtech.api.enums.MetaTileEntityIDs.ALLOY_SMELTER_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.ALLOY_SMELTER_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.ALLOY_SMELTER_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.ALLOY_SMELTER_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.ALLOY_SMELTER_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.ALLOY_SMELTER_UV; +import static gregtech.api.enums.MetaTileEntityIDs.ALLOY_SMELTER_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.ARC_FURNACE_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.ARC_FURNACE_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.ARC_FURNACE_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.ARC_FURNACE_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.ARC_FURNACE_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.ARC_FURNACE_UV; +import static gregtech.api.enums.MetaTileEntityIDs.ARC_FURNACE_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.ASSEMBLING_LINE_CONTROLLER; +import static gregtech.api.enums.MetaTileEntityIDs.ASSEMBLING_MACHINE_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.ASSEMBLING_MACHINE_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.ASSEMBLING_MACHINE_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.ASSEMBLING_MACHINE_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.ASSEMBLING_MACHINE_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.ASSEMBLING_MACHINE_UV; +import static gregtech.api.enums.MetaTileEntityIDs.ASSEMBLING_MACHINE_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.AUTOCLAVE_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.AUTOCLAVE_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.AUTOCLAVE_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.AUTOCLAVE_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.AUTOCLAVE_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.AUTOCLAVE_UV; +import static gregtech.api.enums.MetaTileEntityIDs.AUTOCLAVE_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.AUTOMATABLE_DATA_ACCESS_HATCH; import static gregtech.api.enums.MetaTileEntityIDs.AUTO_MAINTENANCE_HATCH; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_1_BY_1_EV; @@ -14,41 +42,65 @@ import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_1_BY_1_HV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_1_BY_1_IV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_1_BY_1_LV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_1_BY_1_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_1_BY_1_MAX; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_1_BY_1_MV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_1_BY_1_UEV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_1_BY_1_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_1_BY_1_UIV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_1_BY_1_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_1_BY_1_UMV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_1_BY_1_UV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_1_BY_1_UXV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_1_BY_1_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_2_BY_2_EV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_2_BY_2_HV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_2_BY_2_IV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_2_BY_2_LV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_2_BY_2_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_2_BY_2_MAX; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_2_BY_2_MV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_2_BY_2_UEV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_2_BY_2_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_2_BY_2_UIV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_2_BY_2_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_2_BY_2_UMV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_2_BY_2_UV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_2_BY_2_UXV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_2_BY_2_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_3_BY_3_EV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_3_BY_3_HV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_3_BY_3_IV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_3_BY_3_LV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_3_BY_3_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_3_BY_3_MAX; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_3_BY_3_MV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_3_BY_3_UEV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_3_BY_3_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_3_BY_3_UIV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_3_BY_3_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_3_BY_3_UMV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_3_BY_3_UV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_3_BY_3_UXV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_3_BY_3_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_4_BY_4_EV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_4_BY_4_HV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_4_BY_4_IV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_4_BY_4_LV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_4_BY_4_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_4_BY_4_MAX; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_4_BY_4_MV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_4_BY_4_UEV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_4_BY_4_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_4_BY_4_UIV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_4_BY_4_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_4_BY_4_UMV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_4_BY_4_UV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_4_BY_4_UXV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_BUFFER_4_BY_4_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_CHARGER_4_4_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_CHARGER_4_4_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_CHARGER_4_4_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_CHARGER_4_4_UXV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_CHARGER_4_BY_4_EV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_CHARGER_4_BY_4_HV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_CHARGER_4_BY_4_IV; @@ -59,35 +111,107 @@ import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_CHARGER_4_BY_4_UHV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_CHARGER_4_BY_4_ULV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_CHARGER_4_BY_4_UV; import static gregtech.api.enums.MetaTileEntityIDs.BATTERY_CHARGER_4_BY_4_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.BENDING_MACHINE_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.BENDING_MACHINE_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.BENDING_MACHINE_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.BENDING_MACHINE_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.BENDING_MACHINE_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.BENDING_MACHINE_UV; +import static gregtech.api.enums.MetaTileEntityIDs.BENDING_MACHINE_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.BREWERY_EV; import static gregtech.api.enums.MetaTileEntityIDs.BREWERY_HV; import static gregtech.api.enums.MetaTileEntityIDs.BREWERY_IV; import static gregtech.api.enums.MetaTileEntityIDs.BREWERY_LV; +import static gregtech.api.enums.MetaTileEntityIDs.BREWERY_LuV; import static gregtech.api.enums.MetaTileEntityIDs.BREWERY_MV; +import static gregtech.api.enums.MetaTileEntityIDs.BREWERY_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.BREWERY_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.BREWERY_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.BREWERY_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.BREWERY_UV; +import static gregtech.api.enums.MetaTileEntityIDs.BREWERY_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.BRICKED_BLAST_FURNACE_CONTROLLER; +import static gregtech.api.enums.MetaTileEntityIDs.CANNING_MACHINE_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.CANNING_MACHINE_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.CANNING_MACHINE_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.CANNING_MACHINE_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.CANNING_MACHINE_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.CANNING_MACHINE_UV; +import static gregtech.api.enums.MetaTileEntityIDs.CANNING_MACHINE_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.CENTRIFUGE_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.CENTRIFUGE_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.CENTRIFUGE_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.CENTRIFUGE_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.CENTRIFUGE_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.CENTRIFUGE_UV; +import static gregtech.api.enums.MetaTileEntityIDs.CENTRIFUGE_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.CHARCOAL_PILE_IGNITER_CONTROLLER; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_BATH_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_BATH_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_BATH_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_BATH_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_BATH_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_BATH_UV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_BATH_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_REACTOR_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_REACTOR_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_REACTOR_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_REACTOR_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_REACTOR_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_REACTOR_UV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_REACTOR_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.CHEST_BUFFER_EV; import static gregtech.api.enums.MetaTileEntityIDs.CHEST_BUFFER_HV; import static gregtech.api.enums.MetaTileEntityIDs.CHEST_BUFFER_IV; import static gregtech.api.enums.MetaTileEntityIDs.CHEST_BUFFER_LV; import static gregtech.api.enums.MetaTileEntityIDs.CHEST_BUFFER_LuV; import static gregtech.api.enums.MetaTileEntityIDs.CHEST_BUFFER_MV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEST_BUFFER_UEV; import static gregtech.api.enums.MetaTileEntityIDs.CHEST_BUFFER_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEST_BUFFER_UIV; import static gregtech.api.enums.MetaTileEntityIDs.CHEST_BUFFER_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEST_BUFFER_UMV; import static gregtech.api.enums.MetaTileEntityIDs.CHEST_BUFFER_UV; import static gregtech.api.enums.MetaTileEntityIDs.CHEST_BUFFER_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.CIRCUIT_ASSEMBLER_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.CIRCUIT_ASSEMBLER_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.CIRCUIT_ASSEMBLER_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.CIRCUIT_ASSEMBLER_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.CIRCUIT_ASSEMBLER_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.CIRCUIT_ASSEMBLER_UXV; import static gregtech.api.enums.MetaTileEntityIDs.CLEANROOM_CONTROLLER; import static gregtech.api.enums.MetaTileEntityIDs.COMBUSTION_ENGINE_CONTROLLER; import static gregtech.api.enums.MetaTileEntityIDs.COMBUSTION_GENERATOR_HV; import static gregtech.api.enums.MetaTileEntityIDs.COMBUSTION_GENERATOR_LV; import static gregtech.api.enums.MetaTileEntityIDs.COMBUSTION_GENERATOR_MV; +import static gregtech.api.enums.MetaTileEntityIDs.COMPRESSOR_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.COMPRESSOR_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.COMPRESSOR_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.COMPRESSOR_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.COMPRESSOR_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.COMPRESSOR_UV; +import static gregtech.api.enums.MetaTileEntityIDs.COMPRESSOR_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.CONCRETE_BACKFILLER_II_CONTROLLER; import static gregtech.api.enums.MetaTileEntityIDs.CONCRETE_BACKFILLER_I_CONTROLLER; import static gregtech.api.enums.MetaTileEntityIDs.CRAFTING_INPUT_ME; import static gregtech.api.enums.MetaTileEntityIDs.CRAFTING_INPUT_ME_BUS; import static gregtech.api.enums.MetaTileEntityIDs.CRAFTING_INPUT_SLAVE; +import static gregtech.api.enums.MetaTileEntityIDs.CUTTING_MACHINE_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.CUTTING_MACHINE_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.CUTTING_MACHINE_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.CUTTING_MACHINE_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.CUTTING_MACHINE_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.CUTTING_MACHINE_UV; +import static gregtech.api.enums.MetaTileEntityIDs.CUTTING_MACHINE_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.DATA_ACCESS_HATCH; import static gregtech.api.enums.MetaTileEntityIDs.DISTILLATION_TOWER_CONTROLLER; +import static gregtech.api.enums.MetaTileEntityIDs.DISTILLERY_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.DISTILLERY_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.DISTILLERY_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.DISTILLERY_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.DISTILLERY_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.DISTILLERY_UV; +import static gregtech.api.enums.MetaTileEntityIDs.DISTILLERY_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.DTPF_CONTROLLER; import static gregtech.api.enums.MetaTileEntityIDs.DYNAMO_HATCH_EV; import static gregtech.api.enums.MetaTileEntityIDs.DYNAMO_HATCH_HV; @@ -95,24 +219,116 @@ import static gregtech.api.enums.MetaTileEntityIDs.DYNAMO_HATCH_IV; import static gregtech.api.enums.MetaTileEntityIDs.DYNAMO_HATCH_LV; import static gregtech.api.enums.MetaTileEntityIDs.DYNAMO_HATCH_LuV; import static gregtech.api.enums.MetaTileEntityIDs.DYNAMO_HATCH_MV; +import static gregtech.api.enums.MetaTileEntityIDs.DYNAMO_HATCH_UEV; import static gregtech.api.enums.MetaTileEntityIDs.DYNAMO_HATCH_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.DYNAMO_HATCH_UIV; import static gregtech.api.enums.MetaTileEntityIDs.DYNAMO_HATCH_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.DYNAMO_HATCH_UMV; import static gregtech.api.enums.MetaTileEntityIDs.DYNAMO_HATCH_UV; +import static gregtech.api.enums.MetaTileEntityIDs.DYNAMO_HATCH_UXV; import static gregtech.api.enums.MetaTileEntityIDs.DYNAMO_HATCH_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.DroneDownLink; import static gregtech.api.enums.MetaTileEntityIDs.Drone_Centre; import static gregtech.api.enums.MetaTileEntityIDs.EBF_CONTROLLER; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTRIC_FURNACE_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTRIC_FURNACE_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTRIC_FURNACE_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTRIC_FURNACE_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTRIC_FURNACE_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTRIC_FURNACE_UV; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTRIC_FURNACE_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTROLYZER_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTROLYZER_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTROLYZER_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTROLYZER_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTROLYZER_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTROLYZER_UV; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTROLYZER_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTROMAGNETIC_SEPARATOR_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTROMAGNETIC_SEPARATOR_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTROMAGNETIC_SEPARATOR_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTROMAGNETIC_SEPARATOR_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTROMAGNETIC_SEPARATOR_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTROMAGNETIC_SEPARATOR_UV; +import static gregtech.api.enums.MetaTileEntityIDs.ELECTROMAGNETIC_SEPARATOR_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.ENERGY_HATCH_EV; import static gregtech.api.enums.MetaTileEntityIDs.ENERGY_HATCH_HV; import static gregtech.api.enums.MetaTileEntityIDs.ENERGY_HATCH_IV; import static gregtech.api.enums.MetaTileEntityIDs.ENERGY_HATCH_LV; import static gregtech.api.enums.MetaTileEntityIDs.ENERGY_HATCH_LuV; import static gregtech.api.enums.MetaTileEntityIDs.ENERGY_HATCH_MV; +import static gregtech.api.enums.MetaTileEntityIDs.ENERGY_HATCH_UEV; import static gregtech.api.enums.MetaTileEntityIDs.ENERGY_HATCH_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.ENERGY_HATCH_UIV; import static gregtech.api.enums.MetaTileEntityIDs.ENERGY_HATCH_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.ENERGY_HATCH_UMV; import static gregtech.api.enums.MetaTileEntityIDs.ENERGY_HATCH_UV; +import static gregtech.api.enums.MetaTileEntityIDs.ENERGY_HATCH_UXV; import static gregtech.api.enums.MetaTileEntityIDs.ENERGY_HATCH_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.EXTRACTOR_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.EXTRACTOR_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.EXTRACTOR_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.EXTRACTOR_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.EXTRACTOR_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.EXTRACTOR_UV; +import static gregtech.api.enums.MetaTileEntityIDs.EXTRACTOR_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.EXTREME_COMBUSTION_ENGINE_CONTROLLER; +import static gregtech.api.enums.MetaTileEntityIDs.EXTRUDER_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.EXTRUDER_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.EXTRUDER_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.EXTRUDER_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.EXTRUDER_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.EXTRUDER_UV; +import static gregtech.api.enums.MetaTileEntityIDs.EXTRUDER_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.FERMENTER_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.FERMENTER_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.FERMENTER_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.FERMENTER_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.FERMENTER_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.FERMENTER_UV; +import static gregtech.api.enums.MetaTileEntityIDs.FERMENTER_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_CANNER_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_CANNER_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_CANNER_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_CANNER_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_CANNER_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_CANNER_UV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_CANNER_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_EXTRACTOR_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_EXTRACTOR_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_EXTRACTOR_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_EXTRACTOR_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_EXTRACTOR_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_EXTRACTOR_UV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_EXTRACTOR_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_HEATER_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_HEATER_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_HEATER_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_HEATER_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_HEATER_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_HEATER_UV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_HEATER_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_SOLIDIFIER_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_SOLIDIFIER_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_SOLIDIFIER_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_SOLIDIFIER_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_SOLIDIFIER_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_SOLIDIFIER_UV; +import static gregtech.api.enums.MetaTileEntityIDs.FLUID_SOLIDIFIER_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.FORGE_HAMMER_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.FORGE_HAMMER_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.FORGE_HAMMER_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.FORGE_HAMMER_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.FORGE_HAMMER_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.FORGE_HAMMER_UV; +import static gregtech.api.enums.MetaTileEntityIDs.FORGE_HAMMER_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.FORMING_PRESS_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.FORMING_PRESS_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.FORMING_PRESS_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.FORMING_PRESS_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.FORMING_PRESS_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.FORMING_PRESS_UV; +import static gregtech.api.enums.MetaTileEntityIDs.FORMING_PRESS_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.FUSION_CONTROLLER_MKI; import static gregtech.api.enums.MetaTileEntityIDs.FUSION_CONTROLLER_MKII; import static gregtech.api.enums.MetaTileEntityIDs.FUSION_CONTROLLER_MKIII; @@ -125,6 +341,11 @@ import static gregtech.api.enums.MetaTileEntityIDs.HATCH_DEGASIFIER_CONTROL; import static gregtech.api.enums.MetaTileEntityIDs.HATCH_LENS_HOUSING; import static gregtech.api.enums.MetaTileEntityIDs.HATCH_LENS_INDICATOR; import static gregtech.api.enums.MetaTileEntityIDs.HATCH_PH_SENSOR; +import static gregtech.api.enums.MetaTileEntityIDs.HIGH_AMP_TRANSFORMER_MAX_UXV; +import static gregtech.api.enums.MetaTileEntityIDs.HIGH_AMP_TRANSFORMER_UEV_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.HIGH_AMP_TRANSFORMER_UIV_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.HIGH_AMP_TRANSFORMER_UMV_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.HIGH_AMP_TRANSFORMER_UXV_UMV; import static gregtech.api.enums.MetaTileEntityIDs.HIGH_PRESSURE_COAL_BOILER; import static gregtech.api.enums.MetaTileEntityIDs.HIGH_PRESSURE_LAVA_BOILER; import static gregtech.api.enums.MetaTileEntityIDs.HIGH_PRESSURE_SOLAR_BOILER; @@ -141,11 +362,16 @@ import static gregtech.api.enums.MetaTileEntityIDs.HULL_HV; import static gregtech.api.enums.MetaTileEntityIDs.HULL_IV; import static gregtech.api.enums.MetaTileEntityIDs.HULL_LV; import static gregtech.api.enums.MetaTileEntityIDs.HULL_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.HULL_MAX; import static gregtech.api.enums.MetaTileEntityIDs.HULL_MV; import static gregtech.api.enums.MetaTileEntityIDs.HULL_STEEL; +import static gregtech.api.enums.MetaTileEntityIDs.HULL_UEV; import static gregtech.api.enums.MetaTileEntityIDs.HULL_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.HULL_UIV; import static gregtech.api.enums.MetaTileEntityIDs.HULL_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.HULL_UMV; import static gregtech.api.enums.MetaTileEntityIDs.HULL_UV; +import static gregtech.api.enums.MetaTileEntityIDs.HULL_UXV; import static gregtech.api.enums.MetaTileEntityIDs.HULL_WROUGHT_IRON; import static gregtech.api.enums.MetaTileEntityIDs.HULL_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.IMPLOSION_COMPRESSOR_CONTROLLER; @@ -169,12 +395,17 @@ import static gregtech.api.enums.MetaTileEntityIDs.INPUT_HATCH_HV; import static gregtech.api.enums.MetaTileEntityIDs.INPUT_HATCH_IV; import static gregtech.api.enums.MetaTileEntityIDs.INPUT_HATCH_LV; import static gregtech.api.enums.MetaTileEntityIDs.INPUT_HATCH_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.INPUT_HATCH_MAX; import static gregtech.api.enums.MetaTileEntityIDs.INPUT_HATCH_ME; import static gregtech.api.enums.MetaTileEntityIDs.INPUT_HATCH_ME_ADVANCED; import static gregtech.api.enums.MetaTileEntityIDs.INPUT_HATCH_MV; +import static gregtech.api.enums.MetaTileEntityIDs.INPUT_HATCH_UEV; import static gregtech.api.enums.MetaTileEntityIDs.INPUT_HATCH_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.INPUT_HATCH_UIV; import static gregtech.api.enums.MetaTileEntityIDs.INPUT_HATCH_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.INPUT_HATCH_UMV; import static gregtech.api.enums.MetaTileEntityIDs.INPUT_HATCH_UV; +import static gregtech.api.enums.MetaTileEntityIDs.INPUT_HATCH_UXV; import static gregtech.api.enums.MetaTileEntityIDs.INPUT_HATCH_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.INTEGRATED_ORE_FACTORY_CONTROLLER; import static gregtech.api.enums.MetaTileEntityIDs.ITEM_DISTRIBUTOR_EV; @@ -207,6 +438,13 @@ import static gregtech.api.enums.MetaTileEntityIDs.LARGE_STEAM_TURBINE_CONTROLLE import static gregtech.api.enums.MetaTileEntityIDs.LARGE_STEEL_BOILER_CONTROLLER; import static gregtech.api.enums.MetaTileEntityIDs.LARGE_TITANIUM_BOILER_CONTROLLER; import static gregtech.api.enums.MetaTileEntityIDs.LARGE_TUNGSTENSTEEL_BOILER_CONTROLLER; +import static gregtech.api.enums.MetaTileEntityIDs.LATHE_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LATHE_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.LATHE_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.LATHE_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.LATHE_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.LATHE_UV; +import static gregtech.api.enums.MetaTileEntityIDs.LATHE_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.LCR_CONTROLLER; import static gregtech.api.enums.MetaTileEntityIDs.LIGHTNING_ROD_EV; import static gregtech.api.enums.MetaTileEntityIDs.LIGHTNING_ROD_HV; @@ -223,6 +461,13 @@ import static gregtech.api.enums.MetaTileEntityIDs.LOCKER_UV; import static gregtech.api.enums.MetaTileEntityIDs.LOCKER_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.LONG_DISTANCE_PIPELINE_FLUID; import static gregtech.api.enums.MetaTileEntityIDs.LONG_DISTANCE_PIPELINE_ITEM; +import static gregtech.api.enums.MetaTileEntityIDs.MACERATOR_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.MACERATOR_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.MACERATOR_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.MACERATOR_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.MACERATOR_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.MACERATOR_UV; +import static gregtech.api.enums.MetaTileEntityIDs.MACERATOR_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.MAGIC_ENERGY_ABSORBER_EV; import static gregtech.api.enums.MetaTileEntityIDs.MAGIC_ENERGY_ABSORBER_HV; import static gregtech.api.enums.MetaTileEntityIDs.MAGIC_ENERGY_ABSORBER_LV; @@ -237,15 +482,50 @@ import static gregtech.api.enums.MetaTileEntityIDs.MASS_FABRICATOR_HV; import static gregtech.api.enums.MetaTileEntityIDs.MASS_FABRICATOR_IV; import static gregtech.api.enums.MetaTileEntityIDs.MASS_FABRICATOR_LV; import static gregtech.api.enums.MetaTileEntityIDs.MASS_FABRICATOR_MV; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_AMPLIFIER_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_AMPLIFIER_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_AMPLIFIER_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_AMPLIFIER_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_AMPLIFIER_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_AMPLIFIER_UV; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_AMPLIFIER_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_FABRICATOR_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_FABRICATOR_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_FABRICATOR_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_FABRICATOR_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_FABRICATOR_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_FABRICATOR_UV; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_FABRICATOR_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_REPLICATOR_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_REPLICATOR_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_REPLICATOR_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_REPLICATOR_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_REPLICATOR_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_REPLICATOR_UV; +import static gregtech.api.enums.MetaTileEntityIDs.MATTER_REPLICATOR_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.MICROWAVE_ENERGY_TRANSMITTER_EV; import static gregtech.api.enums.MetaTileEntityIDs.MICROWAVE_ENERGY_TRANSMITTER_HV; import static gregtech.api.enums.MetaTileEntityIDs.MICROWAVE_ENERGY_TRANSMITTER_IV; import static gregtech.api.enums.MetaTileEntityIDs.MICROWAVE_ENERGY_TRANSMITTER_LuV; import static gregtech.api.enums.MetaTileEntityIDs.MICROWAVE_ENERGY_TRANSMITTER_UV; import static gregtech.api.enums.MetaTileEntityIDs.MICROWAVE_ENERGY_TRANSMITTER_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.MICROWAVE_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.MICROWAVE_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.MICROWAVE_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.MICROWAVE_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.MICROWAVE_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.MICROWAVE_UV; +import static gregtech.api.enums.MetaTileEntityIDs.MICROWAVE_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.MINER_HV; import static gregtech.api.enums.MetaTileEntityIDs.MINER_LV; import static gregtech.api.enums.MetaTileEntityIDs.MINER_MV; +import static gregtech.api.enums.MetaTileEntityIDs.MIXER_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.MIXER_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.MIXER_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.MIXER_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.MIXER_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.MIXER_UV; +import static gregtech.api.enums.MetaTileEntityIDs.MIXER_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.MONSTER_REPELLATOR_EV; import static gregtech.api.enums.MetaTileEntityIDs.MONSTER_REPELLATOR_HV; import static gregtech.api.enums.MetaTileEntityIDs.MONSTER_REPELLATOR_IV; @@ -282,6 +562,13 @@ import static gregtech.api.enums.MetaTileEntityIDs.ORE_DRILL_MKIII_CONTROLLER; import static gregtech.api.enums.MetaTileEntityIDs.ORE_DRILL_MKII_CONTROLLER; import static gregtech.api.enums.MetaTileEntityIDs.ORE_DRILL_MKIV_CONTROLLER; import static gregtech.api.enums.MetaTileEntityIDs.ORE_DRILL_MKI_CONTROLLER; +import static gregtech.api.enums.MetaTileEntityIDs.ORE_WASHING_PLANT_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.ORE_WASHING_PLANT_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.ORE_WASHING_PLANT_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.ORE_WASHING_PLANT_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.ORE_WASHING_PLANT_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.ORE_WASHING_PLANT_UV; +import static gregtech.api.enums.MetaTileEntityIDs.ORE_WASHING_PLANT_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.OUTPUT_BUS_EV; import static gregtech.api.enums.MetaTileEntityIDs.OUTPUT_BUS_HV; import static gregtech.api.enums.MetaTileEntityIDs.OUTPUT_BUS_IV; @@ -298,11 +585,16 @@ import static gregtech.api.enums.MetaTileEntityIDs.OUTPUT_HATCH_HV; import static gregtech.api.enums.MetaTileEntityIDs.OUTPUT_HATCH_IV; import static gregtech.api.enums.MetaTileEntityIDs.OUTPUT_HATCH_LV; import static gregtech.api.enums.MetaTileEntityIDs.OUTPUT_HATCH_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.OUTPUT_HATCH_MAX; import static gregtech.api.enums.MetaTileEntityIDs.OUTPUT_HATCH_ME; import static gregtech.api.enums.MetaTileEntityIDs.OUTPUT_HATCH_MV; +import static gregtech.api.enums.MetaTileEntityIDs.OUTPUT_HATCH_UEV; import static gregtech.api.enums.MetaTileEntityIDs.OUTPUT_HATCH_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.OUTPUT_HATCH_UIV; import static gregtech.api.enums.MetaTileEntityIDs.OUTPUT_HATCH_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.OUTPUT_HATCH_UMV; import static gregtech.api.enums.MetaTileEntityIDs.OUTPUT_HATCH_UV; +import static gregtech.api.enums.MetaTileEntityIDs.OUTPUT_HATCH_UXV; import static gregtech.api.enums.MetaTileEntityIDs.OUTPUT_HATCH_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.PACKAGER_EV; import static gregtech.api.enums.MetaTileEntityIDs.PACKAGER_HV; @@ -313,15 +605,40 @@ import static gregtech.api.enums.MetaTileEntityIDs.PACKAGER_MV; import static gregtech.api.enums.MetaTileEntityIDs.PACKAGER_UV; import static gregtech.api.enums.MetaTileEntityIDs.PACKAGER_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.PCB_FACTORY_CONTROLLER; +import static gregtech.api.enums.MetaTileEntityIDs.PLASMA_ARC_FURNACE_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.PLASMA_ARC_FURNACE_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.PLASMA_ARC_FURNACE_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.PLASMA_ARC_FURNACE_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.PLASMA_ARC_FURNACE_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.PLASMA_ARC_FURNACE_UV; +import static gregtech.api.enums.MetaTileEntityIDs.PLASMA_ARC_FURNACE_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.PLASMA_GENERATOR_EV; import static gregtech.api.enums.MetaTileEntityIDs.PLASMA_GENERATOR_IV; import static gregtech.api.enums.MetaTileEntityIDs.PLASMA_GENERATOR_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.PLASMA_GENERATOR_UV; import static gregtech.api.enums.MetaTileEntityIDs.PLASMA_GENERATOR_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.POLARIZER_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.POLARIZER_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.POLARIZER_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.POLARIZER_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.POLARIZER_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.POLARIZER_UV; +import static gregtech.api.enums.MetaTileEntityIDs.POLARIZER_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.PRECISION_LASER_ENGRAVER_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.PRECISION_LASER_ENGRAVER_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.PRECISION_LASER_ENGRAVER_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.PRECISION_LASER_ENGRAVER_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.PRECISION_LASER_ENGRAVER_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.PRECISION_LASER_ENGRAVER_UV; +import static gregtech.api.enums.MetaTileEntityIDs.PRECISION_LASER_ENGRAVER_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.PROCESSING_ARRAY_CONTROLLER; import static gregtech.api.enums.MetaTileEntityIDs.PUMP_EV; import static gregtech.api.enums.MetaTileEntityIDs.PUMP_HV; import static gregtech.api.enums.MetaTileEntityIDs.PUMP_IV; import static gregtech.api.enums.MetaTileEntityIDs.PUMP_LV; +import static gregtech.api.enums.MetaTileEntityIDs.PUMP_LuV; import static gregtech.api.enums.MetaTileEntityIDs.PUMP_MV; +import static gregtech.api.enums.MetaTileEntityIDs.PUMP_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.PURIFICATION_PLANT_CONTROLLER; import static gregtech.api.enums.MetaTileEntityIDs.PURIFICATION_UNIT_CLARIFIER; import static gregtech.api.enums.MetaTileEntityIDs.PURIFICATION_UNIT_DEGASIFIER; @@ -363,6 +680,13 @@ import static gregtech.api.enums.MetaTileEntityIDs.RECIPE_FILTER_UHV; import static gregtech.api.enums.MetaTileEntityIDs.RECIPE_FILTER_ULV; import static gregtech.api.enums.MetaTileEntityIDs.RECIPE_FILTER_UV; import static gregtech.api.enums.MetaTileEntityIDs.RECIPE_FILTER_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.RECYCLER_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.RECYCLER_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.RECYCLER_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.RECYCLER_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.RECYCLER_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.RECYCLER_UV; +import static gregtech.api.enums.MetaTileEntityIDs.RECYCLER_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.REPLICATOR_EV; import static gregtech.api.enums.MetaTileEntityIDs.REPLICATOR_HV; import static gregtech.api.enums.MetaTileEntityIDs.REPLICATOR_IV; @@ -372,13 +696,41 @@ import static gregtech.api.enums.MetaTileEntityIDs.ROCK_BREAKER_EV; import static gregtech.api.enums.MetaTileEntityIDs.ROCK_BREAKER_HV; import static gregtech.api.enums.MetaTileEntityIDs.ROCK_BREAKER_IV; import static gregtech.api.enums.MetaTileEntityIDs.ROCK_BREAKER_LV; +import static gregtech.api.enums.MetaTileEntityIDs.ROCK_BREAKER_LuV; import static gregtech.api.enums.MetaTileEntityIDs.ROCK_BREAKER_MV; +import static gregtech.api.enums.MetaTileEntityIDs.ROCK_BREAKER_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.ROCK_BREAKER_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.ROCK_BREAKER_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.ROCK_BREAKER_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.ROCK_BREAKER_UV; +import static gregtech.api.enums.MetaTileEntityIDs.ROCK_BREAKER_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.SCANNER_EV; import static gregtech.api.enums.MetaTileEntityIDs.SCANNER_HV; import static gregtech.api.enums.MetaTileEntityIDs.SCANNER_IV; import static gregtech.api.enums.MetaTileEntityIDs.SCANNER_LV; +import static gregtech.api.enums.MetaTileEntityIDs.SCANNER_LuV; import static gregtech.api.enums.MetaTileEntityIDs.SCANNER_MV; +import static gregtech.api.enums.MetaTileEntityIDs.SCANNER_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.SCANNER_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.SCANNER_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.SCANNER_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.SCANNER_UV; +import static gregtech.api.enums.MetaTileEntityIDs.SCANNER_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.SIFTING_MACHINE_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.SIFTING_MACHINE_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.SIFTING_MACHINE_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.SIFTING_MACHINE_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.SIFTING_MACHINE_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.SIFTING_MACHINE_UV; +import static gregtech.api.enums.MetaTileEntityIDs.SIFTING_MACHINE_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.SIMPLE_SOLAR_BOILER; +import static gregtech.api.enums.MetaTileEntityIDs.SLICING_MACHINE_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.SLICING_MACHINE_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.SLICING_MACHINE_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.SLICING_MACHINE_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.SLICING_MACHINE_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.SLICING_MACHINE_UV; +import static gregtech.api.enums.MetaTileEntityIDs.SLICING_MACHINE_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.SMALL_COAL_BOILER; import static gregtech.api.enums.MetaTileEntityIDs.STEAM_ALLOY_SMELTER; import static gregtech.api.enums.MetaTileEntityIDs.STEAM_COMPRESSOR; @@ -410,7 +762,29 @@ import static gregtech.api.enums.MetaTileEntityIDs.SUPER_TANK_IV; import static gregtech.api.enums.MetaTileEntityIDs.SUPER_TANK_LV; import static gregtech.api.enums.MetaTileEntityIDs.SUPER_TANK_MV; import static gregtech.api.enums.MetaTileEntityIDs.TELEPORTER; +import static gregtech.api.enums.MetaTileEntityIDs.THERMAL_CENTRIFUGE_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.THERMAL_CENTRIFUGE_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.THERMAL_CENTRIFUGE_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.THERMAL_CENTRIFUGE_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.THERMAL_CENTRIFUGE_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.THERMAL_CENTRIFUGE_UV; +import static gregtech.api.enums.MetaTileEntityIDs.THERMAL_CENTRIFUGE_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.TRANSCENDENT_PLASMA_MIXER_CONTROLLER; +import static gregtech.api.enums.MetaTileEntityIDs.TRANSFORMER_MAX_UXV; +import static gregtech.api.enums.MetaTileEntityIDs.TRANSFORMER_UEV_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.TRANSFORMER_UIV_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.TRANSFORMER_UMV_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.TRANSFORMER_UXV_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.TURBO_CHARGER_EV; +import static gregtech.api.enums.MetaTileEntityIDs.TURBO_CHARGER_HV; +import static gregtech.api.enums.MetaTileEntityIDs.TURBO_CHARGER_IV; +import static gregtech.api.enums.MetaTileEntityIDs.TURBO_CHARGER_LV; +import static gregtech.api.enums.MetaTileEntityIDs.TURBO_CHARGER_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.TURBO_CHARGER_MV; +import static gregtech.api.enums.MetaTileEntityIDs.TURBO_CHARGER_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.TURBO_CHARGER_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.TURBO_CHARGER_UV; +import static gregtech.api.enums.MetaTileEntityIDs.TURBO_CHARGER_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.TYPE_FILTER_EV; import static gregtech.api.enums.MetaTileEntityIDs.TYPE_FILTER_HV; import static gregtech.api.enums.MetaTileEntityIDs.TYPE_FILTER_IV; @@ -432,6 +806,20 @@ import static gregtech.api.enums.MetaTileEntityIDs.VOLTAGE_REGULATOR_UHV; import static gregtech.api.enums.MetaTileEntityIDs.VOLTAGE_REGULATOR_ULV; import static gregtech.api.enums.MetaTileEntityIDs.VOLTAGE_REGULATOR_UV; import static gregtech.api.enums.MetaTileEntityIDs.VOLTAGE_REGULATOR_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.WET_TRANSFORMER_EV_HV; +import static gregtech.api.enums.MetaTileEntityIDs.WET_TRANSFORMER_HV_MV; +import static gregtech.api.enums.MetaTileEntityIDs.WET_TRANSFORMER_IV_EV; +import static gregtech.api.enums.MetaTileEntityIDs.WET_TRANSFORMER_LV_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.WET_TRANSFORMER_LuV_IV; +import static gregtech.api.enums.MetaTileEntityIDs.WET_TRANSFORMER_MAX_UXV; +import static gregtech.api.enums.MetaTileEntityIDs.WET_TRANSFORMER_MV_LV; +import static gregtech.api.enums.MetaTileEntityIDs.WET_TRANSFORMER_UEV_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.WET_TRANSFORMER_UHV_UV; +import static gregtech.api.enums.MetaTileEntityIDs.WET_TRANSFORMER_UIV_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.WET_TRANSFORMER_UMV_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.WET_TRANSFORMER_UV_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.WET_TRANSFORMER_UXV_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.WET_TRANSFORMER_ZPM_LuV; import static gregtech.api.enums.MetaTileEntityIDs.WIRELESS_DYNAMO_ENERGY_HATCH_EV; import static gregtech.api.enums.MetaTileEntityIDs.WIRELESS_DYNAMO_ENERGY_HATCH_HV; import static gregtech.api.enums.MetaTileEntityIDs.WIRELESS_DYNAMO_ENERGY_HATCH_IV; @@ -462,6 +850,21 @@ import static gregtech.api.enums.MetaTileEntityIDs.WIRELESS_HATCH_ENERGY_UMV; import static gregtech.api.enums.MetaTileEntityIDs.WIRELESS_HATCH_ENERGY_UV; import static gregtech.api.enums.MetaTileEntityIDs.WIRELESS_HATCH_ENERGY_UXV; import static gregtech.api.enums.MetaTileEntityIDs.WIRELESS_HATCH_ENERGY_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.WIREMILL_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.WIREMILL_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.WIREMILL_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.WIREMILL_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.WIREMILL_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.WIREMILL_UV; +import static gregtech.api.enums.MetaTileEntityIDs.WIREMILL_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.WORLD_ACCELERATOR_EV; +import static gregtech.api.enums.MetaTileEntityIDs.WORLD_ACCELERATOR_HV; +import static gregtech.api.enums.MetaTileEntityIDs.WORLD_ACCELERATOR_IV; +import static gregtech.api.enums.MetaTileEntityIDs.WORLD_ACCELERATOR_LV; +import static gregtech.api.enums.MetaTileEntityIDs.WORLD_ACCELERATOR_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.WORLD_ACCELERATOR_MV; +import static gregtech.api.enums.MetaTileEntityIDs.WORLD_ACCELERATOR_UV; +import static gregtech.api.enums.MetaTileEntityIDs.WORLD_ACCELERATOR_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.WORMHOLE_GENERATOR_CONTROLLER; import static gregtech.api.enums.MetaTileEntityIDs.transformer_EV_HV; import static gregtech.api.enums.MetaTileEntityIDs.transformer_HV_MV; @@ -474,6 +877,45 @@ import static gregtech.api.enums.MetaTileEntityIDs.transformer_UV_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.transformer_ZPM_LuV; import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes; +import static gregtech.api.recipe.RecipeMaps.amplifierRecipes; +import static gregtech.api.recipe.RecipeMaps.arcFurnaceRecipes; +import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; +import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; +import static gregtech.api.recipe.RecipeMaps.benderRecipes; +import static gregtech.api.recipe.RecipeMaps.cannerRecipes; +import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; +import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes; +import static gregtech.api.recipe.RecipeMaps.chemicalReactorRecipes; +import static gregtech.api.recipe.RecipeMaps.circuitAssemblerRecipes; +import static gregtech.api.recipe.RecipeMaps.compressorRecipes; +import static gregtech.api.recipe.RecipeMaps.cutterRecipes; +import static gregtech.api.recipe.RecipeMaps.distilleryRecipes; +import static gregtech.api.recipe.RecipeMaps.electroMagneticSeparatorRecipes; +import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes; +import static gregtech.api.recipe.RecipeMaps.extractorRecipes; +import static gregtech.api.recipe.RecipeMaps.extruderRecipes; +import static gregtech.api.recipe.RecipeMaps.fermentingRecipes; +import static gregtech.api.recipe.RecipeMaps.fluidCannerRecipes; +import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; +import static gregtech.api.recipe.RecipeMaps.fluidHeaterRecipes; +import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; +import static gregtech.api.recipe.RecipeMaps.formingPressRecipes; +import static gregtech.api.recipe.RecipeMaps.furnaceRecipes; +import static gregtech.api.recipe.RecipeMaps.hammerRecipes; +import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes; +import static gregtech.api.recipe.RecipeMaps.latheRecipes; +import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; +import static gregtech.api.recipe.RecipeMaps.microwaveRecipes; +import static gregtech.api.recipe.RecipeMaps.mixerRecipes; +import static gregtech.api.recipe.RecipeMaps.oreWasherRecipes; +import static gregtech.api.recipe.RecipeMaps.plasmaArcFurnaceRecipes; +import static gregtech.api.recipe.RecipeMaps.polarizerRecipes; +import static gregtech.api.recipe.RecipeMaps.recyclerRecipes; +import static gregtech.api.recipe.RecipeMaps.sifterRecipes; +import static gregtech.api.recipe.RecipeMaps.slicerRecipes; +import static gregtech.api.recipe.RecipeMaps.thermalCentrifugeRecipes; +import static gregtech.api.recipe.RecipeMaps.wiremillRecipes; import net.minecraft.util.EnumChatFormatting; @@ -481,15 +923,18 @@ import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; +import gregtech.api.enums.MachineType; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SoundResource; import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable; import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid; import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame; import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Item; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicBatteryBuffer; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_DataAccess; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; @@ -503,6 +948,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Outpu import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_QuadrupleHumongous; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MagHatch; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_WetTransformer; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Wireless_Dynamo; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Wireless_Hatch; import gregtech.api.util.GT_LanguageManager; @@ -553,6 +999,8 @@ import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Replicator; import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_RockBreaker; import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Scanner; import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Teleporter; +import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_TurboCharger; +import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_WorldAccelerator; import gregtech.common.tileentities.machines.long_distance.GT_MetaTileEntity_LongDistancePipelineFluid; import gregtech.common.tileentities.machines.long_distance.GT_MetaTileEntity_LongDistancePipelineItem; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_AssemblyLine; @@ -636,6 +1084,7 @@ import gregtech.common.tileentities.storage.GT_MetaTileEntity_QuantumChest; import gregtech.common.tileentities.storage.GT_MetaTileEntity_QuantumTank; import gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperChest; import gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperTank; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTransformerHiAmp; // Free IDs left for machines in GT as of 29th of July 2022 - Colen. Please try use them up in order. // 366 @@ -1177,6 +1626,348 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC } + private static void registerAssemblingMachine() { + ItemList.AssemblingMachineLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ASSEMBLING_MACHINE_LuV.ID, + "basicmachine.assembler.tier.06", + "Elite Assembling Machine", + 6, + MachineType.ASSEMBLER.tooltipDescription(), + assemblerRecipes, + 9, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ASSEMBLER", + null).getStackForm(1L)); + + ItemList.AssemblingMachineZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ASSEMBLING_MACHINE_ZPM.ID, + "basicmachine.assembler.tier.07", + "Elite Assembling Machine II", + 7, + MachineType.ASSEMBLER.tooltipDescription(), + assemblerRecipes, + 9, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ASSEMBLER", + null).getStackForm(1L)); + + ItemList.AssemblingMachineUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ASSEMBLING_MACHINE_UV.ID, + "basicmachine.assembler.tier.08", + "Ultimate Assembly Constructor", + 8, + MachineType.ASSEMBLER.tooltipDescription(), + assemblerRecipes, + 9, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ASSEMBLER", + null).getStackForm(1L)); + + ItemList.AssemblingMachineUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ASSEMBLING_MACHINE_UHV.ID, + "basicmachine.assembler.tier.09", + "Epic Assembly Constructor", + 9, + MachineType.ASSEMBLER.tooltipDescription(), + assemblerRecipes, + 9, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ASSEMBLER", + null).getStackForm(1L)); + + ItemList.AssemblingMachineUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ASSEMBLING_MACHINE_UEV.ID, + "basicmachine.assembler.tier.10", + "Epic Assembly Constructor II", + 10, + MachineType.ASSEMBLER.tooltipDescription(), + assemblerRecipes, + 9, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ASSEMBLER", + null).getStackForm(1L)); + + ItemList.AssemblingMachineUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ASSEMBLING_MACHINE_UIV.ID, + "basicmachine.assembler.tier.11", + "Epic Assembly Constructor III", + 11, + MachineType.ASSEMBLER.tooltipDescription(), + assemblerRecipes, + 9, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ASSEMBLER", + null).getStackForm(1L)); + + ItemList.AssemblingMachineUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ASSEMBLING_MACHINE_UMV.ID, + "basicmachine.assembler.tier.12", + "Epic Assembly Constructor IV", + 12, + MachineType.ASSEMBLER.tooltipDescription(), + assemblerRecipes, + 9, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ASSEMBLER", + null).getStackForm(1L)); + } + + private static void registerMatterAmplifier() { + ItemList.AmplifabricatorLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MATTER_AMPLIFIER_LuV.ID, + "basicmachine.amplifab.tier.06", + "Elite Amplifabricator", + 6, + MachineType.MATTER_AMPLIFIER.tooltipDescription(), + amplifierRecipes, + 1, + 1, + 1000, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "AMPLIFAB", + null).getStackForm(1L)); + + ItemList.AmplifabricatorZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MATTER_AMPLIFIER_ZPM.ID, + "basicmachine.amplifab.tier.07", + "Elite Amplifabricator II", + 7, + MachineType.MATTER_AMPLIFIER.tooltipDescription(), + amplifierRecipes, + 1, + 1, + 1000, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "AMPLIFAB", + null).getStackForm(1L)); + + ItemList.AmplifabricatorUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MATTER_AMPLIFIER_UV.ID, + "basicmachine.amplifab.tier.08", + "Ultimate Amplicreator", + 8, + MachineType.MATTER_AMPLIFIER.tooltipDescription(), + amplifierRecipes, + 1, + 1, + 1000, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "AMPLIFAB", + null).getStackForm(1L)); + + ItemList.AmplifabricatorUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MATTER_AMPLIFIER_UHV.ID, + "basicmachine.amplifab.tier.09", + "Epic Amplicreator", + 9, + MachineType.MATTER_AMPLIFIER.tooltipDescription(), + amplifierRecipes, + 1, + 1, + 1000, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "AMPLIFAB", + null).getStackForm(1L)); + + ItemList.AmplifabricatorUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MATTER_AMPLIFIER_UEV.ID, + "basicmachine.amplifab.tier.10", + "Epic Amplicreator II", + 10, + MachineType.MATTER_AMPLIFIER.tooltipDescription(), + amplifierRecipes, + 1, + 1, + 1000, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "AMPLIFAB", + null).getStackForm(1L)); + + ItemList.AmplifabricatorUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MATTER_AMPLIFIER_UIV.ID, + "basicmachine.amplifab.tier.11", + "Epic Amplicreator III", + 11, + MachineType.MATTER_AMPLIFIER.tooltipDescription(), + amplifierRecipes, + 1, + 1, + 1000, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "AMPLIFAB", + null).getStackForm(1L)); + + ItemList.AmplifabricatorUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MATTER_AMPLIFIER_UMV.ID, + "basicmachine.amplifab.tier.12", + "Epic Amplicreator IV", + 12, + MachineType.MATTER_AMPLIFIER.tooltipDescription(), + amplifierRecipes, + 1, + 1, + 1000, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "AMPLIFAB", + null).getStackForm(1L)); + } + + private static void registerAlloySmelter() { + ItemList.AlloySmelterLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ALLOY_SMELTER_LuV.ID, + "basicmachine.alloysmelter.tier.06", + "Elite Alloy Smelter", + 6, + MachineType.ALLOY_SMELTER.tooltipDescription(), + alloySmelterRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ALLOY_SMELTER", + null).getStackForm(1L)); + + ItemList.AlloySmelterZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ALLOY_SMELTER_ZPM.ID, + "basicmachine.alloysmelter.tier.07", + "Elite Alloy Smelter II", + 7, + MachineType.ALLOY_SMELTER.tooltipDescription(), + alloySmelterRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ALLOY_SMELTER", + null).getStackForm(1L)); + + ItemList.AlloySmelterUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ALLOY_SMELTER_UV.ID, + "basicmachine.alloysmelter.tier.08", + "Ultimate Alloy Integrator", + 8, + MachineType.ALLOY_SMELTER.tooltipDescription(), + alloySmelterRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ALLOY_SMELTER", + null).getStackForm(1L)); + + ItemList.AlloySmelterUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ALLOY_SMELTER_UHV.ID, + "basicmachine.alloysmelter.tier.09", + "Epic Alloy Integrator", + 9, + MachineType.ALLOY_SMELTER.tooltipDescription(), + alloySmelterRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ALLOY_SMELTER", + null).getStackForm(1L)); + + ItemList.AlloySmelterUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ALLOY_SMELTER_UEV.ID, + "basicmachine.alloysmelter.tier.10", + "Epic Alloy Integrator II", + 10, + MachineType.ALLOY_SMELTER.tooltipDescription(), + alloySmelterRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ALLOY_SMELTER", + null).getStackForm(1L)); + + ItemList.AlloySmelterUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ALLOY_SMELTER_UIV.ID, + "basicmachine.alloysmelter.tier.11", + "Epic Alloy Integrator III", + 11, + MachineType.ALLOY_SMELTER.tooltipDescription(), + alloySmelterRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ALLOY_SMELTER", + null).getStackForm(1L)); + + ItemList.AlloySmelterUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ALLOY_SMELTER_UMV.ID, + "basicmachine.alloysmelter.tier.12", + "Epic Alloy Integrator IV", + 12, + MachineType.ALLOY_SMELTER.tooltipDescription(), + alloySmelterRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ALLOY_SMELTER", + null).getStackForm(1L)); + } + private static void registerHPSteamMachines() { ItemList.Machine_HP_Extractor.set( new GT_MetaTileEntity_Extractor_Steel( @@ -1251,6 +2042,39 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Machine_IV_Scanner.set( new GT_MetaTileEntity_Scanner(SCANNER_IV.ID, "basicmachine.scanner.tier.05", "Advanced Scanner IV", 5) .getStackForm(1L)); + ItemList.ScannerLuV.set( + new GT_MetaTileEntity_Scanner(SCANNER_LuV.ID, "basicmachine.scanner.tier.06", "Elite Scanner", 6) + .getStackForm(1L)); + ItemList.ScannerZPM.set( + new GT_MetaTileEntity_Scanner(SCANNER_ZPM.ID, "basicmachine.scanner.tier.07", "Elite Scanner II", 7) + .getStackForm(1L)); + ItemList.ScannerUV.set( + new GT_MetaTileEntity_Scanner( + SCANNER_UV.ID, + "basicmachine.scanner.tier.08", + "Ultimate Electron Microscope", + 8).getStackForm(1L)); + ItemList.ScannerUHV.set( + new GT_MetaTileEntity_Scanner(SCANNER_UHV.ID, "basicmachine.scanner.tier.09", "Epic Electron Microscope", 9) + .getStackForm(1L)); + ItemList.ScannerUEV.set( + new GT_MetaTileEntity_Scanner( + SCANNER_UEV.ID, + "basicmachine.scanner.tier.10", + "Epic Electron Microscope II", + 10).getStackForm(1L)); + ItemList.ScannerUIV.set( + new GT_MetaTileEntity_Scanner( + SCANNER_UIV.ID, + "basicmachine.scanner.tier.11", + "Epic Electron Microscope III", + 11).getStackForm(1L)); + ItemList.ScannerUMV.set( + new GT_MetaTileEntity_Scanner( + SCANNER_UMV.ID, + "basicmachine.scanner.tier.12", + "Epic Electron Microscope IV", + 12).getStackForm(1L)); } private static void registerPackager() { @@ -1314,6 +2138,54 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "basicmachine.rockbreaker.tier.05", "Cryogenic Magma Solidifier R-8200", 5).getStackForm(1L)); + ItemList.RockBreakerLuV.set( + new GT_MetaTileEntity_RockBreaker( + ROCK_BREAKER_LuV.ID, + "rockbreaker.tier.06", + "Cryogenic Magma Solidifier R-9200", + 6).getStackForm(1L)); + + ItemList.RockBreakerZPM.set( + new GT_MetaTileEntity_RockBreaker( + ROCK_BREAKER_ZPM.ID, + "rockbreaker.tier.07", + "Cryogenic Magma Solidifier R-10200", + 7).getStackForm(1L)); + + ItemList.RockBreakerUV.set( + new GT_MetaTileEntity_RockBreaker( + ROCK_BREAKER_UV.ID, + "rockbreaker.tier.08", + "Cryogenic Magma Solidifier R-11200", + 8).getStackForm(1L)); + + ItemList.RockBreakerUHV.set( + new GT_MetaTileEntity_RockBreaker( + ROCK_BREAKER_UHV.ID, + "rockbreaker.tier.09", + "Cryogenic Magma Solidifier R-12200", + 9).getStackForm(1L)); + + ItemList.RockBreakerUEV.set( + new GT_MetaTileEntity_RockBreaker( + ROCK_BREAKER_UEV.ID, + "rockbreaker.tier.10", + "Cryogenic Magma Solidifier R-13200", + 10).getStackForm(1L)); + + ItemList.RockBreakerUIV.set( + new GT_MetaTileEntity_RockBreaker( + ROCK_BREAKER_UIV.ID, + "rockbreaker.tier.11", + "Cryogenic Magma Solidifier R-14200", + 11).getStackForm(1L)); + + ItemList.RockBreakerUMV.set( + new GT_MetaTileEntity_RockBreaker( + ROCK_BREAKER_UMV.ID, + "rockbreaker.tier.12", + "Cryogenic Magma Solidifier R-15200", + 12).getStackForm(1L)); } private static void registerIndustrialApiary() { @@ -1388,6 +2260,49 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "basicmachine.replicator.tier.05", "Advanced Replicator IV", 5).getStackForm(1L)); + + ItemList.ReplicatorLuV.set( + new GT_MetaTileEntity_Replicator( + MATTER_REPLICATOR_LuV.ID, + "basicmachine.replicator.tier.06", + "Elite Replicator", + 6).getStackForm(1L)); + ItemList.ReplicatorZPM.set( + new GT_MetaTileEntity_Replicator( + MATTER_REPLICATOR_ZPM.ID, + "basicmachine.replicator.tier.07", + "Elite Replicator II", + 7).getStackForm(1L)); + ItemList.ReplicatorUV.set( + new GT_MetaTileEntity_Replicator( + MATTER_REPLICATOR_UV.ID, + "basicmachine.replicator.tier.08", + "Ultimate Elemental Composer", + 8).getStackForm(1L)); + ItemList.ReplicatorUHV.set( + new GT_MetaTileEntity_Replicator( + MATTER_REPLICATOR_UHV.ID, + "basicmachine.replicator.tier.09", + "Epic Elemental Composer", + 9).getStackForm(1L)); + ItemList.ReplicatorUEV.set( + new GT_MetaTileEntity_Replicator( + MATTER_REPLICATOR_UEV.ID, + "basicmachine.replicator.tier.10", + "Epic Elemental Composer II", + 10).getStackForm(1L)); + ItemList.ReplicatorUIV.set( + new GT_MetaTileEntity_Replicator( + MATTER_REPLICATOR_UIV.ID, + "basicmachine.replicator.tier.11", + "Epic Elemental Composer III", + 11).getStackForm(1L)); + ItemList.ReplicatorUMV.set( + new GT_MetaTileEntity_Replicator( + MATTER_REPLICATOR_UMV.ID, + "basicmachine.replicator.tier.12", + "Epic Elemental Composer IV", + 12).getStackForm(1L)); } private static void registerBrewery() { @@ -1406,6 +2321,37 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Machine_IV_Brewery.set( new GT_MetaTileEntity_PotionBrewer(BREWERY_IV.ID, "basicmachine.brewery.tier.05", "Advanced Brewery IV", 5) .getStackForm(1L)); + + ItemList.BreweryLuV.set( + new GT_MetaTileEntity_PotionBrewer(BREWERY_LuV.ID, "basicmachine.brewery.tier.06", "Elite Brewery", 6) + .getStackForm(1L)); + ItemList.BreweryZPM.set( + new GT_MetaTileEntity_PotionBrewer(BREWERY_ZPM.ID, "basicmachine.brewery.tier.07", "Elite Brewery II", 7) + .getStackForm(1L)); + ItemList.BreweryUV.set( + new GT_MetaTileEntity_PotionBrewer(BREWERY_UV.ID, "basicmachine.brewery.tier.08", "Ultimate Brew Rusher", 8) + .getStackForm(1L)); + ItemList.BreweryUHV.set( + new GT_MetaTileEntity_PotionBrewer(BREWERY_UHV.ID, "basicmachine.brewery.tier.09", "Epic Brew Rusher", 9) + .getStackForm(1L)); + ItemList.BreweryUEV.set( + new GT_MetaTileEntity_PotionBrewer( + BREWERY_UEV.ID, + "basicmachine.brewery.tier.10", + "Epic Brew Rusher II", + 10).getStackForm(1L)); + ItemList.BreweryUIV.set( + new GT_MetaTileEntity_PotionBrewer( + BREWERY_UIV.ID, + "basicmachine.brewery.tier.11", + "Epic Brew Rusher III", + 11).getStackForm(1L)); + ItemList.BreweryUMV.set( + new GT_MetaTileEntity_PotionBrewer( + BREWERY_UMV.ID, + "basicmachine.brewery.tier.12", + "Epic Brew Rusher IV", + 12).getStackForm(1L)); } private static void registerMiner() { @@ -1432,6 +2378,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Pump_IV.set( new GT_MetaTileEntity_Pump(PUMP_IV.ID, "basicmachine.pump.tier.05", "Advanced Pump IV", 5) .getStackForm(1L)); + ItemList.PumpLuV.set( + new GT_MetaTileEntity_Pump(PUMP_LuV.ID, "basicmachine.pump.tier.06", "Lake Dislocator", 6) + .getStackForm(1L)); + ItemList.PumpZPM.set( + new GT_MetaTileEntity_Pump(PUMP_ZPM.ID, "basicmachine.pump.tier.07", "Ocean Transposer", 7) + .getStackForm(1L)); } private static void registerTeleporter() { @@ -1491,6 +2443,58 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 8).getStackForm(1L)); } + private void registerWorldAccelerator() { + ItemList.AcceleratorLV.set( + new GT_MetaTileEntity_WorldAccelerator( + WORLD_ACCELERATOR_LV.ID, + "basicmachine.accelerator.tier.01", + "Basic World Accelerator", + 1).getStackForm(1L)); + ItemList.AcceleratorMV.set( + new GT_MetaTileEntity_WorldAccelerator( + WORLD_ACCELERATOR_MV.ID, + "basicmachine.accelerator.tier.02", + "Advanced World Accelerator", + 2).getStackForm(1L)); + ItemList.AcceleratorHV.set( + new GT_MetaTileEntity_WorldAccelerator( + WORLD_ACCELERATOR_HV.ID, + "basicmachine.accelerator.tier.03", + "Advanced World Accelerator II", + 3).getStackForm(1L)); + ItemList.AcceleratorEV.set( + new GT_MetaTileEntity_WorldAccelerator( + WORLD_ACCELERATOR_EV.ID, + "basicmachine.accelerator.tier.04", + "Advanced World Accelerator III", + 4).getStackForm(1L)); + ItemList.AcceleratorIV.set( + new GT_MetaTileEntity_WorldAccelerator( + WORLD_ACCELERATOR_IV.ID, + "basicmachine.accelerator.tier.05", + "Advanced World Accelerator IV", + 5).getStackForm(1L)); + ItemList.AcceleratorLuV.set( + new GT_MetaTileEntity_WorldAccelerator( + WORLD_ACCELERATOR_LuV.ID, + "basicmachine.accelerator.tier.06", + "Elite World Accelerator", + 6).getStackForm(1L)); + ItemList.AcceleratorZPM.set( + new GT_MetaTileEntity_WorldAccelerator( + WORLD_ACCELERATOR_ZPM.ID, + "basicmachine.accelerator.tier.07", + "Elite World Accelerator II", + 7).getStackForm(1L)); + ItemList.AcceleratorUV.set( + new GT_MetaTileEntity_WorldAccelerator( + WORLD_ACCELERATOR_UV.ID, + "basicmachine.accelerator.tier.08", + "Ultimate Time Anomaly", + 8).getStackForm(1L)); + + } + private static void registerAdvancedSeismicProspector() { ItemList.Seismic_Prospector_Adv_LV.set( new GT_MetaTileEntity_AdvSeismicProspector( @@ -1620,12 +2624,33 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "automation.chestbuffer.tier.08", "Ultimate Voltage Chest Buffer", 8).getStackForm(1L)); - ItemList.Automation_ChestBuffer_MAX.set( + ItemList.Automation_ChestBuffer_UHV.set( new GT_MetaTileEntity_ChestBuffer( CHEST_BUFFER_UHV.ID, "automation.chestbuffer.tier.09", "Highly Ultimate Voltage Chest Buffer", 9).getStackForm(1L)); + + ItemList.Automation_ChestBuffer_UEV.set( + new GT_MetaTileEntity_ChestBuffer( + CHEST_BUFFER_UEV.ID, + "automation.chestbuffer.tier.10", + "Ultra High Voltage Chest Buffer", + 10).getStackForm(1L)); + + ItemList.Automation_ChestBuffer_UIV.set( + new GT_MetaTileEntity_ChestBuffer( + CHEST_BUFFER_UIV.ID, + "automation.chestbuffer.tier.11", + "UIV Voltage Chest Buffer", + 11).getStackForm(1L)); + + ItemList.Automation_ChestBuffer_UMV.set( + new GT_MetaTileEntity_ChestBuffer( + CHEST_BUFFER_UMV.ID, + "automation.chestbuffer.tier.12", + "UMV Voltage Chest Buffer", + 12).getStackForm(1L)); } private static void registerItemFilter() { @@ -2057,6 +3082,46 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Hull_MAX.set( new GT_MetaTileEntity_BasicHull(HULL_UHV.ID, "hull.tier.09", "UHV Machine Hull", 9, imagination) .getStackForm(1L)); + + ItemList.Hull_UEV.set( + new GT_MetaTileEntity_BasicHull( + HULL_UEV.ID, + "hull.tier.10", + "UEV Machine Hull", + 10, + GT_Loader_MetaTileEntities.imagination).getStackForm(1L)); + + ItemList.Hull_UIV.set( + new GT_MetaTileEntity_BasicHull( + HULL_UIV.ID, + "hull.tier.11", + "UIV Machine Hull", + 11, + GT_Loader_MetaTileEntities.imagination).getStackForm(1L)); + + ItemList.Hull_UMV.set( + new GT_MetaTileEntity_BasicHull( + HULL_UMV.ID, + "hull.tier.12", + "UMV Machine Hull", + 12, + GT_Loader_MetaTileEntities.imagination).getStackForm(1L)); + + ItemList.Hull_UXV.set( + new GT_MetaTileEntity_BasicHull( + HULL_UXV.ID, + "hull.tier.13", + "UXV Machine Hull", + 13, + GT_Loader_MetaTileEntities.imagination).getStackForm(1L)); + + ItemList.Hull_MAXV.set( + new GT_MetaTileEntity_BasicHull( + HULL_MAX.ID, + "hull.tier.14", + "MAX Machine Hull", + 14, + GT_Loader_MetaTileEntities.imagination).getStackForm(1L)); } private static void registerTransformer() { @@ -2123,6 +3188,4132 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "Ultimate Transformer", 8, "UHV -> UV (Use Soft Mallet to invert)").getStackForm(1L)); + ItemList.Transformer_UEV_UHV.set( + new GT_MetaTileEntity_Transformer( + TRANSFORMER_UEV_UHV.ID, + "transformer.tier.09", + "Highly Ultimate Transformer", + 9, + "UEV -> UHV (Use Soft Mallet to invert)").getStackForm(1L)); + + ItemList.Transformer_UIV_UEV.set( + new GT_MetaTileEntity_Transformer( + TRANSFORMER_UIV_UEV.ID, + "transformer.tier.10", + "Extremely Ultimate Transformer", + 10, + "UIV -> UEV (Use Soft Mallet to invert)").getStackForm(1L)); + + ItemList.Transformer_UMV_UIV.set( + new GT_MetaTileEntity_Transformer( + TRANSFORMER_UMV_UIV.ID, + "transformer.tier.11", + "Insanely Ultimate Transformer", + 11, + "UMV -> UIV (Use Soft Mallet to invert)").getStackForm(1L)); + + ItemList.Transformer_UXV_UMV.set( + new GT_MetaTileEntity_Transformer( + TRANSFORMER_UXV_UMV.ID, + "transformer.tier.12", + "Mega Ultimate Transformer", + 12, + "UXV -> UMV (Use Soft Mallet to invert)").getStackForm(1L)); + + ItemList.Transformer_MAX_UXV.set( + new GT_MetaTileEntity_Transformer( + TRANSFORMER_MAX_UXV.ID, + "transformer.tier.13", + "Extended Mega Ultimate Transformer", + 13, + "MAX -> UXV (Use Soft Mallet to invert)").getStackForm(1L)); + } + + private void registerChemicalBath() { + ItemList.ChemicalBathLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CHEMICAL_BATH_LuV.ID, + "basicmachine.chemicalbath.tier.06", + "Elite Chemical Bath", + 6, + MachineType.CHEMICAL_BATH.tooltipDescription(), + chemicalBathRecipes, + 1, + 3, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CHEMICAL_BATH", + null).getStackForm(1L)); + + ItemList.ChemicalBathZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CHEMICAL_BATH_ZPM.ID, + "basicmachine.chemicalbath.tier.07", + "Elite Chemical Bath II", + 7, + MachineType.CHEMICAL_BATH.tooltipDescription(), + chemicalBathRecipes, + 1, + 3, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CHEMICAL_BATH", + null).getStackForm(1L)); + + ItemList.ChemicalBathUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CHEMICAL_BATH_UV.ID, + "basicmachine.chemicalbath.tier.08", + "Ultimate Chemical Dunktron", + 8, + MachineType.CHEMICAL_BATH.tooltipDescription(), + chemicalBathRecipes, + 1, + 3, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CHEMICAL_BATH", + null).getStackForm(1L)); + + ItemList.ChemicalBathUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CHEMICAL_BATH_UHV.ID, + "basicmachine.chemicalbath.tier.09", + "Epic Chemical Dunktron", + 9, + MachineType.CHEMICAL_BATH.tooltipDescription(), + chemicalBathRecipes, + 1, + 3, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CHEMICAL_BATH", + null).getStackForm(1L)); + + ItemList.ChemicalBathUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CHEMICAL_BATH_UEV.ID, + "basicmachine.chemicalbath.tier.10", + "Epic Chemical Dunktron II", + 10, + MachineType.CHEMICAL_BATH.tooltipDescription(), + chemicalBathRecipes, + 1, + 3, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CHEMICAL_BATH", + null).getStackForm(1L)); + + ItemList.ChemicalBathUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CHEMICAL_BATH_UIV.ID, + "basicmachine.chemicalbath.tier.11", + "Epic Chemical Dunktron III", + 11, + MachineType.CHEMICAL_BATH.tooltipDescription(), + chemicalBathRecipes, + 1, + 3, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CHEMICAL_BATH", + null).getStackForm(1L)); + + ItemList.ChemicalBathUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CHEMICAL_BATH_UMV.ID, + "basicmachine.chemicalbath.tier.12", + "Epic Chemical Dunktron IV", + 12, + MachineType.CHEMICAL_BATH.tooltipDescription(), + chemicalBathRecipes, + 1, + 3, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CHEMICAL_BATH", + null).getStackForm(1L)); + } + + private void registerChemicalReactor() { + + ItemList.ChemicalReactorLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CHEMICAL_REACTOR_LuV.ID, + "basicmachine.chemicalreactor.tier.06", + "Elite Chemical Reactor", + 6, + MachineType.CHEMICAL_REACTOR.tooltipDescription(), + chemicalReactorRecipes, + 2, + 2, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CHEMICAL_REACTOR", + null).getStackForm(1L)); + + ItemList.ChemicalReactorZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CHEMICAL_REACTOR_ZPM.ID, + "basicmachine.chemicalreactor.tier.07", + "Elite Chemical Reactor II", + 7, + MachineType.CHEMICAL_REACTOR.tooltipDescription(), + chemicalReactorRecipes, + 2, + 2, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CHEMICAL_REACTOR", + null).getStackForm(1L)); + + ItemList.ChemicalReactorUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CHEMICAL_REACTOR_UV.ID, + "basicmachine.chemicalreactor.tier.08", + "Ultimate Chemical Perforer", + 8, + MachineType.CHEMICAL_REACTOR.tooltipDescription(), + chemicalReactorRecipes, + 2, + 2, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CHEMICAL_REACTOR", + null).getStackForm(1L)); + + ItemList.ChemicalReactorUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CHEMICAL_REACTOR_UHV.ID, + "basicmachine.chemicalreactor.tier.09", + "Epic Chemical Performer", + 9, + MachineType.CHEMICAL_REACTOR.tooltipDescription(), + chemicalReactorRecipes, + 2, + 2, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CHEMICAL_REACTOR", + null).getStackForm(1L)); + + ItemList.ChemicalReactorUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CHEMICAL_REACTOR_UEV.ID, + "basicmachine.chemicalreactor.tier.10", + "Epic Chemical Performer II", + 10, + MachineType.CHEMICAL_REACTOR.tooltipDescription(), + chemicalReactorRecipes, + 2, + 2, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CHEMICAL_REACTOR", + null).getStackForm(1L)); + + ItemList.ChemicalReactorUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CHEMICAL_REACTOR_UIV.ID, + "basicmachine.chemicalreactor.tier.11", + "Epic Chemical Performer III", + 11, + MachineType.CHEMICAL_REACTOR.tooltipDescription(), + chemicalReactorRecipes, + 2, + 2, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CHEMICAL_REACTOR", + null).getStackForm(1L)); + + ItemList.ChemicalReactorUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CHEMICAL_REACTOR_UMV.ID, + "basicmachine.chemicalreactor.tier.12", + "Epic Chemical Performer IV", + 12, + MachineType.CHEMICAL_REACTOR.tooltipDescription(), + chemicalReactorRecipes, + 2, + 2, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CHEMICAL_REACTOR", + null).getStackForm(1L)); + + } + + private void registerFermenter() { + ItemList.FermenterLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FERMENTER_LuV.ID, + "basicmachine.fermenter.tier.06", + "Elite Fermenter", + 6, + MachineType.FERMENTER.tooltipDescription(), + fermentingRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FERMENTER", + null).getStackForm(1L)); + + ItemList.FermenterZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FERMENTER_ZPM.ID, + "basicmachine.fermenter.tier.07", + "Elite Fermenter II", + 7, + MachineType.FERMENTER.tooltipDescription(), + fermentingRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FERMENTER", + null).getStackForm(1L)); + + ItemList.FermenterUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FERMENTER_UV.ID, + "basicmachine.fermenter.tier.08", + "Ultimate Fermentation Hastener", + 8, + MachineType.FERMENTER.tooltipDescription(), + fermentingRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FERMENTER", + null).getStackForm(1L)); + + ItemList.FermenterUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FERMENTER_UHV.ID, + "basicmachine.fermenter.tier.09", + "Epic Fermentation Hastener", + 9, + MachineType.FERMENTER.tooltipDescription(), + fermentingRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FERMENTER", + null).getStackForm(1L)); + + ItemList.FermenterUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FERMENTER_UEV.ID, + "basicmachine.fermenter.tier.10", + "Epic Fermentation Hastener II", + 10, + MachineType.FERMENTER.tooltipDescription(), + fermentingRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FERMENTER", + null).getStackForm(1L)); + + ItemList.FermenterUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FERMENTER_UIV.ID, + "basicmachine.fermenter.tier.11", + "Epic Fermentation Hastener III", + 11, + MachineType.FERMENTER.tooltipDescription(), + fermentingRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FERMENTER", + null).getStackForm(1L)); + + ItemList.FermenterUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FERMENTER_UMV.ID, + "basicmachine.fermenter.tier.12", + "Epic Fermentation Hastener IV", + 12, + MachineType.FERMENTER.tooltipDescription(), + fermentingRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FERMENTER", + null).getStackForm(1L)); + } + + private void registerFluidCanner() { + ItemList.FluidCannerLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_CANNER_LuV.ID, + "basicmachine.fluidcanner.tier.06", + "Elite Fluid Canner", + 6, + MachineType.FLUID_CANNER.tooltipDescription(), + fluidCannerRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_CANNER", + null).getStackForm(1L)); + + ItemList.FluidCannerZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_CANNER_ZPM.ID, + "basicmachine.fluidcanner.tier.07", + "Elite Fluid Canner II", + 7, + MachineType.FLUID_CANNER.tooltipDescription(), + fluidCannerRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_CANNER", + null).getStackForm(1L)); + + ItemList.FluidCannerUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_CANNER_UV.ID, + "basicmachine.fluidcanner.tier.08", + "Ultimate Liquid Can Actuator", + 8, + MachineType.FLUID_CANNER.tooltipDescription(), + fluidCannerRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_CANNER", + null).getStackForm(1L)); + + ItemList.FluidCannerUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_CANNER_UHV.ID, + "basicmachine.fluidcanner.tier.09", + "Epic Liquid Can Actuator", + 9, + MachineType.FLUID_CANNER.tooltipDescription(), + fluidCannerRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_CANNER", + null).getStackForm(1L)); + + ItemList.FluidCannerUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_CANNER_UEV.ID, + "basicmachine.fluidcanner.tier.10", + "Epic Liquid Can Actuator II", + 10, + MachineType.FLUID_CANNER.tooltipDescription(), + fluidCannerRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_CANNER", + null).getStackForm(1L)); + + ItemList.FluidCannerUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_CANNER_UIV.ID, + "basicmachine.fluidcanner.tier.11", + "Epic Liquid Can Actuator III", + 11, + MachineType.FLUID_CANNER.tooltipDescription(), + fluidCannerRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_CANNER", + null).getStackForm(1L)); + + ItemList.FluidCannerUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_CANNER_UMV.ID, + "basicmachine.fluidcanner.tier.12", + "Epic Liquid Can Actuator IV", + 12, + MachineType.FLUID_CANNER.tooltipDescription(), + fluidCannerRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_CANNER", + null).getStackForm(1L)); + } + + private void registerFluidExtractor() { + ItemList.FluidExtractorLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_EXTRACTOR_LuV.ID, + "basicmachine.fluidextractor.tier.06", + "Elite Fluid Extractor", + 6, + MachineType.FLUID_EXTRACTOR.tooltipDescription(), + fluidExtractionRecipes, + 1, + 1, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_EXTRACTOR", + null).getStackForm(1L)); + + ItemList.FluidExtractorZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_EXTRACTOR_ZPM.ID, + "basicmachine.fluidextractor.tier.07", + "Elite Fluid Extractor II", + 7, + MachineType.FLUID_EXTRACTOR.tooltipDescription(), + fluidExtractionRecipes, + 1, + 1, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_EXTRACTOR", + null).getStackForm(1L)); + + ItemList.FluidExtractorUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_EXTRACTOR_UV.ID, + "basicmachine.fluidextractor.tier.08", + "Ultimate Liquefying Sucker", + 8, + MachineType.FLUID_EXTRACTOR.tooltipDescription(), + fluidExtractionRecipes, + 1, + 1, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_EXTRACTOR", + null).getStackForm(1L)); + + ItemList.FluidExtractorUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_EXTRACTOR_UHV.ID, + "basicmachine.fluidextractor.tier.09", + "Epic Liquefying Sucker", + 9, + MachineType.FLUID_EXTRACTOR.tooltipDescription(), + fluidExtractionRecipes, + 1, + 1, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_EXTRACTOR", + null).getStackForm(1L)); + + ItemList.FluidExtractorUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_EXTRACTOR_UEV.ID, + "basicmachine.fluidextractor.tier.10", + "Epic Liquefying Sucker II", + 10, + MachineType.FLUID_EXTRACTOR.tooltipDescription(), + fluidExtractionRecipes, + 1, + 1, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_EXTRACTOR", + null).getStackForm(1L)); + + ItemList.FluidExtractorUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_EXTRACTOR_UIV.ID, + "basicmachine.fluidextractor.tier.11", + "Epic Liquefying Sucker III", + 11, + MachineType.FLUID_EXTRACTOR.tooltipDescription(), + fluidExtractionRecipes, + 1, + 1, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_EXTRACTOR", + null).getStackForm(1L)); + + ItemList.FluidExtractorUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_EXTRACTOR_UMV.ID, + "basicmachine.fluidextractor.tier.12", + "Epic Liquefying Sucker IV", + 12, + MachineType.FLUID_EXTRACTOR.tooltipDescription(), + fluidExtractionRecipes, + 1, + 1, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_EXTRACTOR", + null).getStackForm(1L)); + } + + private void registerFluidHeater() { + ItemList.FluidHeaterLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_HEATER_LuV.ID, + "basicmachine.fluidheater.tier.06", + "Elite Fluid Heater", + 6, + MachineType.FLUID_HEATER.tooltipDescription(), + fluidHeaterRecipes, + 1, + 0, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_HEATER", + null).getStackForm(1L)); + + ItemList.FluidHeaterZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_HEATER_ZPM.ID, + "basicmachine.fluidheater.tier.07", + "Elite Fluid Heater II", + 7, + MachineType.FLUID_HEATER.tooltipDescription(), + fluidHeaterRecipes, + 1, + 0, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_HEATER", + null).getStackForm(1L)); + + ItemList.FluidHeaterUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_HEATER_UV.ID, + "basicmachine.fluidheater.tier.08", + "Ultimate Heat Infuser", + 8, + MachineType.FLUID_HEATER.tooltipDescription(), + fluidHeaterRecipes, + 1, + 0, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_HEATER", + null).getStackForm(1L)); + + ItemList.FluidHeaterUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_HEATER_UHV.ID, + "basicmachine.fluidheater.tier.09", + "Epic Heat Infuser", + 9, + MachineType.FLUID_HEATER.tooltipDescription(), + fluidHeaterRecipes, + 1, + 0, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_HEATER", + null).getStackForm(1L)); + + ItemList.FluidHeaterUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_HEATER_UEV.ID, + "basicmachine.fluidheater.tier.10", + "Epic Heat Infuser II", + 10, + MachineType.FLUID_HEATER.tooltipDescription(), + fluidHeaterRecipes, + 1, + 0, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_HEATER", + null).getStackForm(1L)); + + ItemList.FluidHeaterUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_HEATER_UIV.ID, + "basicmachine.fluidheater.tier.11", + "Epic Heat Infuser III", + 11, + MachineType.FLUID_HEATER.tooltipDescription(), + fluidHeaterRecipes, + 1, + 0, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_HEATER", + null).getStackForm(1L)); + + ItemList.FluidHeaterUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_HEATER_UMV.ID, + "basicmachine.fluidheater.tier.12", + "Epic Heat Infuser IV", + 12, + MachineType.FLUID_HEATER.tooltipDescription(), + fluidHeaterRecipes, + 1, + 0, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_HEATER", + null).getStackForm(1L)); + } + + private void registerMixer() { + ItemList.MixerLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MIXER_LuV.ID, + "basicmachine.mixer.tier.06", + "Elite Mixer", + 6, + MachineType.MIXER.tooltipDescription(), + mixerRecipes, + 9, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "MIXER", + null).getStackForm(1L)); + + ItemList.MixerZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MIXER_ZPM.ID, + "basicmachine.mixer.tier.07", + "Elite Mixer II", + 7, + MachineType.MIXER.tooltipDescription(), + mixerRecipes, + 9, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "MIXER", + null).getStackForm(1L)); + + ItemList.MixerUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MIXER_UV.ID, + "basicmachine.mixer.tier.08", + "Ultimate Matter Organizer", + 8, + MachineType.MIXER.tooltipDescription(), + mixerRecipes, + 9, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "MIXER", + null).getStackForm(1L)); + + ItemList.MixerUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MIXER_UHV.ID, + "basicmachine.mixer.tier.09", + "Epic Matter Organizer", + 9, + MachineType.MIXER.tooltipDescription(), + mixerRecipes, + 9, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "MIXER", + null).getStackForm(1L)); + + ItemList.MixerUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MIXER_UEV.ID, + "basicmachine.mixer.tier.10", + "Epic Matter Organizer II", + 10, + MachineType.MIXER.tooltipDescription(), + mixerRecipes, + 9, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "MIXER", + null).getStackForm(1L)); + + ItemList.MixerUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MIXER_UIV.ID, + "basicmachine.mixer.tier.11", + "Epic Matter Organizer III", + 11, + MachineType.MIXER.tooltipDescription(), + mixerRecipes, + 9, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "MIXER", + null).getStackForm(1L)); + + ItemList.MixerUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MIXER_UMV.ID, + "basicmachine.mixer.tier.12", + "Epic Matter Organizer IV", + 12, + MachineType.MIXER.tooltipDescription(), + mixerRecipes, + 9, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "MIXER", + null).getStackForm(1L)); + } + + private void registerAutoclave() { + ItemList.AutoclaveLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + AUTOCLAVE_LuV.ID, + "basicmachine.autoclave.tier.06", + "Elite Autoclave", + 6, + MachineType.AUTOCLAVE.tooltipDescription(), + autoclaveRecipes, + 2, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "AUTOCLAVE", + null).getStackForm(1L)); + + ItemList.AutoclaveZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + AUTOCLAVE_ZPM.ID, + "basicmachine.autoclave.tier.07", + "Elite Autoclave II", + 7, + MachineType.AUTOCLAVE.tooltipDescription(), + autoclaveRecipes, + 2, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "AUTOCLAVE", + null).getStackForm(1L)); + + ItemList.AutoclaveUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + AUTOCLAVE_UV.ID, + "basicmachine.autoclave.tier.08", + "Ultimate Pressure Cooker", + 8, + MachineType.AUTOCLAVE.tooltipDescription(), + autoclaveRecipes, + 2, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "AUTOCLAVE", + null).getStackForm(1L)); + + ItemList.AutoclaveUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + AUTOCLAVE_UHV.ID, + "basicmachine.autoclave.tier.09", + "Epic Pressure Cooker", + 9, + MachineType.AUTOCLAVE.tooltipDescription(), + autoclaveRecipes, + 2, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "AUTOCLAVE", + null).getStackForm(1L)); + + ItemList.AutoclaveUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + AUTOCLAVE_UEV.ID, + "basicmachine.autoclave.tier.10", + "Epic Pressure Cooker II", + 10, + MachineType.AUTOCLAVE.tooltipDescription(), + autoclaveRecipes, + 2, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "AUTOCLAVE", + null).getStackForm(1L)); + + ItemList.AutoclaveUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + AUTOCLAVE_UIV.ID, + "basicmachine.autoclave.tier.11", + "Epic Pressure Cooker III", + 11, + MachineType.AUTOCLAVE.tooltipDescription(), + autoclaveRecipes, + 2, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "AUTOCLAVE", + null).getStackForm(1L)); + + ItemList.AutoclaveUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + AUTOCLAVE_UMV.ID, + "basicmachine.autoclave.tier.12", + "Epic Pressure Cooker IV", + 12, + MachineType.AUTOCLAVE.tooltipDescription(), + autoclaveRecipes, + 2, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "AUTOCLAVE", + null).getStackForm(1L)); + + } + + private void registerBendingMachine() { + + ItemList.BendingMachineLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + BENDING_MACHINE_LuV.ID, + "basicmachine.bender.tier.06", + "Elite Bending Machine", + 6, + MachineType.BENDING_MACHINE.tooltipDescription(), + benderRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "BENDER", + null).getStackForm(1L)); + + ItemList.BendingMachineZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + BENDING_MACHINE_ZPM.ID, + "basicmachine.bender.tier.07", + "Elite Bending Machine II", + 7, + MachineType.BENDING_MACHINE.tooltipDescription(), + benderRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "BENDER", + null).getStackForm(1L)); + + ItemList.BendingMachineUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + BENDING_MACHINE_UV.ID, + "basicmachine.bender.tier.08", + "Ultimate Bending Unit", + 8, + MachineType.BENDING_MACHINE.tooltipDescription(), + benderRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "BENDER", + null).getStackForm(1L)); + + ItemList.BendingMachineUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + BENDING_MACHINE_UHV.ID, + "basicmachine.bender.tier.09", + "Epic Bending Unit", + 9, + MachineType.BENDING_MACHINE.tooltipDescription(), + benderRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "BENDER", + null).getStackForm(1L)); + + ItemList.BendingMachineUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + BENDING_MACHINE_UEV.ID, + "basicmachine.bender.tier.10", + "Epic Bending Unit II", + 10, + MachineType.BENDING_MACHINE.tooltipDescription(), + benderRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "BENDER", + null).getStackForm(1L)); + + ItemList.BendingMachineUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + BENDING_MACHINE_UIV.ID, + "basicmachine.bender.tier.11", + "Epic Bending Unit III", + 11, + MachineType.BENDING_MACHINE.tooltipDescription(), + benderRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "BENDER", + null).getStackForm(1L)); + + ItemList.BendingMachineUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + BENDING_MACHINE_UMV.ID, + "basicmachine.bender.tier.12", + "Epic Bending Unit IV", + 12, + MachineType.BENDING_MACHINE.tooltipDescription(), + benderRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "BENDER", + null).getStackForm(1L)); + } + + private void registerCompressor() { + ItemList.CompressorLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + COMPRESSOR_LuV.ID, + "basicmachine.compressor.tier.06", + "Elite Compressor", + 6, + MachineType.COMPRESSOR.tooltipDescription(), + compressorRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "COMPRESSOR", + null).getStackForm(1L)); + + ItemList.CompressorZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + COMPRESSOR_ZPM.ID, + "basicmachine.compressor.tier.07", + "Elite Compressor II", + 7, + MachineType.COMPRESSOR.tooltipDescription(), + compressorRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "COMPRESSOR", + null).getStackForm(1L)); + + ItemList.CompressorUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + COMPRESSOR_UV.ID, + "basicmachine.compressor.tier.08", + "Ultimate Matter Constrictor", + 8, + MachineType.COMPRESSOR.tooltipDescription(), + compressorRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "COMPRESSOR", + null).getStackForm(1L)); + + ItemList.CompressorUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + COMPRESSOR_UHV.ID, + "basicmachine.compressor.tier.09", + "Epic Matter Constrictor", + 9, + MachineType.COMPRESSOR.tooltipDescription(), + compressorRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "COMPRESSOR", + null).getStackForm(1L)); + + ItemList.CompressorUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + COMPRESSOR_UEV.ID, + "basicmachine.compressor.tier.10", + "Epic Matter Constrictor II", + 10, + MachineType.COMPRESSOR.tooltipDescription(), + compressorRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "COMPRESSOR", + null).getStackForm(1L)); + + ItemList.CompressorUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + COMPRESSOR_UIV.ID, + "basicmachine.compressor.tier.11", + "Epic Matter Constrictor III", + 11, + MachineType.COMPRESSOR.tooltipDescription(), + compressorRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "COMPRESSOR", + null).getStackForm(1L)); + + ItemList.CompressorUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + COMPRESSOR_UMV.ID, + "basicmachine.compressor.tier.12", + "Epic Matter Constrictor IV", + 12, + MachineType.COMPRESSOR.tooltipDescription(), + compressorRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "COMPRESSOR", + null).getStackForm(1L)); + + } + + private void registerCuttingMachine() { + + ItemList.CuttingMachineLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CUTTING_MACHINE_LuV.ID, + "basicmachine.cutter.tier.06", + "Elite Cutting Machine", + 6, + MachineType.CUTTING_MACHINE.tooltipDescription(), + cutterRecipes, + 2, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CUTTER", + null).getStackForm(1L)); + + ItemList.CuttingMachineZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CUTTING_MACHINE_ZPM.ID, + "basicmachine.cutter.tier.07", + "Elite Cutting Machine II", + 7, + MachineType.CUTTING_MACHINE.tooltipDescription(), + cutterRecipes, + 2, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CUTTER", + null).getStackForm(1L)); + + ItemList.CuttingMachineUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CUTTING_MACHINE_UV.ID, + "basicmachine.cutter.tier.08", + "Ultimate Object Divider", + 8, + MachineType.CUTTING_MACHINE.tooltipDescription(), + cutterRecipes, + 2, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CUTTER", + null).getStackForm(1L)); + + ItemList.CuttingMachineUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CUTTING_MACHINE_UHV.ID, + "basicmachine.cutter.tier.09", + "Epic Object Divider", + 9, + MachineType.CUTTING_MACHINE.tooltipDescription(), + cutterRecipes, + 2, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CUTTER", + null).getStackForm(1L)); + + ItemList.CuttingMachineUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CUTTING_MACHINE_UEV.ID, + "basicmachine.cutter.tier.10", + "Epic Object Divider II", + 10, + MachineType.CUTTING_MACHINE.tooltipDescription(), + cutterRecipes, + 2, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CUTTER", + null).getStackForm(1L)); + + ItemList.CuttingMachineUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CUTTING_MACHINE_UIV.ID, + "basicmachine.cutter.tier.11", + "Epic Object Divider III", + 11, + MachineType.CUTTING_MACHINE.tooltipDescription(), + cutterRecipes, + 2, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CUTTER", + null).getStackForm(1L)); + + ItemList.CuttingMachineUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CUTTING_MACHINE_UMV.ID, + "basicmachine.cutter.tier.12", + "Epic Object Divider IV", + 12, + MachineType.CUTTING_MACHINE.tooltipDescription(), + cutterRecipes, + 2, + 4, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CUTTER", + null).getStackForm(1L)); + + } + + private void registerDistillery() { + + ItemList.DistilleryLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + DISTILLERY_LuV.ID, + "basicmachine.distillery.tier.06", + "Elite Distillery", + 6, + MachineType.DISTILLERY.tooltipDescription(), + distilleryRecipes, + 1, + 1, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "DISTILLERY", + null).getStackForm(1L)); + + ItemList.DistilleryZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + DISTILLERY_ZPM.ID, + "basicmachine.distillery.tier.07", + "Elite Distillery II", + 7, + MachineType.DISTILLERY.tooltipDescription(), + distilleryRecipes, + 1, + 1, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "DISTILLERY", + null).getStackForm(1L)); + + ItemList.DistilleryUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + DISTILLERY_UV.ID, + "basicmachine.distillery.tier.08", + "Ultimate Fraction Splitter", + 8, + MachineType.DISTILLERY.tooltipDescription(), + distilleryRecipes, + 1, + 1, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "DISTILLERY", + null).getStackForm(1L)); + + ItemList.DistilleryUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + DISTILLERY_UHV.ID, + "basicmachine.distillery.tier.09", + "Epic Fraction Splitter", + 9, + MachineType.DISTILLERY.tooltipDescription(), + distilleryRecipes, + 1, + 1, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "DISTILLERY", + null).getStackForm(1L)); + + ItemList.DistilleryUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + DISTILLERY_UEV.ID, + "basicmachine.distillery.tier.10", + "Epic Fraction Splitter II", + 10, + MachineType.DISTILLERY.tooltipDescription(), + distilleryRecipes, + 1, + 1, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "DISTILLERY", + null).getStackForm(1L)); + + ItemList.DistilleryUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + DISTILLERY_UIV.ID, + "basicmachine.distillery.tier.11", + "Epic Fraction Splitter III", + 11, + MachineType.DISTILLERY.tooltipDescription(), + distilleryRecipes, + 1, + 1, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "DISTILLERY", + null).getStackForm(1L)); + + ItemList.DistilleryUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + DISTILLERY_UMV.ID, + "basicmachine.distillery.tier.12", + "Epic Fraction Splitter IV", + 12, + MachineType.DISTILLERY.tooltipDescription(), + distilleryRecipes, + 1, + 1, + true, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "DISTILLERY", + null).getStackForm(1L)); + + } + + private void registerElectricFurnace() { + + ItemList.ElectricFurnaceLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTRIC_FURNACE_LuV.ID, + "basicmachine.e_furnace.tier.06", + "Elite Electric Furnace", + 6, + MachineType.ELECTRIC_FURNACE.tooltipDescription(), + furnaceRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTRIC_FURNACE", + null).getStackForm(1L)); + + ItemList.ElectricFurnaceZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTRIC_FURNACE_ZPM.ID, + "basicmachine.e_furnace.tier.07", + "Elite Electric Furnace II", + 7, + MachineType.ELECTRIC_FURNACE.tooltipDescription(), + furnaceRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTRIC_FURNACE", + null).getStackForm(1L)); + + ItemList.ElectricFurnaceUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTRIC_FURNACE_UV.ID, + "basicmachine.e_furnace.tier.08", + "Ultimate Atom Stimulator", + 8, + MachineType.ELECTRIC_FURNACE.tooltipDescription(), + furnaceRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTRIC_FURNACE", + null).getStackForm(1L)); + + ItemList.ElectricFurnaceUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTRIC_FURNACE_UHV.ID, + "basicmachine.e_furnace.tier.09", + "Epic Atom Stimulator", + 9, + MachineType.ELECTRIC_FURNACE.tooltipDescription(), + furnaceRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTRIC_FURNACE", + null).getStackForm(1L)); + + ItemList.ElectricFurnaceUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTRIC_FURNACE_UEV.ID, + "basicmachine.e_furnace.tier.10", + "Epic Atom Stimulator II", + 10, + MachineType.ELECTRIC_FURNACE.tooltipDescription(), + furnaceRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTRIC_FURNACE", + null).getStackForm(1L)); + + ItemList.ElectricFurnaceUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTRIC_FURNACE_UIV.ID, + "basicmachine.e_furnace.tier.11", + "Epic Atom Stimulator III", + 11, + MachineType.ELECTRIC_FURNACE.tooltipDescription(), + furnaceRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTRIC_FURNACE", + null).getStackForm(1L)); + + ItemList.ElectricFurnaceUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTRIC_FURNACE_UMV.ID, + "basicmachine.e_furnace.tier.12", + "Epic Atom Stimulator IV", + 12, + MachineType.ELECTRIC_FURNACE.tooltipDescription(), + furnaceRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTRIC_FURNACE", + null).getStackForm(1L)); + } + + private void registerElectrolyzer() { + + ItemList.ElectrolyzerLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTROLYZER_LuV.ID, + "basicmachine.electrolyzer.tier.06", + "Elite Electrolyzer", + 6, + MachineType.ELECTROLYZER.tooltipDescription(), + electrolyzerRecipes, + 2, + 6, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTROLYZER", + null).getStackForm(1L)); + + ItemList.ElectrolyzerZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTROLYZER_ZPM.ID, + "basicmachine.electrolyzer.tier.07", + "Elite Electrolyzer II", + 7, + MachineType.ELECTROLYZER.tooltipDescription(), + electrolyzerRecipes, + 2, + 6, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTROLYZER", + null).getStackForm(1L)); + + ItemList.ElectrolyzerUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTROLYZER_UV.ID, + "basicmachine.electrolyzer.tier.08", + "Ultimate Ionizer", + 8, + MachineType.ELECTROLYZER.tooltipDescription(), + electrolyzerRecipes, + 2, + 6, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTROLYZER", + null).getStackForm(1L)); + + ItemList.ElectrolyzerUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTROLYZER_UHV.ID, + "basicmachine.electrolyzer.tier.09", + "Epic Ionizer", + 9, + MachineType.ELECTROLYZER.tooltipDescription(), + electrolyzerRecipes, + 2, + 6, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTROLYZER", + null).getStackForm(1L)); + + ItemList.ElectrolyzerUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTROLYZER_UEV.ID, + "basicmachine.electrolyzer.tier.10", + "Epic Ionizer II", + 10, + MachineType.ELECTROLYZER.tooltipDescription(), + electrolyzerRecipes, + 2, + 6, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTROLYZER", + null).getStackForm(1L)); + + ItemList.ElectrolyzerUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTROLYZER_UIV.ID, + "basicmachine.electrolyzer.tier.11", + "Epic Ionizer III", + 11, + MachineType.ELECTROLYZER.tooltipDescription(), + electrolyzerRecipes, + 2, + 6, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTROLYZER", + null).getStackForm(1L)); + + ItemList.ElectrolyzerUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTROLYZER_UMV.ID, + "basicmachine.electrolyzer.tier.12", + "Epic Ionizer IV", + 12, + MachineType.ELECTROLYZER.tooltipDescription(), + electrolyzerRecipes, + 2, + 6, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTROLYZER", + null).getStackForm(1L)); + + } + + private void registerElectromagneticSeparator() { + + ItemList.ElectromagneticSeparatorLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTROMAGNETIC_SEPARATOR_LuV.ID, + "basicmachine.electromagneticseparator.tier.06", + "Elite Electromagnetic Separator", + 6, + MachineType.ELECTROMAGNETIC_SEPARATOR.tooltipDescription(), + electroMagneticSeparatorRecipes, + 1, + 3, + false, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTROMAGNETIC_SEPARATOR", + null).getStackForm(1L)); + + ItemList.ElectromagneticSeparatorZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTROMAGNETIC_SEPARATOR_ZPM.ID, + "basicmachine.electromagneticseparator.tier.07", + "Elite Electromagnetic Separator II", + 7, + MachineType.ELECTROMAGNETIC_SEPARATOR.tooltipDescription(), + electroMagneticSeparatorRecipes, + 1, + 3, + false, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTROMAGNETIC_SEPARATOR", + null).getStackForm(1L)); + + ItemList.ElectromagneticSeparatorUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTROMAGNETIC_SEPARATOR_UV.ID, + "basicmachine.electromagneticseparator.tier.08", + "Ultimate Magnetar Separator", + 8, + MachineType.ELECTROMAGNETIC_SEPARATOR.tooltipDescription(), + electroMagneticSeparatorRecipes, + 1, + 3, + false, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTROMAGNETIC_SEPARATOR", + null).getStackForm(1L)); + + ItemList.ElectromagneticSeparatorUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTROMAGNETIC_SEPARATOR_UHV.ID, + "basicmachine.electromagneticseparator.tier.09", + "Epic Magnetar Separator", + 9, + MachineType.ELECTROMAGNETIC_SEPARATOR.tooltipDescription(), + electroMagneticSeparatorRecipes, + 1, + 3, + false, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTROMAGNETIC_SEPARATOR", + null).getStackForm(1L)); + + ItemList.ElectromagneticSeparatorUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTROMAGNETIC_SEPARATOR_UEV.ID, + "basicmachine.electromagneticseparator.tier.10", + "Epic Magnetar Separator II", + 10, + MachineType.ELECTROMAGNETIC_SEPARATOR.tooltipDescription(), + electroMagneticSeparatorRecipes, + 1, + 3, + false, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTROMAGNETIC_SEPARATOR", + null).getStackForm(1L)); + + ItemList.ElectromagneticSeparatorUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTROMAGNETIC_SEPARATOR_UIV.ID, + "basicmachine.electromagneticseparator.tier.11", + "Epic Magnetar Separator III", + 11, + MachineType.ELECTROMAGNETIC_SEPARATOR.tooltipDescription(), + electroMagneticSeparatorRecipes, + 1, + 3, + false, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTROMAGNETIC_SEPARATOR", + null).getStackForm(1L)); + + ItemList.ElectromagneticSeparatorUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ELECTROMAGNETIC_SEPARATOR_UMV.ID, + "basicmachine.electromagneticseparator.tier.12", + "Epic Magnetar Separator IV", + 12, + MachineType.ELECTROMAGNETIC_SEPARATOR.tooltipDescription(), + electroMagneticSeparatorRecipes, + 1, + 3, + false, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ELECTROMAGNETIC_SEPARATOR", + null).getStackForm(1L)); + + } + + private void registerExtractor() { + + ItemList.ExtractorLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + EXTRACTOR_LuV.ID, + "basicmachine.extractor.tier.06", + "Elite Extractor", + 6, + MachineType.EXTRACTOR.tooltipDescription(), + extractorRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "EXTRACTOR", + null).getStackForm(1L)); + + ItemList.ExtractorZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + EXTRACTOR_ZPM.ID, + "basicmachine.extractor.tier.07", + "Elite Extractor II", + 7, + MachineType.EXTRACTOR.tooltipDescription(), + extractorRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "EXTRACTOR", + null).getStackForm(1L)); + + ItemList.ExtractorUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + EXTRACTOR_UV.ID, + "basicmachine.extractor.tier.08", + "Ultimate Extractinator", + 8, + MachineType.EXTRACTOR.tooltipDescription(), + extractorRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "EXTRACTOR", + null).getStackForm(1L)); + + ItemList.ExtractorUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + EXTRACTOR_UHV.ID, + "basicmachine.extractor.tier.09", + "Epic Extractinator", + 9, + MachineType.EXTRACTOR.tooltipDescription(), + extractorRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "EXTRACTOR", + null).getStackForm(1L)); + + ItemList.ExtractorUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + EXTRACTOR_UEV.ID, + "basicmachine.extractor.tier.10", + "Epic Extractinator II", + 10, + MachineType.EXTRACTOR.tooltipDescription(), + extractorRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "EXTRACTOR", + null).getStackForm(1L)); + + ItemList.ExtractorUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + EXTRACTOR_UIV.ID, + "basicmachine.extractor.tier.11", + "Epic Extractinator III", + 11, + MachineType.EXTRACTOR.tooltipDescription(), + extractorRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "EXTRACTOR", + null).getStackForm(1L)); + + ItemList.ExtractorUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + EXTRACTOR_UMV.ID, + "basicmachine.extractor.tier.12", + "Epic Extractinator IV", + 12, + MachineType.EXTRACTOR.tooltipDescription(), + extractorRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "EXTRACTOR", + null).getStackForm(1L)); + + } + + private void registerExtruder() { + + ItemList.ExtruderLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + EXTRUDER_LuV.ID, + "basicmachine.extruder.tier.06", + "Elite Extruder", + 6, + MachineType.EXTRUDER.tooltipDescription(), + extruderRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "EXTRUDER", + null).getStackForm(1L)); + + ItemList.ExtruderZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + EXTRUDER_ZPM.ID, + "basicmachine.extruder.tier.07", + "Elite Extruder II", + 7, + MachineType.EXTRUDER.tooltipDescription(), + extruderRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "EXTRUDER", + null).getStackForm(1L)); + + ItemList.ExtruderUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + EXTRUDER_UV.ID, + "basicmachine.extruder.tier.08", + "Ultimate Shape Driver", + 8, + MachineType.EXTRUDER.tooltipDescription(), + extruderRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "EXTRUDER", + null).getStackForm(1L)); + + ItemList.ExtruderUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + EXTRUDER_UHV.ID, + "basicmachine.extruder.tier.09", + "Epic Shape Driver", + 9, + MachineType.EXTRUDER.tooltipDescription(), + extruderRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "EXTRUDER", + null).getStackForm(1L)); + + ItemList.ExtruderUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + EXTRUDER_UEV.ID, + "basicmachine.extruder.tier.10", + "Epic Shape Driver II", + 10, + MachineType.EXTRUDER.tooltipDescription(), + extruderRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "EXTRUDER", + null).getStackForm(1L)); + + ItemList.ExtruderUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + EXTRUDER_UIV.ID, + "basicmachine.extruder.tier.11", + "Epic Shape Driver III", + 11, + MachineType.EXTRUDER.tooltipDescription(), + extruderRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "EXTRUDER", + null).getStackForm(1L)); + + ItemList.ExtruderUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + EXTRUDER_UMV.ID, + "basicmachine.extruder.tier.12", + "Epic Shape Driver IV", + 12, + MachineType.EXTRUDER.tooltipDescription(), + extruderRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "EXTRUDER", + null).getStackForm(1L)); + + } + + private void registerFluidSolidifier() { + + ItemList.FluidSolidifierLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_SOLIDIFIER_LuV.ID, + "basicmachine.fluidsolidifier.tier.06", + "Elite Fluid Solidifier", + 6, + MachineType.FLUID_SOLIDIFIER.tooltipDescription(), + fluidSolidifierRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_SOLIDIFIER", + null).getStackForm(1L)); + + ItemList.FluidSolidifierZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_SOLIDIFIER_ZPM.ID, + "basicmachine.fluidsolidifier.tier.07", + "Elite Fluid Solidifier II", + 7, + MachineType.FLUID_SOLIDIFIER.tooltipDescription(), + fluidSolidifierRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_SOLIDIFIER", + null).getStackForm(1L)); + + ItemList.FluidSolidifierUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_SOLIDIFIER_UV.ID, + "basicmachine.fluidsolidifier.tier.08", + "Ultimate Fluid Petrificator", + 8, + MachineType.FLUID_SOLIDIFIER.tooltipDescription(), + fluidSolidifierRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_SOLIDIFIER", + null).getStackForm(1L)); + + ItemList.FluidSolidifierUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_SOLIDIFIER_UHV.ID, + "basicmachine.fluidsolidifier.tier.09", + "Epic Fluid Petrificator", + 9, + MachineType.FLUID_SOLIDIFIER.tooltipDescription(), + fluidSolidifierRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_SOLIDIFIER", + null).getStackForm(1L)); + + ItemList.FluidSolidifierUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_SOLIDIFIER_UEV.ID, + "basicmachine.fluidsolidifier.tier.10", + "Epic Fluid Petrificator II", + 10, + MachineType.FLUID_SOLIDIFIER.tooltipDescription(), + fluidSolidifierRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_SOLIDIFIER", + null).getStackForm(1L)); + + ItemList.FluidSolidifierUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_SOLIDIFIER_UIV.ID, + "basicmachine.fluidsolidifier.tier.11", + "Epic Fluid Petrificator III", + 11, + MachineType.FLUID_SOLIDIFIER.tooltipDescription(), + fluidSolidifierRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_SOLIDIFIER", + null).getStackForm(1L)); + + ItemList.FluidSolidifierUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FLUID_SOLIDIFIER_UMV.ID, + "basicmachine.fluidsolidifier.tier.12", + "Epic Fluid Petrificator IV", + 12, + MachineType.FLUID_SOLIDIFIER.tooltipDescription(), + fluidSolidifierRecipes, + 1, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "FLUID_SOLIDIFIER", + null).getStackForm(1L)); + + } + + private void registerFormingPress() { + + ItemList.FormingPressLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FORMING_PRESS_LuV.ID, + "basicmachine.press.tier.06", + "Elite Forming Press", + 6, + MachineType.FORMING_PRESS.tooltipDescription(), + formingPressRecipes, + 6, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "PRESS", + null).getStackForm(1L)); + + ItemList.FormingPressZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FORMING_PRESS_ZPM.ID, + "basicmachine.press.tier.07", + "Elite Forming Press II", + 7, + MachineType.FORMING_PRESS.tooltipDescription(), + formingPressRecipes, + 6, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "PRESS", + null).getStackForm(1L)); + + ItemList.FormingPressUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FORMING_PRESS_UV.ID, + "basicmachine.press.tier.08", + "Ultimate Surface Shifter", + 8, + MachineType.FORMING_PRESS.tooltipDescription(), + formingPressRecipes, + 6, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "PRESS", + null).getStackForm(1L)); + + ItemList.FormingPressUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FORMING_PRESS_UHV.ID, + "basicmachine.press.tier.09", + "Epic Surface Shifter", + 9, + MachineType.FORMING_PRESS.tooltipDescription(), + formingPressRecipes, + 6, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "PRESS", + null).getStackForm(1L)); + + ItemList.FormingPressUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FORMING_PRESS_UEV.ID, + "basicmachine.press.tier.10", + "Epic Surface Shifter II", + 10, + MachineType.FORMING_PRESS.tooltipDescription(), + formingPressRecipes, + 6, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "PRESS", + null).getStackForm(1L)); + + ItemList.FormingPressUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FORMING_PRESS_UIV.ID, + "basicmachine.press.tier.11", + "Epic Surface Shifter III", + 11, + MachineType.FORMING_PRESS.tooltipDescription(), + formingPressRecipes, + 6, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "PRESS", + null).getStackForm(1L)); + + ItemList.FormingPressUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FORMING_PRESS_UMV.ID, + "basicmachine.press.tier.12", + "Epic Surface Shifter IV", + 12, + MachineType.FORMING_PRESS.tooltipDescription(), + formingPressRecipes, + 6, + 1, + false, + SoundResource.IC2_MACHINES_COMPRESSOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "PRESS", + null).getStackForm(1L)); + + } + + private void registerForgeHammer() { + + ItemList.ForgeHammerLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FORGE_HAMMER_LuV.ID, + "basicmachine.hammer.tier.06", + "Elite Forge Hammer", + 6, + MachineType.FORGE_HAMMER.tooltipDescription(), + hammerRecipes, + 1, + 1, + true, + SoundResource.RANDOM_ANVIL_USE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "HAMMER", + null).getStackForm(1L)); + + ItemList.ForgeHammerZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FORGE_HAMMER_ZPM.ID, + "basicmachine.hammer.tier.07", + "Elite Forge Hammer II", + 7, + MachineType.FORGE_HAMMER.tooltipDescription(), + hammerRecipes, + 1, + 1, + true, + SoundResource.RANDOM_ANVIL_USE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "HAMMER", + null).getStackForm(1L)); + + ItemList.ForgeHammerUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FORGE_HAMMER_UV.ID, + "basicmachine.hammer.tier.08", + "Ultimate Impact Modulator", + 8, + MachineType.FORGE_HAMMER.tooltipDescription(), + hammerRecipes, + 1, + 1, + true, + SoundResource.RANDOM_ANVIL_USE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "HAMMER", + null).getStackForm(1L)); + + ItemList.ForgeHammerUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FORGE_HAMMER_UHV.ID, + "basicmachine.hammer.tier.09", + "Epic Impact Modulator", + 9, + MachineType.FORGE_HAMMER.tooltipDescription(), + hammerRecipes, + 1, + 1, + true, + SoundResource.RANDOM_ANVIL_USE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "HAMMER", + null).getStackForm(1L)); + + ItemList.ForgeHammerUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FORGE_HAMMER_UEV.ID, + "basicmachine.hammer.tier.10", + "Epic Impact Modulator II", + 10, + MachineType.FORGE_HAMMER.tooltipDescription(), + hammerRecipes, + 1, + 1, + true, + SoundResource.RANDOM_ANVIL_USE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "HAMMER", + null).getStackForm(1L)); + + ItemList.ForgeHammerUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FORGE_HAMMER_UIV.ID, + "basicmachine.hammer.tier.11", + "Epic Impact Modulator III", + 11, + MachineType.FORGE_HAMMER.tooltipDescription(), + hammerRecipes, + 1, + 1, + true, + SoundResource.RANDOM_ANVIL_USE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "HAMMER", + null).getStackForm(1L)); + + ItemList.ForgeHammerUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + FORGE_HAMMER_UMV.ID, + "basicmachine.hammer.tier.12", + "Epic Impact Modulator IV", + 12, + MachineType.FORGE_HAMMER.tooltipDescription(), + hammerRecipes, + 1, + 1, + true, + SoundResource.RANDOM_ANVIL_USE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "HAMMER", + null).getStackForm(1L)); + + } + + private void registerLathe() { + + ItemList.LatheLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + LATHE_LuV.ID, + "basicmachine.lathe.tier.06", + "Elite Lathe", + 6, + MachineType.LATHE.tooltipDescription(), + latheRecipes, + 1, + 2, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "LATHE", + null).getStackForm(1L)); + + ItemList.LatheZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + LATHE_ZPM.ID, + "basicmachine.lathe.tier.07", + "Elite Lathe II", + 7, + MachineType.LATHE.tooltipDescription(), + latheRecipes, + 1, + 2, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "LATHE", + null).getStackForm(1L)); + + ItemList.LatheUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + LATHE_UV.ID, + "basicmachine.lathe.tier.08", + "Ultimate Turn-O-Matic", + 8, + MachineType.LATHE.tooltipDescription(), + latheRecipes, + 1, + 2, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "LATHE", + null).getStackForm(1L)); + + ItemList.LatheUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + LATHE_UHV.ID, + "basicmachine.lathe.tier.09", + "Epic Turn-O-Matic", + 9, + MachineType.LATHE.tooltipDescription(), + latheRecipes, + 1, + 2, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "LATHE", + null).getStackForm(1L)); + + ItemList.LatheUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + LATHE_UEV.ID, + "basicmachine.lathe.tier.10", + "Epic Turn-O-Matic II", + 10, + MachineType.LATHE.tooltipDescription(), + latheRecipes, + 1, + 2, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "LATHE", + null).getStackForm(1L)); + + ItemList.LatheUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + LATHE_UIV.ID, + "basicmachine.lathe.tier.11", + "Epic Turn-O-Matic III", + 11, + MachineType.LATHE.tooltipDescription(), + latheRecipes, + 1, + 2, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "LATHE", + null).getStackForm(1L)); + + ItemList.LatheUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + LATHE_UMV.ID, + "basicmachine.lathe.tier.12", + "Epic Turn-O-Matic IV", + 12, + MachineType.LATHE.tooltipDescription(), + latheRecipes, + 1, + 2, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "LATHE", + null).getStackForm(1L)); + + } + + private void registerPrecisionLaserEngraver() { + + ItemList.PrecisionLaserEngraverLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + PRECISION_LASER_ENGRAVER_LuV.ID, + "basicmachine.laserengraver.tier.06", + "Elite Precision Laser Engraver", + 6, + MachineType.LASER_ENGRAVER.tooltipDescription(), + laserEngraverRecipes, + 4, + 1, + true, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "LASER_ENGRAVER", + null).getStackForm(1L)); + + ItemList.PrecisionLaserEngraverZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + PRECISION_LASER_ENGRAVER_ZPM.ID, + "basicmachine.laserengraver.tier.07", + "Elite Precision Laser Engraver II", + 7, + MachineType.LASER_ENGRAVER.tooltipDescription(), + laserEngraverRecipes, + 4, + 1, + true, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "LASER_ENGRAVER", + null).getStackForm(1L)); + + ItemList.PrecisionLaserEngraverUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + PRECISION_LASER_ENGRAVER_UV.ID, + "basicmachine.laserengraver.tier.08", + "Ultimate Exact Photon Cannon", + 8, + MachineType.LASER_ENGRAVER.tooltipDescription(), + laserEngraverRecipes, + 4, + 1, + true, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "LASER_ENGRAVER", + null).getStackForm(1L)); + + ItemList.PrecisionLaserEngraverUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + PRECISION_LASER_ENGRAVER_UHV.ID, + "basicmachine.laserengraver.tier.09", + "Epic Exact Photon Cannon", + 9, + MachineType.LASER_ENGRAVER.tooltipDescription(), + laserEngraverRecipes, + 4, + 1, + true, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "LASER_ENGRAVER", + null).getStackForm(1L)); + + ItemList.PrecisionLaserEngraverUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + PRECISION_LASER_ENGRAVER_UEV.ID, + "basicmachine.laserengraver.tier.10", + "Epic Exact Photon Cannon II", + 10, + MachineType.LASER_ENGRAVER.tooltipDescription(), + laserEngraverRecipes, + 4, + 1, + true, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "LASER_ENGRAVER", + null).getStackForm(1L)); + + ItemList.PrecisionLaserEngraverUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + PRECISION_LASER_ENGRAVER_UIV.ID, + "basicmachine.laserengraver.tier.11", + "Epic Exact Photon Cannon III", + 11, + MachineType.LASER_ENGRAVER.tooltipDescription(), + laserEngraverRecipes, + 4, + 1, + true, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "LASER_ENGRAVER", + null).getStackForm(1L)); + + ItemList.PrecisionLaserEngraverUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + PRECISION_LASER_ENGRAVER_UMV.ID, + "basicmachine.laserengraver.tier.12", + "Epic Exact Photon Cannon IV", + 12, + MachineType.LASER_ENGRAVER.tooltipDescription(), + laserEngraverRecipes, + 4, + 1, + true, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "LASER_ENGRAVER", + null).getStackForm(1L)); + + } + + private void registerMacerator() { + + ItemList.MaceratorLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MACERATOR_LuV.ID, + "basicmachine.macerator.tier.06", + "Elite Pulverizer", + 6, + MachineType.MACERATOR.tooltipDescription(), + maceratorRecipes, + 1, + 4, + false, + SoundResource.IC2_MACHINES_MACERATOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + "PULVERIZER", + null).getStackForm(1L)); + + ItemList.MaceratorZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MACERATOR_ZPM.ID, + "basicmachine.macerator.tier.07", + "Elite Pulverizer II", + 7, + MachineType.MACERATOR.tooltipDescription(), + maceratorRecipes, + 1, + 4, + false, + SoundResource.IC2_MACHINES_MACERATOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + "PULVERIZER", + null).getStackForm(1L)); + + ItemList.MaceratorUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MACERATOR_UV.ID, + "basicmachine.macerator.tier.08", + "Ultimate Shape Eliminator", + 8, + MachineType.MACERATOR.tooltipDescription(), + maceratorRecipes, + 1, + 4, + false, + SoundResource.IC2_MACHINES_MACERATOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + "PULVERIZER", + null).getStackForm(1L)); + + ItemList.MaceratorUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MACERATOR_UHV.ID, + "basicmachine.macerator.tier.09", + "Epic Shape Eliminator", + 9, + MachineType.MACERATOR.tooltipDescription(), + maceratorRecipes, + 1, + 4, + false, + SoundResource.IC2_MACHINES_MACERATOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + "PULVERIZER", + null).getStackForm(1L)); + + ItemList.MaceratorUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MACERATOR_UEV.ID, + "basicmachine.macerator.tier.10", + "Epic Shape Eliminator II", + 10, + MachineType.MACERATOR.tooltipDescription(), + maceratorRecipes, + 1, + 4, + false, + SoundResource.IC2_MACHINES_MACERATOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + "PULVERIZER", + null).getStackForm(1L)); + + ItemList.MaceratorUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MACERATOR_UIV.ID, + "basicmachine.macerator.tier.11", + "Epic Shape Eliminator III", + 11, + MachineType.MACERATOR.tooltipDescription(), + maceratorRecipes, + 1, + 4, + false, + SoundResource.IC2_MACHINES_MACERATOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + "PULVERIZER", + null).getStackForm(1L)); + + ItemList.MaceratorUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MACERATOR_UMV.ID, + "basicmachine.macerator.tier.12", + "Epic Shape Eliminator IV", + 12, + MachineType.MACERATOR.tooltipDescription(), + maceratorRecipes, + 1, + 4, + false, + SoundResource.IC2_MACHINES_MACERATOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + "PULVERIZER", + null).getStackForm(1L)); + + } + + private void registerMatterFabricator() { + + ItemList.MassFabricatorLuV.set( + new GT_MetaTileEntity_Massfabricator( + MATTER_FABRICATOR_LuV.ID, + "basicmachine.massfab.tier.06", + "Elite Mass Fabricator", + 6).getStackForm(1L)); + ItemList.MassFabricatorZPM.set( + new GT_MetaTileEntity_Massfabricator( + MATTER_FABRICATOR_ZPM.ID, + "basicmachine.massfab.tier.07", + "Elite Mass Fabricator II", + 7).getStackForm(1L)); + ItemList.MassFabricatorUV.set( + new GT_MetaTileEntity_Massfabricator( + MATTER_FABRICATOR_UV.ID, + "basicmachine.massfab.tier.08", + "Ultimate Existence Initiator", + 8).getStackForm(1L)); + ItemList.MassFabricatorUHV.set( + new GT_MetaTileEntity_Massfabricator( + MATTER_FABRICATOR_UHV.ID, + "basicmachine.massfab.tier.09", + "Epic Existence Initiator", + 9).getStackForm(1L)); + ItemList.MassFabricatorUEV.set( + new GT_MetaTileEntity_Massfabricator( + MATTER_FABRICATOR_UEV.ID, + "basicmachine.massfab.tier.10", + "Epic Existence Initiator II", + 10).getStackForm(1L)); + ItemList.MassFabricatorUIV.set( + new GT_MetaTileEntity_Massfabricator( + MATTER_FABRICATOR_UIV.ID, + "basicmachine.massfab.tier.11", + "Epic Existence Initiator III", + 11).getStackForm(1L)); + ItemList.MassFabricatorUMV.set( + new GT_MetaTileEntity_Massfabricator( + MATTER_FABRICATOR_UMV.ID, + "basicmachine.massfab.tier.12", + "Epic Existence Initiator IV", + 12).getStackForm(1L)); + } + + private void registerMicrowave() { + + ItemList.MicrowaveLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MICROWAVE_LuV.ID, + "basicmachine.microwave.tier.06", + "Elite Microwave", + 6, + MachineType.MICROWAVE.tooltipDescription(), + microwaveRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "MICROWAVE", + null).getStackForm(1L)); + + ItemList.MicrowaveZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MICROWAVE_ZPM.ID, + "basicmachine.microwave.tier.07", + "Elite Microwave II", + 7, + MachineType.MICROWAVE.tooltipDescription(), + microwaveRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "MICROWAVE", + null).getStackForm(1L)); + + ItemList.MicrowaveUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MICROWAVE_UV.ID, + "basicmachine.microwave.tier.08", + "Ultimate UFO Engine", + 8, + MachineType.MICROWAVE.tooltipDescription(), + microwaveRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "MICROWAVE", + null).getStackForm(1L)); + + ItemList.MicrowaveUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MICROWAVE_UHV.ID, + "basicmachine.microwave.tier.09", + "Epic UFO Engine", + 9, + MachineType.MICROWAVE.tooltipDescription(), + microwaveRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "MICROWAVE", + null).getStackForm(1L)); + + ItemList.MicrowaveUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MICROWAVE_UEV.ID, + "basicmachine.microwave.tier.10", + "Epic UFO Engine II", + 10, + MachineType.MICROWAVE.tooltipDescription(), + microwaveRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "MICROWAVE", + null).getStackForm(1L)); + + ItemList.MicrowaveUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MICROWAVE_UIV.ID, + "basicmachine.microwave.tier.11", + "Epic UFO Engine III", + 11, + MachineType.MICROWAVE.tooltipDescription(), + microwaveRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "MICROWAVE", + null).getStackForm(1L)); + + ItemList.MicrowaveUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + MICROWAVE_UMV.ID, + "basicmachine.microwave.tier.12", + "Epic UFO Engine IV", + 12, + MachineType.MICROWAVE.tooltipDescription(), + microwaveRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "MICROWAVE", + null).getStackForm(1L)); + + } + + private void registerOreWashingPlant() { + + ItemList.OreWashingPlantLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ORE_WASHING_PLANT_LuV.ID, + "basicmachine.orewasher.tier.06", + "Elite Ore Washing Plant", + 6, + MachineType.ORE_WASHER.tooltipDescription(), + oreWasherRecipes, + 1, + 3, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ORE_WASHER", + null).getStackForm(1L)); + + ItemList.OreWashingPlantZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ORE_WASHING_PLANT_ZPM.ID, + "basicmachine.orewasher.tier.07", + "Elite Ore Washing Plant II", + 7, + MachineType.ORE_WASHER.tooltipDescription(), + oreWasherRecipes, + 1, + 3, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ORE_WASHER", + null).getStackForm(1L)); + + ItemList.OreWashingPlantUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ORE_WASHING_PLANT_UV.ID, + "basicmachine.orewasher.tier.08", + "Ultimate Ore Washing Machine", + 8, + MachineType.ORE_WASHER.tooltipDescription(), + oreWasherRecipes, + 1, + 3, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ORE_WASHER", + null).getStackForm(1L)); + + ItemList.OreWashingPlantUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ORE_WASHING_PLANT_UHV.ID, + "basicmachine.orewasher.tier.09", + "Epic Ore Washing Machine", + 9, + MachineType.ORE_WASHER.tooltipDescription(), + oreWasherRecipes, + 1, + 3, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ORE_WASHER", + null).getStackForm(1L)); + + ItemList.OreWashingPlantUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ORE_WASHING_PLANT_UEV.ID, + "basicmachine.orewasher.tier.10", + "Epic Ore Washing Machine II", + 10, + MachineType.ORE_WASHER.tooltipDescription(), + oreWasherRecipes, + 1, + 3, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ORE_WASHER", + null).getStackForm(1L)); + + ItemList.OreWashingPlantUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ORE_WASHING_PLANT_UIV.ID, + "basicmachine.orewasher.tier.11", + "Epic Ore Washing Machine III", + 11, + MachineType.ORE_WASHER.tooltipDescription(), + oreWasherRecipes, + 1, + 3, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ORE_WASHER", + null).getStackForm(1L)); + + ItemList.OreWashingPlantUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ORE_WASHING_PLANT_UMV.ID, + "basicmachine.orewasher.tier.12", + "Epic Ore Washing Machine IV", + 12, + MachineType.ORE_WASHER.tooltipDescription(), + oreWasherRecipes, + 1, + 3, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ORE_WASHER", + null).getStackForm(1L)); + + } + + private void registerPolarizer() { + + ItemList.PolarizerLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + POLARIZER_LuV.ID, + "basicmachine.polarizer.tier.06", + "Elite Polarizer", + 6, + MachineType.POLARIZER.tooltipDescription(), + polarizerRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "POLARIZER", + null).getStackForm(1L)); + + ItemList.PolarizerZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + POLARIZER_ZPM.ID, + "basicmachine.polarizer.tier.07", + "Elite Polarizer II", + 7, + MachineType.POLARIZER.tooltipDescription(), + polarizerRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "POLARIZER", + null).getStackForm(1L)); + + ItemList.PolarizerUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + POLARIZER_UV.ID, + "basicmachine.polarizer.tier.08", + "Ultimate Magnetism Inducer", + 8, + MachineType.POLARIZER.tooltipDescription(), + polarizerRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "POLARIZER", + null).getStackForm(1L)); + + ItemList.PolarizerUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + POLARIZER_UHV.ID, + "basicmachine.polarizer.tier.09", + "Epic Magnetism Inducer", + 9, + MachineType.POLARIZER.tooltipDescription(), + polarizerRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "POLARIZER", + null).getStackForm(1L)); + + ItemList.PolarizerUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + POLARIZER_UEV.ID, + "basicmachine.polarizer.tier.10", + "Epic Magnetism Inducer II", + 10, + MachineType.POLARIZER.tooltipDescription(), + polarizerRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "POLARIZER", + null).getStackForm(1L)); + + ItemList.PolarizerUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + POLARIZER_UIV.ID, + "basicmachine.polarizer.tier.11", + "Epic Magnetism Inducer III", + 11, + MachineType.POLARIZER.tooltipDescription(), + polarizerRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "POLARIZER", + null).getStackForm(1L)); + + ItemList.PolarizerUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + POLARIZER_UMV.ID, + "basicmachine.polarizer.tier.12", + "Epic Magnetism Inducer IV", + 12, + MachineType.POLARIZER.tooltipDescription(), + polarizerRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "POLARIZER", + null).getStackForm(1L)); + + } + + private void registerRecycler() { + + ItemList.RecyclerLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + RECYCLER_LuV.ID, + "basicmachine.recycler.tier.06", + "Elite Recycler", + 6, + MachineType.RECYCLER.tooltipDescription(), + recyclerRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_RECYCLER_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "RECYCLER", + null).getStackForm(1L)); + + ItemList.RecyclerZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + RECYCLER_ZPM.ID, + "basicmachine.recycler.tier.07", + "Elite Recycler II", + 7, + MachineType.RECYCLER.tooltipDescription(), + recyclerRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_RECYCLER_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "RECYCLER", + null).getStackForm(1L)); + + ItemList.RecyclerUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + RECYCLER_UV.ID, + "basicmachine.recycler.tier.08", + "Ultimate Scrap-O-Matic", + 8, + MachineType.RECYCLER.tooltipDescription(), + recyclerRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_RECYCLER_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "RECYCLER", + null).getStackForm(1L)); + + ItemList.RecyclerUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + RECYCLER_UHV.ID, + "basicmachine.recycler.tier.09", + "Epic Scrap-O-Matic", + 9, + MachineType.RECYCLER.tooltipDescription(), + recyclerRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_RECYCLER_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "RECYCLER", + null).getStackForm(1L)); + + ItemList.RecyclerUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + RECYCLER_UEV.ID, + "basicmachine.recycler.tier.10", + "Epic Scrap-O-Matic II", + 10, + MachineType.RECYCLER.tooltipDescription(), + recyclerRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_RECYCLER_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "RECYCLER", + null).getStackForm(1L)); + + ItemList.RecyclerUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + RECYCLER_UIV.ID, + "basicmachine.recycler.tier.11", + "Epic Scrap-O-Matic III", + 11, + MachineType.RECYCLER.tooltipDescription(), + recyclerRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_RECYCLER_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "RECYCLER", + null).getStackForm(1L)); + + ItemList.RecyclerUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + RECYCLER_UMV.ID, + "basicmachine.recycler.tier.12", + "Epic Scrap-O-Matic IV", + 12, + MachineType.RECYCLER.tooltipDescription(), + recyclerRecipes, + 1, + 1, + false, + SoundResource.IC2_MACHINES_RECYCLER_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "RECYCLER", + null).getStackForm(1L)); + + } + + private void registerSiftingMachine() { + + ItemList.SiftingMachineLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + SIFTING_MACHINE_LuV.ID, + "basicmachine.sifter.tier.06", + "Elite Sifting Machine", + 6, + MachineType.SIFTER.tooltipDescription(), + sifterRecipes, + 1, + 9, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "SIFTER", + null).getStackForm(1L)); + + ItemList.SiftingMachineZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + SIFTING_MACHINE_ZPM.ID, + "basicmachine.sifter.tier.07", + "Elite Sifting Machine II", + 7, + MachineType.SIFTER.tooltipDescription(), + sifterRecipes, + 1, + 9, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "SIFTER", + null).getStackForm(1L)); + + ItemList.SiftingMachineUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + SIFTING_MACHINE_UV.ID, + "basicmachine.sifter.tier.08", + "Ultimate Pulsation Filter", + 8, + MachineType.SIFTER.tooltipDescription(), + sifterRecipes, + 1, + 9, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "SIFTER", + null).getStackForm(1L)); + + ItemList.SiftingMachineUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + SIFTING_MACHINE_UHV.ID, + "basicmachine.sifter.tier.09", + "Epic Pulsation Filter", + 9, + MachineType.SIFTER.tooltipDescription(), + sifterRecipes, + 1, + 9, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "SIFTER", + null).getStackForm(1L)); + + ItemList.SiftingMachineUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + SIFTING_MACHINE_UEV.ID, + "basicmachine.sifter.tier.10", + "Epic Pulsation Filter II", + 10, + MachineType.SIFTER.tooltipDescription(), + sifterRecipes, + 1, + 9, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "SIFTER", + null).getStackForm(1L)); + + ItemList.SiftingMachineUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + SIFTING_MACHINE_UIV.ID, + "basicmachine.sifter.tier.11", + "Epic Pulsation Filter III", + 11, + MachineType.SIFTER.tooltipDescription(), + sifterRecipes, + 1, + 9, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "SIFTER", + null).getStackForm(1L)); + + ItemList.SiftingMachineUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + SIFTING_MACHINE_UMV.ID, + "basicmachine.sifter.tier.12", + "Epic Pulsation Filter IV", + 12, + MachineType.SIFTER.tooltipDescription(), + sifterRecipes, + 1, + 9, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "SIFTER", + null).getStackForm(1L)); + + } + + private void registerSlicingMachine() { + + ItemList.SlicingMachineLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + SLICING_MACHINE_LuV.ID, + "basicmachine.slicer.tier.06", + "Elite Slicing Machine", + 6, + MachineType.SLICER.tooltipDescription(), + slicerRecipes, + 2, + 1, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "SLICER", + null).getStackForm(1L)); + + ItemList.SlicingMachineZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + SLICING_MACHINE_ZPM.ID, + "basicmachine.slicer.tier.07", + "Elite Slicing Machine II", + 7, + MachineType.SLICER.tooltipDescription(), + slicerRecipes, + 2, + 1, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "SLICER", + null).getStackForm(1L)); + + ItemList.SlicingMachineUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + SLICING_MACHINE_UV.ID, + "basicmachine.slicer.tier.08", + "Ultimate Quantum Slicer", + 8, + MachineType.SLICER.tooltipDescription(), + slicerRecipes, + 2, + 1, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "SLICER", + null).getStackForm(1L)); + + ItemList.SlicingMachineUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + SLICING_MACHINE_UHV.ID, + "basicmachine.slicer.tier.09", + "Epic Quantum Slicer", + 9, + MachineType.SLICER.tooltipDescription(), + slicerRecipes, + 2, + 1, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "SLICER", + null).getStackForm(1L)); + + ItemList.SlicingMachineUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + SLICING_MACHINE_UEV.ID, + "basicmachine.slicer.tier.10", + "Epic Quantum Slicer II", + 10, + MachineType.SLICER.tooltipDescription(), + slicerRecipes, + 2, + 1, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "SLICER", + null).getStackForm(1L)); + + ItemList.SlicingMachineUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + SLICING_MACHINE_UIV.ID, + "basicmachine.slicer.tier.11", + "Epic Quantum Slicer III", + 11, + MachineType.SLICER.tooltipDescription(), + slicerRecipes, + 2, + 1, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "SLICER", + null).getStackForm(1L)); + + ItemList.SlicingMachineUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + SLICING_MACHINE_UMV.ID, + "basicmachine.slicer.tier.12", + "Epic Quantum Slicer IV", + 12, + MachineType.SLICER.tooltipDescription(), + slicerRecipes, + 2, + 1, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "SLICER", + null).getStackForm(1L)); + + } + + private void registerThermalCentrifuge() { + + ItemList.ThermalCentrifugeLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + THERMAL_CENTRIFUGE_LuV.ID, + "basicmachine.thermalcentrifuge.tier.06", + "Elite Thermal Centrifuge", + 6, + MachineType.THERMAL_CENTRIFUGE.tooltipDescription(), + thermalCentrifugeRecipes, + 1, + 3, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "THERMAL_CENTRIFUGE", + null).getStackForm(1L)); + + ItemList.ThermalCentrifugeZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + THERMAL_CENTRIFUGE_ZPM.ID, + "basicmachine.thermalcentrifuge.tier.07", + "Elite Thermal Centrifuge II", + 7, + MachineType.THERMAL_CENTRIFUGE.tooltipDescription(), + thermalCentrifugeRecipes, + 1, + 3, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "THERMAL_CENTRIFUGE", + null).getStackForm(1L)); + + ItemList.ThermalCentrifugeUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + THERMAL_CENTRIFUGE_UV.ID, + "basicmachine.thermalcentrifuge.tier.08", + "Ultimate Fire Cyclone", + 8, + MachineType.THERMAL_CENTRIFUGE.tooltipDescription(), + thermalCentrifugeRecipes, + 1, + 3, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "THERMAL_CENTRIFUGE", + null).getStackForm(1L)); + + ItemList.ThermalCentrifugeUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + THERMAL_CENTRIFUGE_UHV.ID, + "basicmachine.thermalcentrifuge.tier.09", + "Epic Fire Cyclone", + 9, + MachineType.THERMAL_CENTRIFUGE.tooltipDescription(), + thermalCentrifugeRecipes, + 1, + 3, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "THERMAL_CENTRIFUGE", + null).getStackForm(1L)); + + ItemList.ThermalCentrifugeUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + THERMAL_CENTRIFUGE_UEV.ID, + "basicmachine.thermalcentrifuge.tier.10", + "Epic Fire Cyclone II", + 10, + MachineType.THERMAL_CENTRIFUGE.tooltipDescription(), + thermalCentrifugeRecipes, + 1, + 3, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "THERMAL_CENTRIFUGE", + null).getStackForm(1L)); + + ItemList.ThermalCentrifugeUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + THERMAL_CENTRIFUGE_UIV.ID, + "basicmachine.thermalcentrifuge.tier.11", + "Epic Fire Cyclone III", + 11, + MachineType.THERMAL_CENTRIFUGE.tooltipDescription(), + thermalCentrifugeRecipes, + 1, + 3, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "THERMAL_CENTRIFUGE", + null).getStackForm(1L)); + + ItemList.ThermalCentrifugeUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + THERMAL_CENTRIFUGE_UMV.ID, + "basicmachine.thermalcentrifuge.tier.12", + "Epic Fire Cyclone IV", + 12, + MachineType.THERMAL_CENTRIFUGE.tooltipDescription(), + thermalCentrifugeRecipes, + 1, + 3, + false, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "THERMAL_CENTRIFUGE", + null).getStackForm(1L)); + } + + private void registerWiremill() { + + ItemList.WiremillLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + WIREMILL_LuV.ID, + "basicmachine.wiremill.tier.06", + "Elite Wiremill", + 6, + MachineType.WIREMILL.tooltipDescription(), + wiremillRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_RECYCLER_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "WIREMILL", + null).getStackForm(1L)); + + ItemList.WiremillZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + WIREMILL_ZPM.ID, + "basicmachine.wiremill.tier.07", + "Elite Wiremill II", + 7, + MachineType.WIREMILL.tooltipDescription(), + wiremillRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_RECYCLER_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "WIREMILL", + null).getStackForm(1L)); + + ItemList.WiremillUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + WIREMILL_UV.ID, + "basicmachine.wiremill.tier.08", + "Ultimate Wire Transfigurator", + 8, + MachineType.WIREMILL.tooltipDescription(), + wiremillRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_RECYCLER_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "WIREMILL", + null).getStackForm(1L)); + + ItemList.WiremillUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + WIREMILL_UHV.ID, + "basicmachine.wiremill.tier.09", + "Epic Wire Transfigurator", + 9, + MachineType.WIREMILL.tooltipDescription(), + wiremillRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_RECYCLER_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "WIREMILL", + null).getStackForm(1L)); + + ItemList.WiremillUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + WIREMILL_UEV.ID, + "basicmachine.wiremill.tier.10", + "Epic Wire Transfigurator II", + 10, + MachineType.WIREMILL.tooltipDescription(), + wiremillRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_RECYCLER_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "WIREMILL", + null).getStackForm(1L)); + + ItemList.WiremillUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + WIREMILL_UIV.ID, + "basicmachine.wiremill.tier.11", + "Epic Wire Transfigurator III", + 11, + MachineType.WIREMILL.tooltipDescription(), + wiremillRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_RECYCLER_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "WIREMILL", + null).getStackForm(1L)); + + ItemList.WiremillUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + WIREMILL_UMV.ID, + "basicmachine.wiremill.tier.12", + "Epic Wire Transfigurator IV", + 12, + MachineType.WIREMILL.tooltipDescription(), + wiremillRecipes, + 2, + 1, + false, + SoundResource.IC2_MACHINES_RECYCLER_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "WIREMILL", + null).getStackForm(1L)); + + } + + private void registerArcFurnace() { + + ItemList.ArcFurnaceLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ARC_FURNACE_LuV.ID, + "basicmachine.arcfurnace.tier.06", + "Elite Arc Furnace", + 6, + MachineType.ARC_FURNACE.tooltipDescription(), + arcFurnaceRecipes, + 1, + 9, + true, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ARC_FURNACE", + null).getStackForm(1L)); + + ItemList.ArcFurnaceZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ARC_FURNACE_ZPM.ID, + "basicmachine.arcfurnace.tier.07", + "Elite Arc Furnace II", + 7, + MachineType.ARC_FURNACE.tooltipDescription(), + arcFurnaceRecipes, + 1, + 9, + true, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ARC_FURNACE", + null).getStackForm(1L)); + + ItemList.ArcFurnaceUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ARC_FURNACE_UV.ID, + "basicmachine.arcfurnace.tier.08", + "Ultimate Short Circuit Heater", + 8, + MachineType.ARC_FURNACE.tooltipDescription(), + arcFurnaceRecipes, + 1, + 9, + true, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ARC_FURNACE", + null).getStackForm(1L)); + + ItemList.ArcFurnaceUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ARC_FURNACE_UHV.ID, + "basicmachine.arcfurnace.tier.09", + "Epic Short Circuit Heater", + 9, + MachineType.ARC_FURNACE.tooltipDescription(), + arcFurnaceRecipes, + 1, + 9, + true, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ARC_FURNACE", + null).getStackForm(1L)); + + ItemList.ArcFurnaceUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ARC_FURNACE_UEV.ID, + "basicmachine.arcfurnace.tier.10", + "Epic Short Circuit Heater II", + 10, + MachineType.ARC_FURNACE.tooltipDescription(), + arcFurnaceRecipes, + 1, + 9, + true, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ARC_FURNACE", + null).getStackForm(1L)); + + ItemList.ArcFurnaceUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ARC_FURNACE_UIV.ID, + "basicmachine.arcfurnace.tier.11", + "Epic Short Circuit Heater III", + 11, + MachineType.ARC_FURNACE.tooltipDescription(), + arcFurnaceRecipes, + 1, + 9, + true, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ARC_FURNACE", + null).getStackForm(1L)); + + ItemList.ArcFurnaceUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + ARC_FURNACE_UMV.ID, + "basicmachine.arcfurnace.tier.12", + "Epic Short Circuit Heater IV", + 12, + MachineType.ARC_FURNACE.tooltipDescription(), + arcFurnaceRecipes, + 1, + 9, + true, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "ARC_FURNACE", + null).getStackForm(1L)); + + } + + private void registerCentrifuge() { + + ItemList.CentrifugeLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CENTRIFUGE_LuV.ID, + "basicmachine.centrifuge.tier.06", + "Elite Centrifuge", + 6, + MachineType.CENTRIFUGE.tooltipDescription(), + centrifugeRecipes, + 2, + 6, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CENTRIFUGE", + null).getStackForm(1L)); + + ItemList.CentrifugeZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CENTRIFUGE_ZPM.ID, + "basicmachine.centrifuge.tier.07", + "Elite Centrifuge II", + 7, + MachineType.CENTRIFUGE.tooltipDescription(), + centrifugeRecipes, + 2, + 6, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CENTRIFUGE", + null).getStackForm(1L)); + + ItemList.CentrifugeUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CENTRIFUGE_UV.ID, + "basicmachine.centrifuge.tier.08", + "Ultimate Molecular Tornado", + 8, + MachineType.CENTRIFUGE.tooltipDescription(), + centrifugeRecipes, + 2, + 6, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CENTRIFUGE", + null).getStackForm(1L)); + + ItemList.CentrifugeUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CENTRIFUGE_UHV.ID, + "basicmachine.centrifuge.tier.09", + "Epic Molecular Tornado", + 9, + MachineType.CENTRIFUGE.tooltipDescription(), + centrifugeRecipes, + 2, + 6, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CENTRIFUGE", + null).getStackForm(1L)); + + ItemList.CentrifugeUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CENTRIFUGE_UEV.ID, + "basicmachine.centrifuge.tier.10", + "Epic Molecular Tornado II", + 10, + MachineType.CENTRIFUGE.tooltipDescription(), + centrifugeRecipes, + 2, + 6, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CENTRIFUGE", + null).getStackForm(1L)); + + ItemList.CentrifugeUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CENTRIFUGE_UIV.ID, + "basicmachine.centrifuge.tier.11", + "Epic Molecular Tornado III", + 11, + MachineType.CENTRIFUGE.tooltipDescription(), + centrifugeRecipes, + 2, + 6, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CENTRIFUGE", + null).getStackForm(1L)); + + ItemList.CentrifugeUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CENTRIFUGE_UMV.ID, + "basicmachine.centrifuge.tier.12", + "Epic Molecular Tornado IV", + 12, + MachineType.CENTRIFUGE.tooltipDescription(), + centrifugeRecipes, + 2, + 6, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CENTRIFUGE", + null).getStackForm(1L)); + + } + + private void registerPlasmaArcFurnace() { + + ItemList.PlasmaArcFurnaceLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + PLASMA_ARC_FURNACE_LuV.ID, + "basicmachine.plasmaarcfurnace.tier.06", + "Elite Plasma Arc Furnace", + 6, + MachineType.PLASMA_ARC_FURNACE.tooltipDescription(), + plasmaArcFurnaceRecipes, + 1, + 9, + true, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "PLASMA_ARC_FURNACE", + null).getStackForm(1L)); + + ItemList.PlasmaArcFurnaceZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + PLASMA_ARC_FURNACE_ZPM.ID, + "basicmachine.plasmaarcfurnace.tier.07", + "Elite Plasma Arc Furnace II", + 7, + MachineType.PLASMA_ARC_FURNACE.tooltipDescription(), + plasmaArcFurnaceRecipes, + 1, + 9, + true, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "PLASMA_ARC_FURNACE", + null).getStackForm(1L)); + + ItemList.PlasmaArcFurnaceUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + PLASMA_ARC_FURNACE_UV.ID, + "basicmachine.plasmaarcfurnace.tier.08", + "Ultimate Plasma Discharge Heater", + 8, + MachineType.PLASMA_ARC_FURNACE.tooltipDescription(), + plasmaArcFurnaceRecipes, + 1, + 9, + true, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "PLASMA_ARC_FURNACE", + null).getStackForm(1L)); + + ItemList.PlasmaArcFurnaceUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + PLASMA_ARC_FURNACE_UHV.ID, + "basicmachine.plasmaarcfurnace.tier.09", + "Epic Plasma Discharge Heater", + 9, + MachineType.PLASMA_ARC_FURNACE.tooltipDescription(), + plasmaArcFurnaceRecipes, + 1, + 9, + true, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "PLASMA_ARC_FURNACE", + null).getStackForm(1L)); + + ItemList.PlasmaArcFurnaceUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + PLASMA_ARC_FURNACE_UEV.ID, + "basicmachine.plasmaarcfurnace.tier.10", + "Epic Plasma Discharge Heater II", + 10, + MachineType.PLASMA_ARC_FURNACE.tooltipDescription(), + plasmaArcFurnaceRecipes, + 1, + 9, + true, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "PLASMA_ARC_FURNACE", + null).getStackForm(1L)); + + ItemList.PlasmaArcFurnaceUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + PLASMA_ARC_FURNACE_UIV.ID, + "basicmachine.plasmaarcfurnace.tier.11", + "Epic Plasma Discharge Heater III", + 11, + MachineType.PLASMA_ARC_FURNACE.tooltipDescription(), + plasmaArcFurnaceRecipes, + 1, + 9, + true, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "PLASMA_ARC_FURNACE", + null).getStackForm(1L)); + + ItemList.PlasmaArcFurnaceUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + PLASMA_ARC_FURNACE_UMV.ID, + "basicmachine.plasmaarcfurnace.tier.12", + "Epic Plasma Discharge Heater IV", + 12, + MachineType.PLASMA_ARC_FURNACE.tooltipDescription(), + plasmaArcFurnaceRecipes, + 1, + 9, + true, + SoundResource.IC2_MACHINES_INDUCTION_LOOP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "PLASMA_ARC_FURNACE", + null).getStackForm(1L)); + } + + private void registerCanningMachine() { + + ItemList.CanningMachineLuV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CANNING_MACHINE_LuV.ID, + "basicmachine.canner.tier.06", + "Elite Canning Machine", + 6, + MachineType.CANNER.tooltipDescription(), + cannerRecipes, + 2, + 2, + false, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CANNER", + null).getStackForm(1L)); + + ItemList.CanningMachineZPM.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CANNING_MACHINE_ZPM.ID, + "basicmachine.canner.tier.07", + "Elite Canning Machine II", + 7, + MachineType.CANNER.tooltipDescription(), + cannerRecipes, + 2, + 2, + false, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CANNER", + null).getStackForm(1L)); + + ItemList.CanningMachineUV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CANNING_MACHINE_UV.ID, + "basicmachine.canner.tier.08", + "Ultimate Can Operator", + 8, + MachineType.CANNER.tooltipDescription(), + cannerRecipes, + 2, + 2, + false, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CANNER", + null).getStackForm(1L)); + + ItemList.CanningMachineUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CANNING_MACHINE_UHV.ID, + "basicmachine.canner.tier.09", + "Epic Can Operator", + 9, + MachineType.CANNER.tooltipDescription(), + cannerRecipes, + 2, + 2, + false, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CANNER", + null).getStackForm(1L)); + + ItemList.CanningMachineUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CANNING_MACHINE_UEV.ID, + "basicmachine.canner.tier.10", + "Epic Can Operator II", + 10, + MachineType.CANNER.tooltipDescription(), + cannerRecipes, + 2, + 2, + false, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CANNER", + null).getStackForm(1L)); + + ItemList.CanningMachineUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CANNING_MACHINE_UIV.ID, + "basicmachine.canner.tier.11", + "Epic Can Operator III", + 11, + MachineType.CANNER.tooltipDescription(), + cannerRecipes, + 2, + 2, + false, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CANNER", + null).getStackForm(1L)); + + ItemList.CanningMachineUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CANNING_MACHINE_UMV.ID, + "basicmachine.canner.tier.12", + "Epic Can Operator IV", + 12, + MachineType.CANNER.tooltipDescription(), + cannerRecipes, + 2, + 2, + false, + SoundResource.IC2_MACHINES_EXTRACTOR_OP, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CANNER", + null).getStackForm(1L)); } private static void registerDynamoHatch() { @@ -2153,9 +7344,24 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Hatch_Dynamo_UV.set( new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_UV.ID, "hatch.dynamo.tier.08", "UV Dynamo Hatch", 8) .getStackForm(1L)); - ItemList.Hatch_Dynamo_MAX.set( + ItemList.Hatch_Dynamo_UHV.set( new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_UHV.ID, "hatch.dynamo.tier.09", "UHV Dynamo Hatch", 9) .getStackForm(1L)); + ItemList.Hatch_Dynamo_UEV.set( + new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_UEV.ID, "hatch.dynamo.tier.10", "UEV Dynamo Hatch", 10) + .getStackForm(1L)); + + ItemList.Hatch_Dynamo_UIV.set( + new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_UIV.ID, "hatch.dynamo.tier.11", "UIV Dynamo Hatch", 11) + .getStackForm(1L)); + + ItemList.Hatch_Dynamo_UMV.set( + new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_UMV.ID, "hatch.dynamo.tier.12", "UMV Dynamo Hatch", 12) + .getStackForm(1L)); + + ItemList.Hatch_Dynamo_UXV.set( + new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_UXV.ID, "hatch.dynamo.tier.13", "UXV Dynamo Hatch", 13) + .getStackForm(1L)); } private static void registerEnergyHatch() { @@ -2186,9 +7392,24 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Hatch_Energy_UV.set( new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_UV.ID, "hatch.energy.tier.08", "UV Energy Hatch", 8) .getStackForm(1L)); - ItemList.Hatch_Energy_MAX.set( + ItemList.Hatch_Energy_UHV.set( new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_UHV.ID, "hatch.energy.tier.09", "UHV Energy Hatch", 9) .getStackForm(1L)); + ItemList.Hatch_Energy_UEV.set( + new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_UEV.ID, "hatch.energy.tier.10", "UEV Energy Hatch", 10) + .getStackForm(1L)); + + ItemList.Hatch_Energy_UIV.set( + new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_UIV.ID, "hatch.energy.tier.11", "UIV Energy Hatch", 11) + .getStackForm(1L)); + + ItemList.Hatch_Energy_UMV.set( + new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_UMV.ID, "hatch.energy.tier.12", "UMV Energy Hatch", 12) + .getStackForm(1L)); + + ItemList.Hatch_Energy_UXV.set( + new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_UXV.ID, "hatch.energy.tier.13", "UXV Energy Hatch", 13) + .getStackForm(1L)); } private static void registerInputHatch() { @@ -2219,9 +7440,24 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Hatch_Input_UV.set( new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_UV.ID, "hatch.input.tier.08", "Input Hatch (UV)", 8) .getStackForm(1L)); - ItemList.Hatch_Input_MAX.set( + ItemList.Hatch_Input_UHV.set( new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_UHV.ID, "hatch.input.tier.09", "Input Hatch (UHV)", 9) .getStackForm(1L)); + ItemList.Hatch_Input_UEV.set( + new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_UEV.ID, "hatch.input.tier.10", "Input Hatch (UEV)", 10) + .getStackForm(1L)); + ItemList.Hatch_Input_UIV.set( + new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_UIV.ID, "hatch.input.tier.11", "Input Hatch (UIV)", 11) + .getStackForm(1L)); + ItemList.Hatch_Input_UMV.set( + new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_UMV.ID, "hatch.input.tier.12", "Input Hatch (UMV)", 12) + .getStackForm(1L)); + ItemList.Hatch_Input_UXV.set( + new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_UXV.ID, "hatch.input.tier.13", "Input Hatch (UXV)", 13) + .getStackForm(1L)); + ItemList.Hatch_Input_MAX.set( + new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_MAX.ID, "hatch.input.tier.14", "Input Hatch (MAX)", 14) + .getStackForm(1L)); } private static void registerQuadrupleInputHatch() { @@ -2332,9 +7568,24 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Hatch_Output_UV.set( new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_UV.ID, "hatch.output.tier.08", "Output Hatch (UV)", 8) .getStackForm(1L)); - ItemList.Hatch_Output_MAX.set( + ItemList.Hatch_Output_UHV.set( new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_UHV.ID, "hatch.output.tier.09", "Output Hatch (UHV)", 9) .getStackForm(1L)); + ItemList.Hatch_Output_UEV.set( + new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_UEV.ID, "hatch.output.tier.10", "Output Hatch (UEV)", 10) + .getStackForm(1L)); + ItemList.Hatch_Output_UIV.set( + new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_UIV.ID, "hatch.output.tier.11", "Output Hatch (UIV)", 11) + .getStackForm(1L)); + ItemList.Hatch_Output_UMV.set( + new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_UMV.ID, "hatch.output.tier.12", "Output Hatch (UMV)", 12) + .getStackForm(1L)); + ItemList.Hatch_Output_UXV.set( + new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_UXV.ID, "hatch.output.tier.13", "Output Hatch (UXV)", 13) + .getStackForm(1L)); + ItemList.Hatch_Output_MAX.set( + new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_MAX.ID, "hatch.output.tier.14", "Output Hatch (MAX)", 14) + .getStackForm(1L)); } private static void registerQuantumTank() { @@ -2670,7 +7921,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 8, "", 1).getStackForm(1L)); - ItemList.Battery_Buffer_1by1_MAX.set( + ItemList.Battery_Buffer_1by1_UHV.set( new GT_MetaTileEntity_BasicBatteryBuffer( BATTERY_BUFFER_1_BY_1_UHV.ID, "batterybuffer.01.tier.09", @@ -2678,6 +7929,51 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, "", 1).getStackForm(1L)); + + ItemList.Battery_Buffer_1by1_UEV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + BATTERY_BUFFER_1_BY_1_UEV.ID, + "batterybuffer.01.tier.10", + "Extremely Ultimate Battery Buffer", + 10, + "", + 1).getStackForm(1L)); + + ItemList.Battery_Buffer_1by1_UIV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + BATTERY_BUFFER_1_BY_1_UIV.ID, + "batterybuffer.01.tier.11", + "Insanely Ultimate Battery Buffer", + 11, + "", + 1).getStackForm(1L)); + + ItemList.Battery_Buffer_1by1_UMV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + BATTERY_BUFFER_1_BY_1_UMV.ID, + "batterybuffer.01.tier.12", + "Mega Ultimate Battery Buffer", + 12, + "", + 1).getStackForm(1L)); + + ItemList.Battery_Buffer_1by1_UXV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + BATTERY_BUFFER_1_BY_1_UXV.ID, + "batterybuffer.01.tier.13", + "Extended Mega Ultimate Battery Buffer", + 13, + "", + 1).getStackForm(1L)); + + ItemList.Battery_Buffer_1by1_MAXV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + BATTERY_BUFFER_1_BY_1_MAX.ID, + "batterybuffer.01.tier.14", + "Maximum Battery Buffer", + 14, + "", + 1).getStackForm(1L)); } private static void registerBatteryBuffer2x2() { @@ -2753,7 +8049,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 8, "", 4).getStackForm(1L)); - ItemList.Battery_Buffer_2by2_MAX.set( + ItemList.Battery_Buffer_2by2_UHV.set( new GT_MetaTileEntity_BasicBatteryBuffer( BATTERY_BUFFER_2_BY_2_UHV.ID, "batterybuffer.04.tier.09", @@ -2761,6 +8057,51 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, "", 4).getStackForm(1L)); + + ItemList.Battery_Buffer_2by2_UEV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + BATTERY_BUFFER_2_BY_2_UEV.ID, + "batterybuffer.04.tier.10", + "Extremely Ultimate Battery Buffer", + 10, + "", + 4).getStackForm(1L)); + + ItemList.Battery_Buffer_2by2_UIV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + BATTERY_BUFFER_2_BY_2_UIV.ID, + "batterybuffer.04.tier.11", + "Insanely Ultimate Battery Buffer", + 11, + "", + 4).getStackForm(1L)); + + ItemList.Battery_Buffer_2by2_UMV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + BATTERY_BUFFER_2_BY_2_UMV.ID, + "batterybuffer.04.tier.12", + "Mega Ultimate Battery Buffer", + 12, + "", + 4).getStackForm(1L)); + + ItemList.Battery_Buffer_2by2_UXV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + BATTERY_BUFFER_2_BY_2_UXV.ID, + "batterybuffer.04.tier.13", + "Extended Mega Ultimate Battery Buffer", + 13, + "", + 4).getStackForm(1L)); + + ItemList.Battery_Buffer_2by2_MAXV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + BATTERY_BUFFER_2_BY_2_MAX.ID, + "batterybuffer.04.tier.14", + "Maximum Battery Buffer", + 14, + "", + 4).getStackForm(1L)); } private static void registerBatteryBuffer3x3() { @@ -2836,7 +8177,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 8, "", 9).getStackForm(1L)); - ItemList.Battery_Buffer_3by3_MAX.set( + ItemList.Battery_Buffer_3by3_UHV.set( new GT_MetaTileEntity_BasicBatteryBuffer( BATTERY_BUFFER_3_BY_3_UHV.ID, "batterybuffer.09.tier.09", @@ -2844,6 +8185,51 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, "", 9).getStackForm(1L)); + + ItemList.Battery_Buffer_3by3_UEV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + BATTERY_BUFFER_3_BY_3_UEV.ID, + "batterybuffer.09.tier.10", + "Extremely Ultimate Battery Buffer", + 10, + "", + 9).getStackForm(1L)); + + ItemList.Battery_Buffer_3by3_UIV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + BATTERY_BUFFER_3_BY_3_UIV.ID, + "batterybuffer.09.tier.11", + "Insanely Ultimate Battery Buffer", + 11, + "", + 9).getStackForm(1L)); + + ItemList.Battery_Buffer_3by3_UMV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + BATTERY_BUFFER_3_BY_3_UMV.ID, + "batterybuffer.09.tier.12", + "Mega Ultimate Battery Buffer", + 12, + "", + 9).getStackForm(1L)); + + ItemList.Battery_Buffer_3by3_UXV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + BATTERY_BUFFER_3_BY_3_UXV.ID, + "batterybuffer.09.tier.13", + "Extended Mega Ultimate Battery Buffer", + 13, + "", + 9).getStackForm(1L)); + + ItemList.Battery_Buffer_3by3_MAXV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + BATTERY_BUFFER_3_BY_3_MAX.ID, + "batterybuffer.09.tier.14", + "Maximum Battery Buffer", + 14, + "", + 9).getStackForm(1L)); } private static void registerBatteryBuffer4x4() { @@ -2919,7 +8305,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 8, "", 16).getStackForm(1L)); - ItemList.Battery_Buffer_4by4_MAX.set( + ItemList.Battery_Buffer_4by4_UHV.set( new GT_MetaTileEntity_BasicBatteryBuffer( BATTERY_BUFFER_4_BY_4_UHV.ID, "batterybuffer.16.tier.09", @@ -2927,6 +8313,50 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, "", 16).getStackForm(1L)); + ItemList.Battery_Buffer_4by4_UEV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + BATTERY_BUFFER_4_BY_4_UEV.ID, + "batterybuffer.16.tier.10", + "Extremely Ultimate Battery Buffer", + 10, + "", + 16).getStackForm(1L)); + + ItemList.Battery_Buffer_4by4_UIV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + BATTERY_BUFFER_4_BY_4_UIV.ID, + "batterybuffer.16.tier.11", + "Insanely Ultimate Battery Buffer", + 11, + "", + 16).getStackForm(1L)); + + ItemList.Battery_Buffer_4by4_UMV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + BATTERY_BUFFER_4_BY_4_UMV.ID, + "batterybuffer.16.tier.12", + "Mega Ultimate Battery Buffer", + 12, + "", + 16).getStackForm(1L)); + + ItemList.Battery_Buffer_4by4_UXV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + BATTERY_BUFFER_4_BY_4_UXV.ID, + "batterybuffer.16.tier.13", + "Extended Mega Ultimate Battery Buffer", + 13, + "", + 16).getStackForm(1L)); + + ItemList.Battery_Buffer_4by4_MAXV.set( + new GT_MetaTileEntity_BasicBatteryBuffer( + BATTERY_BUFFER_4_BY_4_MAX.ID, + "batterybuffer.16.tier.14", + "Maximum Battery Buffer", + 14, + "", + 16).getStackForm(1L)); } private static void registerCharger4x4() { @@ -3002,7 +8432,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 8, "Each battery gives 8A in/4A out (min 4A/2A)", 4).getStackForm(1L)); - ItemList.Battery_Charger_4by4_MAX.set( + ItemList.Battery_Charger_4by4_UHV.set( new GT_MetaTileEntity_Charger( BATTERY_CHARGER_4_BY_4_UHV.ID, "batterycharger.16.tier.09", @@ -3010,6 +8440,386 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, "Each battery gives 8A in/4A out (min 4A/2A)", 4).getStackForm(1L)); + + ItemList.Battery_Charger_4by4_UEV.set( + new GT_MetaTileEntity_Charger( + BATTERY_CHARGER_4_4_UEV.ID, + "batterycharger.16.tier.10", + "Extremely Ultimate Battery Charger", + 10, + "", + 4).getStackForm(1L)); + + ItemList.Battery_Charger_4by4_UIV.set( + new GT_MetaTileEntity_Charger( + BATTERY_CHARGER_4_4_UIV.ID, + "batterycharger.16.tier.11", + "Insanely Ultimate Battery Charger", + 11, + "", + 4).getStackForm(1L)); + + ItemList.Battery_Charger_4by4_UMV.set( + new GT_MetaTileEntity_Charger( + BATTERY_CHARGER_4_4_UMV.ID, + "batterycharger.16.tier.12", + "Mega Ultimate Battery Charger", + 12, + "", + 4).getStackForm(1L)); + + ItemList.Battery_Charger_4by4_UXV.set( + new GT_MetaTileEntity_Charger( + BATTERY_CHARGER_4_4_UXV.ID, + "batterycharger.16.tier.13", + "Extended Mega Ultimate Battery Charger", + 13, + "", + 4).getStackForm(1L)); + } + + private void registerCircuitAssembler() { + ItemList.CircuitAssemblerUHV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CIRCUIT_ASSEMBLER_UHV.ID, + "basicmachine.circuitassembler.tier.09", + "Ultimate Circuit Assembling Machine", + 9, + MachineType.CIRCUIT_ASSEMBLER.tooltipDescription(), + circuitAssemblerRecipes, + 6, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CIRCUITASSEMBLER", + null).getStackForm(1L)); + + ItemList.CircuitAssemblerUEV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CIRCUIT_ASSEMBLER_UEV.ID, + "basicmachine.circuitassembler.tier.10", + "Ultimate Circuit Assembling Machine II", + 10, + MachineType.CIRCUIT_ASSEMBLER.tooltipDescription(), + circuitAssemblerRecipes, + 6, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CIRCUITASSEMBLER", + null).getStackForm(1L)); + + ItemList.CircuitAssemblerUIV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CIRCUIT_ASSEMBLER_UIV.ID, + "basicmachine.circuitassembler.tier.11", + "Ultimate Circuit Assembling Machine III", + 11, + MachineType.CIRCUIT_ASSEMBLER.tooltipDescription(), + circuitAssemblerRecipes, + 6, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CIRCUITASSEMBLER", + null).getStackForm(1L)); + + ItemList.CircuitAssemblerUMV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CIRCUIT_ASSEMBLER_UMV.ID, + "basicmachine.circuitassembler.tier.12", + "Ultimate Circuit Assembling Machine IV", + 12, + MachineType.CIRCUIT_ASSEMBLER.tooltipDescription(), + circuitAssemblerRecipes, + 6, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CIRCUITASSEMBLER", + null).getStackForm(1L)); + + ItemList.CircuitAssemblerUXV.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CIRCUIT_ASSEMBLER_UXV.ID, + "basicmachine.circuitassembler.tier.13", + "Ultimate Circuit Assembling Machine V", + 13, + MachineType.CIRCUIT_ASSEMBLER.tooltipDescription(), + circuitAssemblerRecipes, + 6, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CIRCUITASSEMBLER", + null).getStackForm(1L)); + + ItemList.CircuitAssemblerMAX.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( + CIRCUIT_ASSEMBLER_MAX.ID, + "basicmachine.circuitassembler.tier.14", + "MAX Circuit Assembling Machine", + 14, + MachineType.CIRCUIT_ASSEMBLER.tooltipDescription(), + circuitAssemblerRecipes, + 6, + 1, + true, + SoundResource.NONE, + GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + "CIRCUITASSEMBLER", + null).getStackForm(1L)); + } + + private void registerWetTransformer() { + ItemList.WetTransformer_LV_ULV.set( + new GT_MetaTileEntity_WetTransformer( + WET_TRANSFORMER_LV_ULV.ID, + "wettransformer.tier.00", + "Ultra Low Voltage Power Transformer", + 0, + "LV -> ULV (Use Soft Mallet to invert)").getStackForm(1L)); + + ItemList.WetTransformer_MV_LV.set( + new GT_MetaTileEntity_WetTransformer( + WET_TRANSFORMER_MV_LV.ID, + "wetransformer.tier.01", + "Low Voltage Power Transformer", + 1, + "MV -> LV (Use Soft Mallet to invert)").getStackForm(1L)); + + ItemList.WetTransformer_HV_MV.set( + new GT_MetaTileEntity_WetTransformer( + WET_TRANSFORMER_HV_MV.ID, + "wettransformer.tier.02", + "Medium Voltage Power Transformer", + 2, + "HV -> MV (Use Soft Mallet to invert)").getStackForm(1L)); + + ItemList.WetTransformer_EV_HV.set( + new GT_MetaTileEntity_WetTransformer( + WET_TRANSFORMER_EV_HV.ID, + "wettransformer.tier.03", + "High Voltage Power Transformer", + 3, + "EV -> HV (Use Soft Mallet to invert)").getStackForm(1L)); + + ItemList.WetTransformer_IV_EV.set( + new GT_MetaTileEntity_WetTransformer( + WET_TRANSFORMER_IV_EV.ID, + "wettransformer.tier.04", + "Extreme Power Transformer", + 4, + "IV -> EV (Use Soft Mallet to invert)").getStackForm(1L)); + + ItemList.WetTransformer_LuV_IV.set( + new GT_MetaTileEntity_WetTransformer( + WET_TRANSFORMER_LuV_IV.ID, + "wettransformer.tier.05", + "Insane Power Transformer", + 5, + "LuV -> IV (Use Soft Mallet to invert)").getStackForm(1L)); + + ItemList.WetTransformer_ZPM_LuV.set( + new GT_MetaTileEntity_WetTransformer( + WET_TRANSFORMER_ZPM_LuV.ID, + "wettransformer.tier.06", + "Ludicrous Power Transformer", + 6, + "ZPM -> LuV (Use Soft Mallet to invert)").getStackForm(1L)); + + ItemList.WetTransformer_UV_ZPM.set( + new GT_MetaTileEntity_WetTransformer( + WET_TRANSFORMER_UV_ZPM.ID, + "wettransformer.tier.07", + "ZPM Voltage Power Transformer", + 7, + "UV -> ZPM (Use Soft Mallet to invert)").getStackForm(1L)); + + ItemList.WetTransformer_UHV_UV.set( + new GT_MetaTileEntity_WetTransformer( + WET_TRANSFORMER_UHV_UV.ID, + "wettransformer.tier.08", + "Ultimate Power Transformer", + 8, + "UHV -> UV (Use Soft Mallet to invert)").getStackForm(1L)); + + ItemList.WetTransformer_UEV_UHV.set( + new GT_MetaTileEntity_WetTransformer( + WET_TRANSFORMER_UEV_UHV.ID, + "wettransformer.tier.09", + "Highly Ultimate Power Transformer", + 9, + "UEV -> UHV (Use Soft Mallet to invert)").getStackForm(1L)); + + ItemList.WetTransformer_UIV_UEV.set( + new GT_MetaTileEntity_WetTransformer( + WET_TRANSFORMER_UIV_UEV.ID, + "wettransformer.tier.10", + "Extremely Ultimate Power Transformer", + 10, + "UIV -> UEV (Use Soft Mallet to invert)").getStackForm(1L)); + + ItemList.WetTransformer_UMV_UIV.set( + new GT_MetaTileEntity_WetTransformer( + WET_TRANSFORMER_UMV_UIV.ID, + "wettransformer.tier.11", + "Insanely Ultimate Power Transformer", + 11, + "UMV -> UIV (Use Soft Mallet to invert)").getStackForm(1L)); + + ItemList.WetTransformer_UXV_UMV.set( + new GT_MetaTileEntity_WetTransformer( + WET_TRANSFORMER_UXV_UMV.ID, + "wettransformer.tier.12", + "Mega Ultimate Power Transformer", + 12, + "UXV -> UMV (Use Soft Mallet to invert)").getStackForm(1L)); + + ItemList.WetTransformer_MAX_UXV.set( + new GT_MetaTileEntity_WetTransformer( + WET_TRANSFORMER_MAX_UXV.ID, + "wettransformer.tier.13", + "Extended Mega Ultimate Power Transformer", + 13, + "MAX -> UXV (Use Soft Mallet to invert)").getStackForm(1L)); + } + + private void registerHighAmpTransformer() { + ItemList.Transformer_HA_UEV_UHV.set( + new GregtechMetaTransformerHiAmp( + HIGH_AMP_TRANSFORMER_UEV_UHV.ID, + "transformer.ha.tier.09", + "Highly Ultimate Hi-Amp Transformer", + 9, + "UEV -> UHV (Use Soft Mallet to invert)").getStackForm(1L)); + ItemList.Transformer_HA_UIV_UEV.set( + new GregtechMetaTransformerHiAmp( + HIGH_AMP_TRANSFORMER_UIV_UEV.ID, + "transformer.ha.tier.10", + "Extremely Ultimate Hi-Amp Transformer", + 10, + "UIV -> UEV (Use Soft Mallet to invert)").getStackForm(1L)); + ItemList.Transformer_HA_UMV_UIV.set( + new GregtechMetaTransformerHiAmp( + HIGH_AMP_TRANSFORMER_UMV_UIV.ID, + "transformer.ha.tier.11", + "Insanely Ultimate Hi-Amp Transformer", + 11, + "UMV -> UIV (Use Soft Mallet to invert)").getStackForm(1L)); + ItemList.Transformer_HA_UXV_UMV.set( + new GregtechMetaTransformerHiAmp( + HIGH_AMP_TRANSFORMER_UXV_UMV.ID, + "transformer.ha.tier.12", + "Mega Ultimate Hi-Amp Transformer", + 12, + "UXV -> UMV (Use Soft Mallet to invert)").getStackForm(1L)); + ItemList.Transformer_HA_MAX_UXV.set( + new GregtechMetaTransformerHiAmp( + HIGH_AMP_TRANSFORMER_MAX_UXV.ID, + "transformer.ha.tier.13", + "Extended Mega Ultimate Hi-Amp Transformer", + 13, + "MAX -> UXV (Use Soft Mallet to invert)").getStackForm(1L)); + + } + + private void registerTurboCharger4By4() { + ItemList.Battery_TurboCharger_4by4_ULV.set( + new GT_MetaTileEntity_TurboCharger( + TURBO_CHARGER_ULV.ID, + "batteryturbocharger.16.tier.00", + "Ultra Low Voltage Turbo Charger", + 0, + "64A in /16A out, 120A/item, Disable to force Charge", + 4).getStackForm(1L)); + + ItemList.Battery_TurboCharger_4by4_LV.set( + new GT_MetaTileEntity_TurboCharger( + TURBO_CHARGER_LV.ID, + "batteryturbocharger.16.tier.01", + "Low Voltage Turbo Charger", + 1, + "64A in /16A out, 120A/item, Disable to force Charge", + 4).getStackForm(1L)); + + ItemList.Battery_TurboCharger_4by4_MV.set( + new GT_MetaTileEntity_TurboCharger( + TURBO_CHARGER_MV.ID, + "batteryturbocharger.16.tier.02", + "Medium Voltage Turbo Charger", + 2, + "64A in /16A out, 120A/item, Disable to force Charge", + 4).getStackForm(1L)); + + ItemList.Battery_TurboCharger_4by4_HV.set( + new GT_MetaTileEntity_TurboCharger( + TURBO_CHARGER_HV.ID, + "batteryturbocharger.16.tier.03", + "High Voltage Turbo Charger", + 3, + "64A in /16A out, 120A/item, Disable to force Charge", + 4).getStackForm(1L)); + + ItemList.Battery_TurboCharger_4by4_EV.set( + new GT_MetaTileEntity_TurboCharger( + TURBO_CHARGER_EV.ID, + "batteryturbocharger.16.tier.04", + "Extreme Voltage Turbo Charger", + 4, + "64A in /16A out, 120A/item, Disable to force Charge", + 4).getStackForm(1L)); + + ItemList.Battery_TurboCharger_4by4_IV.set( + new GT_MetaTileEntity_TurboCharger( + TURBO_CHARGER_IV.ID, + "batteryturbocharger.16.tier.05", + "Insane Voltage Turbo Charger", + 5, + "64A in /16A out, 120A/item, Disable to force Charge", + 4).getStackForm(1L)); + + ItemList.Battery_TurboCharger_4by4_LuV.set( + new GT_MetaTileEntity_TurboCharger( + TURBO_CHARGER_LuV.ID, + "batteryturbocharger.16.tier.06", + "Ludicrous Voltage Turbo Charger", + 6, + "64A in /16A out, 120A/item, Disable to force Charge", + 4).getStackForm(1L)); + + ItemList.Battery_TurboCharger_4by4_ZPM.set( + new GT_MetaTileEntity_TurboCharger( + TURBO_CHARGER_ZPM.ID, + "batteryturbocharger.16.tier.07", + "ZPM Voltage Turbo Charger", + 7, + "64A in /16A out, 120A/item, Disable to force Charge", + 4).getStackForm(1L)); + + ItemList.Battery_TurboCharger_4by4_UV.set( + new GT_MetaTileEntity_TurboCharger( + TURBO_CHARGER_UV.ID, + "batteryturbocharger.16.tier.08", + "Ultimate Voltage Turbo Charger", + 8, + "64A in /16A out, 120A/item, Disable to force Charge", + 4).getStackForm(1L)); + + ItemList.Battery_TurboCharger_4by4_UHV.set( + new GT_MetaTileEntity_TurboCharger( + TURBO_CHARGER_UHV.ID, + "batteryturbocharger.16.tier.09", + "Highly Ultimate Voltage Turbo Charger", + 9, + "64A in /16A out, 120A/item, Disable to force Charge", + 4).getStackForm(1L)); + } private static void registerWirelessEnergyHatch() { @@ -3386,24 +9196,38 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC } private static void registerPlasmaGenerators() { - ItemList.Generator_Plasma_IV.set( + ItemList.Generator_Plasma_EV.set( new GT_MetaTileEntity_PlasmaGenerator( - PLASMA_GENERATOR_IV.ID, + PLASMA_GENERATOR_EV.ID, "basicgenerator.plasmagenerator.tier.05", "Plasma Generator Mark I", 4).getStackForm(1L)); - ItemList.Generator_Plasma_LuV.set( + ItemList.Generator_Plasma_IV.set( new GT_MetaTileEntity_PlasmaGenerator( - PLASMA_GENERATOR_LuV.ID, + PLASMA_GENERATOR_IV.ID, "basicgenerator.plasmagenerator.tier.06", "Plasma Generator Mark II", 5).getStackForm(1L)); - ItemList.Generator_Plasma_ZPMV.set( + ItemList.Generator_Plasma_LuV.set( new GT_MetaTileEntity_PlasmaGenerator( - PLASMA_GENERATOR_ZPM.ID, + PLASMA_GENERATOR_LuV.ID, "basicgenerator.plasmagenerator.tier.07", "Plasma Generator Mark III", 6).getStackForm(1L)); + + ItemList.Generator_Plasma_ZPMV.set( + new GT_MetaTileEntity_PlasmaGenerator( + PLASMA_GENERATOR_ZPM.ID, + "basicgenerator.plasmagenerator.tier.08", + "Plasma Generator Mark IV", + 7).getStackForm(1L)); + + ItemList.Generator_Plasma_UV.set( + new GT_MetaTileEntity_PlasmaGenerator( + PLASMA_GENERATOR_UV.ID, + "basicgenerator.plasmagenerator.tier.09", + "Ultimate Pocket Sun", + 8).getStackForm(1L)); } private static void generateWiresAndPipes() { @@ -4199,6 +10023,50 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC registerMagicEnergyConverters(); registerPlasmaGenerators(); registerMultiblockControllers(); + registerWorldAccelerator(); + registerAlloySmelter(); + registerMatterAmplifier(); + registerAssemblingMachine(); + registerWetTransformer(); + registerHighAmpTransformer(); + registerChemicalBath(); + registerChemicalReactor(); + registerFermenter(); + registerFluidCanner(); + registerFluidExtractor(); + registerFluidHeater(); + registerMixer(); + registerAutoclave(); + registerBendingMachine(); + registerCompressor(); + registerCuttingMachine(); + registerDistillery(); + registerElectricFurnace(); + registerElectromagneticSeparator(); + registerExtractor(); + registerExtruder(); + registerFluidSolidifier(); + registerFormingPress(); + registerForgeHammer(); + registerLathe(); + registerPrecisionLaserEngraver(); + registerMacerator(); + registerMatterFabricator(); + registerMicrowave(); + registerOreWashingPlant(); + registerPolarizer(); + registerRecycler(); + registerSiftingMachine(); + registerSlicingMachine(); + registerThermalCentrifuge(); + registerWiremill(); + registerArcFurnace(); + registerCentrifuge(); + registerPlasmaArcFurnace(); + registerCanningMachine(); + registerElectrolyzer(); + registerCircuitAssembler(); + registerTurboCharger4By4(); ItemList.AdvDebugStructureWriter.set( new GT_MetaTileEntity_AdvDebugStructureWriter( diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java index d7c752a199..6bd91fe027 100644 --- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java +++ b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java @@ -429,6 +429,11 @@ public class GT_PreLoad { // GT_Values.oreveinMaxSize = tMainConfig.get(aTextGeneral, "oreveinMaxSize_64",64).getInt(64); GT_Values.ticksBetweenSounds = tMainConfig.get("machines", "TicksBetweenSounds", 30) .getInt(30); + GT_Values.blacklistedTileEntiyClassNamesForWA = tMainConfig.getStringList( + "blacklistedTileEntiyClassNamesForWA", + "machines", + GT_Values.blacklistedTileEntiyClassNamesForWA, + "class names to be blacklisted from the world accelerator"); GT_Values.cleanroomGlass = (float) tMainConfig.get("machines", "ReinforcedGlassPercentageForCleanroom", 5D) .getDouble(5D); GT_Values.enableChunkloaders = tMainConfig.get("machines", "enableChunkloaders", true) diff --git a/src/main/java/gregtech/nei/NEI_GT_Config.java b/src/main/java/gregtech/nei/NEI_GT_Config.java index cb51380539..198f71fdb0 100644 --- a/src/main/java/gregtech/nei/NEI_GT_Config.java +++ b/src/main/java/gregtech/nei/NEI_GT_Config.java @@ -103,10 +103,6 @@ public class NEI_GT_Config implements IConfigureNEI { API.addRecipeCatalyst( GT_ModHandler.getIC2Item("nuclearReactor", 1, null), RecipeMaps.ic2NuclearFakeRecipes.unlocalizedName); - // Bronze Blast Furnace - API.removeRecipeCatalyst( - GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 108), - RecipeMaps.primitiveBlastRecipes.unlocalizedName); } private void registerItemEntries() { diff --git a/src/main/java/gtPlusPlus/core/material/ALLOY.java b/src/main/java/gtPlusPlus/core/material/ALLOY.java index 1ee963fb97..8df8d54f12 100644 --- a/src/main/java/gtPlusPlus/core/material/ALLOY.java +++ b/src/main/java/gtPlusPlus/core/material/ALLOY.java @@ -30,9 +30,10 @@ public final class ALLOY { true, // Uses Blast furnace? "⬟ ⯂ ⬢ ⬣ ⯃ ⯄", // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().AER, 5), - new MaterialStack(ELEMENT.getInstance().IGNIS, 5), new MaterialStack(ELEMENT.getInstance().TERRA, 5), - new MaterialStack(ELEMENT.getInstance().AQUA, 5) }); + new MaterialStack(ELEMENT.getInstance().AER, 5), + new MaterialStack(ELEMENT.getInstance().IGNIS, 5), + new MaterialStack(ELEMENT.getInstance().TERRA, 5), + new MaterialStack(ELEMENT.getInstance().AQUA, 5)); public static final Material BLOODSTEEL = new Material( "Blood Steel", // Material Name @@ -44,7 +45,8 @@ public final class ALLOY { 100, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ALLOY.STEEL, 5), new MaterialStack(ELEMENT.getInstance().IGNIS, 5) }); + new MaterialStack(ALLOY.STEEL, 5), + new MaterialStack(ELEMENT.getInstance().IGNIS, 5)); public static final Material STABALLOY = new Material( "Staballoy", // Material Name @@ -56,8 +58,8 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().URANIUM238, 9), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 1) }); + new MaterialStack(ELEMENT.getInstance().URANIUM238, 9), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 1)); public static final Material TANTALLOY_60 = new Material( "Tantalloy-60", // Material Name @@ -69,8 +71,8 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4), - new MaterialStack(ELEMENT.getInstance().TANTALUM, 46) }); + new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4), + new MaterialStack(ELEMENT.getInstance().TANTALUM, 46)); public static final Material TANTALLOY_61 = new Material( "Tantalloy-61", // Material Name @@ -82,9 +84,9 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ALLOY.TANTALLOY_60, 2), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 12), - new MaterialStack(ELEMENT.getInstance().YTTRIUM, 8) }); + new MaterialStack(ALLOY.TANTALLOY_60, 2), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 12), + new MaterialStack(ELEMENT.getInstance().YTTRIUM, 8)); public static final Material TUMBAGA = new Material( "Tumbaga", // Material Name @@ -96,8 +98,8 @@ public final class ALLOY { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().GOLD, 70), - new MaterialStack(ELEMENT.getInstance().COPPER, 30) }); + new MaterialStack(ELEMENT.getInstance().GOLD, 70), + new MaterialStack(ELEMENT.getInstance().COPPER, 30)); public static final Material POTIN = new Material( "Potin", // Material Name @@ -109,8 +111,9 @@ public final class ALLOY { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().LEAD, 40), new MaterialStack(ALLOY.BRONZE, 40), - new MaterialStack(ELEMENT.getInstance().TIN, 20) }); + new MaterialStack(ELEMENT.getInstance().LEAD, 40), + new MaterialStack(ALLOY.BRONZE, 40), + new MaterialStack(ELEMENT.getInstance().TIN, 20)); /* * public static final Material BEDROCKIUM = new Material( "Bedrockium", //Material Name new short[]{32, 32, 32, 0}, @@ -128,10 +131,11 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NICKEL, 3), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 7), - new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10), new MaterialStack(INVAR, 10), - new MaterialStack(NICHROME, 13) }); + new MaterialStack(ELEMENT.getInstance().NICKEL, 3), + new MaterialStack(ELEMENT.getInstance().CHROMIUM, 7), + new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10), + new MaterialStack(INVAR, 10), + new MaterialStack(NICHROME, 13)); public static final Material INCONEL_690 = new Material( "Inconel-690", // Material Name @@ -143,9 +147,10 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CHROMIUM, 5), - new MaterialStack(ELEMENT.getInstance().NIOBIUM, 10), - new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10), new MaterialStack(NICHROME, 15) }); + new MaterialStack(ELEMENT.getInstance().CHROMIUM, 5), + new MaterialStack(ELEMENT.getInstance().NIOBIUM, 10), + new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10), + new MaterialStack(NICHROME, 15)); public static final Material INCONEL_792 = new Material( "Inconel-792", // Material Name @@ -157,9 +162,10 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NICKEL, 20), - new MaterialStack(ELEMENT.getInstance().NIOBIUM, 10), - new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 20), new MaterialStack(NICHROME, 10) }); + new MaterialStack(ELEMENT.getInstance().NICKEL, 20), + new MaterialStack(ELEMENT.getInstance().NIOBIUM, 10), + new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 20), + new MaterialStack(NICHROME, 10)); public static final Material NITINOL_60 = new Material( "Nitinol 60", // Material Name @@ -171,8 +177,8 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NICKEL, 40), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 60) }); + new MaterialStack(ELEMENT.getInstance().NICKEL, 40), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 60)); public static final Material ZERON_100 = new Material( "Zeron-100", // Material Name @@ -184,10 +190,12 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CHROMIUM, 26), - new MaterialStack(ELEMENT.getInstance().NICKEL, 6), new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4), - new MaterialStack(ELEMENT.getInstance().COPPER, 20), new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4), - new MaterialStack(ALLOY.STEEL, 40) }); + new MaterialStack(ELEMENT.getInstance().CHROMIUM, 26), + new MaterialStack(ELEMENT.getInstance().NICKEL, 6), + new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4), + new MaterialStack(ELEMENT.getInstance().COPPER, 20), + new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4), + new MaterialStack(ALLOY.STEEL, 40)); public static final Material MARAGING250 = new Material( "Maraging Steel 250", // Material Name @@ -199,10 +207,11 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ALLOY.STEEL, 64), - new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 4), new MaterialStack(ELEMENT.getInstance().NICKEL, 16), - new MaterialStack(ELEMENT.getInstance().COBALT, 8), }); + new MaterialStack(ALLOY.STEEL, 64), + new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 4), + new MaterialStack(ELEMENT.getInstance().NICKEL, 16), + new MaterialStack(ELEMENT.getInstance().COBALT, 8)); public static final Material MARAGING300 = new Material( "Maraging Steel 300", // Material Name @@ -214,9 +223,11 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ALLOY.STEEL, 64), new MaterialStack(ELEMENT.getInstance().TITANIUM, 4), - new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4), new MaterialStack(ELEMENT.getInstance().NICKEL, 16), - new MaterialStack(ELEMENT.getInstance().COBALT, 8), }); + new MaterialStack(ALLOY.STEEL, 64), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 4), + new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4), + new MaterialStack(ELEMENT.getInstance().NICKEL, 16), + new MaterialStack(ELEMENT.getInstance().COBALT, 8)); public static final Material MARAGING350 = new Material( "Maraging Steel 350", // Material Name @@ -228,9 +239,11 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ALLOY.STEEL, 64), new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4), - new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4), new MaterialStack(ELEMENT.getInstance().NICKEL, 16), - new MaterialStack(ELEMENT.getInstance().COBALT, 8), }); + new MaterialStack(ALLOY.STEEL, 64), + new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4), + new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4), + new MaterialStack(ELEMENT.getInstance().NICKEL, 16), + new MaterialStack(ELEMENT.getInstance().COBALT, 8)); public static final Material AQUATIC_STEEL = new Material( "Watertight Steel", // Material Name @@ -242,10 +255,13 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ALLOY.STEEL, 60), new MaterialStack(ELEMENT.getInstance().CARBON, 10), - new MaterialStack(ELEMENT.getInstance().MANGANESE, 5), new MaterialStack(ELEMENT.getInstance().SILICON, 10), - new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 5), new MaterialStack(ELEMENT.getInstance().SULFUR, 5), - new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 5) }); + new MaterialStack(ALLOY.STEEL, 60), + new MaterialStack(ELEMENT.getInstance().CARBON, 10), + new MaterialStack(ELEMENT.getInstance().MANGANESE, 5), + new MaterialStack(ELEMENT.getInstance().SILICON, 10), + new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 5), + new MaterialStack(ELEMENT.getInstance().SULFUR, 5), + new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 5)); public static final Material STELLITE = new Material( "Stellite", // Material Name @@ -257,10 +273,10 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().COBALT, 35), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 35), - new MaterialStack(ELEMENT.getInstance().MANGANESE, 20), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 10) }); + new MaterialStack(ELEMENT.getInstance().COBALT, 35), + new MaterialStack(ELEMENT.getInstance().CHROMIUM, 35), + new MaterialStack(ELEMENT.getInstance().MANGANESE, 20), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 10)); public static final Material TALONITE = new Material( "Talonite", // Material Name @@ -272,10 +288,10 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().COBALT, 40), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 30), - new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 20), - new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10) }); + new MaterialStack(ELEMENT.getInstance().COBALT, 40), + new MaterialStack(ELEMENT.getInstance().CHROMIUM, 30), + new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 20), + new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10)); public static final Material HASTELLOY_W = new Material( "Hastelloy-W", // Material Name @@ -287,10 +303,11 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 06), - new MaterialStack(ELEMENT.getInstance().COBALT, 2), new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 24), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 6), - new MaterialStack(ELEMENT.getInstance().NICKEL, 62) }); + new MaterialStack(ELEMENT.getInstance().IRON, 06), + new MaterialStack(ELEMENT.getInstance().COBALT, 2), + new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 24), + new MaterialStack(ELEMENT.getInstance().CHROMIUM, 6), + new MaterialStack(ELEMENT.getInstance().NICKEL, 62)); public static final Material HASTELLOY_X = new Material( "Hastelloy-X", // Material Name @@ -302,11 +319,12 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 18), - new MaterialStack(ELEMENT.getInstance().MANGANESE, 2), new MaterialStack(ELEMENT.getInstance().SILICON, 2), - new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 8), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 22), - new MaterialStack(ELEMENT.getInstance().NICKEL, 48) }); + new MaterialStack(ELEMENT.getInstance().IRON, 18), + new MaterialStack(ELEMENT.getInstance().MANGANESE, 2), + new MaterialStack(ELEMENT.getInstance().SILICON, 2), + new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 8), + new MaterialStack(ELEMENT.getInstance().CHROMIUM, 22), + new MaterialStack(ELEMENT.getInstance().NICKEL, 48)); public static final Material HASTELLOY_N = new Material( "Hastelloy-N", // Material Name @@ -318,10 +336,11 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 8), - new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 16), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 8), new MaterialStack(ELEMENT.getInstance().TITANIUM, 8), - new MaterialStack(ELEMENT.getInstance().NICKEL, 60) }); + new MaterialStack(ELEMENT.getInstance().YTTRIUM, 8), + new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 16), + new MaterialStack(ELEMENT.getInstance().CHROMIUM, 8), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 8), + new MaterialStack(ELEMENT.getInstance().NICKEL, 60)); public static final Material HASTELLOY_C276 = new Material( "Hastelloy-C276", // Material Name @@ -333,11 +352,12 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().COBALT, 2), - new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 16), - new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 2), new MaterialStack(ELEMENT.getInstance().COPPER, 2), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 14), - new MaterialStack(ELEMENT.getInstance().NICKEL, 64) }); + new MaterialStack(ELEMENT.getInstance().COBALT, 2), + new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 16), + new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 2), + new MaterialStack(ELEMENT.getInstance().COPPER, 2), + new MaterialStack(ELEMENT.getInstance().CHROMIUM, 14), + new MaterialStack(ELEMENT.getInstance().NICKEL, 64)); public static final Material INCOLOY_020 = new Material( "Incoloy-020", // Material Name @@ -349,9 +369,10 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 40), - new MaterialStack(ELEMENT.getInstance().COPPER, 4), new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20), - new MaterialStack(ELEMENT.getInstance().NICKEL, 36) }); + new MaterialStack(ELEMENT.getInstance().IRON, 40), + new MaterialStack(ELEMENT.getInstance().COPPER, 4), + new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20), + new MaterialStack(ELEMENT.getInstance().NICKEL, 36)); public static final Material INCOLOY_DS = new Material( "Incoloy-DS", // Material Name @@ -363,9 +384,10 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 46), - new MaterialStack(ELEMENT.getInstance().COBALT, 18), new MaterialStack(ELEMENT.getInstance().CHROMIUM, 18), - new MaterialStack(ELEMENT.getInstance().NICKEL, 18) }); + new MaterialStack(ELEMENT.getInstance().IRON, 46), + new MaterialStack(ELEMENT.getInstance().COBALT, 18), + new MaterialStack(ELEMENT.getInstance().CHROMIUM, 18), + new MaterialStack(ELEMENT.getInstance().NICKEL, 18)); public static final Material INCOLOY_MA956 = new Material( "Incoloy-MA956", // Material Name @@ -377,10 +399,10 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 64), - new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 12), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20), - new MaterialStack(ELEMENT.getInstance().YTTRIUM, 4) }); + new MaterialStack(ELEMENT.getInstance().IRON, 64), + new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 12), + new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20), + new MaterialStack(ELEMENT.getInstance().YTTRIUM, 4)); public static final Material TUNGSTEN_CARBIDE = new Material( "Tungsten Carbide", // Material Name @@ -393,8 +415,8 @@ public final class ALLOY { true, // Uses Blast furnace? false, // Generate cells // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CARBON, 50), - new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 50) }); + new MaterialStack(ELEMENT.getInstance().CARBON, 50), + new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 50)); public static final Material TUNGSTEN_TITANIUM_CARBIDE = new Material( "Tungsten Titanium Carbide", // Material Name @@ -406,8 +428,8 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(TUNGSTEN_CARBIDE, 70), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 30) }); + new MaterialStack(TUNGSTEN_CARBIDE, 70), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 30)); public static final Material SILICON_CARBIDE = new Material( "Silicon Carbide", // Material Name @@ -419,8 +441,8 @@ public final class ALLOY { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().SILICON, 50), - new MaterialStack(ELEMENT.getInstance().CARBON, 50) }); + new MaterialStack(ELEMENT.getInstance().SILICON, 50), + new MaterialStack(ELEMENT.getInstance().CARBON, 50)); public static final Material TANTALUM_CARBIDE = new Material( "Tantalum Carbide", // Material Name @@ -432,8 +454,8 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TANTALUM, 50), - new MaterialStack(ELEMENT.getInstance().CARBON, 50) }); + new MaterialStack(ELEMENT.getInstance().TANTALUM, 50), + new MaterialStack(ELEMENT.getInstance().CARBON, 50)); public static final Material ZIRCONIUM_CARBIDE = new Material( "Zirconium Carbide", // Material Name @@ -445,8 +467,8 @@ public final class ALLOY { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 50), - new MaterialStack(ELEMENT.getInstance().CARBON, 50) }); + new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 50), + new MaterialStack(ELEMENT.getInstance().CARBON, 50)); public static final Material NIOBIUM_CARBIDE = new Material( "Niobium Carbide", // Material Name @@ -458,8 +480,8 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NIOBIUM, 50), - new MaterialStack(ELEMENT.getInstance().CARBON, 50) }); + new MaterialStack(ELEMENT.getInstance().NIOBIUM, 50), + new MaterialStack(ELEMENT.getInstance().CARBON, 50)); public static final Material ARCANITE = new Material( "Arcanite", // Material Name @@ -471,9 +493,10 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().THORIUM232, 40), - new MaterialStack(ENERGYCRYSTAL, 40), new MaterialStack(ELEMENT.getInstance().ORDO, 10), - new MaterialStack(ELEMENT.getInstance().PERDITIO, 10) }); + new MaterialStack(ELEMENT.getInstance().THORIUM232, 40), + new MaterialStack(ENERGYCRYSTAL, 40), + new MaterialStack(ELEMENT.getInstance().ORDO, 10), + new MaterialStack(ELEMENT.getInstance().PERDITIO, 10)); public static final Material LEAGRISIUM = new Material( "Grisium", // Material Name @@ -484,11 +507,13 @@ public final class ALLOY { 96, // Protons 128, // Neutrons true, // Uses Blast furnace? - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TITANIUM, 18), - new MaterialStack(ELEMENT.getInstance().CARBON, 18), new MaterialStack(ELEMENT.getInstance().POTASSIUM, 18), - new MaterialStack(ELEMENT.getInstance().LITHIUM, 18), new MaterialStack(ELEMENT.getInstance().SULFUR, 18), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10) }); // Material Stacks with Percentage of - // required elements. + new MaterialStack(ELEMENT.getInstance().TITANIUM, 18), + new MaterialStack(ELEMENT.getInstance().CARBON, 18), + new MaterialStack(ELEMENT.getInstance().POTASSIUM, 18), + new MaterialStack(ELEMENT.getInstance().LITHIUM, 18), + new MaterialStack(ELEMENT.getInstance().SULFUR, 18), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10)); // Material Stacks with Percentage of + // required elements. public static final Material EGLIN_STEEL_BASE = new Material( "Eglin Steel Base Compound", // Material Name @@ -500,8 +525,9 @@ public final class ALLOY { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 12), new MaterialStack(KANTHAL, 3), - new MaterialStack(INVAR, 15) }); + new MaterialStack(ELEMENT.getInstance().IRON, 12), + new MaterialStack(KANTHAL, 3), + new MaterialStack(INVAR, 15)); public static final Material EGLIN_STEEL = new Material( "Eglin Steel", // Material Name @@ -513,9 +539,10 @@ public final class ALLOY { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ALLOY.EGLIN_STEEL_BASE, 10), - new MaterialStack(ELEMENT.getInstance().SULFUR, 1), new MaterialStack(ELEMENT.getInstance().SILICON, 4), - new MaterialStack(ELEMENT.getInstance().CARBON, 1) }); + new MaterialStack(ALLOY.EGLIN_STEEL_BASE, 10), + new MaterialStack(ELEMENT.getInstance().SULFUR, 1), + new MaterialStack(ELEMENT.getInstance().SILICON, 4), + new MaterialStack(ELEMENT.getInstance().CARBON, 1)); public static final Material HG1223 = new Material( "HG-1223", // Material Name @@ -526,9 +553,11 @@ public final class ALLOY { -1, -1, false, // Uses Blast furnace? - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().MERCURY, 1), - new MaterialStack(ELEMENT.getInstance().BARIUM, 2), new MaterialStack(ELEMENT.getInstance().CALCIUM, 2), - new MaterialStack(ELEMENT.getInstance().COPPER, 3), new MaterialStack(ELEMENT.getInstance().OXYGEN, 8) }); + new MaterialStack(ELEMENT.getInstance().MERCURY, 1), + new MaterialStack(ELEMENT.getInstance().BARIUM, 2), + new MaterialStack(ELEMENT.getInstance().CALCIUM, 2), + new MaterialStack(ELEMENT.getInstance().COPPER, 3), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 8)); public static final Material HS188A = new Material( "HS188-A", // Material Name @@ -539,12 +568,15 @@ public final class ALLOY { -1, // Protons -1, // Neutrons true, // Uses Blast furnace? - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().COBALT, 20), - new MaterialStack(ELEMENT.getInstance().HAFNIUM, 20), new MaterialStack(TALONITE, 16), - new MaterialStack(ELEMENT.getInstance().RHENIUM, 10), new MaterialStack(NIOBIUM_CARBIDE, 10), - new MaterialStack(HASTELLOY_X, 8), new MaterialStack(TUNGSTENSTEEL, 8), - new MaterialStack(ZIRCONIUM_CARBIDE, 8), }); // Material Stacks with Percentage of required - // elements. + new MaterialStack(ELEMENT.getInstance().COBALT, 20), + new MaterialStack(ELEMENT.getInstance().HAFNIUM, 20), + new MaterialStack(TALONITE, 16), + new MaterialStack(ELEMENT.getInstance().RHENIUM, 10), + new MaterialStack(NIOBIUM_CARBIDE, 10), + new MaterialStack(HASTELLOY_X, 8), + new MaterialStack(TUNGSTENSTEEL, 8), + new MaterialStack(ZIRCONIUM_CARBIDE, 8)); // Material Stacks with Percentage of required + // elements. /** * Stargate Materials - #D2FFA9 210, 255, 170 @@ -558,8 +590,8 @@ public final class ALLOY { -1, -1, true, // Uses Blast furnace? - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 3), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 7) }); + new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 3), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 7)); public static final Material TRINIUM_NAQUADAH = new Material( "Trinium Naquadah Alloy", // Material Name @@ -570,8 +602,8 @@ public final class ALLOY { -1, -1, false, // Uses Blast furnace? - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 5), - new MaterialStack(ELEMENT.getInstance().NAQUADAH, 9) }); + new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 5), + new MaterialStack(ELEMENT.getInstance().NAQUADAH, 9)); public static final Material TRINIUM_NAQUADAH_CARBON = new Material( "Trinium Naquadah Carbonite", // Material Name MaterialState.SOLID, // State @@ -581,8 +613,8 @@ public final class ALLOY { -1, -1, true, // Uses Blast furnace? - new MaterialStack[] { new MaterialStack(TRINIUM_NAQUADAH, 9), - new MaterialStack(ELEMENT.getInstance().CARBON, 1) }); + new MaterialStack(TRINIUM_NAQUADAH, 9), + new MaterialStack(ELEMENT.getInstance().CARBON, 1)); public static final Material TRINIUM_REINFORCED_STEEL = new Material( "Arceus Alloy 2B", // Material Name @@ -594,9 +626,11 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 30), - new MaterialStack(ALLOY.MARAGING350, 40), new MaterialStack(ALLOY.TUNGSTENSTEEL, 20), - new MaterialStack(ALLOY.OSMIRIDIUM, 10), new MaterialStack(ELEMENT.getInstance().STRONTIUM, 10) }); + new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 30), + new MaterialStack(ALLOY.MARAGING350, 40), + new MaterialStack(ALLOY.TUNGSTENSTEEL, 20), + new MaterialStack(ALLOY.OSMIRIDIUM, 10), + new MaterialStack(ELEMENT.getInstance().STRONTIUM, 10)); /* * Witchery Material @@ -612,8 +646,9 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NICKEL, 35), - new MaterialStack(ELEMENT.getInstance().THAUMIUM, 30), new MaterialStack(ELEMENT.getInstance().IRON, 35) }); + new MaterialStack(ELEMENT.getInstance().NICKEL, 35), + new MaterialStack(ELEMENT.getInstance().THAUMIUM, 30), + new MaterialStack(ELEMENT.getInstance().IRON, 35)); /* * Top Tier Alloys @@ -629,10 +664,11 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().HELIUM, 20), - new MaterialStack(ELEMENT.getInstance().LITHIUM, 20), new MaterialStack(ELEMENT.getInstance().COBALT, 20), - new MaterialStack(ELEMENT.getInstance().PLATINUM, 20), - new MaterialStack(ELEMENT.getInstance().ERBIUM, 20) }); + new MaterialStack(ELEMENT.getInstance().HELIUM, 20), + new MaterialStack(ELEMENT.getInstance().LITHIUM, 20), + new MaterialStack(ELEMENT.getInstance().COBALT, 20), + new MaterialStack(ELEMENT.getInstance().PLATINUM, 20), + new MaterialStack(ELEMENT.getInstance().ERBIUM, 20)); // 0lafe Compound public static final Material LAFIUM = new Material( @@ -645,11 +681,14 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ALLOY.HASTELLOY_N, 8), - new MaterialStack(ELEMENT.getInstance().NAQUADAH, 4), new MaterialStack(ELEMENT.getInstance().SAMARIUM, 2), - new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4), new MaterialStack(ELEMENT.getInstance().ARGON, 2), - new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 6), new MaterialStack(ELEMENT.getInstance().NICKEL, 8), - new MaterialStack(ELEMENT.getInstance().CARBON, 2) }); + new MaterialStack(ALLOY.HASTELLOY_N, 8), + new MaterialStack(ELEMENT.getInstance().NAQUADAH, 4), + new MaterialStack(ELEMENT.getInstance().SAMARIUM, 2), + new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4), + new MaterialStack(ELEMENT.getInstance().ARGON, 2), + new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 6), + new MaterialStack(ELEMENT.getInstance().NICKEL, 8), + new MaterialStack(ELEMENT.getInstance().CARBON, 2)); // Cinobi Alloy public static final Material CINOBITE = new Material( @@ -662,12 +701,14 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ALLOY.ZERON_100, 16), - new MaterialStack(ELEMENT.getInstance().NAQUADRIA, 7), - new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 5), - new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 3), new MaterialStack(ELEMENT.getInstance().MERCURY, 2), - new MaterialStack(ELEMENT.getInstance().TIN, 2), new MaterialStack(ELEMENT.getInstance().TITANIUM, 12), - new MaterialStack(ALLOY.OSMIRIDIUM, 6) }); + new MaterialStack(ALLOY.ZERON_100, 16), + new MaterialStack(ELEMENT.getInstance().NAQUADRIA, 7), + new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 5), + new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 3), + new MaterialStack(ELEMENT.getInstance().MERCURY, 2), + new MaterialStack(ELEMENT.getInstance().TIN, 2), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 12), + new MaterialStack(ALLOY.OSMIRIDIUM, 6)); // Piky Alloy public static final Material PIKYONIUM = new Material( @@ -680,11 +721,14 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ALLOY.INCONEL_792, 16), new MaterialStack(ALLOY.EGLIN_STEEL, 10), - new MaterialStack(ELEMENT.getInstance().NAQUADAH_ENRICHED, 8), - new MaterialStack(ELEMENT.getInstance().CERIUM, 6), new MaterialStack(ELEMENT.getInstance().ANTIMONY, 4), - new MaterialStack(ELEMENT.getInstance().PLATINUM, 4), new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), - new MaterialStack(ALLOY.TUNGSTENSTEEL, 8) }); + new MaterialStack(ALLOY.INCONEL_792, 16), + new MaterialStack(ALLOY.EGLIN_STEEL, 10), + new MaterialStack(ELEMENT.getInstance().NAQUADAH_ENRICHED, 8), + new MaterialStack(ELEMENT.getInstance().CERIUM, 6), + new MaterialStack(ELEMENT.getInstance().ANTIMONY, 4), + new MaterialStack(ELEMENT.getInstance().PLATINUM, 4), + new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), + new MaterialStack(ALLOY.TUNGSTENSTEEL, 8)); // Piky Alloy public static final Material ABYSSAL = new Material( @@ -697,11 +741,14 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ALLOY.STAINLESS_STEEL, 10), - new MaterialStack(ALLOY.TUNGSTEN_CARBIDE, 10), new MaterialStack(ALLOY.NICHROME, 10), - new MaterialStack(ALLOY.BRONZE, 10), new MaterialStack(ALLOY.INCOLOY_MA956, 10), - new MaterialStack(ELEMENT.getInstance().IODINE, 2), new MaterialStack(ELEMENT.getInstance().RADON, 2), - new MaterialStack(ELEMENT.getInstance().GERMANIUM, 2), }); + new MaterialStack(ALLOY.STAINLESS_STEEL, 10), + new MaterialStack(ALLOY.TUNGSTEN_CARBIDE, 10), + new MaterialStack(ALLOY.NICHROME, 10), + new MaterialStack(ALLOY.BRONZE, 10), + new MaterialStack(ALLOY.INCOLOY_MA956, 10), + new MaterialStack(ELEMENT.getInstance().IODINE, 2), + new MaterialStack(ELEMENT.getInstance().RADON, 2), + new MaterialStack(ELEMENT.getInstance().GERMANIUM, 2)); // Alkalus Alloy public static final Material LAURENIUM = new Material( @@ -714,10 +761,11 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ALLOY.EGLIN_STEEL, 40), - new MaterialStack(ELEMENT.getInstance().INDIUM, 10), new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20), - new MaterialStack(ELEMENT.getInstance().DYSPROSIUM, 5), - new MaterialStack(ELEMENT.getInstance().RHENIUM, 5), }); + new MaterialStack(ALLOY.EGLIN_STEEL, 40), + new MaterialStack(ELEMENT.getInstance().INDIUM, 10), + new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20), + new MaterialStack(ELEMENT.getInstance().DYSPROSIUM, 5), + new MaterialStack(ELEMENT.getInstance().RHENIUM, 5)); // Bot Alloy public static final Material BOTMIUM = new Material( @@ -730,9 +778,10 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ALLOY.NITINOL_60, 2), - new MaterialStack(ELEMENT.getInstance().OSMIUM, 12), new MaterialStack(ELEMENT.getInstance().RUTHENIUM, 12), - new MaterialStack(ELEMENT.getInstance().THALLIUM, 6), }); + new MaterialStack(ALLOY.NITINOL_60, 2), + new MaterialStack(ELEMENT.getInstance().OSMIUM, 12), + new MaterialStack(ELEMENT.getInstance().RUTHENIUM, 12), + new MaterialStack(ELEMENT.getInstance().THALLIUM, 6)); // Titansteel public static final Material TITANSTEEL = new Material( @@ -745,9 +794,10 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ALLOY.TUNGSTEN_TITANIUM_CARBIDE, 3), - new MaterialStack(ELEMENT.getInstance().IGNIS, 1), new MaterialStack(ELEMENT.getInstance().TERRA, 1), - new MaterialStack(ELEMENT.getInstance().PERDITIO, 1), }); + new MaterialStack(ALLOY.TUNGSTEN_TITANIUM_CARBIDE, 3), + new MaterialStack(ELEMENT.getInstance().IGNIS, 1), + new MaterialStack(ELEMENT.getInstance().TERRA, 1), + new MaterialStack(ELEMENT.getInstance().PERDITIO, 1)); public static final Material OCTIRON = new Material( "Octiron", // Material Name @@ -759,9 +809,11 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ARCANITE, 30), new MaterialStack(TITANSTEEL, 30), - new MaterialStack(ENERGYCRYSTAL, 5), new MaterialStack(STEEL_BLACK, 10), - new MaterialStack(ELEMENT.getInstance().THAUMIUM, 25) }); + new MaterialStack(ARCANITE, 30), + new MaterialStack(TITANSTEEL, 30), + new MaterialStack(ENERGYCRYSTAL, 5), + new MaterialStack(STEEL_BLACK, 10), + new MaterialStack(ELEMENT.getInstance().THAUMIUM, 25)); public static final Material BLACK_TITANIUM = new Material( "Black Titanium", // Material Name @@ -773,13 +825,15 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TITANIUM, 55), - new MaterialStack(ELEMENT.getInstance().LANTHANUM, 12), - new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 8), new MaterialStack(ELEMENT.getInstance().COBALT, 6), - new MaterialStack(ELEMENT.getInstance().MANGANESE, 4), - new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 4), - new MaterialStack(ELEMENT.getInstance().PALLADIUM, 4), new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2), - new MaterialStack(ELEMENT.getInstance().ARGON, 5) }); + new MaterialStack(ELEMENT.getInstance().TITANIUM, 55), + new MaterialStack(ELEMENT.getInstance().LANTHANUM, 12), + new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 8), + new MaterialStack(ELEMENT.getInstance().COBALT, 6), + new MaterialStack(ELEMENT.getInstance().MANGANESE, 4), + new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 4), + new MaterialStack(ELEMENT.getInstance().PALLADIUM, 4), + new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2), + new MaterialStack(ELEMENT.getInstance().ARGON, 5)); public static final Material BABBIT_ALLOY = new Material( "Babbit Alloy", // Material Name @@ -791,9 +845,10 @@ public final class ALLOY { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TIN, 10), - new MaterialStack(ELEMENT.getInstance().LEAD, 72), new MaterialStack(ELEMENT.getInstance().ANTIMONY, 16), - new MaterialStack(ELEMENT.getInstance().ARSENIC, 2) }); + new MaterialStack(ELEMENT.getInstance().TIN, 10), + new MaterialStack(ELEMENT.getInstance().LEAD, 72), + new MaterialStack(ELEMENT.getInstance().ANTIMONY, 16), + new MaterialStack(ELEMENT.getInstance().ARSENIC, 2)); public static final Material INDALLOY_140 = new Material( "Indalloy 140", // Material Name @@ -805,9 +860,11 @@ public final class ALLOY { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().BISMUTH, 47), - new MaterialStack(ELEMENT.getInstance().LEAD, 25), new MaterialStack(ELEMENT.getInstance().TIN, 13), - new MaterialStack(ELEMENT.getInstance().CADMIUM, 10), new MaterialStack(ELEMENT.getInstance().INDIUM, 5) }); + new MaterialStack(ELEMENT.getInstance().BISMUTH, 47), + new MaterialStack(ELEMENT.getInstance().LEAD, 25), + new MaterialStack(ELEMENT.getInstance().TIN, 13), + new MaterialStack(ELEMENT.getInstance().CADMIUM, 10), + new MaterialStack(ELEMENT.getInstance().INDIUM, 5)); // Quantum public static final Material QUANTUM = new Material( @@ -820,9 +877,12 @@ public final class ALLOY { 200, // Neutrons true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(ALLOY.STELLITE, 15), new MaterialStack(ALLOY.ENERGYCRYSTAL, 5), - new MaterialStack(ALLOY.SILICON_CARBIDE, 5), new MaterialStack(ELEMENT.getInstance().GALLIUM, 5), - new MaterialStack(ELEMENT.getInstance().AMERICIUM, 5), - new MaterialStack(ELEMENT.getInstance().PALLADIUM, 5), new MaterialStack(ELEMENT.getInstance().BISMUTH, 5), - new MaterialStack(ELEMENT.getInstance().GERMANIUM, 5) }); + new MaterialStack(ALLOY.STELLITE, 15), + new MaterialStack(ALLOY.ENERGYCRYSTAL, 5), + new MaterialStack(ALLOY.SILICON_CARBIDE, 5), + new MaterialStack(ELEMENT.getInstance().GALLIUM, 5), + new MaterialStack(ELEMENT.getInstance().AMERICIUM, 5), + new MaterialStack(ELEMENT.getInstance().PALLADIUM, 5), + new MaterialStack(ELEMENT.getInstance().BISMUTH, 5), + new MaterialStack(ELEMENT.getInstance().GERMANIUM, 5)); } diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java index fec80060ac..95088535ce 100644 --- a/src/main/java/gtPlusPlus/core/material/Material.java +++ b/src/main/java/gtPlusPlus/core/material/Material.java @@ -601,16 +601,6 @@ public class Material { } } - /* - * if (vMaterialInput.size() > 0) { AutoMap<Integer> aDataSet = new AutoMap<Integer>(); int bonus = 0; bonus - * += this.vMaterialInput.size(); bonus += MathUtils.roundToClosestInt(meltingPointC/1000); - * aDataSet.put(bonus); for (MaterialStack m : this.vMaterialInput) { - * aDataSet.put(m.getStackMaterial().vTier); } int aAverage = MathUtils.getIntAverage(aDataSet); if - * (aAverage > Integer.MAX_VALUE || aAverage < Integer.MIN_VALUE) { aAverage = 0; } if (aAverage > 0) { - * this.vTier = Math.min(aAverage, 10); } else { this.vTier = MaterialUtils.getTierOfMaterial((int) - * MathUtils.celsiusToKelvin(meltingPoint)); } } else { this.vTier = MaterialUtils.getTierOfMaterial((int) - * MathUtils.celsiusToKelvin(meltingPoint)); } - */ this.vTier = MaterialUtils.getTierOfMaterial(meltingPoint); // Sets the materials 'tier'. Will probably replace this logic. @@ -1142,7 +1132,7 @@ public class Material { /** * Ore Components - * + * * @return */ public final ItemStack getOre(final int stacksize) { diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index b7394a9a51..ac940aeecf 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -1,9 +1,7 @@ package gtPlusPlus.core.recipe; -import static gregtech.api.enums.Mods.BartWorks; +import static goodgenerator.loader.Loaders.supercriticalFluidTurbineCasing; import static gregtech.api.enums.Mods.EternalSingularity; -import static gregtech.api.enums.Mods.GoodGenerator; -import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.enums.Mods.RemoteIO; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; @@ -28,10 +26,12 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.technus.tectech.recipe.TT_recipeAdder; import com.github.technus.tectech.thing.CustomItemList; import com.google.common.collect.ImmutableList; +import goodgenerator.loader.Loaders; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -549,9 +549,9 @@ public class RECIPES_Machines { GT_Values.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(18), - GT_ModHandler.getModItem(GoodGenerator.ID, "supercriticalFluidTurbineCasing", 1), - GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 4, 10101), - GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedscrew", 8, 10101)) + new ItemStack(supercriticalFluidTurbineCasing, 1), + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.plate), 4, 10101), + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.screw), 8, 10101)) .itemOutputs(GregtechItemList.Casing_Turbine_SC.get(1)) .fluidInputs(FluidRegistry.getFluidStack("molten.adamantium alloy", 144 * 2)) .duration(5 * SECONDS) @@ -560,10 +560,10 @@ public class RECIPES_Machines { GT_Values.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(18), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 32016), - GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 8, 10104), - GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedscrew", 16, 10104), - GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedgearGt", 4, 10104), + GT_Utility.copyAmount(1, Loaders.SCTurbine), + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.plate), 8, 10104), + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.screw), 16, 10104), + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.gearGt), 4, 10104), CI.getCircuit(7, 8)) .itemOutputs(GregtechItemList.Large_SCSteam_Turbine.get(1)) .fluidInputs(FluidRegistry.getFluidStack("molten.hikarium", 144 * 8)) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java index 5789f5be03..c22d57b34f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java @@ -1,9 +1,8 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; -import static gregtech.api.enums.Mods.BartWorks; +import static goodgenerator.loader.Loaders.advancedRadiationProtectionPlate; import static gregtech.api.enums.Mods.EternalSingularity; import static gregtech.api.enums.Mods.GalaxySpace; -import static gregtech.api.enums.Mods.GoodGenerator; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.fusionRecipes; @@ -240,8 +239,8 @@ public class RecipeLoader_ChemicalSkips { Materials.Cerium.getDust(64), Materials.Gadolinium.getDust(64), Materials.Samarium.getDust(64), - getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 64L, 11002), - getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 64L, 11007), + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.dust), 64, 11002), + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.dust), 64, 11007), ItemList.SuperconductorComposite.get(1)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_UHV) @@ -480,7 +479,7 @@ public class RecipeLoader_ChemicalSkips { .itemInputs( GT_Utility.getIntegratedCircuit(10), CI.getEmptyCatalyst(1), - getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 64L, 88), + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.dust), 64, 88), Materials.Osmiridium.getDust(64), Materials.Carbon.getNanite(64)) .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 1)) @@ -678,8 +677,7 @@ public class RecipeLoader_ChemicalSkips { new ItemStack[] { GregtechItemList.ForceFieldGlass.get(1), Materials.Carbon.getNanite(4), ItemList.Emitter_UV.get(4), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 8), - GregtechItemList.Laser_Lens_Special.get(1), - getModItem(GoodGenerator.ID, "advancedRadiationProtectionPlate", 2) }, + GregtechItemList.Laser_Lens_Special.get(1), new ItemStack(advancedRadiationProtectionPlate, 2) }, new FluidStack[] { Materials.Thulium.getMolten(144 * 10), MaterialsUEVplus.ExcitedDTCC.getFluid(5000), new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 500), new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 500) }, @@ -696,8 +694,8 @@ public class RecipeLoader_ChemicalSkips { new ItemStack[] { GregtechItemList.ForceFieldGlass.get(2), Materials.Carbon.getNanite(8), ItemList.Emitter_UEV.get(4), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 8), - GregtechItemList.Laser_Lens_Special.get(1), - getModItem(GoodGenerator.ID, "advancedRadiationProtectionPlate", 4), ItemList.StableAdhesive.get(4) }, + GregtechItemList.Laser_Lens_Special.get(1), new ItemStack(advancedRadiationProtectionPlate, 4), + ItemList.StableAdhesive.get(4) }, new FluidStack[] { Materials.Thulium.getMolten(144 * 12), MaterialsUEVplus.ExcitedDTPC.getFluid(5000), new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2500), new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 2500) }, @@ -714,8 +712,7 @@ public class RecipeLoader_ChemicalSkips { new ItemStack[] { GregtechItemList.ForceFieldGlass.get(4), Materials.Carbon.getNanite(16), ItemList.Emitter_UIV.get(4), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUIV, 8), - GregtechItemList.Laser_Lens_Special.get(1), - getModItem(GoodGenerator.ID, "advancedRadiationProtectionPlate", 8), + GregtechItemList.Laser_Lens_Special.get(1), new ItemStack(advancedRadiationProtectionPlate, 8), ItemList.SuperconductorComposite.get(4) }, new FluidStack[] { Materials.Thulium.getMolten(144 * 15), MaterialsUEVplus.ExcitedDTRC.getFluid(5000), new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 1000 * 10), @@ -732,8 +729,7 @@ public class RecipeLoader_ChemicalSkips { new ItemStack[] { GregtechItemList.ForceFieldGlass.get(8), Materials.Carbon.getNanite(32), ItemList.Emitter_UMV.get(4), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 8), - GregtechItemList.Laser_Lens_Special.get(1), - getModItem(GoodGenerator.ID, "advancedRadiationProtectionPlate", 16), + GregtechItemList.Laser_Lens_Special.get(1), new ItemStack(advancedRadiationProtectionPlate, 16), ItemList.NaquadriaSupersolid.get(4) }, new FluidStack[] { Materials.Thulium.getMolten(144 * 20), MaterialsUEVplus.ExcitedDTEC.getFluid(5000), new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2000 * 10), diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java index 295c79677b..b4638bc7f0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java @@ -135,7 +135,7 @@ public class GregtechBufferDynamos { GT_ModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_MAX.get(1L), bitsd, - new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_MAX, 'T', CI.getTieredCircuit(9), 'C', + new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_UHV, 'T', CI.getTieredCircuit(9), 'C', OrePrefixes.wireGt04.get(Materials.SuperconductorUHV) }); } } diff --git a/src/main/java/kubatech/CommonProxy.java b/src/main/java/kubatech/CommonProxy.java index 7a75789271..ad66ad30af 100644 --- a/src/main/java/kubatech/CommonProxy.java +++ b/src/main/java/kubatech/CommonProxy.java @@ -70,6 +70,7 @@ public class CommonProxy { } public void postInit(FMLPostInitializationEvent event) { + RecipeLoader.registerMTEs(); RecipeLoader.addRecipes(); EIGBucketLoader.LoadEIGBuckets(); if (Thaumcraft.isModLoaded()) TCLoader.init(); diff --git a/src/main/java/kubatech/loaders/DEFCRecipes.java b/src/main/java/kubatech/loaders/DEFCRecipes.java index f3b8774758..bbdddd2f97 100644 --- a/src/main/java/kubatech/loaders/DEFCRecipes.java +++ b/src/main/java/kubatech/loaders/DEFCRecipes.java @@ -1,6 +1,11 @@ package kubatech.loaders; +import static gregtech.api.enums.Mods.AdvancedSolarPanel; +import static gregtech.api.enums.Mods.DraconicEvolution; import static gregtech.api.enums.Mods.ElectroMagicTools; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.SuperSolarPanels; +import static gregtech.api.enums.Mods.Witchery; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gregtech.api.util.GT_RecipeConstants.DEFC_CASING_TIER; @@ -73,7 +78,7 @@ public class DEFCRecipes { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "tile.BloodyIchorium", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "tile.BloodyIchorium", 1, 0), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 6L)) .fluidInputs(Materials.Void.getMolten(1152L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT1.get(1)) @@ -84,7 +89,7 @@ public class DEFCRecipes { .itemInputs( kubatech.api.enums.ItemList.DEFCCasingT1.get(1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 6L), - GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0)) + GT_ModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0)) .fluidInputs(Materials.Void.getMolten(2304L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT2.get(1)) .eut(491_520) @@ -94,7 +99,7 @@ public class DEFCRecipes { .itemInputs( kubatech.api.enums.ItemList.DEFCCasingT2.get(1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 6L), - GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 2, 0)) + GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 2, 0)) .fluidInputs(Materials.Void.getMolten(4608L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT3.get(1)) .eut(1_996_080) @@ -104,7 +109,7 @@ public class DEFCRecipes { .itemInputs( kubatech.api.enums.ItemList.DEFCCasingT3.get(1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 6L), - GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 3, 0)) + GT_ModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 3, 0)) .fluidInputs(Materials.Void.getMolten(9216L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT4.get(1)) .eut(7_864_320) @@ -114,7 +119,7 @@ public class DEFCRecipes { .itemInputs( kubatech.api.enums.ItemList.DEFCCasingT4.get(1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 6L), - GT_ModHandler.getModItem("DraconicEvolution", "chaoticCore", 4, 0)) + GT_ModHandler.getModItem(DraconicEvolution.ID, "chaoticCore", 4, 0)) .fluidInputs(Materials.Void.getMolten(18432L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT5.get(1)) .eut(31_457_280) @@ -170,7 +175,7 @@ public class DEFCRecipes { ItemList.QuantumEye.get(1L), kubatech.api.enums.ItemList.DEFCDraconicSchematic.get(0L)) .fluidInputs(Materials.Sunnarium.getMolten(1440)) - .itemOutputs(GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0)) + .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0)) .eut(500_000) .duration(400) .metadata(DEFC_CASING_TIER, 1) @@ -181,11 +186,11 @@ public class DEFCRecipes { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4), - GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 4, 0), + GT_ModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 4, 0), ItemList.QuantumStar.get(1L), kubatech.api.enums.ItemList.DEFCWyvernSchematic.get(0L)) .fluidInputs(Materials.Neutronium.getMolten(1440)) - .itemOutputs(GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 1, 0)) + .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 1, 0)) .eut(2_000_000) .duration(800) .metadata(DEFC_CASING_TIER, 2) @@ -197,11 +202,11 @@ public class DEFCRecipes { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4), - GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 4, 0), - GT_ModHandler.getModItem("supersolarpanel", "enderquantumcomponent", 1, 0), + GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 4, 0), + GT_ModHandler.getModItem(SuperSolarPanels.ID, "enderquantumcomponent", 1, 0), kubatech.api.enums.ItemList.DEFCAwakenedSchematic.get(0L)) .fluidInputs(Materials.Infinity.getMolten(1440)) - .itemOutputs(GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 1, 0)) + .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 1, 0)) .eut(8_000_000) .duration(1600) .metadata(DEFC_CASING_TIER, 3) @@ -212,11 +217,11 @@ public class DEFCRecipes { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4), - GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 4, 0), - GT_ModHandler.getModItem("dreamcraft", "item.ManyullynCrystal", 1, 0), + GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 4, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ManyullynCrystal", 1, 0), kubatech.api.enums.ItemList.DEFCAwakenedSchematic.get(0L)) .fluidInputs(Materials.Infinity.getMolten(1440)) - .itemOutputs(GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 1, 0)) + .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 1, 0)) .eut(8_000_000) .duration(1600) .metadata(DEFC_CASING_TIER, 3) @@ -228,11 +233,11 @@ public class DEFCRecipes { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 16), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 4), - GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 4, 0), - GT_ModHandler.getModItem("DraconicEvolution", "chaosFragment", 2, 2), + GT_ModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 4, 0), + GT_ModHandler.getModItem(DraconicEvolution.ID, "chaosFragment", 2, 2), kubatech.api.enums.ItemList.DEFCChaoticSchematic.get(0L)) .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(1440)) - .itemOutputs(GT_ModHandler.getModItem("DraconicEvolution", "chaoticCore", 1, 0)) + .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "chaoticCore", 1, 0)) .eut(24_000_000) .duration(3200) .metadata(DEFC_CASING_TIER, 4) @@ -245,10 +250,10 @@ public class DEFCRecipes { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StellarAlloy, 4), - GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 4, 1), - GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0), + GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 4, 1), + GT_ModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0), kubatech.api.enums.ItemList.DEFCWyvernSchematic.get(0L)) - .itemOutputs(GT_ModHandler.getModItem("DraconicEvolution", "draconiumEnergyCore", 1, 0)) + .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 1, 0)) .eut(500_000) .duration(1000) .metadata(DEFC_CASING_TIER, 2) @@ -258,11 +263,11 @@ public class DEFCRecipes { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 8), - GT_ModHandler.getModItem("DraconicEvolution", "draconiumEnergyCore", 4, 0), - GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 4, 4), - GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 1, 0), + GT_ModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 4, 0), + GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 4, 4), + GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 1, 0), kubatech.api.enums.ItemList.DEFCAwakenedSchematic.get(0L)) - .itemOutputs(GT_ModHandler.getModItem("DraconicEvolution", "draconiumEnergyCore", 1, 1)) + .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 1, 1)) .eut(2_000_000) .duration(2000) .metadata(DEFC_CASING_TIER, 3) @@ -285,7 +290,7 @@ public class DEFCRecipes { GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("witchery", "infinityegg", 0), + GT_ModHandler.getModItem(Witchery.ID, "infinityegg", 0), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), GT_Utility.getIntegratedCircuit(1)) .fluidInputs(Materials.Radon.getPlasma(72)) @@ -311,7 +316,7 @@ public class DEFCRecipes { GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("witchery", "infinityegg", 0), + GT_ModHandler.getModItem(Witchery.ID, "infinityegg", 0), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), GTPP_CombType.DRAGONBLOOD.getStackForType(1)) .fluidInputs(Materials.Radon.getPlasma(108)) diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index 5df6f8aa4f..62f3219c07 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -20,12 +20,17 @@ package kubatech.loaders; +import static gregtech.api.enums.ItemList.FluidExtractorUHV; +import static gregtech.api.enums.MetaTileEntityIDs.DraconicEvolutionFusionCrafterController; +import static gregtech.api.enums.MetaTileEntityIDs.ExtremeEntityCrusherController; +import static gregtech.api.enums.MetaTileEntityIDs.ExtremeIndustrialApiaryController; +import static gregtech.api.enums.MetaTileEntityIDs.ExtremeIndustrialGreenhouseController; import static gregtech.api.enums.Mods.Avaritia; import static gregtech.api.enums.Mods.DraconicEvolution; import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.Forestry; -import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.OpenBlocks; import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; @@ -69,8 +74,6 @@ import static kubatech.api.enums.ItemList.WhiteTeaLeaf; import static kubatech.api.enums.ItemList.YellowTea; import static kubatech.api.enums.ItemList.YellowTeaLeaf; -import java.lang.reflect.InvocationTargetException; - import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -81,7 +84,6 @@ import forestry.plugins.PluginCore; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import ic2.core.Ic2Items; @@ -97,29 +99,50 @@ public class RecipeLoader { | GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.DISMANTLEABLE; - private static int MTEID = 14201; - private static final int MTEIDMax = 14300; + public static void registerMTEs() { + if (EnderIO.isModLoaded()) { + ExtremeEntityCrusher.set( + new GT_MetaTileEntity_ExtremeEntityCrusher( + ExtremeEntityCrusherController.ID, + "multimachine.entitycrusher", + "Extreme Entity Crusher").getStackForm(1)); + } + + if (Forestry.isModLoaded()) { + ExtremeIndustrialApiary.set( + new GT_MetaTileEntity_MegaIndustrialApiary( + ExtremeIndustrialApiaryController.ID, + "multimachine.extremeapiary", + "Industrial Apicultural Acclimatiser and Drone Domestication Station").getStackForm(1)); + } + + ExtremeIndustrialGreenhouse.set( + new GT_MetaTileEntity_ExtremeIndustrialGreenhouse( + ExtremeIndustrialGreenhouseController.ID, + "multimachine.extremegreenhouse", + "Extreme Industrial Greenhouse").getStackForm(1)); + + if (DraconicEvolution.isModLoaded()) { + DraconicEvolutionFusionCrafter.set( + new GT_MetaTileEntity_DEFusionCrafter( + DraconicEvolutionFusionCrafterController.ID, + "multimachine.defusioncrafter", + "Draconic Evolution Fusion Crafter").getStackForm(1)); + } + } public static void addRecipes() { - if (registerMTE( - ExtremeEntityCrusher, - GT_MetaTileEntity_ExtremeEntityCrusher.class, - "multimachine.entitycrusher", - "Extreme Entity Crusher", - EnderIO.isModLoaded())) { + + if (EnderIO.isModLoaded()) { GT_ModHandler.addCraftingRecipe( ItemList.ExtremeEntityCrusher.get(1), bitsd, new Object[] { "RCR", "CHC", "VVV", 'R', gregtech.api.enums.ItemList.Robot_Arm_EV, 'C', OrePrefixes.circuit.get(Materials.EV), 'H', gregtech.api.enums.ItemList.Hull_EV, 'V', - GT_ModHandler.getModItem("OpenBlocks", "vacuumhopper", 1, new ItemStack(Blocks.hopper)) }); + GT_ModHandler.getModItem(OpenBlocks.ID, "vacuumhopper", 1, new ItemStack(Blocks.hopper)) }); } - if (registerMTE( - ExtremeIndustrialApiary, - GT_MetaTileEntity_MegaIndustrialApiary.class, - "multimachine.extremeapiary", - "Industrial Apicultural Acclimatiser and Drone Domestication Station", - Forestry.isModLoaded())) { + + if (Forestry.isModLoaded()) { GT_Values.RA.stdBuilder() .metadata(RESEARCH_ITEM, gregtech.api.enums.ItemList.Machine_IndustrialApiary.get(1)) .metadata(RESEARCH_TIME, 8 * MINUTES + 20 * SECONDS) @@ -139,81 +162,28 @@ public class RecipeLoader { .eut(2_048_000) .duration(5 * MINUTES) .addTo(AssemblyLine); + + GT_MetaTileEntity_ExtremeIndustrialGreenhouse + .addFertilizerItem(PluginCore.items.fertilizerCompound.getItemStack(1)); } - if (registerMTEUsingID( - 12_792, - ExtremeIndustrialGreenhouse, - GT_MetaTileEntity_ExtremeIndustrialGreenhouse.class, - "multimachine.extremegreenhouse", - "Extreme Industrial Greenhouse", - true /* IC2 is always loaded */)) { - GT_ModHandler.addCraftingRecipe( - ExtremeIndustrialGreenhouse.get(1), - bitsd, - new Object[] { "AZA", "BRB", "AZA", 'B', gregtech.api.enums.ItemList.Casing_CleanStainlessSteel, 'R', - GT_ModHandler.getModItem("EnderIO", "blockFarmStation", 1, new ItemStack(Items.diamond_hoe)), 'A', - NewHorizonsCoreMod.isModLoaded() - ? GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 11104) // IV World Accelerator - : gregtech.api.enums.ItemList.Robot_Arm_IV, - 'Z', OrePrefixes.circuit.get(Materials.ZPM) }); - - // Vanilla should always be loaded - GT_MetaTileEntity_ExtremeIndustrialGreenhouse.addFertilizerItem(new ItemStack(Items.dye, 1, 15)); - // IC2 should always be loaded - GT_MetaTileEntity_ExtremeIndustrialGreenhouse.addFertilizerItem(Ic2Items.fertilizer); - if (Forestry.isModLoaded()) { - GT_MetaTileEntity_ExtremeIndustrialGreenhouse - .addFertilizerItem(PluginCore.items.fertilizerCompound.getItemStack(1)); - } - } - if (registerMTEUsingID( - 5_001, - DraconicEvolutionFusionCrafter, - GT_MetaTileEntity_DEFusionCrafter.class, - "multimachine.defusioncrafter", - "Draconic Evolution Fusion Crafter", - DraconicEvolution.isModLoaded())) { + + GT_ModHandler.addCraftingRecipe( + ExtremeIndustrialGreenhouse.get(1), + bitsd, + new Object[] { "AZA", "BRB", "AZA", 'B', gregtech.api.enums.ItemList.Casing_CleanStainlessSteel, 'R', + GT_ModHandler.getModItem(EnderIO.ID, "blockFarmStation", 1, new ItemStack(Items.diamond_hoe)), 'A', + gregtech.api.enums.ItemList.AcceleratorIV.get(1), 'Z', OrePrefixes.circuit.get(Materials.ZPM) }); + + // Vanilla should always be loaded + GT_MetaTileEntity_ExtremeIndustrialGreenhouse.addFertilizerItem(new ItemStack(Items.dye, 1, 15)); + // IC2 should always be loaded + GT_MetaTileEntity_ExtremeIndustrialGreenhouse.addFertilizerItem(Ic2Items.fertilizer); + + if (DraconicEvolution.isModLoaded()) { // Controller recipe added in TecTech DEFCRecipes.addRecipes(); } RegisterTeaLine(); - if (MTEID > MTEIDMax + 1) throw new RuntimeException("MTE ID's"); - } - - private static boolean registerMTE(ItemList item, Class<? extends MetaTileEntity> mte, String aName, - String aNameRegional, boolean... deps) { - if (MTEID > MTEIDMax) throw new RuntimeException("MTE ID's"); - boolean dep = registerMTEUsingID(MTEID, item, mte, aName, aNameRegional, deps); - MTEID++; - return dep; - } - - private static boolean registerMTEUsingID(int ID, ItemList item, Class<? extends MetaTileEntity> mte, String aName, - String aNameRegional, boolean... deps) { - boolean dep = true; - for (boolean b : deps) { - if (!b) { - dep = false; - break; - } - } - if (dep) { - try { - item.set( - mte.getConstructor(int.class, String.class, String.class) - .newInstance(ID, aName, aNameRegional) - .getStackForm(1)); - } catch (InvocationTargetException ex) { - Throwable original_ex = ex.getCause(); - if (original_ex instanceof RuntimeException) throw (RuntimeException) original_ex; - throw new RuntimeException(original_ex.getMessage()); - } catch (RuntimeException ex) { - throw ex; - } catch (Exception ex) { - throw new RuntimeException(ex.getMessage()); - } - } - return dep; } private static boolean lateRecipesInitialized = false; @@ -369,7 +339,7 @@ public class RecipeLoader { LegendaryUltimateTea.get(0), GameRegistry.findItemStack("Avaritia", "Neutronium_Compressor", 1), gregtech.api.enums.ItemList.Quantum_Tank_EV.get(1), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 10, 11193), // UHV Fluid extractor + FluidExtractorUHV.get(10), new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L }, new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L }, new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L }, diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR.png Binary files differnew file mode 100644 index 0000000000..cac886f252 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR.xcf b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR.xcf Binary files differnew file mode 100644 index 0000000000..c91e4e7b6f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR.xcf diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png Binary files differnew file mode 100644 index 0000000000..6de133ad06 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png.mcmeta new file mode 100644 index 0000000000..18e5c3223b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":12 + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.xcf b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.xcf Binary files differnew file mode 100644 index 0000000000..3d5d3436c9 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.xcf diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE.png Binary files differnew file mode 100644 index 0000000000..8aeb6c7c5f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png Binary files differnew file mode 100644 index 0000000000..a03b2bdd49 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png.mcmeta new file mode 100644 index 0000000000..18e5c3223b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":12 + } +}
\ No newline at end of file |
