diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a1cb883..472e1a6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # 2.4.7 - Fix Draconium Casing Recycle [#324](https://github.com/GTModpackTeam/GTExpert-Core/pull/324) +- AE2 UEL: Extended support ends [#325](https://github.com/GTModpackTeam/GTExpert-Core/pull/325) * * * diff --git a/dependencies.gradle b/dependencies.gradle index 8c8f2423..0ca90a3e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -50,13 +50,7 @@ dependencies { //devOnlyNonPublishable(rfg.deobf(project.files("libs/gregtech-1.12.2-2.8.9-beta-dev.jar"))) // CEu pr 2.8.10 devOnlyNonPublishable(rfg.deobf("curse.maven:gregicality-multiblocks-564858:5508050")) // GCYM 1.2.10 devOnlyNonPublishable(rfg.deobf("curse.maven:forgelin-continuous-456403:6142081")) // Forgelin-Continuous 2.1.10.0 - - // Switchable Dependencies - if (project.useAE2uelExtended.toBoolean()) { - devOnlyNonPublishable(rfg.deobf("curse.maven:ae2-uel-extended-913322:5006535")) // AE2 UEL: Extended 0.55.30-0.4.0.2 - } else { - devOnlyNonPublishable(rfg.deobf("curse.maven:ae2-extended-life-570458:5411078")) // AE2UEL 0.56.6 - } + devOnlyNonPublishable(rfg.deobf("curse.maven:ae2-extended-life-570458:5378163")) // AE2UEL 0.56.5 // Debug GTWoodProcessing if (project.debug_all.toBoolean() || project.debug_gtwp.toBoolean()) { diff --git a/gradle.properties b/gradle.properties index 0d51ed39..cabd05a2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,11 +20,6 @@ autoUpdateBuildScript = false minecraftVersion = 1.12.2 -# Switchable Dependencies -# If 'useAE2uelExtended = true', AE2 UEL: Extended will be used -# After enabling, change 'enableAE2UELExtended' in cfg(ae_integration.cfg) -useAE2uelExtended = false - # Debug mod compatibility debug_all = false debug_gtwp = false diff --git a/src/main/java/com/github/gtexpert/core/integration/ae/AEConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/ae/AEConfigHolder.java index 02572bde..a6163edb 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ae/AEConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/AEConfigHolder.java @@ -12,10 +12,6 @@ category = "Applied Energistics 2") public class AEConfigHolder { - @Config.Comment({ "Change the recipe to use AE2 UEL: Extended by setting it to true.", - "Changes are not recommended if you don't know what kind of mod it is.", "Default: false" }) - public static boolean enableAE2UELExtended = false; - @Config.Comment({ "The voltage at which AE can be started.", "The material is also adjusted to each voltage.", "Default: 3 (HV)" }) @Config.RangeInt(min = 2, max = 10) diff --git a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEBlocksRecipe.java index eedab8e3..6fa4c02e 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEBlocksRecipe.java @@ -22,7 +22,6 @@ import com.github.gtexpert.core.api.unification.material.GTEMaterials; import com.github.gtexpert.core.api.util.Mods; import com.github.gtexpert.core.common.GTEConfigHolder; -import com.github.gtexpert.core.integration.ae.AEConfigHolder; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; @@ -90,96 +89,6 @@ public static void init() { " ", "I", 'I', Mods.AppliedEnergistics2.getItem("fluid_interface")); - if (AEConfigHolder.enableAE2UELExtended) { - // ME Delivery Interface - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/blocks/interfaces_interfaceimp_alt")); - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/blocks/interfaces_interfaceimp_part")); - ModHandler.addShapedNBTClearingRecipe("interfaceimp_to_interfaceimp", - Mods.AppliedEnergistics2.getItem("interfaceimp"), - "I", " ", - 'I', Mods.AppliedEnergistics2.getItem("interfaceimp")); - ModHandler.addShapedNBTClearingRecipe("interfaceimp_to_part_interfaceimp", - Mods.AppliedEnergistics2.getItem("interfaceimp"), - " ", "I", - 'I', Mods.AppliedEnergistics2.getItem("part", 1, 620)); - ModHandler.addShapedNBTClearingRecipe("part_interfaceimp_to_part_interfaceimp", - Mods.AppliedEnergistics2.getItem("part", 1, 620), - "I", " ", - 'I', Mods.AppliedEnergistics2.getItem("part", 1, 620)); - ModHandler.addShapedNBTClearingRecipe("part_interfaceimp_to_interfaceimp", - Mods.AppliedEnergistics2.getItem("part", 1, 620), - " ", "I", - 'I', Mods.AppliedEnergistics2.getItem("interfaceimp")); - - // Advanced ME Delivery Interface - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/blocks/interfaces_interfaceadv_alt")); - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/blocks/interfaces_interfaceadv_part")); - ModHandler.addShapedNBTClearingRecipe("interfaceadv_to_interfaceadv", - Mods.AppliedEnergistics2.getItem("interfaceadv"), - "I", " ", - 'I', Mods.AppliedEnergistics2.getItem("interfaceadv")); - ModHandler.addShapedNBTClearingRecipe("interfaceadv_to_part_interfaceadv", - Mods.AppliedEnergistics2.getItem("interfaceadv"), - " ", "I", - 'I', Mods.AppliedEnergistics2.getItem("part", 1, 621)); - ModHandler.addShapedNBTClearingRecipe("part_interfaceadv_to_part_interfaceadv", - Mods.AppliedEnergistics2.getItem("part", 1, 621), - "I", " ", - 'I', Mods.AppliedEnergistics2.getItem("part", 1, 621)); - ModHandler.addShapedNBTClearingRecipe("part_interfaceadv_to_interfaceadv", - Mods.AppliedEnergistics2.getItem("part", 1, 621), - " ", "I", - 'I', Mods.AppliedEnergistics2.getItem("interfaceadv")); - - // Perfect ME Delivery Interface - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/blocks/interfaces_interfaceper_alt")); - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/blocks/interfaces_interfaceper_part")); - ModHandler.addShapedNBTClearingRecipe("interfaceper_to_interfaceper", - Mods.AppliedEnergistics2.getItem("interfaceper"), - "I", " ", - 'I', Mods.AppliedEnergistics2.getItem("interfaceper")); - ModHandler.addShapedNBTClearingRecipe("interfaceper_to_part_interfaceper", - Mods.AppliedEnergistics2.getItem("interfaceper"), - " ", "I", - 'I', Mods.AppliedEnergistics2.getItem("part", 1, 622)); - ModHandler.addShapedNBTClearingRecipe("part_interfaceper_to_part_interfaceper", - Mods.AppliedEnergistics2.getItem("part", 1, 622), - "I", " ", - 'I', Mods.AppliedEnergistics2.getItem("part", 1, 622)); - ModHandler.addShapedNBTClearingRecipe("part_interfaceper_to_interfaceper", - Mods.AppliedEnergistics2.getItem("part", 1, 622), - " ", "I", - 'I', Mods.AppliedEnergistics2.getItem("interfaceper")); - - // ME Patterns Interface - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/blocks/interfaces_interfacepatt_alt")); - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/blocks/interfaces_interfacepatt_part")); - ModHandler.addShapedNBTClearingRecipe("interfacepatt_to_interfacepatt", - Mods.AppliedEnergistics2.getItem("interface_patterns"), - "I", " ", - 'I', Mods.AppliedEnergistics2.getItem("interface_patterns")); - ModHandler.addShapedNBTClearingRecipe("interfacepatt_to_part_interfacepatt", - Mods.AppliedEnergistics2.getItem("interface_patterns"), - " ", "I", - 'I', Mods.AppliedEnergistics2.getItem("part", 1, 623)); - ModHandler.addShapedNBTClearingRecipe("part_interfacepatt_to_part_interfacepatt", - Mods.AppliedEnergistics2.getItem("part", 1, 623), - "I", " ", - 'I', Mods.AppliedEnergistics2.getItem("part", 1, 623)); - ModHandler.addShapedNBTClearingRecipe("part_interfacepatt_to_interfacepatt", - Mods.AppliedEnergistics2.getItem("part", 1, 623), - " ", "I", - 'I', Mods.AppliedEnergistics2.getItem("interface_patterns")); - } - // ME Dual Interface if (Mods.AE2FluidCrafting.isModLoaded()) { ModHandler.removeRecipeByName(Mods.AE2FluidCrafting.getResource("dual_interface")); @@ -492,56 +401,6 @@ public static void init() { Mods.AppliedEnergistics2.getItem("material", 1, 22), Mods.AppliedEnergistics2.getItem("material", 1, 24)); - if (AEConfigHolder.enableAE2UELExtended) { - // 4x Crafting Co-Processing Unit - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_accelerator_4x")); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator")) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 35)) - .outputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator_4x")) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator_4x")) - .outputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator")) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 35)) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - - // 16x Crafting Co-Processing Unit - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_accelerator_16x")); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator")) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 36)) - .outputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator_16x")) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator_16x")) - .outputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator")) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 36)) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - - // 64x Crafting Co-Processing Unit - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_accelerator_64x")); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator")) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 37)) - .outputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator_64x")) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator_64x")) - .outputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator")) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 37)) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - } - // 1k Crafting Storage ModHandler.removeRecipeByName( Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_storage_1k")); @@ -605,119 +464,5 @@ public static void init() { .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 38)) .duration(10).EUt(VA[ULV]) .buildAndRegister(); - - if (AEConfigHolder.enableAE2UELExtended) { - // 1mb Crafting Storage - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_storage_1mb")); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("crafting_unit")) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 61)) - .outputs(Mods.AppliedEnergistics2.getItem("crafting_storage_1mb")) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("crafting_storage_1mb")) - .outputs(Mods.AppliedEnergistics2.getItem("crafting_unit")) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 61)) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - - // 4mb Crafting Storage - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_storage_4mb")); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("crafting_unit")) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 62)) - .outputs(Mods.AppliedEnergistics2.getItem("crafting_storage_4mb")) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("crafting_storage_4mb")) - .outputs(Mods.AppliedEnergistics2.getItem("crafting_unit")) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 62)) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - - // 16mb Crafting Storage - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_storage_16mb")); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("crafting_unit")) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 63)) - .outputs(Mods.AppliedEnergistics2.getItem("crafting_storage_16mb")) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("crafting_storage_16mb")) - .outputs(Mods.AppliedEnergistics2.getItem("crafting_unit")) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 63)) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - - // 64mb Crafting Storage - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_storage_64mb")); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("crafting_unit")) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 64)) - .outputs(Mods.AppliedEnergistics2.getItem("crafting_storage_64mb")) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("crafting_storage_64mb")) - .outputs(Mods.AppliedEnergistics2.getItem("crafting_unit")) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 64)) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - - // 256mb Crafting Storage - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_storage_256mb")); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("crafting_unit")) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 65)) - .outputs(Mods.AppliedEnergistics2.getItem("crafting_storage_256mb")) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("crafting_storage_256mb")) - .outputs(Mods.AppliedEnergistics2.getItem("crafting_unit")) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 65)) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - - // 1gb Crafting Storage - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_storage_1gb")); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("crafting_unit")) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 66)) - .outputs(Mods.AppliedEnergistics2.getItem("crafting_storage_1gb")) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("crafting_storage_1gb")) - .outputs(Mods.AppliedEnergistics2.getItem("crafting_unit")) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 66)) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - - // 2gb Crafting Storage - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_storage_15gb")); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("crafting_unit")) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 67)) - .outputs(Mods.AppliedEnergistics2.getItem("crafting_storage_15gb")) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AppliedEnergistics2.getItem("crafting_storage_15gb")) - .outputs(Mods.AppliedEnergistics2.getItem("crafting_unit")) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 67)) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - } } } diff --git a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java index f35548ef..e9512c93 100644 --- a/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java @@ -35,10 +35,7 @@ public static void init() { .fluidInputs(Materials.Neutronium.getFluid(9216)) .output(GTEMetaItems.GTE_ME_FAKE_COMPONENT, 1) .duration(1200).EUt(VA[UV]); - if (AEConfigHolder.enableAE2UELExtended) { - builderGTECore.inputs(Mods.AppliedEnergistics2.getItem("material", 16, 65)); - builderGTECore.inputs(Mods.AppliedEnergistics2.getItem("material", 16, 70)); - } else if (Mods.AEAdditions.isModLoaded()) { + if (Mods.AEAdditions.isModLoaded()) { builderGTECore.inputs(Mods.AEAdditions.getItem("storage.component", 16, 3)); builderGTECore.inputs(Mods.AEAdditions.getItem("storage.component", 16, 6)); } else { @@ -307,238 +304,6 @@ public static void init() { .withRecycling() .buildAndRegister(); - if (AEConfigHolder.enableAE2UELExtended) { - // 1mb Storage Cell - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/cells/storage_cell_1mb")); - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/cells/storage_cell_1mb_storage")); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AEAdditions.isModLoaded() ? - Mods.AEAdditions.getItem("storage.casing") : - Mods.AppliedEnergistics2.getItem("material", 1, 39)) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 61)) - .outputs(Mods.AppliedEnergistics2.getItem("storage_cell_1mb")) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputNBT(Mods.AppliedEnergistics2.getItem("storage_cell_1mb").getItem(), - NBTMatcher.ANY, NBTCondition.ANY) - .outputs(Mods.AEAdditions.isModLoaded() ? - Mods.AEAdditions.getItem("storage.casing") : - Mods.AppliedEnergistics2.getItem("material", 1, 39)) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 61)) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - - // 4mb Storage Cell - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/cells/storage_cell_4mb")); - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/cells/storage_cell_4mb_storage")); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AEAdditions.isModLoaded() ? - Mods.AEAdditions.getItem("storage.casing") : - Mods.AppliedEnergistics2.getItem("material", 1, 39)) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 62)) - .outputs(Mods.AppliedEnergistics2.getItem("storage_cell_4mb")) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputNBT(Mods.AppliedEnergistics2.getItem("storage_cell_4mb").getItem(), - NBTMatcher.ANY, NBTCondition.ANY) - .outputs(Mods.AEAdditions.isModLoaded() ? - Mods.AEAdditions.getItem("storage.casing") : - Mods.AppliedEnergistics2.getItem("material", 1, 39)) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 62)) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - - // 16mb Storage Cell - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/cells/storage_cell_16mb")); - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/cells/storage_cell_16mb_storage")); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AEAdditions.isModLoaded() ? - Mods.AEAdditions.getItem("storage.casing") : - Mods.AppliedEnergistics2.getItem("material", 1, 39)) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 63)) - .outputs(Mods.AppliedEnergistics2.getItem("storage_cell_16mb")) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputNBT(Mods.AppliedEnergistics2.getItem("storage_cell_16mb").getItem(), - NBTMatcher.ANY, NBTCondition.ANY) - .outputs(Mods.AEAdditions.isModLoaded() ? - Mods.AEAdditions.getItem("storage.casing") : - Mods.AppliedEnergistics2.getItem("material", 1, 39)) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 63)) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - - // 64mb Storage Cell - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/cells/storage_cell_64mb")); - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/cells/storage_cell_64mb_storage")); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AEAdditions.isModLoaded() ? - Mods.AEAdditions.getItem("storage.casing") : - Mods.AppliedEnergistics2.getItem("material", 1, 39)) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 64)) - .outputs(Mods.AppliedEnergistics2.getItem("storage_cell_64mb")) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputNBT(Mods.AppliedEnergistics2.getItem("storage_cell_64mb").getItem(), - NBTMatcher.ANY, NBTCondition.ANY) - .outputs(Mods.AEAdditions.isModLoaded() ? - Mods.AEAdditions.getItem("storage.casing") : - Mods.AppliedEnergistics2.getItem("material", 1, 39)) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 64)) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - - // 256mb Storage Cell - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/cells/storage_cell_256mb")); - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/cells/storage_cell_256mb_storage")); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AEAdditions.isModLoaded() ? - Mods.AEAdditions.getItem("storage.casing") : - Mods.AppliedEnergistics2.getItem("material", 1, 39)) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 65)) - .outputs(Mods.AppliedEnergistics2.getItem("storage_cell_256mb")) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputNBT(Mods.AppliedEnergistics2.getItem("storage_cell_256mb").getItem(), - NBTMatcher.ANY, NBTCondition.ANY) - .outputs(Mods.AEAdditions.isModLoaded() ? - Mods.AEAdditions.getItem("storage.casing") : - Mods.AppliedEnergistics2.getItem("material", 1, 39)) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 65)) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - - // 1mb Fluid Storage Cell - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/cells/fluid_storage_cell_1mb")); - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/cells/fluid_storage_cell_1mb_storage")); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AEAdditions.isModLoaded() ? - Mods.AEAdditions.getItem("storage.casing", 1, 1) : - Mods.AppliedEnergistics2.getItem("material", 1, 39)) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 68)) - .outputs(Mods.AppliedEnergistics2.getItem("fluid_storage_cell_1mb")) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputNBT(Mods.AppliedEnergistics2.getItem("fluid_storage_cell_1mb").getItem(), - NBTMatcher.ANY, NBTCondition.ANY) - .outputs(Mods.AEAdditions.isModLoaded() ? - Mods.AEAdditions.getItem("storage.casing", 1, 1) : - Mods.AppliedEnergistics2.getItem("material", 1, 39)) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 68)) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - - // 4mb Fluid Storage Cell - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/cells/fluid_storage_cell_4mb")); - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/cells/fluid_storage_cell_4mb_storage")); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AEAdditions.isModLoaded() ? - Mods.AEAdditions.getItem("storage.casing", 1, 1) : - Mods.AppliedEnergistics2.getItem("material", 1, 39)) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 69)) - .outputs(Mods.AppliedEnergistics2.getItem("fluid_storage_cell_4mb")) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputNBT(Mods.AppliedEnergistics2.getItem("fluid_storage_cell_4mb").getItem(), - NBTMatcher.ANY, NBTCondition.ANY) - .outputs(Mods.AEAdditions.isModLoaded() ? - Mods.AEAdditions.getItem("storage.casing", 1, 1) : - Mods.AppliedEnergistics2.getItem("material", 1, 39)) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 69)) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - - // 16mb Fluid Storage Cell - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/cells/fluid_storage_cell_16mb")); - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/cells/fluid_storage_cell_16mb_storage")); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AEAdditions.isModLoaded() ? - Mods.AEAdditions.getItem("storage.casing", 1, 1) : - Mods.AppliedEnergistics2.getItem("material", 1, 39)) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 70)) - .outputs(Mods.AppliedEnergistics2.getItem("fluid_storage_cell_16mb")) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputNBT(Mods.AppliedEnergistics2.getItem("fluid_storage_cell_16mb").getItem(), - NBTMatcher.ANY, NBTCondition.ANY) - .outputs(Mods.AEAdditions.isModLoaded() ? - Mods.AEAdditions.getItem("storage.casing", 1, 1) : - Mods.AppliedEnergistics2.getItem("material", 1, 39)) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 70)) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - - // 64mb Fluid Storage Cell - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/cells/fluid_storage_cell_64mb")); - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/cells/fluid_storage_cell_64mb_storage")); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AEAdditions.isModLoaded() ? - Mods.AEAdditions.getItem("storage.casing", 1, 1) : - Mods.AppliedEnergistics2.getItem("material", 1, 39)) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 71)) - .outputs(Mods.AppliedEnergistics2.getItem("fluid_storage_cell_64mb")) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputNBT(Mods.AppliedEnergistics2.getItem("fluid_storage_cell_64mb").getItem(), - NBTMatcher.ANY, NBTCondition.ANY) - .outputs(Mods.AEAdditions.isModLoaded() ? - Mods.AEAdditions.getItem("storage.casing", 1, 1) : - Mods.AppliedEnergistics2.getItem("material", 1, 39)) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 71)) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - - // 256mb Fluid Storage Cell - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/cells/fluid_storage_cell_256mb")); - ModHandler.removeRecipeByName( - Mods.AppliedEnergistics2.getResource("network/cells/fluid_storage_cell_256mb_storage")); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputs(Mods.AEAdditions.isModLoaded() ? - Mods.AEAdditions.getItem("storage.casing", 1, 1) : - Mods.AppliedEnergistics2.getItem("material", 1, 39)) - .inputs(Mods.AppliedEnergistics2.getItem("material", 1, 72)) - .outputs(Mods.AppliedEnergistics2.getItem("fluid_storage_cell_256mb")) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - RecipeMaps.PACKER_RECIPES.recipeBuilder() - .inputNBT(Mods.AppliedEnergistics2.getItem("fluid_storage_cell_256mb").getItem(), - NBTMatcher.ANY, NBTCondition.ANY) - .outputs(Mods.AEAdditions.isModLoaded() ? - Mods.AEAdditions.getItem("storage.casing", 1, 1) : - Mods.AppliedEnergistics2.getItem("material", 1, 39)) - .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 72)) - .duration(10).EUt(VA[ULV]) - .buildAndRegister(); - } - // Formation Core ModHandler.removeRecipeByName(Mods.AppliedEnergistics2.getResource("materials/formationcore")); ModHandler.addShapedRecipe(true, "formation_core",