From 2e2bb12671d363d0e9f5960693e4905d3eabdd59 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Tue, 4 Oct 2016 00:38:58 +0200 Subject: [PATCH] Fixes #2375: Recipes should now work. Definitely needs more fine-tuning. --- .../appeng/items/misc/ItemCrystalSeed.java | 3 +- .../java/appeng/recipes/AEItemResolver.java | 52 ++-- .../recipes/decorative/certus.recipe | 10 +- .../recipes/decorative/crystals.recipe | 26 +- .../recipes/decorative/fixtures.recipe | 6 +- .../recipes/decorative/quartzglass.recipe | 6 +- .../recipes/decorative/skystone.recipe | 8 +- .../recipes/decorative/slabs.recipe | 14 +- .../recipes/decorative/stairs.recipe | 58 ++-- .../appliedenergistics2/recipes/groups.recipe | 14 +- .../appliedenergistics2/recipes/index.recipe | 4 - .../recipes/materials/cards.recipe | 32 +-- .../recipes/materials/circuits.recipe | 16 +- .../recipes/materials/cores.recipe | 8 +- .../recipes/materials/presses.recipe | 16 +- .../recipes/materials/processors.recipe | 12 +- .../recipes/misc/chests.recipe | 16 +- .../recipes/misc/deconstruction.recipe | 16 +- .../recipes/misc/fluixpearl.recipe | 2 +- .../recipes/misc/grindstone.recipe | 6 +- .../recipes/misc/meteors.recipe | 4 +- .../recipes/misc/seeds.recipe | 6 +- .../recipes/misc/tinytnt.recipe | 2 +- .../recipes/misc/vanilla.recipe | 8 +- .../network/blocks/cellworkbench.recipe | 4 +- .../recipes/network/blocks/controller.recipe | 8 +- ...ssing.recipe => crystal_processing.recipe} | 6 +- .../recipes/network/blocks/energy.recipe | 24 +- .../recipes/network/blocks/index.recipe | 6 +- .../recipes/network/blocks/inscribers.recipe | 2 +- .../recipes/network/blocks/interfaces.recipe | 12 +- .../recipes/network/blocks/io.recipe | 8 +- .../recipes/network/blocks/quantum.recipe | 16 +- .../network/blocks/security_station.recipe | 8 +- .../recipes/network/blocks/spatial-io.recipe | 11 - .../recipes/network/blocks/spatial_io.recipe | 11 + .../recipes/network/blocks/storage.recipe | 10 +- .../recipes/network/cables/covered.recipe | 136 +++++----- .../recipes/network/cables/dense.recipe | 136 +++++----- .../recipes/network/cables/glass.recipe | 136 +++++----- .../recipes/network/cables/smart.recipe | 136 +++++----- .../recipes/network/cells/empty.recipe | 4 +- .../recipes/network/cells/index.recipe | 4 +- .../network/cells/spatial-components.recipe | 17 -- .../recipes/network/cells/spatial.recipe | 24 +- .../network/cells/spatial_components.recipe | 17 ++ .../network/cells/storage-components.recipe | 23 -- .../recipes/network/cells/storage.recipe | 32 +-- .../network/cells/storage_components.recipe | 23 ++ .../recipes/network/cells/view.recipe | 6 +- .../recipes/network/crafting/assembler.recipe | 8 +- .../recipes/network/crafting/cpu.recipe | 44 +-- .../recipes/network/crafting/patterns.recipe | 4 +- .../recipes/network/parts/cable-anchor.recipe | 3 - .../recipes/network/parts/cable_anchor.recipe | 3 + .../recipes/network/parts/emitters.recipe | 4 +- .../recipes/network/parts/index.recipe | 8 +- .../recipes/network/parts/io-buses.recipe | 13 - .../recipes/network/parts/io_buses.recipe | 13 + .../recipes/network/parts/monitors.recipe | 8 +- .../recipes/network/parts/panels.recipe | 20 +- .../recipes/network/parts/planes.recipe | 20 +- ...uartz-fiber.recipe => quartz_fiber.recipe} | 2 +- .../recipes/network/parts/terminals.recipe | 16 +- .../recipes/network/parts/toggle-buses.recipe | 13 - .../recipes/network/parts/toggle_buses.recipe | 13 + .../recipes/network/parts/tunnels.recipe | 4 +- .../recipes/network/wireless.recipe | 22 +- .../recipes/oredict.recipe | 22 +- .../recipes/processing/factorization.recipe | 18 +- .../recipes/processing/grind.recipe | 4 +- .../recipes/processing/hydraulicraft.recipe | 18 +- .../recipes/processing/ic2.recipe | 18 +- .../recipes/processing/mekanism.recipe | 18 +- .../recipes/processing/rotarycraft.recipe | 18 +- .../recipes/processing/te.recipe | 18 +- .../recipes/processing/vanilla.recipe | 10 +- ...tus-quartz.recipe => certus_quartz.recipe} | 14 +- .../recipes/tools/index.recipe | 6 +- .../recipes/tools/matter-cannon.recipe | 5 - .../recipes/tools/matter_cannon.recipe | 5 + .../recipes/tools/misctools.recipe | 10 +- ...her-quartz.recipe => nether_quartz.recipe} | 14 +- .../recipes/tools/network.recipe | 24 +- .../recipes/tools/paintballs.recipe | 256 +++++++++--------- 85 files changed, 929 insertions(+), 932 deletions(-) rename src/main/resources/assets/appliedenergistics2/recipes/network/blocks/{crystal-processing.recipe => crystal_processing.recipe} (70%) delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial-io.recipe create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io.recipe delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial-components.recipe create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components.recipe delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage-components.recipe create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components.recipe delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable-anchor.recipe create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable_anchor.recipe delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/parts/io-buses.recipe create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/parts/io_buses.recipe rename src/main/resources/assets/appliedenergistics2/recipes/network/parts/{quartz-fiber.recipe => quartz_fiber.recipe} (72%) delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle-buses.recipe create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_buses.recipe rename src/main/resources/assets/appliedenergistics2/recipes/tools/{certus-quartz.recipe => certus_quartz.recipe} (82%) delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/tools/matter-cannon.recipe create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/tools/matter_cannon.recipe rename src/main/resources/assets/appliedenergistics2/recipes/tools/{nether-quartz.recipe => nether_quartz.recipe} (82%) diff --git a/src/main/java/appeng/items/misc/ItemCrystalSeed.java b/src/main/java/appeng/items/misc/ItemCrystalSeed.java index f3710377..630952e5 100644 --- a/src/main/java/appeng/items/misc/ItemCrystalSeed.java +++ b/src/main/java/appeng/items/misc/ItemCrystalSeed.java @@ -74,7 +74,8 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal { crystalSeedStack.setItemDamage( certus2 ); crystalSeedStack = newStyle( crystalSeedStack ); - return new ResolverResult( "ItemCrystalSeed", crystalSeedStack.getItemDamage(), crystalSeedStack.getTagCompound() ); + String itemName = crystalSeedStack.getItem().getRegistryName().getResourcePath(); + return new ResolverResult( itemName, crystalSeedStack.getItemDamage(), crystalSeedStack.getTagCompound() ); } ) .orElse( null ); diff --git a/src/main/java/appeng/recipes/AEItemResolver.java b/src/main/java/appeng/recipes/AEItemResolver.java index 21684ecf..05f23971 100644 --- a/src/main/java/appeng/recipes/AEItemResolver.java +++ b/src/main/java/appeng/recipes/AEItemResolver.java @@ -51,67 +51,67 @@ public class AEItemResolver implements ISubItemResolver final IItems items = definitions.items(); final IParts parts = definitions.parts(); - if( itemName.startsWith( "PaintBall." ) ) + if( itemName.startsWith( "paint_ball." ) ) { return this.paintBall( items.coloredPaintBall(), itemName.substring( itemName.indexOf( '.' ) + 1 ), false ); } - if( itemName.startsWith( "LumenPaintBall." ) ) + if( itemName.startsWith( "lumen_paint_ball." ) ) { return this.paintBall( items.coloredLumenPaintBall(), itemName.substring( itemName.indexOf( '.' ) + 1 ), true ); } - if( itemName.equals( "CableGlass" ) ) + if( itemName.equals( "cable_glass" ) ) { - return new ResolverResultSet( "CableGlass", parts.cableGlass().allStacks( 1 ) ); + return new ResolverResultSet( "cable_glass", parts.cableGlass().allStacks( 1 ) ); } - if( itemName.startsWith( "CableGlass." ) ) + if( itemName.startsWith( "cable_glass." ) ) { return this.cableItem( parts.cableGlass(), itemName.substring( itemName.indexOf( '.' ) + 1 ) ); } - if( itemName.equals( "CableCovered" ) ) + if( itemName.equals( "cable_covered" ) ) { - return new ResolverResultSet( "CableCovered", parts.cableCovered().allStacks( 1 ) ); + return new ResolverResultSet( "cable_covered", parts.cableCovered().allStacks( 1 ) ); } - if( itemName.startsWith( "CableCovered." ) ) + if( itemName.startsWith( "cable_covered." ) ) { return this.cableItem( parts.cableCovered(), itemName.substring( itemName.indexOf( '.' ) + 1 ) ); } - if( itemName.equals( "CableSmart" ) ) + if( itemName.equals( "cable_smart" ) ) { - return new ResolverResultSet( "CableSmart", parts.cableSmart().allStacks( 1 ) ); + return new ResolverResultSet( "cable_smart", parts.cableSmart().allStacks( 1 ) ); } - if( itemName.startsWith( "CableSmart." ) ) + if( itemName.startsWith( "cable_smart." ) ) { return this.cableItem( parts.cableSmart(), itemName.substring( itemName.indexOf( '.' ) + 1 ) ); } - if( itemName.equals( "CableDense" ) ) + if( itemName.equals( "cable_dense" ) ) { - return new ResolverResultSet( "CableDense", parts.cableDense().allStacks( 1 ) ); + return new ResolverResultSet( "cable_dense", parts.cableDense().allStacks( 1 ) ); } - if( itemName.startsWith( "CableDense." ) ) + if( itemName.startsWith( "cable_dense." ) ) { return this.cableItem( parts.cableDense(), itemName.substring( itemName.indexOf( '.' ) + 1 ) ); } - if( itemName.startsWith( "ItemCrystalSeed." ) ) + if( itemName.startsWith( "crystal_seed." ) ) { - if( itemName.equalsIgnoreCase( "ItemCrystalSeed.Certus" ) ) + if( itemName.equalsIgnoreCase( "crystal_seed.certus" ) ) { return ItemCrystalSeed.getResolver( ItemCrystalSeed.CERTUS ); } - if( itemName.equalsIgnoreCase( "ItemCrystalSeed.Nether" ) ) + if( itemName.equalsIgnoreCase( "crystal_seed.nether" ) ) { return ItemCrystalSeed.getResolver( ItemCrystalSeed.NETHER ); } - if( itemName.equalsIgnoreCase( "ItemCrystalSeed.Fluix" ) ) + if( itemName.equalsIgnoreCase( "crystal_seed.fluix" ) ) { return ItemCrystalSeed.getResolver( ItemCrystalSeed.FLUIX ); } @@ -119,18 +119,18 @@ public class AEItemResolver implements ISubItemResolver return null; } - if( itemName.startsWith( "ItemMaterial." ) ) + if( itemName.startsWith( "material." ) ) { final String materialName = itemName.substring( itemName.indexOf( '.' ) + 1 ); final MaterialType mt = MaterialType.valueOf( materialName ); // itemName = itemName.substring( 0, itemName.indexOf( "." ) ); if( mt.getItemInstance() == ItemMaterial.instance && mt.getDamageValue() >= 0 && mt.isRegistered() ) { - return new ResolverResult( "ItemMultiMaterial", mt.getDamageValue() ); + return new ResolverResult( "material", mt.getDamageValue() ); } } - if( itemName.startsWith( "ItemPart." ) ) + if( itemName.startsWith( "part." ) ) { final String partName = itemName.substring( itemName.indexOf( '.' ) + 1 ); final PartType pt = PartType.valueOf( partName ); @@ -138,7 +138,7 @@ public class AEItemResolver implements ISubItemResolver final int dVal = ItemPart.instance.getDamageByType( pt ); if( dVal >= 0 ) { - return new ResolverResult( "ItemPart", dVal ); + return new ResolverResult( "part", dVal ); } } } @@ -152,7 +152,7 @@ public class AEItemResolver implements ISubItemResolver try { - col = AEColor.valueOf( substring ); + col = AEColor.valueOf( substring.toUpperCase() ); } catch( final Throwable t ) { @@ -165,7 +165,7 @@ public class AEItemResolver implements ISubItemResolver } final ItemStack is = partType.stack( col, 1 ); - return new ResolverResult( "ItemPaintBall", ( lumen ? 20 : 0 ) + is.getItemDamage() ); + return new ResolverResult( "paint_ball", ( lumen ? 20 : 0 ) + is.getItemDamage() ); } private Object cableItem( final AEColoredItemDefinition partType, final String substring ) @@ -174,7 +174,7 @@ public class AEItemResolver implements ISubItemResolver try { - col = AEColor.valueOf( substring ); + col = AEColor.valueOf( substring.toUpperCase() ); } catch( final Throwable t ) { @@ -182,6 +182,6 @@ public class AEItemResolver implements ISubItemResolver } final ItemStack is = partType.stack( col, 1 ); - return new ResolverResult( "ItemPart", is.getItemDamage() ); + return new ResolverResult( "part", is.getItemDamage() ); } } diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus.recipe b/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus.recipe index d6931027..f47d1152 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus.recipe @@ -1,8 +1,8 @@ shaped= - ae2:BlockQuartz, - ae2:BlockQuartz - -> 2 ae2:BlockQuartzPillar + ae2:quartz_block, + ae2:quartz_block + -> 2 ae2:quartz_pillar shaped= - ae2:BlockQuartz ae2:BlockQuartz - -> 2 ae2:BlockQuartzChiseled + ae2:quartz_block ae2:quartz_block + -> 2 ae2:chiseled_quartz_block diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/crystals.recipe b/src/main/resources/assets/appliedenergistics2/recipes/decorative/crystals.recipe index 69e3b1c8..34397bd5 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/crystals.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/crystals.recipe @@ -2,29 +2,29 @@ shaped= oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz, oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz - -> ae2:BlockQuartz + -> ae2:quartz_block shaped= oredictionary:crystalFluix oredictionary:crystalFluix, oredictionary:crystalFluix oredictionary:crystalFluix - -> ae2:BlockFluix + -> ae2:fluix_block # Pure Storage Blocks shaped= - ae2:ItemMaterial.PurifiedNetherQuartzCrystal ae2:ItemMaterial.PurifiedNetherQuartzCrystal ae2:ItemMaterial.PurifiedNetherQuartzCrystal, - ae2:ItemMaterial.PurifiedNetherQuartzCrystal _ ae2:ItemMaterial.PurifiedNetherQuartzCrystal, - ae2:ItemMaterial.PurifiedNetherQuartzCrystal ae2:ItemMaterial.PurifiedNetherQuartzCrystal ae2:ItemMaterial.PurifiedNetherQuartzCrystal + ae2:material.PurifiedNetherQuartzCrystal ae2:material.PurifiedNetherQuartzCrystal ae2:material.PurifiedNetherQuartzCrystal, + ae2:material.PurifiedNetherQuartzCrystal _ ae2:material.PurifiedNetherQuartzCrystal, + ae2:material.PurifiedNetherQuartzCrystal ae2:material.PurifiedNetherQuartzCrystal ae2:material.PurifiedNetherQuartzCrystal -> mc:quartz_block shaped= - ae2:ItemMaterial.PurifiedCertusQuartzCrystal ae2:ItemMaterial.PurifiedCertusQuartzCrystal ae2:ItemMaterial.PurifiedCertusQuartzCrystal, - ae2:ItemMaterial.PurifiedCertusQuartzCrystal _ ae2:ItemMaterial.PurifiedCertusQuartzCrystal, - ae2:ItemMaterial.PurifiedCertusQuartzCrystal ae2:ItemMaterial.PurifiedCertusQuartzCrystal ae2:ItemMaterial.PurifiedCertusQuartzCrystal - -> ae2:BlockQuartz + ae2:material.PurifiedCertusQuartzCrystal ae2:material.PurifiedCertusQuartzCrystal ae2:material.PurifiedCertusQuartzCrystal, + ae2:material.PurifiedCertusQuartzCrystal _ ae2:material.PurifiedCertusQuartzCrystal, + ae2:material.PurifiedCertusQuartzCrystal ae2:material.PurifiedCertusQuartzCrystal ae2:material.PurifiedCertusQuartzCrystal + -> ae2:quartz_block shaped= - ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.PurifiedFluixCrystal, - ae2:ItemMaterial.PurifiedFluixCrystal _ ae2:ItemMaterial.PurifiedFluixCrystal, - ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.PurifiedFluixCrystal - -> ae2:BlockFluix + ae2:material.PurifiedFluixCrystal ae2:material.PurifiedFluixCrystal ae2:material.PurifiedFluixCrystal, + ae2:material.PurifiedFluixCrystal _ ae2:material.PurifiedFluixCrystal, + ae2:material.PurifiedFluixCrystal ae2:material.PurifiedFluixCrystal ae2:material.PurifiedFluixCrystal + -> ae2:fluix_block diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/fixtures.recipe b/src/main/resources/assets/appliedenergistics2/recipes/decorative/fixtures.recipe index 8ced2119..5af69cd3 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/fixtures.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/fixtures.recipe @@ -1,7 +1,7 @@ shaped= - ae2:ItemMaterial.CertusQuartzCrystalCharged mc:iron_ingot - -> 2 ae2:BlockQuartzTorch + ae2:material.CertusQuartzCrystalCharged mc:iron_ingot + -> 2 ae2:quartz_fixture shaped= netherCrystal mc:iron_ingot - -> ae2:BlockLightDetector + -> ae2:light_detector diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartzglass.recipe b/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartzglass.recipe index 89c2230c..3c5d6657 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartzglass.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartzglass.recipe @@ -2,8 +2,8 @@ shaped= dustQuartz glass dustQuartz, glass dustQuartz glass, dustQuartz glass dustQuartz - -> 4 ae2:BlockQuartzGlass + -> 4 ae2:quartz_glass shaped= - mc:glowstone_dust ae2:BlockQuartzGlass mc:glowstone_dust - -> ae2:BlockQuartzLamp + mc:glowstone_dust ae2:quartz_glass mc:glowstone_dust + -> ae2:quartz_vibrant_glass diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/skystone.recipe b/src/main/resources/assets/appliedenergistics2/recipes/decorative/skystone.recipe index d55ee054..2f58de31 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/skystone.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/skystone.recipe @@ -1,11 +1,11 @@ smelt= - ae2:BlockSkyStone -> ae2:BlockSkyStone:1 + ae2:sky_stone_block -> ae2:smooth_sky_stone_block shapeless= - ae2:BlockSkyStone:1 -> ae2:BlockSkyStone:2 + ae2:smooth_sky_stone_block -> ae2:sky_stone_brick shapeless= - ae2:BlockSkyStone:2 -> ae2:BlockSkyStone:3 + ae2:sky_stone_brick -> ae2:sky_stone_small_brick shapeless= - ae2:BlockSkyStone:3 -> ae2:BlockSkyStone:1 + ae2:sky_stone_small_brick -> ae2:smooth_sky_stone_block diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs.recipe b/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs.recipe index 7fcdf719..42cf0ce2 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs.recipe @@ -1,5 +1,5 @@ shaped= - ae2:BlockQuartzChiseled ae2:BlockQuartzChiseled ae2:BlockQuartzChiseled + ae2:chiseled_quartz_block ae2:chiseled_quartz_block ae2:chiseled_quartz_block -> 6 ae2:ChiseledQuartzSlabBlock shaped= @@ -7,25 +7,25 @@ shaped= -> 6 ae2:FluixSlabBlock shaped= - ae2:BlockQuartzPillar ae2:BlockQuartzPillar ae2:BlockQuartzPillar + ae2:quartz_pillar ae2:quartz_pillar ae2:quartz_pillar -> 6 ae2:QuartzPillarSlabBlock shaped= - ae2:BlockQuartz ae2:BlockQuartz ae2:BlockQuartz + ae2:quartz_block ae2:quartz_block ae2:quartz_block -> 6 ae2:QuartzSlabBlock shaped= - ae2:BlockSkyStone ae2:BlockSkyStone ae2:BlockSkyStone + ae2:sky_stone_block ae2:sky_stone_block ae2:sky_stone_block -> 6 ae2:SkyStoneSlabBlock shaped= - ae2:BlockSkyStone:1 ae2:BlockSkyStone:1 ae2:BlockSkyStone:1 + ae2:smooth_sky_stone_block ae2:smooth_sky_stone_block ae2:smooth_sky_stone_block -> 6 ae2:SkyStoneBlockSlabBlock shaped= - ae2:BlockSkyStone:2 ae2:BlockSkyStone:2 ae2:BlockSkyStone:2 + ae2:sky_stone_brick ae2:sky_stone_brick ae2:sky_stone_brick -> 6 ae2:SkyStoneBrickSlabBlock shaped= - ae2:BlockSkyStone:3 ae2:BlockSkyStone:3 ae2:BlockSkyStone:3 + ae2:sky_stone_small_brick ae2:sky_stone_small_brick ae2:sky_stone_small_brick -> 6 ae2:SkyStoneSmallBrickSlabBlock diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs.recipe b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs.recipe index c376c665..02b8fe48 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs.recipe @@ -1,47 +1,47 @@ shaped= - ae2:BlockQuartzChiseled _ _, - ae2:BlockQuartzChiseled ae2:BlockQuartzChiseled _, - ae2:BlockQuartzChiseled ae2:BlockQuartzChiseled ae2:BlockQuartzChiseled - -> 4 ae2:ChiseledQuartzStairBlock + ae2:chiseled_quartz_block _ _, + ae2:chiseled_quartz_block ae2:chiseled_quartz_block _, + ae2:chiseled_quartz_block ae2:chiseled_quartz_block ae2:chiseled_quartz_block + -> 4 ae2:chiseled_quartz_stairs shaped= ae2:fluix _ _, ae2:fluix ae2:fluix _, ae2:fluix ae2:fluix ae2:fluix - -> 4 ae2:FluixStairBlock + -> 4 ae2:fluix_stairs shaped= - ae2:BlockQuartzPillar _ _, - ae2:BlockQuartzPillar ae2:BlockQuartzPillar _, - ae2:BlockQuartzPillar ae2:BlockQuartzPillar ae2:BlockQuartzPillar - -> 4 ae2:QuartzPillarStairBlock + ae2:quartz_pillar _ _, + ae2:quartz_pillar ae2:quartz_pillar _, + ae2:quartz_pillar ae2:quartz_pillar ae2:quartz_pillar + -> 4 ae2:quartz_pillar_stairs shaped= - ae2:BlockQuartz _ _, - ae2:BlockQuartz ae2:BlockQuartz _, - ae2:BlockQuartz ae2:BlockQuartz ae2:BlockQuartz - -> 4 ae2:QuartzStairBlock + ae2:quartz_block _ _, + ae2:quartz_block ae2:quartz_block _, + ae2:quartz_block ae2:quartz_block ae2:quartz_block + -> 4 ae2:quartz_stairs shaped= - ae2:BlockSkyStone _ _, - ae2:BlockSkyStone ae2:BlockSkyStone _, - ae2:BlockSkyStone ae2:BlockSkyStone ae2:BlockSkyStone - -> 4 ae2:SkyStoneStairBlock + ae2:sky_stone_block _ _, + ae2:sky_stone_block ae2:sky_stone_block _, + ae2:sky_stone_block ae2:sky_stone_block ae2:sky_stone_block + -> 4 ae2:sky_stone_stairs shaped= - ae2:BlockSkyStone:1 _ _, - ae2:BlockSkyStone:1 ae2:BlockSkyStone:1 _, - ae2:BlockSkyStone:1 ae2:BlockSkyStone:1 ae2:BlockSkyStone:1 - -> 4 ae2:SkyStoneBlockStairBlock + ae2:smooth_sky_stone_block _ _, + ae2:smooth_sky_stone_block ae2:smooth_sky_stone_block _, + ae2:smooth_sky_stone_block ae2:smooth_sky_stone_block ae2:smooth_sky_stone_block + -> 4 ae2:smooth_sky_stone_stairs shaped= - ae2:BlockSkyStone:2 _ _, - ae2:BlockSkyStone:2 ae2:BlockSkyStone:2 _, - ae2:BlockSkyStone:2 ae2:BlockSkyStone:2 ae2:BlockSkyStone:2 - -> 4 ae2:SkyStoneBrickStairBlock + ae2:sky_stone_brick _ _, + ae2:sky_stone_brick ae2:sky_stone_brick _, + ae2:sky_stone_brick ae2:sky_stone_brick ae2:sky_stone_brick + -> 4 ae2:sky_stone_brick_stairs shaped= - ae2:BlockSkyStone:3 _ _, - ae2:BlockSkyStone:3 ae2:BlockSkyStone:3 _, - ae2:BlockSkyStone:3 ae2:BlockSkyStone:3 ae2:BlockSkyStone:3 - -> 4 ae2:SkyStoneSmallBrickStairBlock + ae2:sky_stone_small_brick _ _, + ae2:sky_stone_small_brick ae2:sky_stone_small_brick _, + ae2:sky_stone_small_brick ae2:sky_stone_small_brick ae2:sky_stone_small_brick + -> 4 ae2:sky_stone_small_brick_stairs diff --git a/src/main/resources/assets/appliedenergistics2/recipes/groups.recipe b/src/main/resources/assets/appliedenergistics2/recipes/groups.recipe index 6d57d203..bff12741 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/groups.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/groups.recipe @@ -1,11 +1,11 @@ group= oredictionary:itemIlluminatedPanel -> monitor -group= ae2:BlockInterface ae2:ItemPart.Interface -> interface +group= ae2:interface ae2:part.Interface -> interface group= ae2:ToolCertusQuartzCuttingKnife:* ae2:ToolNetherQuartzCuttingKnife:* -> knife group= ae2:ToolCertusQuartzWrench ae2:ToolNetherQuartzWrench -> wrench -group= ae2:CableGlass ae2:CableCovered ae2:CableSmart -> cable -group= ae2:CableDense -> densecable +group= ae2:cable_glass ae2:cable_covered ae2:cable_smart -> cable +group= ae2:cable_dense -> densecable group= mc:iron_ingot oredictionary:ingotCopper oredictionary:ingotTin oredictionary:ingotSilver oredictionary:ingotLead oredictionary:ingotBronze oredictionary:ingotBrass oredictionary:ingotNickel oredictionary:ingotInvar oredictionary:ingotAluminium -> metalIngots group= oredictionary:dustEnder oredictionary:dustEnderPearl -> dustEnder @@ -13,9 +13,9 @@ group= oredictionary:dustEnder oredictionary:dustEnderPearl -> dustEnder group=oredictionary:blockGlass oredictionary:glass mc:glass -> glass group=oredictionary:wool mc:wool:* -> wool -group=oredictionary:crystalCertusQuartz oredictionary:crystalNetherQuartz ae2:ItemMaterial.CertusQuartzCrystalCharged -> crystalQuartz +group=oredictionary:crystalCertusQuartz oredictionary:crystalNetherQuartz ae2:material.CertusQuartzCrystalCharged -> crystalQuartz group=oredictionary:dustCertusQuartz oredictionary:dustNetherQuartz -> dustQuartz -group=oredictionary:crystalCertusQuartz ae2:ItemMaterial.CertusQuartzCrystalCharged ae2:ItemMaterial.PurifiedCertusQuartzCrystal -> certusCrystal -group=oredictionary:crystalNetherQuartz ae2:ItemMaterial.PurifiedNetherQuartzCrystal -> netherCrystal -group=oredictionary:crystalFluix ae2:ItemMaterial.PurifiedFluixCrystal -> fluixCrystal \ No newline at end of file +group=oredictionary:crystalCertusQuartz ae2:material.CertusQuartzCrystalCharged ae2:material.PurifiedCertusQuartzCrystal -> certusCrystal +group=oredictionary:crystalNetherQuartz ae2:material.PurifiedNetherQuartzCrystal -> netherCrystal +group=oredictionary:crystalFluix ae2:material.PurifiedFluixCrystal -> fluixCrystal \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/index.recipe index 253dbcb0..5c143d90 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/index.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/index.recipe @@ -7,10 +7,6 @@ exceptions=false # Error on Missing Items ( default is no because AE2 allows you to enable/disable items without modifying recipes. ) erroronmissing=true -ore= ae2:ItemPart.SemiDarkMonitor -> itemIlluminatedPanel -ore= ae2:ItemPart.Monitor -> itemIlluminatedPanel -ore= ae2:ItemPart.DarkMonitor -> itemIlluminatedPanel - # Important, keep in this order import=aliases.recipe import=oredict.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cards.recipe b/src/main/resources/assets/appliedenergistics2/recipes/materials/cards.recipe index f033556d..4c89e474 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cards.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cards.recipe @@ -1,35 +1,35 @@ shaped= oredictionary:ingotGold oredictionary:ingotIron _, - oredictionary:dustRedstone ae2:ItemMaterial.CalcProcessor oredictionary:ingotIron, + oredictionary:dustRedstone ae2:material.CalcProcessor oredictionary:ingotIron, oredictionary:ingotGold oredictionary:ingotIron _ - -> 2 ae2:ItemMaterial.BasicCard + -> 2 ae2:material.BasicCard shaped= oredictionary:gemDiamond oredictionary:ingotIron _, - oredictionary:dustRedstone ae2:ItemMaterial.CalcProcessor oredictionary:ingotIron, + oredictionary:dustRedstone ae2:material.CalcProcessor oredictionary:ingotIron, oredictionary:gemDiamond oredictionary:ingotIron _ - -> 2 ae2:ItemMaterial.AdvCard + -> 2 ae2:material.AdvCard shapeless= - ae2:ItemMaterial.BasicCard certusCrystal - -> ae2:ItemMaterial.CardCapacity + ae2:material.BasicCard certusCrystal + -> ae2:material.CardCapacity shapeless= - ae2:ItemMaterial.BasicCard mc:redstone_torch - -> ae2:ItemMaterial.CardRedstone + ae2:material.BasicCard mc:redstone_torch + -> ae2:material.CardRedstone shapeless= - ae2:ItemMaterial.AdvCard wool - -> ae2:ItemMaterial.CardFuzzy + ae2:material.AdvCard wool + -> ae2:material.CardFuzzy shapeless= - ae2:ItemMaterial.AdvCard mc:redstone_torch - -> ae2:ItemMaterial.CardInverter + ae2:material.AdvCard mc:redstone_torch + -> ae2:material.CardInverter shapeless= - ae2:ItemMaterial.AdvCard fluixCrystal - -> ae2:ItemMaterial.CardSpeed + ae2:material.AdvCard fluixCrystal + -> ae2:material.CardSpeed shapeless= - ae2:ItemMaterial.BasicCard oredictionary:craftingTableWood - -> ae2:ItemMaterial.CardCrafting + ae2:material.BasicCard oredictionary:craftingTableWood + -> ae2:material.CardCrafting diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/circuits.recipe b/src/main/resources/assets/appliedenergistics2/recipes/materials/circuits.recipe index 1132d973..f79318cd 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/circuits.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/circuits.recipe @@ -1,15 +1,15 @@ inscribe= - oredictionary:ingotGold ae2:ItemMaterial.LogicProcessorPress - -> ae2:ItemMaterial.LogicProcessorPrint + oredictionary:ingotGold ae2:material.LogicProcessorPress + -> ae2:material.LogicProcessorPrint inscribe= - ae2:ItemMaterial.PurifiedCertusQuartzCrystal ae2:ItemMaterial.CalcProcessorPress - -> ae2:ItemMaterial.CalcProcessorPrint + ae2:material.PurifiedCertusQuartzCrystal ae2:material.CalcProcessorPress + -> ae2:material.CalcProcessorPrint inscribe= - oredictionary:gemDiamond ae2:ItemMaterial.EngProcessorPress - -> ae2:ItemMaterial.EngProcessorPrint + oredictionary:gemDiamond ae2:material.EngProcessorPress + -> ae2:material.EngProcessorPrint inscribe= - oredictionary:itemSilicon ae2:ItemMaterial.SiliconPress - -> ae2:ItemMaterial.SiliconPrint + oredictionary:itemSilicon ae2:material.SiliconPress + -> ae2:material.SiliconPrint diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cores.recipe b/src/main/resources/assets/appliedenergistics2/recipes/materials/cores.recipe index 389f97d2..a1db44dc 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cores.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cores.recipe @@ -1,7 +1,7 @@ shaped= - netherCrystal oreDictionary:dustFluix ae2:ItemMaterial.LogicProcessor - -> 2 ae2:ItemMaterial.AnnihilationCore + netherCrystal oreDictionary:dustFluix ae2:material.LogicProcessor + -> 2 ae2:material.AnnihilationCore shaped= - certusCrystal oreDictionary:dustFluix ae2:ItemMaterial.LogicProcessor - -> 2 ae2:ItemMaterial.FormationCore + certusCrystal oreDictionary:dustFluix ae2:material.LogicProcessor + -> 2 ae2:material.FormationCore diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/presses.recipe b/src/main/resources/assets/appliedenergistics2/recipes/materials/presses.recipe index 52d99148..68a8a302 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/presses.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/presses.recipe @@ -1,15 +1,15 @@ inscribe= - oredictionary:blockIron ae2:ItemMaterial.LogicProcessorPress - -> ae2:ItemMaterial.LogicProcessorPress + oredictionary:blockIron ae2:material.LogicProcessorPress + -> ae2:material.LogicProcessorPress inscribe= - oredictionary:blockIron ae2:ItemMaterial.CalcProcessorPress - -> ae2:ItemMaterial.CalcProcessorPress + oredictionary:blockIron ae2:material.CalcProcessorPress + -> ae2:material.CalcProcessorPress inscribe= - oredictionary:blockIron ae2:ItemMaterial.EngProcessorPress - -> ae2:ItemMaterial.EngProcessorPress + oredictionary:blockIron ae2:material.EngProcessorPress + -> ae2:material.EngProcessorPress inscribe= - oredictionary:blockIron ae2:ItemMaterial.SiliconPress - -> ae2:ItemMaterial.SiliconPress + oredictionary:blockIron ae2:material.SiliconPress + -> ae2:material.SiliconPress diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/processors.recipe b/src/main/resources/assets/appliedenergistics2/recipes/materials/processors.recipe index f9550e4a..74cb2d2f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/processors.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/processors.recipe @@ -1,11 +1,11 @@ press= - oredictionary:dustRedstone ae2:ItemMaterial.LogicProcessorPrint ae2:ItemMaterial.SiliconPrint - -> ae2:ItemMaterial.LogicProcessor + oredictionary:dustRedstone ae2:material.LogicProcessorPrint ae2:material.SiliconPrint + -> ae2:material.LogicProcessor press= - oredictionary:dustRedstone ae2:ItemMaterial.CalcProcessorPrint ae2:ItemMaterial.SiliconPrint - -> ae2:ItemMaterial.CalcProcessor + oredictionary:dustRedstone ae2:material.CalcProcessorPrint ae2:material.SiliconPrint + -> ae2:material.CalcProcessor press= - oredictionary:dustRedstone ae2:ItemMaterial.EngProcessorPrint ae2:ItemMaterial.SiliconPrint - -> ae2:ItemMaterial.EngProcessor + oredictionary:dustRedstone ae2:material.EngProcessorPrint ae2:material.SiliconPrint + -> ae2:material.EngProcessor diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/chests.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/chests.recipe index 4ef1abbf..b63ae729 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/chests.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/chests.recipe @@ -1,11 +1,11 @@ shaped= - ae2:BlockSkyStone ae2:BlockSkyStone ae2:BlockSkyStone, - ae2:BlockSkyStone _ ae2:BlockSkyStone, - ae2:BlockSkyStone ae2:BlockSkyStone ae2:BlockSkyStone - -> ae2:BlockSkyChest + ae2:sky_stone_block ae2:sky_stone_block ae2:sky_stone_block, + ae2:sky_stone_block _ ae2:sky_stone_block, + ae2:sky_stone_block ae2:sky_stone_block ae2:sky_stone_block + -> ae2:sky_stone_chest shaped= - ae2:BlockSkyStone:1 ae2:BlockSkyStone:1 ae2:BlockSkyStone:1, - ae2:BlockSkyStone:1 _ ae2:BlockSkyStone:1, - ae2:BlockSkyStone:1 ae2:BlockSkyStone:1 ae2:BlockSkyStone:1 - -> ae2:BlockSkyChest:1 + ae2:smooth_sky_stone_block ae2:smooth_sky_stone_block ae2:smooth_sky_stone_block, + ae2:smooth_sky_stone_block _ ae2:smooth_sky_stone_block, + ae2:smooth_sky_stone_block ae2:smooth_sky_stone_block ae2:smooth_sky_stone_block + -> ae2:smooth_sky_stone_chest diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction.recipe index 024ce79b..2520e275 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction.recipe @@ -1,15 +1,15 @@ shapeless= - ae2:BlockQuartz - -> 4 ae2:ItemMaterial.CertusQuartzCrystal + ae2:quartz_block + -> 4 ae2:material.CertusQuartzCrystal shapeless= - ae2:BlockQuartzPillar - -> 4 ae2:ItemMaterial.CertusQuartzCrystal + ae2:quartz_pillar + -> 4 ae2:material.CertusQuartzCrystal shapeless= - ae2:BlockQuartzChiseled - -> 4 ae2:ItemMaterial.CertusQuartzCrystal + ae2:chiseled_quartz_block + -> 4 ae2:material.CertusQuartzCrystal shapeless= - ae2:BlockFluix - -> 4 ae2:ItemMaterial.FluixCrystal + ae2:fluix_block + -> 4 ae2:material.FluixCrystal diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.recipe index da2d97c4..c0de2205 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.recipe @@ -2,4 +2,4 @@ shaped= oredictionary:dustFluix fluixCrystal oredictionary:dustFluix, fluixCrystal mc:ender_pearl fluixCrystal, oredictionary:dustFluix fluixCrystal oredictionary:dustFluix - -> ae2:ItemMaterial.FluixPearl + -> ae2:material.FluixPearl diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone.recipe index 61ffae64..bbd395db 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone.recipe @@ -2,16 +2,16 @@ shaped= _ oredictionary:stickWood _, oredictionary:stickWood _ oredictionary:stickWood, _ oredictionary:stickWood _ - -> ae2:ItemMaterial.WoodenGear + -> ae2:material.WoodenGear shaped= oredictionary:stickWood oredictionary:stickWood oredictionary:stickWood, _ _ oredictionary:stickWood, _ _ oredictionary:stickWood - -> ae2:BlockCrank + -> ae2:crank shaped= oredictionary:stone oredictionary:gearWood oredictionary:stone, crystalQuartz oredictionary:stone crystalQuartz, oredictionary:cobblestone crystalQuartz oredictionary:cobblestone - -> ae2:BlockGrinder + -> ae2:grindstone diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/meteors.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/meteors.recipe index d5232592..46ce7ee2 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/meteors.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/meteors.recipe @@ -1,5 +1,5 @@ shaped= _ oredictionary:ingotIron _, - oredictionary:ingotIron ae2:ItemMaterial.CertusQuartzCrystalCharged oredictionary:ingotIron, + oredictionary:ingotIron ae2:material.CertusQuartzCrystalCharged oredictionary:ingotIron, _ oredictionary:ingotIron _ - -> ae2:BlockSkyCompass + -> ae2:sky_compass diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds.recipe index b92ef455..90da7bc1 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds.recipe @@ -1,3 +1,3 @@ -shapeless= oredictionary:sand oredictionary:dustNetherQuartz -> 2 ae2:ItemCrystalSeed.Nether -shapeless= oredictionary:sand oredictionary:dustCertusQuartz -> 2 ae2:ItemCrystalSeed.Certus -shapeless= oredictionary:sand oredictionary:dustFluix -> 2 ae2:ItemCrystalSeed.Fluix +shapeless= oredictionary:sand oredictionary:dustNetherQuartz -> 2 ae2:crystal_seed.nether +shapeless= oredictionary:sand oredictionary:dustCertusQuartz -> 2 ae2:crystal_seed.certus +shapeless= oredictionary:sand oredictionary:dustFluix -> 2 ae2:crystal_seed.fluix diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/tinytnt.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/tinytnt.recipe index 3b2fd9f2..99910a68 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/tinytnt.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/tinytnt.recipe @@ -1,4 +1,4 @@ shaped= dustQuartz mc:gunpowder, mc:gunpowder dustQuartz - -> ae2:BlockTinyTNT + -> ae2:tiny_tnt diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla.recipe index 713540dc..d1182058 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla.recipe @@ -11,11 +11,11 @@ shaped= -> mc:comparator shaped= - ae2:ItemMaterial.IronNugget ae2:ItemMaterial.IronNugget ae2:ItemMaterial.IronNugget, - ae2:ItemMaterial.IronNugget ae2:ItemMaterial.IronNugget ae2:ItemMaterial.IronNugget, - ae2:ItemMaterial.IronNugget ae2:ItemMaterial.IronNugget ae2:ItemMaterial.IronNugget + ae2:material.IronNugget ae2:material.IronNugget ae2:material.IronNugget, + ae2:material.IronNugget ae2:material.IronNugget ae2:material.IronNugget, + ae2:material.IronNugget ae2:material.IronNugget ae2:material.IronNugget -> mc:iron_ingot shapeless= oredictionary:ingotIron - -> 9 ae2:ItemMaterial.IronNugget + -> 9 ae2:material.IronNugget diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/cellworkbench.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/cellworkbench.recipe index 9dbb0dfe..68be753e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/cellworkbench.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/cellworkbench.recipe @@ -1,5 +1,5 @@ shaped= - wool ae2:ItemMaterial.CalcProcessor wool, + wool ae2:material.CalcProcessor wool, oredictionary:ingotIron oredictionary:chestWood oredictionary:ingotIron, oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron - -> ae2:BlockCellWorkbench + -> ae2:cell_workbench diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/controller.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/controller.recipe index 2956d24f..7d6fb5c4 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/controller.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/controller.recipe @@ -1,5 +1,5 @@ shaped= - ae2:BlockSkyStone:1 ae2:ItemMaterial.PurifiedFluixCrystal ae2:BlockSkyStone:1, - ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.EngProcessor ae2:ItemMaterial.PurifiedFluixCrystal, - ae2:BlockSkyStone:1 ae2:ItemMaterial.PurifiedFluixCrystal ae2:BlockSkyStone:1 - -> ae2:BlockController + ae2:smooth_sky_stone_block ae2:material.PurifiedFluixCrystal ae2:smooth_sky_stone_block, + ae2:material.PurifiedFluixCrystal ae2:material.EngProcessor ae2:material.PurifiedFluixCrystal, + ae2:smooth_sky_stone_block ae2:material.PurifiedFluixCrystal ae2:smooth_sky_stone_block + -> ae2:controller diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal-processing.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal_processing.recipe similarity index 70% rename from src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal-processing.recipe rename to src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal_processing.recipe index 81b4fbd0..9b978732 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal-processing.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal_processing.recipe @@ -1,11 +1,11 @@ shaped= oredictionary:ingotIron cable oredictionary:ingotIron, - ae2:BlockQuartzGlass ae2:BlockFluix ae2:BlockQuartzGlass, + ae2:quartz_glass ae2:fluix_block ae2:quartz_glass, oredictionary:ingotIron cable oredictionary:ingotIron - -> ae2:BlockQuartzGrowthAccelerator + -> ae2:quartz_growth_accelerator shaped= oredictionary:ingotIron fluixCrystal oredictionary:ingotIron, oredictionary:ingotIron _ _, oredictionary:ingotIron fluixCrystal oredictionary:ingotIron - -> ae2:BlockCharger + -> ae2:charger diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy.recipe index 648d962a..edf7d662 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy.recipe @@ -1,23 +1,23 @@ shaped= oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron, oredictionary:ingotIron mc:furnace oredictionary:ingotIron, - oredictionary:ingotIron ae2:BlockEnergyAcceptor oredictionary:ingotIron - -> ae2:BlockVibrationChamber + oredictionary:ingotIron ae2:energy_acceptor oredictionary:ingotIron + -> ae2:vibration_chamber shaped= - oredictionary:ingotIron ae2:BlockQuartzGlass oredictionary:ingotIron, - ae2:BlockQuartzGlass fluixCrystal ae2:BlockQuartzGlass, - oredictionary:ingotIron ae2:BlockQuartzGlass oredictionary:ingotIron - -> ae2:BlockEnergyAcceptor + oredictionary:ingotIron ae2:quartz_glass oredictionary:ingotIron, + ae2:quartz_glass fluixCrystal ae2:quartz_glass, + oredictionary:ingotIron ae2:quartz_glass oredictionary:ingotIron + -> ae2:energy_acceptor shaped= certusCrystal oredictionary:dustFluix certusCrystal, - oredictionary:dustFluix ae2:BlockQuartzGlass oredictionary:dustFluix, + oredictionary:dustFluix ae2:quartz_glass oredictionary:dustFluix, certusCrystal oredictionary:dustFluix certusCrystal - -> ae2:BlockEnergyCell + -> ae2:energy_cell shaped= - ae2:BlockEnergyCell ae2:BlockEnergyCell ae2:BlockEnergyCell, - ae2:BlockEnergyCell ae2:ItemMaterial.CalcProcessor ae2:BlockEnergyCell, - ae2:BlockEnergyCell ae2:BlockEnergyCell ae2:BlockEnergyCell - -> ae2:BlockDenseEnergyCell + ae2:energy_cell ae2:energy_cell ae2:energy_cell, + ae2:energy_cell ae2:material.CalcProcessor ae2:energy_cell, + ae2:energy_cell ae2:energy_cell ae2:energy_cell + -> ae2:dense_energy_cell diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/index.recipe index 6174d501..290368db 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/index.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/index.recipe @@ -1,11 +1,11 @@ import=network/blocks/cellworkbench.recipe import=network/blocks/controller.recipe -import=network/blocks/crystal-processing.recipe +import=network/blocks/crystal_processing.recipe import=network/blocks/energy.recipe import=network/blocks/inscribers.recipe import=network/blocks/interfaces.recipe import=network/blocks/io.recipe import=network/blocks/quantum.recipe -import=network/blocks/security.recipe -import=network/blocks/spatial-io.recipe +import=network/blocks/security_station.recipe +import=network/blocks/spatial_io.recipe import=network/blocks/storage.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.recipe index 1243b6e1..d84b56ee 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.recipe @@ -2,4 +2,4 @@ shaped= oredictionary:ingotIron mc:sticky_piston oredictionary:ingotIron, fluixCrystal _ oredictionary:ingotIron, oredictionary:ingotIron mc:sticky_piston oredictionary:ingotIron - -> ae2:BlockInscriber + -> ae2:inscriber diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces.recipe index e132cda5..e4187f4a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces.recipe @@ -1,13 +1,13 @@ shapeless= - ae2:ItemPart.Interface - -> ae2:BlockInterface + ae2:part.Interface + -> ae2:interface shapeless= - ae2:BlockInterface - -> ae2:ItemPart.Interface + ae2:interface + -> ae2:part.Interface shaped= oredictionary:ingotIron glass oredictionary:ingotIron, - ae2:ItemMaterial.AnnihilationCore _ ae2:ItemMaterial.FormationCore, + ae2:material.AnnihilationCore _ ae2:material.FormationCore, oredictionary:ingotIron glass oredictionary:ingotIron - -> ae2:BlockInterface + -> ae2:interface diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io.recipe index ae1eae4c..cd787c42 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io.recipe @@ -2,10 +2,10 @@ shaped= oredictionary:ingotIron glass oredictionary:ingotIron, glass oredictionary:dustFluix glass, oredictionary:ingotIron glass oredictionary:ingotIron - -> ae2:BlockCondenser + -> ae2:condenser shaped= glass glass glass, - ae2:BlockDrive cable ae2:BlockDrive, - oredictionary:ingotIron ae2:ItemMaterial.LogicProcessor oredictionary:ingotIron - -> ae2:BlockIOPort + ae2:drive cable ae2:drive, + oredictionary:ingotIron ae2:material.LogicProcessor oredictionary:ingotIron + -> ae2:io_port diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum.recipe index 9c9fb95b..e26c1547 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum.recipe @@ -1,13 +1,13 @@ # Quantum Link Chamber shaped= - ae2:BlockQuartzGlass ae2:ItemMaterial.FluixPearl ae2:BlockQuartzGlass, - ae2:ItemMaterial.FluixPearl _ ae2:ItemMaterial.FluixPearl, - ae2:BlockQuartzGlass ae2:ItemMaterial.FluixPearl ae2:BlockQuartzGlass, - -> ae2:BlockQuantumLinkChamber + ae2:quartz_glass ae2:material.FluixPearl ae2:quartz_glass, + ae2:material.FluixPearl _ ae2:material.FluixPearl, + ae2:quartz_glass ae2:material.FluixPearl ae2:quartz_glass, + -> ae2:quantum_link # Quantum Ring shaped= - oredictionary:ingotIron ae2:ItemMaterial.LogicProcessor oredictionary:ingotIron, - ae2:ItemMaterial.EngProcessor ae2:BlockEnergyCell densecable, - oredictionary:ingotIron ae2:ItemMaterial.LogicProcessor oredictionary:ingotIron, - -> ae2:BlockQuantumRing + oredictionary:ingotIron ae2:material.LogicProcessor oredictionary:ingotIron, + ae2:material.EngProcessor ae2:energy_cell densecable, + oredictionary:ingotIron ae2:material.LogicProcessor oredictionary:ingotIron, + -> ae2:quantum_ring diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security_station.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security_station.recipe index 6b600293..6623dfa9 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security_station.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security_station.recipe @@ -1,5 +1,5 @@ shaped= - oredictionary:ingotIron ae2:BlockChest oredictionary:ingotIron, - cable ae2:ItemMaterial.Cell16kPart cable, - oredictionary:ingotIron ae2:ItemMaterial.EngProcessor oredictionary:ingotIron - -> ae2:BlockSecurity + oredictionary:ingotIron ae2:chest oredictionary:ingotIron, + cable ae2:material.Cell16kPart cable, + oredictionary:ingotIron ae2:material.EngProcessor oredictionary:ingotIron + -> ae2:security_station diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial-io.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial-io.recipe deleted file mode 100644 index 4722dd36..00000000 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial-io.recipe +++ /dev/null @@ -1,11 +0,0 @@ -shaped= - glass glass glass, - cable ae2:BlockIOPort cable, - oredictionary:ingotIron ae2:ItemMaterial.EngProcessor oredictionary:ingotIron - -> ae2:BlockSpatialIOPort - -shaped= - ae2:BlockQuartzGlass cable ae2:BlockQuartzGlass, - oredictionary:dustFluix fluixCrystal oredictionary:dustFluix, - ae2:BlockQuartzGlass cable ae2:BlockQuartzGlass - -> ae2:BlockSpatialPylon diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io.recipe new file mode 100644 index 00000000..2816302b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial_io.recipe @@ -0,0 +1,11 @@ +shaped= + glass glass glass, + cable ae2:io_port cable, + oredictionary:ingotIron ae2:material.EngProcessor oredictionary:ingotIron + -> ae2:spatial_io_port + +shaped= + ae2:quartz_glass cable ae2:quartz_glass, + oredictionary:dustFluix fluixCrystal oredictionary:dustFluix, + ae2:quartz_glass cable ae2:quartz_glass + -> ae2:spatial_pylon diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage.recipe index 7399583e..cc6faa17 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage.recipe @@ -1,11 +1,11 @@ shaped= - glass ae2:ItemPart.Terminal glass, + glass ae2:part.Terminal glass, cable _ cable, oredictionary:ingotIron fluixCrystal oredictionary:ingotIron, - -> ae2:BlockChest + -> ae2:chest shaped= - oredictionary:ingotIron ae2:ItemMaterial.EngProcessor oredictionary:ingotIron, + oredictionary:ingotIron ae2:material.EngProcessor oredictionary:ingotIron, cable _ cable, - oredictionary:ingotIron ae2:ItemMaterial.EngProcessor oredictionary:ingotIron - -> ae2:BlockDrive + oredictionary:ingotIron ae2:material.EngProcessor oredictionary:ingotIron + -> ae2:drive diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered.recipe index 1e1b5bbc..5b8c1696 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered.recipe @@ -1,104 +1,104 @@ shapeless= - ae2:CableGlass + ae2:cable_glass wool - -> ae2:CableCovered.Fluix + -> ae2:cable_covered.fluix shapeless= - ae2:CableCovered mc:water_bucket - -> ae2:CableCovered.Fluix + ae2:cable_covered mc:water_bucket + -> ae2:cable_covered.fluix shaped= - ae2:CableCovered ae2:CableCovered ae2:CableCovered, - ae2:CableCovered oredictionary:dyeWhite ae2:CableCovered, - ae2:CableCovered ae2:CableCovered ae2:CableCovered - -> 8 ae2:CableCovered.White + ae2:cable_covered ae2:cable_covered ae2:cable_covered, + ae2:cable_covered oredictionary:dyeWhite ae2:cable_covered, + ae2:cable_covered ae2:cable_covered ae2:cable_covered + -> 8 ae2:cable_covered.white shaped= - ae2:CableCovered ae2:CableCovered ae2:CableCovered, - ae2:CableCovered oredictionary:dyeBlack ae2:CableCovered, - ae2:CableCovered ae2:CableCovered ae2:CableCovered - -> 8 ae2:CableCovered.Black + ae2:cable_covered ae2:cable_covered ae2:cable_covered, + ae2:cable_covered oredictionary:dyeBlack ae2:cable_covered, + ae2:cable_covered ae2:cable_covered ae2:cable_covered + -> 8 ae2:cable_covered.black shaped= - ae2:CableCovered ae2:CableCovered ae2:CableCovered, - ae2:CableCovered oredictionary:dyeRed ae2:CableCovered, - ae2:CableCovered ae2:CableCovered ae2:CableCovered - -> 8 ae2:CableCovered.Red + ae2:cable_covered ae2:cable_covered ae2:cable_covered, + ae2:cable_covered oredictionary:dyeRed ae2:cable_covered, + ae2:cable_covered ae2:cable_covered ae2:cable_covered + -> 8 ae2:cable_covered.red shaped= - ae2:CableCovered ae2:CableCovered ae2:CableCovered, - ae2:CableCovered oredictionary:dyeGreen ae2:CableCovered, - ae2:CableCovered ae2:CableCovered ae2:CableCovered - -> 8 ae2:CableCovered.Green + ae2:cable_covered ae2:cable_covered ae2:cable_covered, + ae2:cable_covered oredictionary:dyeGreen ae2:cable_covered, + ae2:cable_covered ae2:cable_covered ae2:cable_covered + -> 8 ae2:cable_covered.green shaped= - ae2:CableCovered ae2:CableCovered ae2:CableCovered, - ae2:CableCovered oredictionary:dyeBrown ae2:CableCovered, - ae2:CableCovered ae2:CableCovered ae2:CableCovered - -> 8 ae2:CableCovered.Brown + ae2:cable_covered ae2:cable_covered ae2:cable_covered, + ae2:cable_covered oredictionary:dyeBrown ae2:cable_covered, + ae2:cable_covered ae2:cable_covered ae2:cable_covered + -> 8 ae2:cable_covered.brown shaped= - ae2:CableCovered ae2:CableCovered ae2:CableCovered, - ae2:CableCovered oredictionary:dyeBlue ae2:CableCovered, - ae2:CableCovered ae2:CableCovered ae2:CableCovered - -> 8 ae2:CableCovered.Blue + ae2:cable_covered ae2:cable_covered ae2:cable_covered, + ae2:cable_covered oredictionary:dyeBlue ae2:cable_covered, + ae2:cable_covered ae2:cable_covered ae2:cable_covered + -> 8 ae2:cable_covered.blue shaped= - ae2:CableCovered ae2:CableCovered ae2:CableCovered, - ae2:CableCovered oredictionary:dyePurple ae2:CableCovered, - ae2:CableCovered ae2:CableCovered ae2:CableCovered - -> 8 ae2:CableCovered.Purple + ae2:cable_covered ae2:cable_covered ae2:cable_covered, + ae2:cable_covered oredictionary:dyePurple ae2:cable_covered, + ae2:cable_covered ae2:cable_covered ae2:cable_covered + -> 8 ae2:cable_covered.purple shaped= - ae2:CableCovered ae2:CableCovered ae2:CableCovered, - ae2:CableCovered oredictionary:dyeCyan ae2:CableCovered, - ae2:CableCovered ae2:CableCovered ae2:CableCovered - -> 8 ae2:CableCovered.Cyan + ae2:cable_covered ae2:cable_covered ae2:cable_covered, + ae2:cable_covered oredictionary:dyeCyan ae2:cable_covered, + ae2:cable_covered ae2:cable_covered ae2:cable_covered + -> 8 ae2:cable_covered.cyan shaped= - ae2:CableCovered ae2:CableCovered ae2:CableCovered, - ae2:CableCovered oredictionary:dyeLightGray ae2:CableCovered, - ae2:CableCovered ae2:CableCovered ae2:CableCovered - -> 8 ae2:CableCovered.LightGray + ae2:cable_covered ae2:cable_covered ae2:cable_covered, + ae2:cable_covered oredictionary:dyeLightGray ae2:cable_covered, + ae2:cable_covered ae2:cable_covered ae2:cable_covered + -> 8 ae2:cable_covered.light_gray shaped= - ae2:CableCovered ae2:CableCovered ae2:CableCovered, - ae2:CableCovered oredictionary:dyeGray ae2:CableCovered, - ae2:CableCovered ae2:CableCovered ae2:CableCovered - -> 8 ae2:CableCovered.Gray + ae2:cable_covered ae2:cable_covered ae2:cable_covered, + ae2:cable_covered oredictionary:dyeGray ae2:cable_covered, + ae2:cable_covered ae2:cable_covered ae2:cable_covered + -> 8 ae2:cable_covered.gray shaped= - ae2:CableCovered ae2:CableCovered ae2:CableCovered, - ae2:CableCovered oredictionary:dyePink ae2:CableCovered, - ae2:CableCovered ae2:CableCovered ae2:CableCovered - -> 8 ae2:CableCovered.Pink + ae2:cable_covered ae2:cable_covered ae2:cable_covered, + ae2:cable_covered oredictionary:dyePink ae2:cable_covered, + ae2:cable_covered ae2:cable_covered ae2:cable_covered + -> 8 ae2:cable_covered.pink shaped= - ae2:CableCovered ae2:CableCovered ae2:CableCovered, - ae2:CableCovered oredictionary:dyeLime ae2:CableCovered, - ae2:CableCovered ae2:CableCovered ae2:CableCovered - -> 8 ae2:CableCovered.Lime + ae2:cable_covered ae2:cable_covered ae2:cable_covered, + ae2:cable_covered oredictionary:dyeLime ae2:cable_covered, + ae2:cable_covered ae2:cable_covered ae2:cable_covered + -> 8 ae2:cable_covered.lime shaped= - ae2:CableCovered ae2:CableCovered ae2:CableCovered, - ae2:CableCovered oredictionary:dyeYellow ae2:CableCovered, - ae2:CableCovered ae2:CableCovered ae2:CableCovered - -> 8 ae2:CableCovered.Yellow + ae2:cable_covered ae2:cable_covered ae2:cable_covered, + ae2:cable_covered oredictionary:dyeYellow ae2:cable_covered, + ae2:cable_covered ae2:cable_covered ae2:cable_covered + -> 8 ae2:cable_covered.yellow shaped= - ae2:CableCovered ae2:CableCovered ae2:CableCovered, - ae2:CableCovered oredictionary:dyeLightBlue ae2:CableCovered, - ae2:CableCovered ae2:CableCovered ae2:CableCovered - -> 8 ae2:CableCovered.LightBlue + ae2:cable_covered ae2:cable_covered ae2:cable_covered, + ae2:cable_covered oredictionary:dyeLightBlue ae2:cable_covered, + ae2:cable_covered ae2:cable_covered ae2:cable_covered + -> 8 ae2:cable_covered.light_blue shaped= - ae2:CableCovered ae2:CableCovered ae2:CableCovered, - ae2:CableCovered oredictionary:dyeMagenta ae2:CableCovered, - ae2:CableCovered ae2:CableCovered ae2:CableCovered - -> 8 ae2:CableCovered.Magenta + ae2:cable_covered ae2:cable_covered ae2:cable_covered, + ae2:cable_covered oredictionary:dyeMagenta ae2:cable_covered, + ae2:cable_covered ae2:cable_covered ae2:cable_covered + -> 8 ae2:cable_covered.magenta shaped= - ae2:CableCovered ae2:CableCovered ae2:CableCovered, - ae2:CableCovered oredictionary:dyeOrange ae2:CableCovered, - ae2:CableCovered ae2:CableCovered ae2:CableCovered - -> 8 ae2:CableCovered.Orange + ae2:cable_covered ae2:cable_covered ae2:cable_covered, + ae2:cable_covered oredictionary:dyeOrange ae2:cable_covered, + ae2:cable_covered ae2:cable_covered ae2:cable_covered + -> 8 ae2:cable_covered.orange diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense.recipe index 147799a2..2f603434 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense.recipe @@ -1,104 +1,104 @@ shapeless= - ae2:CableCovered ae2:CableCovered ae2:CableCovered ae2:CableCovered + ae2:cable_covered ae2:cable_covered ae2:cable_covered ae2:cable_covered oredictionary:dustRedstone oredictionary:dustGlowstone - -> ae2:CableDense.Fluix + -> ae2:cable_dense.fluix shapeless= - ae2:CableDense mc:water_bucket - -> ae2:CableDense.Fluix + ae2:cable_dense mc:water_bucket + -> ae2:cable_dense.fluix shaped= - ae2:CableDense ae2:CableDense ae2:CableDense, - ae2:CableDense oredictionary:dyeWhite ae2:CableDense, - ae2:CableDense ae2:CableDense ae2:CableDense - -> 8 ae2:CableDense.White + ae2:cable_dense ae2:cable_dense ae2:cable_dense, + ae2:cable_dense oredictionary:dyeWhite ae2:cable_dense, + ae2:cable_dense ae2:cable_dense ae2:cable_dense + -> 8 ae2:cable_dense.white shaped= - ae2:CableDense ae2:CableDense ae2:CableDense, - ae2:CableDense oredictionary:dyeBlack ae2:CableDense, - ae2:CableDense ae2:CableDense ae2:CableDense - -> 8 ae2:CableDense.Black + ae2:cable_dense ae2:cable_dense ae2:cable_dense, + ae2:cable_dense oredictionary:dyeBlack ae2:cable_dense, + ae2:cable_dense ae2:cable_dense ae2:cable_dense + -> 8 ae2:cable_dense.black shaped= - ae2:CableDense ae2:CableDense ae2:CableDense, - ae2:CableDense oredictionary:dyeRed ae2:CableDense, - ae2:CableDense ae2:CableDense ae2:CableDense - -> 8 ae2:CableDense.Red + ae2:cable_dense ae2:cable_dense ae2:cable_dense, + ae2:cable_dense oredictionary:dyeRed ae2:cable_dense, + ae2:cable_dense ae2:cable_dense ae2:cable_dense + -> 8 ae2:cable_dense.red shaped= - ae2:CableDense ae2:CableDense ae2:CableDense, - ae2:CableDense oredictionary:dyeGreen ae2:CableDense, - ae2:CableDense ae2:CableDense ae2:CableDense - -> 8 ae2:CableDense.Green + ae2:cable_dense ae2:cable_dense ae2:cable_dense, + ae2:cable_dense oredictionary:dyeGreen ae2:cable_dense, + ae2:cable_dense ae2:cable_dense ae2:cable_dense + -> 8 ae2:cable_dense.green shaped= - ae2:CableDense ae2:CableDense ae2:CableDense, - ae2:CableDense oredictionary:dyeBrown ae2:CableDense, - ae2:CableDense ae2:CableDense ae2:CableDense - -> 8 ae2:CableDense.Brown + ae2:cable_dense ae2:cable_dense ae2:cable_dense, + ae2:cable_dense oredictionary:dyeBrown ae2:cable_dense, + ae2:cable_dense ae2:cable_dense ae2:cable_dense + -> 8 ae2:cable_dense.brown shaped= - ae2:CableDense ae2:CableDense ae2:CableDense, - ae2:CableDense oredictionary:dyeBlue ae2:CableDense, - ae2:CableDense ae2:CableDense ae2:CableDense - -> 8 ae2:CableDense.Blue + ae2:cable_dense ae2:cable_dense ae2:cable_dense, + ae2:cable_dense oredictionary:dyeBlue ae2:cable_dense, + ae2:cable_dense ae2:cable_dense ae2:cable_dense + -> 8 ae2:cable_dense.blue shaped= - ae2:CableDense ae2:CableDense ae2:CableDense, - ae2:CableDense oredictionary:dyePurple ae2:CableDense, - ae2:CableDense ae2:CableDense ae2:CableDense - -> 8 ae2:CableDense.Purple + ae2:cable_dense ae2:cable_dense ae2:cable_dense, + ae2:cable_dense oredictionary:dyePurple ae2:cable_dense, + ae2:cable_dense ae2:cable_dense ae2:cable_dense + -> 8 ae2:cable_dense.purple shaped= - ae2:CableDense ae2:CableDense ae2:CableDense, - ae2:CableDense oredictionary:dyeCyan ae2:CableDense, - ae2:CableDense ae2:CableDense ae2:CableDense - -> 8 ae2:CableDense.Cyan + ae2:cable_dense ae2:cable_dense ae2:cable_dense, + ae2:cable_dense oredictionary:dyeCyan ae2:cable_dense, + ae2:cable_dense ae2:cable_dense ae2:cable_dense + -> 8 ae2:cable_dense.cyan shaped= - ae2:CableDense ae2:CableDense ae2:CableDense, - ae2:CableDense oredictionary:dyeLightGray ae2:CableDense, - ae2:CableDense ae2:CableDense ae2:CableDense - -> 8 ae2:CableDense.LightGray + ae2:cable_dense ae2:cable_dense ae2:cable_dense, + ae2:cable_dense oredictionary:dyeLightGray ae2:cable_dense, + ae2:cable_dense ae2:cable_dense ae2:cable_dense + -> 8 ae2:cable_dense.light_gray shaped= - ae2:CableDense ae2:CableDense ae2:CableDense, - ae2:CableDense oredictionary:dyeGray ae2:CableDense, - ae2:CableDense ae2:CableDense ae2:CableDense - -> 8 ae2:CableDense.Gray + ae2:cable_dense ae2:cable_dense ae2:cable_dense, + ae2:cable_dense oredictionary:dyeGray ae2:cable_dense, + ae2:cable_dense ae2:cable_dense ae2:cable_dense + -> 8 ae2:cable_dense.gray shaped= - ae2:CableDense ae2:CableDense ae2:CableDense, - ae2:CableDense oredictionary:dyePink ae2:CableDense, - ae2:CableDense ae2:CableDense ae2:CableDense - -> 8 ae2:CableDense.Pink + ae2:cable_dense ae2:cable_dense ae2:cable_dense, + ae2:cable_dense oredictionary:dyePink ae2:cable_dense, + ae2:cable_dense ae2:cable_dense ae2:cable_dense + -> 8 ae2:cable_dense.pink shaped= - ae2:CableDense ae2:CableDense ae2:CableDense, - ae2:CableDense oredictionary:dyeLime ae2:CableDense, - ae2:CableDense ae2:CableDense ae2:CableDense - -> 8 ae2:CableDense.Lime + ae2:cable_dense ae2:cable_dense ae2:cable_dense, + ae2:cable_dense oredictionary:dyeLime ae2:cable_dense, + ae2:cable_dense ae2:cable_dense ae2:cable_dense + -> 8 ae2:cable_dense.lime shaped= - ae2:CableDense ae2:CableDense ae2:CableDense, - ae2:CableDense oredictionary:dyeYellow ae2:CableDense, - ae2:CableDense ae2:CableDense ae2:CableDense - -> 8 ae2:CableDense.Yellow + ae2:cable_dense ae2:cable_dense ae2:cable_dense, + ae2:cable_dense oredictionary:dyeYellow ae2:cable_dense, + ae2:cable_dense ae2:cable_dense ae2:cable_dense + -> 8 ae2:cable_dense.yellow shaped= - ae2:CableDense ae2:CableDense ae2:CableDense, - ae2:CableDense oredictionary:dyeLightBlue ae2:CableDense, - ae2:CableDense ae2:CableDense ae2:CableDense - -> 8 ae2:CableDense.LightBlue + ae2:cable_dense ae2:cable_dense ae2:cable_dense, + ae2:cable_dense oredictionary:dyeLightBlue ae2:cable_dense, + ae2:cable_dense ae2:cable_dense ae2:cable_dense + -> 8 ae2:cable_dense.light_blue shaped= - ae2:CableDense ae2:CableDense ae2:CableDense, - ae2:CableDense oredictionary:dyeMagenta ae2:CableDense, - ae2:CableDense ae2:CableDense ae2:CableDense - -> 8 ae2:CableDense.Magenta + ae2:cable_dense ae2:cable_dense ae2:cable_dense, + ae2:cable_dense oredictionary:dyeMagenta ae2:cable_dense, + ae2:cable_dense ae2:cable_dense ae2:cable_dense + -> 8 ae2:cable_dense.magenta shaped= - ae2:CableDense ae2:CableDense ae2:CableDense, - ae2:CableDense oredictionary:dyeOrange ae2:CableDense, - ae2:CableDense ae2:CableDense ae2:CableDense - -> 8 ae2:CableDense.Orange + ae2:cable_dense ae2:cable_dense ae2:cable_dense, + ae2:cable_dense oredictionary:dyeOrange ae2:cable_dense, + ae2:cable_dense ae2:cable_dense ae2:cable_dense + -> 8 ae2:cable_dense.orange diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass.recipe index 8fdecd92..e17ba43e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass.recipe @@ -1,103 +1,103 @@ shapeless= - ae2:ItemPart.QuartzFiber fluixCrystal fluixCrystal - -> 4 ae2:CableGlass.Fluix + ae2:part.QuartzFiber fluixCrystal fluixCrystal + -> 4 ae2:cable_glass.fluix shapeless= - ae2:CableGlass mc:water_bucket - -> ae2:CableGlass.Fluix + ae2:cable_glass mc:water_bucket + -> ae2:cable_glass.fluix shaped= - ae2:CableGlass ae2:CableGlass ae2:CableGlass, - ae2:CableGlass oredictionary:dyeWhite ae2:CableGlass, - ae2:CableGlass ae2:CableGlass ae2:CableGlass - -> 8 ae2:CableGlass.White + ae2:cable_glass ae2:cable_glass ae2:cable_glass, + ae2:cable_glass oredictionary:dyeWhite ae2:cable_glass, + ae2:cable_glass ae2:cable_glass ae2:cable_glass + -> 8 ae2:cable_glass.white shaped= - ae2:CableGlass ae2:CableGlass ae2:CableGlass, - ae2:CableGlass oredictionary:dyeBlack ae2:CableGlass, - ae2:CableGlass ae2:CableGlass ae2:CableGlass - -> 8 ae2:CableGlass.Black + ae2:cable_glass ae2:cable_glass ae2:cable_glass, + ae2:cable_glass oredictionary:dyeBlack ae2:cable_glass, + ae2:cable_glass ae2:cable_glass ae2:cable_glass + -> 8 ae2:cable_glass.black shaped= - ae2:CableGlass ae2:CableGlass ae2:CableGlass, - ae2:CableGlass oredictionary:dyeRed ae2:CableGlass, - ae2:CableGlass ae2:CableGlass ae2:CableGlass - -> 8 ae2:CableGlass.Red + ae2:cable_glass ae2:cable_glass ae2:cable_glass, + ae2:cable_glass oredictionary:dyeRed ae2:cable_glass, + ae2:cable_glass ae2:cable_glass ae2:cable_glass + -> 8 ae2:cable_glass.red shaped= - ae2:CableGlass ae2:CableGlass ae2:CableGlass, - ae2:CableGlass oredictionary:dyeGreen ae2:CableGlass, - ae2:CableGlass ae2:CableGlass ae2:CableGlass - -> 8 ae2:CableGlass.Green + ae2:cable_glass ae2:cable_glass ae2:cable_glass, + ae2:cable_glass oredictionary:dyeGreen ae2:cable_glass, + ae2:cable_glass ae2:cable_glass ae2:cable_glass + -> 8 ae2:cable_glass.green shaped= - ae2:CableGlass ae2:CableGlass ae2:CableGlass, - ae2:CableGlass oredictionary:dyeBrown ae2:CableGlass, - ae2:CableGlass ae2:CableGlass ae2:CableGlass - -> 8 ae2:CableGlass.Brown + ae2:cable_glass ae2:cable_glass ae2:cable_glass, + ae2:cable_glass oredictionary:dyeBrown ae2:cable_glass, + ae2:cable_glass ae2:cable_glass ae2:cable_glass + -> 8 ae2:cable_glass.brown shaped= - ae2:CableGlass ae2:CableGlass ae2:CableGlass, - ae2:CableGlass oredictionary:dyeBlue ae2:CableGlass, - ae2:CableGlass ae2:CableGlass ae2:CableGlass - -> 8 ae2:CableGlass.Blue + ae2:cable_glass ae2:cable_glass ae2:cable_glass, + ae2:cable_glass oredictionary:dyeBlue ae2:cable_glass, + ae2:cable_glass ae2:cable_glass ae2:cable_glass + -> 8 ae2:cable_glass.blue shaped= - ae2:CableGlass ae2:CableGlass ae2:CableGlass, - ae2:CableGlass oredictionary:dyePurple ae2:CableGlass, - ae2:CableGlass ae2:CableGlass ae2:CableGlass - -> 8 ae2:CableGlass.Purple + ae2:cable_glass ae2:cable_glass ae2:cable_glass, + ae2:cable_glass oredictionary:dyePurple ae2:cable_glass, + ae2:cable_glass ae2:cable_glass ae2:cable_glass + -> 8 ae2:cable_glass.purple shaped= - ae2:CableGlass ae2:CableGlass ae2:CableGlass, - ae2:CableGlass oredictionary:dyeCyan ae2:CableGlass, - ae2:CableGlass ae2:CableGlass ae2:CableGlass - -> 8 ae2:CableGlass.Cyan + ae2:cable_glass ae2:cable_glass ae2:cable_glass, + ae2:cable_glass oredictionary:dyeCyan ae2:cable_glass, + ae2:cable_glass ae2:cable_glass ae2:cable_glass + -> 8 ae2:cable_glass.cyan shaped= - ae2:CableGlass ae2:CableGlass ae2:CableGlass, - ae2:CableGlass oredictionary:dyeLightGray ae2:CableGlass, - ae2:CableGlass ae2:CableGlass ae2:CableGlass - -> 8 ae2:CableGlass.LightGray + ae2:cable_glass ae2:cable_glass ae2:cable_glass, + ae2:cable_glass oredictionary:dyeLightGray ae2:cable_glass, + ae2:cable_glass ae2:cable_glass ae2:cable_glass + -> 8 ae2:cable_glass.light_gray shaped= - ae2:CableGlass ae2:CableGlass ae2:CableGlass, - ae2:CableGlass oredictionary:dyeGray ae2:CableGlass, - ae2:CableGlass ae2:CableGlass ae2:CableGlass - -> 8 ae2:CableGlass.Gray + ae2:cable_glass ae2:cable_glass ae2:cable_glass, + ae2:cable_glass oredictionary:dyeGray ae2:cable_glass, + ae2:cable_glass ae2:cable_glass ae2:cable_glass + -> 8 ae2:cable_glass.gray shaped= - ae2:CableGlass ae2:CableGlass ae2:CableGlass, - ae2:CableGlass oredictionary:dyePink ae2:CableGlass, - ae2:CableGlass ae2:CableGlass ae2:CableGlass - -> 8 ae2:CableGlass.Pink + ae2:cable_glass ae2:cable_glass ae2:cable_glass, + ae2:cable_glass oredictionary:dyePink ae2:cable_glass, + ae2:cable_glass ae2:cable_glass ae2:cable_glass + -> 8 ae2:cable_glass.pink shaped= - ae2:CableGlass ae2:CableGlass ae2:CableGlass, - ae2:CableGlass oredictionary:dyeLime ae2:CableGlass, - ae2:CableGlass ae2:CableGlass ae2:CableGlass - -> 8 ae2:CableGlass.Lime + ae2:cable_glass ae2:cable_glass ae2:cable_glass, + ae2:cable_glass oredictionary:dyeLime ae2:cable_glass, + ae2:cable_glass ae2:cable_glass ae2:cable_glass + -> 8 ae2:cable_glass.lime shaped= - ae2:CableGlass ae2:CableGlass ae2:CableGlass, - ae2:CableGlass oredictionary:dyeYellow ae2:CableGlass, - ae2:CableGlass ae2:CableGlass ae2:CableGlass - -> 8 ae2:CableGlass.Yellow + ae2:cable_glass ae2:cable_glass ae2:cable_glass, + ae2:cable_glass oredictionary:dyeYellow ae2:cable_glass, + ae2:cable_glass ae2:cable_glass ae2:cable_glass + -> 8 ae2:cable_glass.yellow shaped= - ae2:CableGlass ae2:CableGlass ae2:CableGlass, - ae2:CableGlass oredictionary:dyeLightBlue ae2:CableGlass, - ae2:CableGlass ae2:CableGlass ae2:CableGlass - -> 8 ae2:CableGlass.LightBlue + ae2:cable_glass ae2:cable_glass ae2:cable_glass, + ae2:cable_glass oredictionary:dyeLightBlue ae2:cable_glass, + ae2:cable_glass ae2:cable_glass ae2:cable_glass + -> 8 ae2:cable_glass.light_blue shaped= - ae2:CableGlass ae2:CableGlass ae2:CableGlass, - ae2:CableGlass oredictionary:dyeMagenta ae2:CableGlass, - ae2:CableGlass ae2:CableGlass ae2:CableGlass - -> 8 ae2:CableGlass.Magenta + ae2:cable_glass ae2:cable_glass ae2:cable_glass, + ae2:cable_glass oredictionary:dyeMagenta ae2:cable_glass, + ae2:cable_glass ae2:cable_glass ae2:cable_glass + -> 8 ae2:cable_glass.magenta shaped= - ae2:CableGlass ae2:CableGlass ae2:CableGlass, - ae2:CableGlass oredictionary:dyeOrange ae2:CableGlass, - ae2:CableGlass ae2:CableGlass ae2:CableGlass - -> 8 ae2:CableGlass.Orange + ae2:cable_glass ae2:cable_glass ae2:cable_glass, + ae2:cable_glass oredictionary:dyeOrange ae2:cable_glass, + ae2:cable_glass ae2:cable_glass ae2:cable_glass + -> 8 ae2:cable_glass.orange diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart.recipe index 3d14679a..ca43794e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart.recipe @@ -1,104 +1,104 @@ shapeless= - ae2:CableCovered + ae2:cable_covered oredictionary:dustRedstone oredictionary:dustGlowstone - -> ae2:CableSmart.Fluix + -> ae2:cable_smart.fluix shapeless= - ae2:CableSmart mc:water_bucket - -> ae2:CableSmart.Fluix + ae2:cable_smart mc:water_bucket + -> ae2:cable_smart.fluix shaped= - ae2:CableSmart ae2:CableSmart ae2:CableSmart, - ae2:CableSmart oredictionary:dyeWhite ae2:CableSmart, - ae2:CableSmart ae2:CableSmart ae2:CableSmart - -> 8 ae2:CableSmart.White + ae2:cable_smart ae2:cable_smart ae2:cable_smart, + ae2:cable_smart oredictionary:dyeWhite ae2:cable_smart, + ae2:cable_smart ae2:cable_smart ae2:cable_smart + -> 8 ae2:cable_smart.white shaped= - ae2:CableSmart ae2:CableSmart ae2:CableSmart, - ae2:CableSmart oredictionary:dyeBlack ae2:CableSmart, - ae2:CableSmart ae2:CableSmart ae2:CableSmart - -> 8 ae2:CableSmart.Black + ae2:cable_smart ae2:cable_smart ae2:cable_smart, + ae2:cable_smart oredictionary:dyeBlack ae2:cable_smart, + ae2:cable_smart ae2:cable_smart ae2:cable_smart + -> 8 ae2:cable_smart.black shaped= - ae2:CableSmart ae2:CableSmart ae2:CableSmart, - ae2:CableSmart oredictionary:dyeRed ae2:CableSmart, - ae2:CableSmart ae2:CableSmart ae2:CableSmart - -> 8 ae2:CableSmart.Red + ae2:cable_smart ae2:cable_smart ae2:cable_smart, + ae2:cable_smart oredictionary:dyeRed ae2:cable_smart, + ae2:cable_smart ae2:cable_smart ae2:cable_smart + -> 8 ae2:cable_smart.red shaped= - ae2:CableSmart ae2:CableSmart ae2:CableSmart, - ae2:CableSmart oredictionary:dyeGreen ae2:CableSmart, - ae2:CableSmart ae2:CableSmart ae2:CableSmart - -> 8 ae2:CableSmart.Green + ae2:cable_smart ae2:cable_smart ae2:cable_smart, + ae2:cable_smart oredictionary:dyeGreen ae2:cable_smart, + ae2:cable_smart ae2:cable_smart ae2:cable_smart + -> 8 ae2:cable_smart.green shaped= - ae2:CableSmart ae2:CableSmart ae2:CableSmart, - ae2:CableSmart oredictionary:dyeBrown ae2:CableSmart, - ae2:CableSmart ae2:CableSmart ae2:CableSmart - -> 8 ae2:CableSmart.Brown + ae2:cable_smart ae2:cable_smart ae2:cable_smart, + ae2:cable_smart oredictionary:dyeBrown ae2:cable_smart, + ae2:cable_smart ae2:cable_smart ae2:cable_smart + -> 8 ae2:cable_smart.brown shaped= - ae2:CableSmart ae2:CableSmart ae2:CableSmart, - ae2:CableSmart oredictionary:dyeBlue ae2:CableSmart, - ae2:CableSmart ae2:CableSmart ae2:CableSmart - -> 8 ae2:CableSmart.Blue + ae2:cable_smart ae2:cable_smart ae2:cable_smart, + ae2:cable_smart oredictionary:dyeBlue ae2:cable_smart, + ae2:cable_smart ae2:cable_smart ae2:cable_smart + -> 8 ae2:cable_smart.blue shaped= - ae2:CableSmart ae2:CableSmart ae2:CableSmart, - ae2:CableSmart oredictionary:dyePurple ae2:CableSmart, - ae2:CableSmart ae2:CableSmart ae2:CableSmart - -> 8 ae2:CableSmart.Purple + ae2:cable_smart ae2:cable_smart ae2:cable_smart, + ae2:cable_smart oredictionary:dyePurple ae2:cable_smart, + ae2:cable_smart ae2:cable_smart ae2:cable_smart + -> 8 ae2:cable_smart.purple shaped= - ae2:CableSmart ae2:CableSmart ae2:CableSmart, - ae2:CableSmart oredictionary:dyeCyan ae2:CableSmart, - ae2:CableSmart ae2:CableSmart ae2:CableSmart - -> 8 ae2:CableSmart.Cyan + ae2:cable_smart ae2:cable_smart ae2:cable_smart, + ae2:cable_smart oredictionary:dyeCyan ae2:cable_smart, + ae2:cable_smart ae2:cable_smart ae2:cable_smart + -> 8 ae2:cable_smart.cyan shaped= - ae2:CableSmart ae2:CableSmart ae2:CableSmart, - ae2:CableSmart oredictionary:dyeLightGray ae2:CableSmart, - ae2:CableSmart ae2:CableSmart ae2:CableSmart - -> 8 ae2:CableSmart.LightGray + ae2:cable_smart ae2:cable_smart ae2:cable_smart, + ae2:cable_smart oredictionary:dyeLightGray ae2:cable_smart, + ae2:cable_smart ae2:cable_smart ae2:cable_smart + -> 8 ae2:cable_smart.light_gray shaped= - ae2:CableSmart ae2:CableSmart ae2:CableSmart, - ae2:CableSmart oredictionary:dyeGray ae2:CableSmart, - ae2:CableSmart ae2:CableSmart ae2:CableSmart - -> 8 ae2:CableSmart.Gray + ae2:cable_smart ae2:cable_smart ae2:cable_smart, + ae2:cable_smart oredictionary:dyeGray ae2:cable_smart, + ae2:cable_smart ae2:cable_smart ae2:cable_smart + -> 8 ae2:cable_smart.gray shaped= - ae2:CableSmart ae2:CableSmart ae2:CableSmart, - ae2:CableSmart oredictionary:dyePink ae2:CableSmart, - ae2:CableSmart ae2:CableSmart ae2:CableSmart - -> 8 ae2:CableSmart.Pink + ae2:cable_smart ae2:cable_smart ae2:cable_smart, + ae2:cable_smart oredictionary:dyePink ae2:cable_smart, + ae2:cable_smart ae2:cable_smart ae2:cable_smart + -> 8 ae2:cable_smart.pink shaped= - ae2:CableSmart ae2:CableSmart ae2:CableSmart, - ae2:CableSmart oredictionary:dyeLime ae2:CableSmart, - ae2:CableSmart ae2:CableSmart ae2:CableSmart - -> 8 ae2:CableSmart.Lime + ae2:cable_smart ae2:cable_smart ae2:cable_smart, + ae2:cable_smart oredictionary:dyeLime ae2:cable_smart, + ae2:cable_smart ae2:cable_smart ae2:cable_smart + -> 8 ae2:cable_smart.lime shaped= - ae2:CableSmart ae2:CableSmart ae2:CableSmart, - ae2:CableSmart oredictionary:dyeYellow ae2:CableSmart, - ae2:CableSmart ae2:CableSmart ae2:CableSmart - -> 8 ae2:CableSmart.Yellow + ae2:cable_smart ae2:cable_smart ae2:cable_smart, + ae2:cable_smart oredictionary:dyeYellow ae2:cable_smart, + ae2:cable_smart ae2:cable_smart ae2:cable_smart + -> 8 ae2:cable_smart.yellow shaped= - ae2:CableSmart ae2:CableSmart ae2:CableSmart, - ae2:CableSmart oredictionary:dyeLightBlue ae2:CableSmart, - ae2:CableSmart ae2:CableSmart ae2:CableSmart - -> 8 ae2:CableSmart.LightBlue + ae2:cable_smart ae2:cable_smart ae2:cable_smart, + ae2:cable_smart oredictionary:dyeLightBlue ae2:cable_smart, + ae2:cable_smart ae2:cable_smart ae2:cable_smart + -> 8 ae2:cable_smart.light_blue shaped= - ae2:CableSmart ae2:CableSmart ae2:CableSmart, - ae2:CableSmart oredictionary:dyeMagenta ae2:CableSmart, - ae2:CableSmart ae2:CableSmart ae2:CableSmart - -> 8 ae2:CableSmart.Magenta + ae2:cable_smart ae2:cable_smart ae2:cable_smart, + ae2:cable_smart oredictionary:dyeMagenta ae2:cable_smart, + ae2:cable_smart ae2:cable_smart ae2:cable_smart + -> 8 ae2:cable_smart.magenta shaped= - ae2:CableSmart ae2:CableSmart ae2:CableSmart, - ae2:CableSmart oredictionary:dyeOrange ae2:CableSmart, - ae2:CableSmart ae2:CableSmart ae2:CableSmart - -> 8 ae2:CableSmart.Orange + ae2:cable_smart ae2:cable_smart ae2:cable_smart, + ae2:cable_smart oredictionary:dyeOrange ae2:cable_smart, + ae2:cable_smart ae2:cable_smart ae2:cable_smart + -> 8 ae2:cable_smart.orange diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/empty.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/empty.recipe index fa2829ca..d1829fad 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/empty.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/empty.recipe @@ -1,5 +1,5 @@ shaped= - ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass, + ae2:quartz_glass oredictionary:dustRedstone ae2:quartz_glass, oredictionary:dustRedstone _ oredictionary:dustRedstone, oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron - -> ae2:ItemMaterial.EmptyStorageCell + -> ae2:material.EmptyStorageCell diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/index.recipe index 74c55d8e..f92abe88 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/index.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/index.recipe @@ -1,6 +1,6 @@ import=network/cells/empty.recipe -import=network/cells/spatial-components.recipe +import=network/cells/spatial_components.recipe import=network/cells/spatial.recipe -import=network/cells/storage-components.recipe +import=network/cells/storage_components.recipe import=network/cells/storage.recipe import=network/cells/view.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial-components.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial-components.recipe deleted file mode 100644 index cc2729c3..00000000 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial-components.recipe +++ /dev/null @@ -1,17 +0,0 @@ -shaped= - oredictionary:dustGlowstone ae2:ItemMaterial.FluixPearl oredictionary:dustGlowstone, - ae2:ItemMaterial.FluixPearl ae2:ItemMaterial.EngProcessor ae2:ItemMaterial.FluixPearl, - oredictionary:dustGlowstone ae2:ItemMaterial.FluixPearl oredictionary:dustGlowstone - -> ae2:ItemMaterial.Cell2SpatialPart - -shaped= - oredictionary:dustGlowstone ae2:ItemMaterial.Cell2SpatialPart oredictionary:dustGlowstone, - ae2:ItemMaterial.Cell2SpatialPart ae2:ItemMaterial.EngProcessor ae2:ItemMaterial.Cell2SpatialPart, - oredictionary:dustGlowstone ae2:ItemMaterial.Cell2SpatialPart oredictionary:dustGlowstone - -> ae2:ItemMaterial.Cell16SpatialPart - -shaped= - oredictionary:dustGlowstone ae2:ItemMaterial.Cell16SpatialPart oredictionary:dustGlowstone, - ae2:ItemMaterial.Cell16SpatialPart ae2:ItemMaterial.EngProcessor ae2:ItemMaterial.Cell16SpatialPart, - oredictionary:dustGlowstone ae2:ItemMaterial.Cell16SpatialPart oredictionary:dustGlowstone - -> ae2:ItemMaterial.Cell128SpatialPart diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial.recipe index b62766e5..c9a0e616 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial.recipe @@ -1,26 +1,26 @@ shapeless= - ae2:ItemMaterial.Cell2SpatialPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemSpatialStorageCell.2Cubed + ae2:material.Cell2SpatialPart ae2:material.EmptyStorageCell -> ae2:spatial_storage_cell_2_cubed shapeless= - ae2:ItemMaterial.Cell16SpatialPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemSpatialStorageCell.16Cubed + ae2:material.Cell16SpatialPart ae2:material.EmptyStorageCell -> ae2:spatial_storage_cell_16_cubed shapeless= - ae2:ItemMaterial.Cell128SpatialPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemSpatialStorageCell.128Cubed + ae2:material.Cell128SpatialPart ae2:material.EmptyStorageCell -> ae2:spatial_storage_cell_128_cubed shaped= - ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass, - oredictionary:dustRedstone ae2:ItemMaterial.Cell2SpatialPart oredictionary:dustRedstone, + ae2:quartz_glass oredictionary:dustRedstone ae2:quartz_glass, + oredictionary:dustRedstone ae2:material.Cell2SpatialPart oredictionary:dustRedstone, oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron - -> ae2:ItemSpatialStorageCell.2Cubed + -> ae2:spatial_storage_cell_2_cubed shaped= - ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass, - oredictionary:dustRedstone ae2:ItemMaterial.Cell16SpatialPart oredictionary:dustRedstone, + ae2:quartz_glass oredictionary:dustRedstone ae2:quartz_glass, + oredictionary:dustRedstone ae2:material.Cell16SpatialPart oredictionary:dustRedstone, oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron - -> ae2:ItemSpatialStorageCell.16Cubed + -> ae2:spatial_storage_cell_16_cubed shaped= - ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass, - oredictionary:dustRedstone ae2:ItemMaterial.Cell128SpatialPart oredictionary:dustRedstone, + ae2:quartz_glass oredictionary:dustRedstone ae2:quartz_glass, + oredictionary:dustRedstone ae2:material.Cell128SpatialPart oredictionary:dustRedstone, oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron - -> ae2:ItemSpatialStorageCell.128Cubed + -> ae2:spatial_storage_cell_128_cubed diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components.recipe new file mode 100644 index 00000000..ae78b07a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial_components.recipe @@ -0,0 +1,17 @@ +shaped= + oredictionary:dustGlowstone ae2:material.FluixPearl oredictionary:dustGlowstone, + ae2:material.FluixPearl ae2:material.EngProcessor ae2:material.FluixPearl, + oredictionary:dustGlowstone ae2:material.FluixPearl oredictionary:dustGlowstone + -> ae2:material.Cell2SpatialPart + +shaped= + oredictionary:dustGlowstone ae2:material.Cell2SpatialPart oredictionary:dustGlowstone, + ae2:material.Cell2SpatialPart ae2:material.EngProcessor ae2:material.Cell2SpatialPart, + oredictionary:dustGlowstone ae2:material.Cell2SpatialPart oredictionary:dustGlowstone + -> ae2:material.Cell16SpatialPart + +shaped= + oredictionary:dustGlowstone ae2:material.Cell16SpatialPart oredictionary:dustGlowstone, + ae2:material.Cell16SpatialPart ae2:material.EngProcessor ae2:material.Cell16SpatialPart, + oredictionary:dustGlowstone ae2:material.Cell16SpatialPart oredictionary:dustGlowstone + -> ae2:material.Cell128SpatialPart diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage-components.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage-components.recipe deleted file mode 100644 index ed819fd7..00000000 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage-components.recipe +++ /dev/null @@ -1,23 +0,0 @@ -shaped= - oredictionary:dustRedstone certusCrystal oredictionary:dustRedstone, - certusCrystal ae2:ItemMaterial.LogicProcessor certusCrystal, - oredictionary:dustRedstone certusCrystal oredictionary:dustRedstone - -> ae2:ItemMaterial.Cell1kPart - -shaped= - oredictionary:dustRedstone ae2:ItemMaterial.CalcProcessor oredictionary:dustRedstone, - ae2:ItemMaterial.Cell1kPart ae2:BlockQuartzGlass ae2:ItemMaterial.Cell1kPart, - oredictionary:dustRedstone ae2:ItemMaterial.Cell1kPart oredictionary:dustRedstone - -> ae2:ItemMaterial.Cell4kPart - -shaped= - oredictionary:dustGlowstone ae2:ItemMaterial.EngProcessor oredictionary:dustGlowstone, - ae2:ItemMaterial.Cell4kPart ae2:BlockQuartzGlass ae2:ItemMaterial.Cell4kPart, - oredictionary:dustGlowstone ae2:ItemMaterial.Cell4kPart oredictionary:dustGlowstone - -> ae2:ItemMaterial.Cell16kPart - -shaped= - oredictionary:dustGlowstone ae2:ItemMaterial.EngProcessor oredictionary:dustGlowstone, - ae2:ItemMaterial.Cell16kPart ae2:BlockQuartzGlass ae2:ItemMaterial.Cell16kPart, - oredictionary:dustGlowstone ae2:ItemMaterial.Cell16kPart oredictionary:dustGlowstone - -> ae2:ItemMaterial.Cell64kPart diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage.recipe index 2aa8ecc6..95b0fcdb 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage.recipe @@ -1,35 +1,35 @@ shapeless= - ae2:ItemMaterial.Cell1kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.1k + ae2:material.Cell1kPart ae2:material.EmptyStorageCell -> ae2:storage_cell_1k shapeless= - ae2:ItemMaterial.Cell4kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.4k + ae2:material.Cell4kPart ae2:material.EmptyStorageCell -> ae2:storage_cell_4k shapeless= - ae2:ItemMaterial.Cell16kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.16k + ae2:material.Cell16kPart ae2:material.EmptyStorageCell -> ae2:storage_cell_16k shapeless= - ae2:ItemMaterial.Cell64kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.64k + ae2:material.Cell64kPart ae2:material.EmptyStorageCell -> ae2:storage_cell_64k shaped= - ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass, - oredictionary:dustRedstone ae2:ItemMaterial.Cell1kPart oredictionary:dustRedstone, + ae2:quartz_glass oredictionary:dustRedstone ae2:quartz_glass, + oredictionary:dustRedstone ae2:material.Cell1kPart oredictionary:dustRedstone, oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron - -> ae2:ItemBasicStorageCell.1k + -> ae2:storage_cell_1k shaped= - ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass, - oredictionary:dustRedstone ae2:ItemMaterial.Cell4kPart oredictionary:dustRedstone, + ae2:quartz_glass oredictionary:dustRedstone ae2:quartz_glass, + oredictionary:dustRedstone ae2:material.Cell4kPart oredictionary:dustRedstone, oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron - -> ae2:ItemBasicStorageCell.4k + -> ae2:storage_cell_4k shaped= - ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass, - oredictionary:dustRedstone ae2:ItemMaterial.Cell16kPart oredictionary:dustRedstone, + ae2:quartz_glass oredictionary:dustRedstone ae2:quartz_glass, + oredictionary:dustRedstone ae2:material.Cell16kPart oredictionary:dustRedstone, oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron - -> ae2:ItemBasicStorageCell.16k + -> ae2:storage_cell_16k shaped= - ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass, - oredictionary:dustRedstone ae2:ItemMaterial.Cell64kPart oredictionary:dustRedstone, + ae2:quartz_glass oredictionary:dustRedstone ae2:quartz_glass, + oredictionary:dustRedstone ae2:material.Cell64kPart oredictionary:dustRedstone, oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron - -> ae2:ItemBasicStorageCell.64k + -> ae2:storage_cell_64k diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components.recipe new file mode 100644 index 00000000..e6669941 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage_components.recipe @@ -0,0 +1,23 @@ +shaped= + oredictionary:dustRedstone certusCrystal oredictionary:dustRedstone, + certusCrystal ae2:material.LogicProcessor certusCrystal, + oredictionary:dustRedstone certusCrystal oredictionary:dustRedstone + -> ae2:material.Cell1kPart + +shaped= + oredictionary:dustRedstone ae2:material.CalcProcessor oredictionary:dustRedstone, + ae2:material.Cell1kPart ae2:quartz_glass ae2:material.Cell1kPart, + oredictionary:dustRedstone ae2:material.Cell1kPart oredictionary:dustRedstone + -> ae2:material.Cell4kPart + +shaped= + oredictionary:dustGlowstone ae2:material.EngProcessor oredictionary:dustGlowstone, + ae2:material.Cell4kPart ae2:quartz_glass ae2:material.Cell4kPart, + oredictionary:dustGlowstone ae2:material.Cell4kPart oredictionary:dustGlowstone + -> ae2:material.Cell16kPart + +shaped= + oredictionary:dustGlowstone ae2:material.EngProcessor oredictionary:dustGlowstone, + ae2:material.Cell16kPart ae2:quartz_glass ae2:material.Cell16kPart, + oredictionary:dustGlowstone ae2:material.Cell16kPart oredictionary:dustGlowstone + -> ae2:material.Cell64kPart diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view.recipe index 249d5e4c..a01193d2 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view.recipe @@ -1,8 +1,8 @@ shapeless= - certusCrystal ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemViewCell + certusCrystal ae2:material.EmptyStorageCell -> ae2:view_cell shaped= - ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass, + ae2:quartz_glass oredictionary:dustRedstone ae2:quartz_glass, oredictionary:dustRedstone certusCrystal oredictionary:dustRedstone, oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron - -> ae2:ItemViewCell + -> ae2:view_cell diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/assembler.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/assembler.recipe index daecf517..3e476c2b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/assembler.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/assembler.recipe @@ -1,5 +1,5 @@ shaped= - oredictionary:ingotIron ae2:BlockQuartzGlass oredictionary:ingotIron, - ae2:ItemMaterial.AnnihilationCore oredictionary:craftingTableWood ae2:ItemMaterial.FormationCore, - oredictionary:ingotIron ae2:BlockQuartzGlass oredictionary:ingotIron - -> ae2:BlockMolecularAssembler + oredictionary:ingotIron ae2:quartz_glass oredictionary:ingotIron, + ae2:material.AnnihilationCore oredictionary:craftingTableWood ae2:material.FormationCore, + oredictionary:ingotIron ae2:quartz_glass oredictionary:ingotIron + -> ae2:molecular_assembler diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu.recipe index 06111398..97020580 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu.recipe @@ -1,37 +1,37 @@ shaped= - oredictionary:ingotIron ae2:ItemMaterial.CalcProcessor oredictionary:ingotIron, - cable ae2:ItemMaterial.LogicProcessor cable, - oredictionary:ingotIron ae2:ItemMaterial.CalcProcessor oredictionary:ingotIron - -> ae2:BlockCraftingUnit:0 + oredictionary:ingotIron ae2:material.CalcProcessor oredictionary:ingotIron, + cable ae2:material.LogicProcessor cable, + oredictionary:ingotIron ae2:material.CalcProcessor oredictionary:ingotIron + -> ae2:crafting_unit # co processor shapeless= - ae2:BlockCraftingUnit:0 - ae2:ItemMaterial.EngProcessor - -> ae2:BlockCraftingUnit:1 + ae2:crafting_unit + ae2:material.EngProcessor + -> ae2:crafting_accelerator shapeless= - ae2:BlockCraftingUnit:0 - ae2:ItemPart.StorageMonitor - -> ae2:BlockCraftingMonitor + ae2:crafting_unit + ae2:part.StorageMonitor + -> ae2:crafting_monitor # various storage sizes shapeless= - ae2:BlockCraftingUnit:0 - ae2:ItemMaterial.Cell1kPart - -> ae2:BlockCraftingStorage:0 + ae2:crafting_unit + ae2:material.Cell1kPart + -> ae2:crafting_storage_1k shapeless= - ae2:BlockCraftingUnit:0 - ae2:ItemMaterial.Cell4kPart - -> ae2:BlockCraftingStorage:1 + ae2:crafting_unit + ae2:material.Cell4kPart + -> ae2:crafting_storage_4k shapeless= - ae2:BlockCraftingUnit:0 - ae2:ItemMaterial.Cell16kPart - -> ae2:BlockCraftingStorage:2 + ae2:crafting_unit + ae2:material.Cell16kPart + -> ae2:crafting_storage_16k shapeless= - ae2:BlockCraftingUnit:0 - ae2:ItemMaterial.Cell64kPart - -> ae2:BlockCraftingStorage:3 + ae2:crafting_unit + ae2:material.Cell64kPart + -> ae2:crafting_storage_64k diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/patterns.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/patterns.recipe index 3b24a0cd..95e9f107 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/patterns.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/patterns.recipe @@ -1,5 +1,5 @@ shaped= - ae2:BlockQuartzGlass oredictionary:dustGlowstone ae2:BlockQuartzGlass, + ae2:quartz_glass oredictionary:dustGlowstone ae2:quartz_glass, oredictionary:dustGlowstone certusCrystal oredictionary:dustGlowstone, oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron - -> ae2:ItemMaterial.BlankPattern + -> ae2:material.BlankPattern diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable-anchor.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable-anchor.recipe deleted file mode 100644 index 589b886b..00000000 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable-anchor.recipe +++ /dev/null @@ -1,3 +0,0 @@ -shapeless= - metalIngots knife - -> 3 ae2:ItemPart.CableAnchor diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable_anchor.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable_anchor.recipe new file mode 100644 index 00000000..f5b5aed9 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable_anchor.recipe @@ -0,0 +1,3 @@ +shapeless= + metalIngots knife + -> 3 ae2:part.CableAnchor diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/emitters.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/emitters.recipe index d337cf4c..0373d198 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/emitters.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/emitters.recipe @@ -1,3 +1,3 @@ shapeless= - ae2:ItemMaterial.CalcProcessor mc:redstone_torch - -> ae2:ItemPart.LevelEmitter + ae2:material.CalcProcessor mc:redstone_torch + -> ae2:part.LevelEmitter diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/index.recipe index 1f8093c3..5e744511 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/index.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/index.recipe @@ -1,10 +1,10 @@ -import=network/parts/cable-anchor.recipe +import=network/parts/cable_anchor.recipe import=network/parts/emitters.recipe -import=network/parts/io-buses.recipe +import=network/parts/io_buses.recipe import=network/parts/monitors.recipe import=network/parts/panels.recipe import=network/parts/planes.recipe -import=network/parts/quartz-fiber.recipe +import=network/parts/quartz_fiber.recipe import=network/parts/terminals.recipe -import=network/parts/toggle-buses.recipe +import=network/parts/toggle_buses.recipe import=network/parts/tunnels.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/io-buses.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/io-buses.recipe deleted file mode 100644 index 864898d4..00000000 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/io-buses.recipe +++ /dev/null @@ -1,13 +0,0 @@ -shaped= - oredictionary:ingotIron ae2:ItemMaterial.FormationCore oredictionary:ingotIron, - _ mc:piston _ - -> ae2:ItemPart.ExportBus - -shaped= - _ ae2:ItemMaterial.AnnihilationCore _, - oredictionary:ingotIron mc:sticky_piston oredictionary:ingotIron - -> ae2:ItemPart.ImportBus - -shapeless= - interface mc:sticky_piston mc:piston - -> ae2:ItemPart.StorageBus diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/io_buses.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/io_buses.recipe new file mode 100644 index 00000000..847f1ada --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/io_buses.recipe @@ -0,0 +1,13 @@ +shaped= + oredictionary:ingotIron ae2:material.FormationCore oredictionary:ingotIron, + _ mc:piston _ + -> ae2:part.ExportBus + +shaped= + _ ae2:material.AnnihilationCore _, + oredictionary:ingotIron mc:sticky_piston oredictionary:ingotIron + -> ae2:part.ImportBus + +shapeless= + interface mc:sticky_piston mc:piston + -> ae2:part.StorageBus diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors.recipe index f6504bcb..edb3b299 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors.recipe @@ -1,7 +1,7 @@ shapeless= - ae2:ItemPart.LevelEmitter monitor - -> ae2:ItemPart.StorageMonitor + ae2:part.LevelEmitter monitor + -> ae2:part.StorageMonitor shapeless= - ae2:ItemMaterial.AnnihilationCore ae2:ItemPart.StorageMonitor ae2:ItemMaterial.FormationCore - -> ae2:ItemPart.ConversionMonitor + ae2:material.AnnihilationCore ae2:part.StorageMonitor ae2:material.FormationCore + -> ae2:part.ConversionMonitor diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels.recipe index 1fbfe56e..b956eff3 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels.recipe @@ -1,17 +1,17 @@ shaped= - _ oredictionary:dustGlowstone ae2:BlockQuartzGlass, - oredictionary:ingotIron oredictionary:dustRedstone ae2:BlockQuartzGlass, - _ oredictionary:dustGlowstone ae2:BlockQuartzGlass - -> 3 ae2:ItemPart.SemiDarkMonitor + _ oredictionary:dustGlowstone ae2:quartz_glass, + oredictionary:ingotIron oredictionary:dustRedstone ae2:quartz_glass, + _ oredictionary:dustGlowstone ae2:quartz_glass + -> 3 ae2:part.SemiDarkMonitor shapeless= - ae2:ItemPart.DarkMonitor - -> ae2:ItemPart.SemiDarkMonitor + ae2:part.DarkMonitor + -> ae2:part.SemiDarkMonitor shapeless= - ae2:ItemPart.SemiDarkMonitor - -> ae2:ItemPart.Monitor + ae2:part.SemiDarkMonitor + -> ae2:part.Monitor shapeless= - ae2:ItemPart.Monitor - -> ae2:ItemPart.DarkMonitor + ae2:part.Monitor + -> ae2:part.DarkMonitor diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes.recipe index 426d9868..87e23d4a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes.recipe @@ -1,25 +1,25 @@ shaped= fluixCrystal fluixCrystal fluixCrystal, - oredictionary:ingotIron ae2:ItemMaterial.FormationCore oredictionary:ingotIron - -> ae2:ItemPart.FormationPlane + oredictionary:ingotIron ae2:material.FormationCore oredictionary:ingotIron + -> ae2:part.FormationPlane shaped= fluixCrystal fluixCrystal fluixCrystal, - oredictionary:ingotIron ae2:ItemMaterial.AnnihilationCore oredictionary:ingotIron - -> ae2:ItemPart.AnnihilationPlane + oredictionary:ingotIron ae2:material.AnnihilationCore oredictionary:ingotIron + -> ae2:part.AnnihilationPlane shaped= oredictionary:ingotIron fluixCrystal, - ae2:ItemMaterial.AnnihilationCore fluixCrystal, + ae2:material.AnnihilationCore fluixCrystal, oredictionary:ingotIron fluixCrystal - -> ae2:ItemPart.AnnihilationPlane + -> ae2:part.AnnihilationPlane shaped= oredictionary:ingotIron fluixCrystal, - ae2:ItemMaterial.FormationCore fluixCrystal, + ae2:material.FormationCore fluixCrystal, oredictionary:ingotIron fluixCrystal - -> ae2:ItemPart.FormationPlane + -> ae2:part.FormationPlane shapeless= - ae2:ItemPart.AnnihilationPlane ae2:ItemMaterial.FluixPearl - -> ae2:ItemPart.IdentityAnnihilationPlane + ae2:part.AnnihilationPlane ae2:material.FluixPearl + -> ae2:part.IdentityAnnihilationPlane diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz-fiber.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz_fiber.recipe similarity index 72% rename from src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz-fiber.recipe rename to src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz_fiber.recipe index 67994b01..09c741a9 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz-fiber.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz_fiber.recipe @@ -2,4 +2,4 @@ shaped= glass glass glass, dustQuartz dustQuartz dustQuartz, glass glass glass - -> 3 ae2:ItemPart.QuartzFiber + -> 3 ae2:part.QuartzFiber diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.recipe index acd92ad7..94a0cd19 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.recipe @@ -1,15 +1,15 @@ shapeless= - monitor ae2:ItemMaterial.FormationCore ae2:ItemMaterial.AnnihilationCore ae2:ItemMaterial.LogicProcessor - -> ae2:ItemPart.Terminal + monitor ae2:material.FormationCore ae2:material.AnnihilationCore ae2:material.LogicProcessor + -> ae2:part.Terminal shapeless= - ae2:ItemPart.Terminal oredictionary:craftingTableWood ae2:ItemMaterial.CalcProcessor - -> ae2:ItemPart.CraftingTerminal + ae2:part.Terminal oredictionary:craftingTableWood ae2:material.CalcProcessor + -> ae2:part.CraftingTerminal shapeless= - monitor interface ae2:ItemMaterial.EngProcessor - -> ae2:ItemPart.InterfaceTerminal + monitor interface ae2:material.EngProcessor + -> ae2:part.InterfaceTerminal shapeless= - ae2:ItemPart.CraftingTerminal ae2:ItemMaterial.EngProcessor - -> ae2:ItemPart.PatternTerminal + ae2:part.CraftingTerminal ae2:material.EngProcessor + -> ae2:part.PatternTerminal diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle-buses.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle-buses.recipe deleted file mode 100644 index 20ff01db..00000000 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle-buses.recipe +++ /dev/null @@ -1,13 +0,0 @@ -shaped= - _ oredictionary:dustRedstone _, - cable mc:lever cable, - _ oredictionary:dustRedstone _ - -> ae2:ItemPart.ToggleBus - -shapeless= - ae2:ItemPart.ToggleBus - -> ae2:ItemPart.InvertedToggleBus - -shapeless= - ae2:ItemPart.InvertedToggleBus - -> ae2:ItemPart.ToggleBus diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_buses.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_buses.recipe new file mode 100644 index 00000000..0b7fd20f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle_buses.recipe @@ -0,0 +1,13 @@ +shaped= + _ oredictionary:dustRedstone _, + cable mc:lever cable, + _ oredictionary:dustRedstone _ + -> ae2:part.ToggleBus + +shapeless= + ae2:part.ToggleBus + -> ae2:part.InvertedToggleBus + +shapeless= + ae2:part.InvertedToggleBus + -> ae2:part.ToggleBus diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels.recipe index d158898e..0eb8c7f1 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels.recipe @@ -1,5 +1,5 @@ shaped= _ oredictionary:ingotIron _, - oredictionary:ingotIron ae2:ItemMaterial.EngProcessor oredictionary:ingotIron, + oredictionary:ingotIron ae2:material.EngProcessor oredictionary:ingotIron, fluixCrystal fluixCrystal fluixCrystal - -> ae2:ItemPart.P2PTunnelME + -> ae2:part.P2PTunnelME diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless.recipe index a469c4df..704564b8 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless.recipe @@ -1,22 +1,22 @@ shaped= - _ ae2:ItemMaterial.FluixPearl _, - oredictionary:ingotIron ae2:ItemPart.QuartzFiber oredictionary:ingotIron, + _ ae2:material.FluixPearl _, + oredictionary:ingotIron ae2:part.QuartzFiber oredictionary:ingotIron, _ oredictionary:ingotIron _ - -> ae2:ItemMaterial.Wireless + -> ae2:material.Wireless shaped= - ae2:ItemMaterial.Wireless, - ae2:ItemMaterial.CalcProcessor, + ae2:material.Wireless, + ae2:material.CalcProcessor, cable - -> ae2:BlockWireless + -> ae2:wireless_access_point shaped= - ae2:ItemMaterial.Wireless, - ae2:ItemPart.Terminal, - ae2:BlockDenseEnergyCell - -> ae2:ToolWirelessTerminal + ae2:material.Wireless, + ae2:part.Terminal, + ae2:dense_energy_cell + -> ae2:wireless_terminal shaped= oredictionary:dustFluix certusCrystal dustEnder, oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron, - -> 2 ae2:ItemMaterial.WirelessBooster + -> 2 ae2:material.WirelessBooster diff --git a/src/main/resources/assets/appliedenergistics2/recipes/oredict.recipe b/src/main/resources/assets/appliedenergistics2/recipes/oredict.recipe index 4a019c36..dc41f920 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/oredict.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/oredict.recipe @@ -14,18 +14,18 @@ ore=mc:chest -> chestWood # AE2 Ore Dictionary # Materials for processing in other machines -ore=ae2:ItemMaterial.CertusQuartzCrystal -> crystalCertusQuartz -ore=ae2:ItemMaterial.FluixCrystal -> crystalFluix -ore=ae2:ItemMaterial.PurifiedFluixCrystal -> crystalPureFluix -ore=ae2:ItemMaterial.NetherQuartzDust -> dustNetherQuartz -ore=ae2:ItemMaterial.CertusQuartzDust -> dustCertusQuartz -ore=ae2:ItemMaterial.FluixDust -> dustFluix +ore=ae2:material.CertusQuartzCrystal -> crystalCertusQuartz +ore=ae2:material.FluixCrystal -> crystalFluix +ore=ae2:material.PurifiedFluixCrystal -> crystalPureFluix +ore=ae2:material.NetherQuartzDust -> dustNetherQuartz +ore=ae2:material.CertusQuartzDust -> dustCertusQuartz +ore=ae2:material.FluixDust -> dustFluix # Ores of AE2 -ore=ae2:tile.OreQuartz -> oreCertusQuartz -ore=ae2:tile.OreQuartzCharged -> oreChargedCertusQuartz +ore=ae2:quartz_ore -> oreCertusQuartz +ore=ae2:charged_quartz_ore -> oreChargedCertusQuartz # Parts to be used -ore= ae2:ItemPart.SemiDarkMonitor -> itemIlluminatedPanel -ore= ae2:ItemPart.Monitor -> itemIlluminatedPanel -ore= ae2:ItemPart.DarkMonitor -> itemIlluminatedPanel \ No newline at end of file +ore= ae2:part.SemiDarkMonitor -> itemIlluminatedPanel +ore= ae2:part.Monitor -> itemIlluminatedPanel +ore= ae2:part.DarkMonitor -> itemIlluminatedPanel diff --git a/src/main/resources/assets/appliedenergistics2/recipes/processing/factorization.recipe b/src/main/resources/assets/appliedenergistics2/recipes/processing/factorization.recipe index d72fb785..67d61bc2 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/processing/factorization.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/processing/factorization.recipe @@ -1,9 +1,9 @@ -grindfz= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust -grindfz= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust -grindfz= mc:ender_pearl -> ae2:ItemMaterial.EnderDust -# grindfz= oredictionary:cropWheat -> ae2:ItemMaterial.Flour -grindfz= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust -grindfz= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust -# grindfz= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust -grindfz= ae2:OreQuartz -> 2 ae2:ItemMaterial.CertusQuartzDust -grindfz= ae2:OreQuartzCharged -> 2 ae2:ItemMaterial.CertusQuartzDust +grindfz= ae2:material.FluixCrystal -> ae2:material.FluixDust +grindfz= ae2:sky_stone_block:0 -> ae2:material.SkyDust +grindfz= mc:ender_pearl -> ae2:material.EnderDust +# grindfz= oredictionary:cropWheat -> ae2:material.Flour +grindfz= ae2:material.CertusQuartzCrystalCharged -> ae2:material.CertusQuartzDust +grindfz= ae2:material.CertusQuartzCrystal -> ae2:material.CertusQuartzDust +# grindfz= mc:quartz -> ae2:material.NetherQuartzDust +grindfz= ae2:quartz_ore -> 2 ae2:material.CertusQuartzDust +grindfz= ae2:charged_quartz_ore -> 2 ae2:material.CertusQuartzDust diff --git a/src/main/resources/assets/appliedenergistics2/recipes/processing/grind.recipe b/src/main/resources/assets/appliedenergistics2/recipes/processing/grind.recipe index f5a14d9a..e2441494 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/processing/grind.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/processing/grind.recipe @@ -1,4 +1,4 @@ -grind= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust -grind= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust +grind= ae2:material.FluixCrystal -> ae2:material.FluixDust +grind= ae2:sky_stone_block:0 -> ae2:material.SkyDust grind= mc:gravel -> mc:flint grind= mc:bone -> 4 mc:dye:15 diff --git a/src/main/resources/assets/appliedenergistics2/recipes/processing/hydraulicraft.recipe b/src/main/resources/assets/appliedenergistics2/recipes/processing/hydraulicraft.recipe index 43102efe..205bf58a 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/processing/hydraulicraft.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/processing/hydraulicraft.recipe @@ -1,9 +1,9 @@ -hccrusher= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust -hccrusher= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust -hccrusher= mc:ender_pearl -> ae2:ItemMaterial.EnderDust -hccrusher= oredictionary:cropWheat -> ae2:ItemMaterial.Flour -hccrusher= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust -hccrusher= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust -hccrusher= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust -hccrusher= ae2:OreQuartz -> 2 ae2:ItemMaterial.CertusQuartzDust -hccrusher= ae2:OreQuartzCharged -> 2 ae2:ItemMaterial.CertusQuartzDust +hccrusher= ae2:material.FluixCrystal -> ae2:material.FluixDust +hccrusher= ae2:sky_stone_block:0 -> ae2:material.SkyDust +hccrusher= mc:ender_pearl -> ae2:material.EnderDust +hccrusher= oredictionary:cropWheat -> ae2:material.Flour +hccrusher= ae2:material.CertusQuartzCrystalCharged -> ae2:material.CertusQuartzDust +hccrusher= ae2:material.CertusQuartzCrystal -> ae2:material.CertusQuartzDust +hccrusher= mc:quartz -> ae2:material.NetherQuartzDust +hccrusher= ae2:quartz_ore -> 2 ae2:material.CertusQuartzDust +hccrusher= ae2:charged_quartz_ore -> 2 ae2:material.CertusQuartzDust diff --git a/src/main/resources/assets/appliedenergistics2/recipes/processing/ic2.recipe b/src/main/resources/assets/appliedenergistics2/recipes/processing/ic2.recipe index 81d724cf..f57ea970 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/processing/ic2.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/processing/ic2.recipe @@ -1,9 +1,9 @@ -macerator= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust -macerator= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust -macerator= mc:ender_pearl -> ae2:ItemMaterial.EnderDust -# macerator= oredictionary:cropWheat -> ae2:ItemMaterial.Flour -macerator= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust -macerator= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust -macerator= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust -macerator= ae2:OreQuartz -> 2 ae2:ItemMaterial.CertusQuartzDust -macerator= ae2:OreQuartzCharged -> 2 ae2:ItemMaterial.CertusQuartzDust +macerator= ae2:material.FluixCrystal -> ae2:material.FluixDust +macerator= ae2:sky_stone_block:0 -> ae2:material.SkyDust +macerator= mc:ender_pearl -> ae2:material.EnderDust +# macerator= oredictionary:cropWheat -> ae2:material.Flour +macerator= ae2:material.CertusQuartzCrystalCharged -> ae2:material.CertusQuartzDust +macerator= ae2:material.CertusQuartzCrystal -> ae2:material.CertusQuartzDust +macerator= mc:quartz -> ae2:material.NetherQuartzDust +macerator= ae2:quartz_ore -> 2 ae2:material.CertusQuartzDust +macerator= ae2:charged_quartz_ore -> 2 ae2:material.CertusQuartzDust diff --git a/src/main/resources/assets/appliedenergistics2/recipes/processing/mekanism.recipe b/src/main/resources/assets/appliedenergistics2/recipes/processing/mekanism.recipe index 60b1be05..68fdb128 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/processing/mekanism.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/processing/mekanism.recipe @@ -1,9 +1,9 @@ -mekcrusher= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust -#bug mekcrusher= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust -#bug mekcrusher= mc:ender_pearl -> ae2:ItemMaterial.EnderDust -# mekcrusher= oredictionary:cropWheat -> ae2:ItemMaterial.Flour -#bug mekcrusher= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust -mekcrusher= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust -mekcrusher= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust -mekechamber= ae2:OreQuartz -> 2 ae2:ItemMaterial.CertusQuartzDust -mekechamber= ae2:OreQuartzCharged -> 2 ae2:ItemMaterial.CertusQuartzDust +mekcrusher= ae2:material.FluixCrystal -> ae2:material.FluixDust +#bug mekcrusher= ae2:sky_stone_block:0 -> ae2:material.SkyDust +#bug mekcrusher= mc:ender_pearl -> ae2:material.EnderDust +# mekcrusher= oredictionary:cropWheat -> ae2:material.Flour +#bug mekcrusher= ae2:material.CertusQuartzCrystalCharged -> ae2:material.CertusQuartzDust +mekcrusher= ae2:material.CertusQuartzCrystal -> ae2:material.CertusQuartzDust +mekcrusher= mc:quartz -> ae2:material.NetherQuartzDust +mekechamber= ae2:quartz_ore -> 2 ae2:material.CertusQuartzDust +mekechamber= ae2:charged_quartz_ore -> 2 ae2:material.CertusQuartzDust diff --git a/src/main/resources/assets/appliedenergistics2/recipes/processing/rotarycraft.recipe b/src/main/resources/assets/appliedenergistics2/recipes/processing/rotarycraft.recipe index cb90574c..1c6bd0e1 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/processing/rotarycraft.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/processing/rotarycraft.recipe @@ -1,9 +1,9 @@ -crusher= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust -crusher= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust -crusher= mc:ender_pearl -> ae2:ItemMaterial.EnderDust -crusher= oredictionary:cropWheat -> ae2:ItemMaterial.Flour -crusher= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust -crusher= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust -crusher= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust -crusher= ae2:OreQuartz -> 2 ae2:ItemMaterial.CertusQuartzDust -crusher= ae2:OreQuartzCharged -> 2 ae2:ItemMaterial.CertusQuartzDust +crusher= ae2:material.FluixCrystal -> ae2:material.FluixDust +crusher= ae2:sky_stone_block:0 -> ae2:material.SkyDust +crusher= mc:ender_pearl -> ae2:material.EnderDust +crusher= oredictionary:cropWheat -> ae2:material.Flour +crusher= ae2:material.CertusQuartzCrystalCharged -> ae2:material.CertusQuartzDust +crusher= ae2:material.CertusQuartzCrystal -> ae2:material.CertusQuartzDust +crusher= mc:quartz -> ae2:material.NetherQuartzDust +crusher= ae2:quartz_ore -> 2 ae2:material.CertusQuartzDust +crusher= ae2:charged_quartz_ore -> 2 ae2:material.CertusQuartzDust diff --git a/src/main/resources/assets/appliedenergistics2/recipes/processing/te.recipe b/src/main/resources/assets/appliedenergistics2/recipes/processing/te.recipe index 61af975a..1436eb9b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/processing/te.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/processing/te.recipe @@ -1,9 +1,9 @@ -pulverizer= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust -pulverizer= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust -pulverizer= mc:ender_pearl -> ae2:ItemMaterial.EnderDust -pulverizer= oredictionary:cropWheat -> ae2:ItemMaterial.Flour -pulverizer= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust -pulverizer= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust -pulverizer= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust -pulverizer= ae2:OreQuartz -> 2 ae2:ItemMaterial.CertusQuartzDust -pulverizer= ae2:OreQuartzCharged -> 2 ae2:ItemMaterial.CertusQuartzDust +pulverizer= ae2:material.FluixCrystal -> ae2:material.FluixDust +pulverizer= ae2:sky_stone_block:0 -> ae2:material.SkyDust +pulverizer= mc:ender_pearl -> ae2:material.EnderDust +pulverizer= oredictionary:cropWheat -> ae2:material.Flour +pulverizer= ae2:material.CertusQuartzCrystalCharged -> ae2:material.CertusQuartzDust +pulverizer= ae2:material.CertusQuartzCrystal -> ae2:material.CertusQuartzDust +pulverizer= mc:quartz -> ae2:material.NetherQuartzDust +pulverizer= ae2:quartz_ore -> 2 ae2:material.CertusQuartzDust +pulverizer= ae2:charged_quartz_ore -> 2 ae2:material.CertusQuartzDust diff --git a/src/main/resources/assets/appliedenergistics2/recipes/processing/vanilla.recipe b/src/main/resources/assets/appliedenergistics2/recipes/processing/vanilla.recipe index 8c8ca0e0..2af55299 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/processing/vanilla.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/processing/vanilla.recipe @@ -1,8 +1,8 @@ # Ore Processing -smelt= ae2:ItemMaterial.GoldDust -> mc:gold_ingot -smelt= ae2:ItemMaterial.IronDust -> mc:iron_ingot -smelt= ae2:ItemMaterial.Flour -> mc:bread +smelt= ae2:material.GoldDust -> mc:gold_ingot +smelt= ae2:material.IronDust -> mc:iron_ingot +smelt= ae2:material.Flour -> mc:bread # Silicon -smelt= ae2:ItemMaterial.NetherQuartzDust -> ae2:ItemMaterial.Silicon -smelt= ae2:ItemMaterial.CertusQuartzDust -> ae2:ItemMaterial.Silicon +smelt= ae2:material.NetherQuartzDust -> ae2:material.Silicon +smelt= ae2:material.CertusQuartzDust -> ae2:material.Silicon diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/certus-quartz.recipe b/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz.recipe similarity index 82% rename from src/main/resources/assets/appliedenergistics2/recipes/tools/certus-quartz.recipe rename to src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz.recipe index 8ebf02c1..debabaef 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/certus-quartz.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/certus_quartz.recipe @@ -2,40 +2,40 @@ shaped= oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz, oredictionary:crystalCertusQuartz oredictionary:stickWood, _ oredictionary:stickWood - -> ae2:ToolCertusQuartzAxe + -> ae2:certus_quartz_axe shaped= oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz, _ oredictionary:stickWood _, _ oredictionary:stickWood _ - -> ae2:ToolCertusQuartzPickaxe + -> ae2:certus_quartz_pickaxe shaped= oredictionary:crystalCertusQuartz, oredictionary:stickWood, oredictionary:stickWood - -> ae2:ToolCertusQuartzSpade + -> ae2:certus_quartz_spade shaped= oredictionary:crystalCertusQuartz, oredictionary:crystalCertusQuartz, oredictionary:stickWood - -> ae2:ToolCertusQuartzSword + -> ae2:certus_quartz_sword shaped= oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz, _ oredictionary:stickWood, _ oredictionary:stickWood - -> ae2:ToolCertusQuartzHoe + -> ae2:certus_quartz_hoe shaped= oredictionary:crystalCertusQuartz _ oredictionary:crystalCertusQuartz, _ oredictionary:crystalCertusQuartz _, oredictionary:crystalCertusQuartz _ oredictionary:crystalCertusQuartz - -> ae2:ToolCertusQuartzWrench + -> ae2:certus_quartz_wrench shaped= _ _ oredictionary:stickWood, oredictionary:ingotIron oredictionary:stickWood _, oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz _ - -> ae2:ToolCertusQuartzCuttingKnife + -> ae2:certus_quartz_cutting_knife diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/tools/index.recipe index b1d6e53a..6c804eb0 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/index.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/index.recipe @@ -1,6 +1,6 @@ -import=tools/certus-quartz.recipe -import=tools/matter-cannon.recipe +import=tools/certus_quartz.recipe +import=tools/matter_cannon.recipe import=tools/misctools.recipe -import=tools/nether-quartz.recipe +import=tools/nether_quartz.recipe import=tools/network.recipe import=tools/paintballs.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/matter-cannon.recipe b/src/main/resources/assets/appliedenergistics2/recipes/tools/matter-cannon.recipe deleted file mode 100644 index 382ba822..00000000 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/matter-cannon.recipe +++ /dev/null @@ -1,5 +0,0 @@ -shaped= - oredictionary:ingotIron oredictionary:ingotIron ae2:ItemMaterial.FormationCore, - ae2:ItemMaterial.Cell4kPart ae2:BlockEnergyCell _, - oredictionary:ingotIron _ _ - -> ae2:ToolMassCannon diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/matter_cannon.recipe b/src/main/resources/assets/appliedenergistics2/recipes/tools/matter_cannon.recipe new file mode 100644 index 00000000..72538c63 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/matter_cannon.recipe @@ -0,0 +1,5 @@ +shaped= + oredictionary:ingotIron oredictionary:ingotIron ae2:material.FormationCore, + ae2:material.Cell4kPart ae2:energy_cell _, + oredictionary:ingotIron _ _ + -> ae2:matter_cannon diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools.recipe b/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools.recipe index a7e89002..cd5cd1cc 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools.recipe @@ -1,11 +1,11 @@ shaped= - ae2:ItemMaterial.CertusQuartzCrystalCharged _ _, + ae2:material.CertusQuartzCrystalCharged _ _, _ oredictionary:ingotIron _, _ _ oredictionary:ingotIron - -> ae2:ToolChargedStaff + -> ae2:charged_staff shaped= - fluixCrystal ae2:BlockEnergyCell _, - ae2:ItemMaterial.EngProcessor oredictionary:ingotIron _, + fluixCrystal ae2:energy_cell _, + ae2:material.EngProcessor oredictionary:ingotIron _, _ _ oredictionary:ingotIron - -> ae2:ToolEntropyManipulator + -> ae2:entropy_manipulator diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/nether-quartz.recipe b/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz.recipe similarity index 82% rename from src/main/resources/assets/appliedenergistics2/recipes/tools/nether-quartz.recipe rename to src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz.recipe index 72c33a98..23f52979 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/nether-quartz.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/nether_quartz.recipe @@ -2,40 +2,40 @@ shaped= oredictionary:crystalNetherQuartz oredictionary:crystalNetherQuartz, oredictionary:crystalNetherQuartz oredictionary:stickWood, _ oredictionary:stickWood - -> ae2:ToolNetherQuartzAxe + -> ae2:nether_quartz_axe shaped= oredictionary:crystalNetherQuartz oredictionary:crystalNetherQuartz oredictionary:crystalNetherQuartz, _ oredictionary:stickWood _, _ oredictionary:stickWood _ - -> ae2:ToolNetherQuartzPickaxe + -> ae2:nether_quartz_pickaxe shaped= oredictionary:crystalNetherQuartz, oredictionary:stickWood, oredictionary:stickWood - -> ae2:ToolNetherQuartzSpade + -> ae2:nether_quartz_spade shaped= oredictionary:crystalNetherQuartz, oredictionary:crystalNetherQuartz, oredictionary:stickWood - -> ae2:ToolNetherQuartzSword + -> ae2:nether_quartz_sword shaped= oredictionary:crystalNetherQuartz oredictionary:crystalNetherQuartz, _ oredictionary:stickWood, _ oredictionary:stickWood - -> ae2:ToolNetherQuartzHoe + -> ae2:nether_quartz_hoe shaped= oredictionary:crystalNetherQuartz _ oredictionary:crystalNetherQuartz, _ oredictionary:crystalNetherQuartz _, oredictionary:crystalNetherQuartz _ oredictionary:crystalNetherQuartz - -> ae2:ToolNetherQuartzWrench + -> ae2:nether_quartz_wrench shaped= _ _ oredictionary:stickWood, oredictionary:ingotIron oredictionary:stickWood _, oredictionary:crystalNetherQuartz oredictionary:crystalNetherQuartz _ - -> ae2:ToolNetherQuartzCuttingKnife + -> ae2:nether_quartz_cutting_knife diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/network.recipe b/src/main/resources/assets/appliedenergistics2/recipes/tools/network.recipe index 432f8241..dbdfa980 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/network.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/network.recipe @@ -1,23 +1,23 @@ shaped= - ae2:BlockChest ae2:ItemMaterial.Cell1kPart ae2:BlockEnergyCell - -> ae2:ToolPortableCell + ae2:chest ae2:material.Cell1kPart ae2:energy_cell + -> ae2:portable_cell shapeless= - wrench monitor ae2:ItemMaterial.CalcProcessor oredictionary:chestWood - -> ae2:ToolNetworkTool + wrench monitor ae2:material.CalcProcessor oredictionary:chestWood + -> ae2:network_tool shaped= - ae2:ItemMaterial.EngProcessor oredictionary:ingotIron oredictionary:ingotIron, + ae2:material.EngProcessor oredictionary:ingotIron oredictionary:ingotIron, oredictionary:ingotGold oredictionary:dustRedstone oredictionary:ingotGold - -> ae2:ToolBiometricCard + -> ae2:biometric_card shaped= - ae2:ItemMaterial.CalcProcessor oredictionary:ingotIron oredictionary:ingotIron, + ae2:material.CalcProcessor oredictionary:ingotIron oredictionary:ingotIron, oredictionary:ingotGold oredictionary:dustRedstone oredictionary:ingotGold - -> ae2:ToolMemoryCard + -> ae2:memory_card shaped= - ae2:ItemMaterial.FormationCore oredictionary:ingotIron _, - oredictionary:ingotIron ae2:ItemMaterial.Cell4kPart _, - _ _ ae2:BlockEnergyCell - -> ae2:ToolColorApplicator + ae2:material.FormationCore oredictionary:ingotIron _, + oredictionary:ingotIron ae2:material.Cell4kPart _, + _ _ ae2:energy_cell + -> ae2:color_applicator diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs.recipe b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs.recipe index d76f7d47..a67d4466 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs.recipe @@ -1,191 +1,191 @@ shaped= - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall oredictionary:dyeWhite ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall - -> 8 ae2:PaintBall.White + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall, + ae2:material.MatterBall oredictionary:dyeWhite ae2:material.MatterBall, + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall + -> 8 ae2:paint_ball.white shaped= - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall oredictionary:dyeBlack ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall - -> 8 ae2:PaintBall.Black + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall, + ae2:material.MatterBall oredictionary:dyeBlack ae2:material.MatterBall, + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall + -> 8 ae2:paint_ball.black shaped= - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall oredictionary:dyeRed ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall - -> 8 ae2:PaintBall.Red + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall, + ae2:material.MatterBall oredictionary:dyeRed ae2:material.MatterBall, + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall + -> 8 ae2:paint_ball.red shaped= - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall oredictionary:dyeGreen ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall - -> 8 ae2:PaintBall.Green + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall, + ae2:material.MatterBall oredictionary:dyeGreen ae2:material.MatterBall, + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall + -> 8 ae2:paint_ball.green shaped= - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall oredictionary:dyeBrown ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall - -> 8 ae2:PaintBall.Brown + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall, + ae2:material.MatterBall oredictionary:dyeBrown ae2:material.MatterBall, + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall + -> 8 ae2:paint_ball.brown shaped= - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall oredictionary:dyeBlue ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall - -> 8 ae2:PaintBall.Blue + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall, + ae2:material.MatterBall oredictionary:dyeBlue ae2:material.MatterBall, + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall + -> 8 ae2:paint_ball.blue shaped= - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall oredictionary:dyePurple ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall - -> 8 ae2:PaintBall.Purple + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall, + ae2:material.MatterBall oredictionary:dyePurple ae2:material.MatterBall, + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall + -> 8 ae2:paint_ball.purple shaped= - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall oredictionary:dyeCyan ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall - -> 8 ae2:PaintBall.Cyan + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall, + ae2:material.MatterBall oredictionary:dyeCyan ae2:material.MatterBall, + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall + -> 8 ae2:paint_ball.cyan shaped= - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall oredictionary:dyeLightGray ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall - -> 8 ae2:PaintBall.LightGray + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall, + ae2:material.MatterBall oredictionary:dyeLightGray ae2:material.MatterBall, + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall + -> 8 ae2:paint_ball.light_gray shaped= - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall oredictionary:dyeGray ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall - -> 8 ae2:PaintBall.Gray + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall, + ae2:material.MatterBall oredictionary:dyeGray ae2:material.MatterBall, + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall + -> 8 ae2:paint_ball.gray shaped= - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall oredictionary:dyePink ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall - -> 8 ae2:PaintBall.Pink + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall, + ae2:material.MatterBall oredictionary:dyePink ae2:material.MatterBall, + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall + -> 8 ae2:paint_ball.pink shaped= - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall oredictionary:dyeLime ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall - -> 8 ae2:PaintBall.Lime + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall, + ae2:material.MatterBall oredictionary:dyeLime ae2:material.MatterBall, + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall + -> 8 ae2:paint_ball.lime shaped= - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall oredictionary:dyeYellow ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall - -> 8 ae2:PaintBall.Yellow + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall, + ae2:material.MatterBall oredictionary:dyeYellow ae2:material.MatterBall, + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall + -> 8 ae2:paint_ball.yellow shaped= - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall oredictionary:dyeLightBlue ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall - -> 8 ae2:PaintBall.LightBlue + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall, + ae2:material.MatterBall oredictionary:dyeLightBlue ae2:material.MatterBall, + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall + -> 8 ae2:paint_ball.light_blue shaped= - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall oredictionary:dyeMagenta ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall - -> 8 ae2:PaintBall.Magenta + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall, + ae2:material.MatterBall oredictionary:dyeMagenta ae2:material.MatterBall, + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall + -> 8 ae2:paint_ball.magenta shaped= - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall oredictionary:dyeOrange ae2:ItemMaterial.MatterBall, - ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall - -> 8 ae2:PaintBall.Orange + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall, + ae2:material.MatterBall oredictionary:dyeOrange ae2:material.MatterBall, + ae2:material.MatterBall ae2:material.MatterBall ae2:material.MatterBall + -> 8 ae2:paint_ball.orange shaped= - ae2:PaintBall.White ae2:PaintBall.White ae2:PaintBall.White, - ae2:PaintBall.White oredictionary:dustGlowstone ae2:PaintBall.White, - ae2:PaintBall.White ae2:PaintBall.White ae2:PaintBall.White - -> 8 ae2:LumenPaintBall.White + ae2:paint_ball.white ae2:paint_ball.white ae2:paint_ball.white, + ae2:paint_ball.white oredictionary:dustGlowstone ae2:paint_ball.white, + ae2:paint_ball.white ae2:paint_ball.white ae2:paint_ball.white + -> 8 ae2:lumen_paint_ball.white shaped= - ae2:PaintBall.Black ae2:PaintBall.Black ae2:PaintBall.Black, - ae2:PaintBall.Black oredictionary:dustGlowstone ae2:PaintBall.Black, - ae2:PaintBall.Black ae2:PaintBall.Black ae2:PaintBall.Black - -> 8 ae2:LumenPaintBall.Black + ae2:paint_ball.black ae2:paint_ball.black ae2:paint_ball.black, + ae2:paint_ball.black oredictionary:dustGlowstone ae2:paint_ball.black, + ae2:paint_ball.black ae2:paint_ball.black ae2:paint_ball.black + -> 8 ae2:lumen_paint_ball.black shaped= - ae2:PaintBall.Red ae2:PaintBall.Red ae2:PaintBall.Red, - ae2:PaintBall.Red oredictionary:dustGlowstone ae2:PaintBall.Red, - ae2:PaintBall.Red ae2:PaintBall.Red ae2:PaintBall.Red - -> 8 ae2:LumenPaintBall.Red + ae2:paint_ball.red ae2:paint_ball.red ae2:paint_ball.red, + ae2:paint_ball.red oredictionary:dustGlowstone ae2:paint_ball.red, + ae2:paint_ball.red ae2:paint_ball.red ae2:paint_ball.red + -> 8 ae2:lumen_paint_ball.red shaped= - ae2:PaintBall.Green ae2:PaintBall.Green ae2:PaintBall.Green, - ae2:PaintBall.Green oredictionary:dustGlowstone ae2:PaintBall.Green, - ae2:PaintBall.Green ae2:PaintBall.Green ae2:PaintBall.Green - -> 8 ae2:LumenPaintBall.Green + ae2:paint_ball.green ae2:paint_ball.green ae2:paint_ball.green, + ae2:paint_ball.green oredictionary:dustGlowstone ae2:paint_ball.green, + ae2:paint_ball.green ae2:paint_ball.green ae2:paint_ball.green + -> 8 ae2:lumen_paint_ball.green shaped= - ae2:PaintBall.Brown ae2:PaintBall.Brown ae2:PaintBall.Brown, - ae2:PaintBall.Brown oredictionary:dustGlowstone ae2:PaintBall.Brown, - ae2:PaintBall.Brown ae2:PaintBall.Brown ae2:PaintBall.Brown - -> 8 ae2:LumenPaintBall.Brown + ae2:paint_ball.brown ae2:paint_ball.brown ae2:paint_ball.brown, + ae2:paint_ball.brown oredictionary:dustGlowstone ae2:paint_ball.brown, + ae2:paint_ball.brown ae2:paint_ball.brown ae2:paint_ball.brown + -> 8 ae2:lumen_paint_ball.brown shaped= - ae2:PaintBall.Blue ae2:PaintBall.Blue ae2:PaintBall.Blue, - ae2:PaintBall.Blue oredictionary:dustGlowstone ae2:PaintBall.Blue, - ae2:PaintBall.Blue ae2:PaintBall.Blue ae2:PaintBall.Blue - -> 8 ae2:LumenPaintBall.Blue + ae2:paint_ball.blue ae2:paint_ball.blue ae2:paint_ball.blue, + ae2:paint_ball.blue oredictionary:dustGlowstone ae2:paint_ball.blue, + ae2:paint_ball.blue ae2:paint_ball.blue ae2:paint_ball.blue + -> 8 ae2:lumen_paint_ball.blue shaped= - ae2:PaintBall.Purple ae2:PaintBall.Purple ae2:PaintBall.Purple, - ae2:PaintBall.Purple oredictionary:dustGlowstone ae2:PaintBall.Purple, - ae2:PaintBall.Purple ae2:PaintBall.Purple ae2:PaintBall.Purple - -> 8 ae2:LumenPaintBall.Purple + ae2:paint_ball.purple ae2:paint_ball.purple ae2:paint_ball.purple, + ae2:paint_ball.purple oredictionary:dustGlowstone ae2:paint_ball.purple, + ae2:paint_ball.purple ae2:paint_ball.purple ae2:paint_ball.purple + -> 8 ae2:lumen_paint_ball.purple shaped= - ae2:PaintBall.Cyan ae2:PaintBall.Cyan ae2:PaintBall.Cyan, - ae2:PaintBall.Cyan oredictionary:dustGlowstone ae2:PaintBall.Cyan, - ae2:PaintBall.Cyan ae2:PaintBall.Cyan ae2:PaintBall.Cyan - -> 8 ae2:LumenPaintBall.Cyan + ae2:paint_ball.cyan ae2:paint_ball.cyan ae2:paint_ball.cyan, + ae2:paint_ball.cyan oredictionary:dustGlowstone ae2:paint_ball.cyan, + ae2:paint_ball.cyan ae2:paint_ball.cyan ae2:paint_ball.cyan + -> 8 ae2:lumen_paint_ball.cyan shaped= - ae2:PaintBall.LightGray ae2:PaintBall.LightGray ae2:PaintBall.LightGray, - ae2:PaintBall.LightGray oredictionary:dustGlowstone ae2:PaintBall.LightGray, - ae2:PaintBall.LightGray ae2:PaintBall.LightGray ae2:PaintBall.LightGray - -> 8 ae2:LumenPaintBall.LightGray + ae2:paint_ball.light_gray ae2:paint_ball.light_gray ae2:paint_ball.light_gray, + ae2:paint_ball.light_gray oredictionary:dustGlowstone ae2:paint_ball.light_gray, + ae2:paint_ball.light_gray ae2:paint_ball.light_gray ae2:paint_ball.light_gray + -> 8 ae2:lumen_paint_ball.light_gray shaped= - ae2:PaintBall.Gray ae2:PaintBall.Gray ae2:PaintBall.Gray, - ae2:PaintBall.Gray oredictionary:dustGlowstone ae2:PaintBall.Gray, - ae2:PaintBall.Gray ae2:PaintBall.Gray ae2:PaintBall.Gray - -> 8 ae2:LumenPaintBall.Gray + ae2:paint_ball.gray ae2:paint_ball.gray ae2:paint_ball.gray, + ae2:paint_ball.gray oredictionary:dustGlowstone ae2:paint_ball.gray, + ae2:paint_ball.gray ae2:paint_ball.gray ae2:paint_ball.gray + -> 8 ae2:lumen_paint_ball.gray shaped= - ae2:PaintBall.Pink ae2:PaintBall.Pink ae2:PaintBall.Pink, - ae2:PaintBall.Pink oredictionary:dustGlowstone ae2:PaintBall.Pink, - ae2:PaintBall.Pink ae2:PaintBall.Pink ae2:PaintBall.Pink - -> 8 ae2:LumenPaintBall.Pink + ae2:paint_ball.pink ae2:paint_ball.pink ae2:paint_ball.pink, + ae2:paint_ball.pink oredictionary:dustGlowstone ae2:paint_ball.pink, + ae2:paint_ball.pink ae2:paint_ball.pink ae2:paint_ball.pink + -> 8 ae2:lumen_paint_ball.pink shaped= - ae2:PaintBall.Lime ae2:PaintBall.Lime ae2:PaintBall.Lime, - ae2:PaintBall.Lime oredictionary:dustGlowstone ae2:PaintBall.Lime, - ae2:PaintBall.Lime ae2:PaintBall.Lime ae2:PaintBall.Lime - -> 8 ae2:LumenPaintBall.Lime + ae2:paint_ball.lime ae2:paint_ball.lime ae2:paint_ball.lime, + ae2:paint_ball.lime oredictionary:dustGlowstone ae2:paint_ball.lime, + ae2:paint_ball.lime ae2:paint_ball.lime ae2:paint_ball.lime + -> 8 ae2:lumen_paint_ball.lime shaped= - ae2:PaintBall.Yellow ae2:PaintBall.Yellow ae2:PaintBall.Yellow, - ae2:PaintBall.Yellow oredictionary:dustGlowstone ae2:PaintBall.Yellow, - ae2:PaintBall.Yellow ae2:PaintBall.Yellow ae2:PaintBall.Yellow - -> 8 ae2:LumenPaintBall.Yellow + ae2:paint_ball.yellow ae2:paint_ball.yellow ae2:paint_ball.yellow, + ae2:paint_ball.yellow oredictionary:dustGlowstone ae2:paint_ball.yellow, + ae2:paint_ball.yellow ae2:paint_ball.yellow ae2:paint_ball.yellow + -> 8 ae2:lumen_paint_ball.yellow shaped= - ae2:PaintBall.LightBlue ae2:PaintBall.LightBlue ae2:PaintBall.LightBlue, - ae2:PaintBall.LightBlue oredictionary:dustGlowstone ae2:PaintBall.LightBlue, - ae2:PaintBall.LightBlue ae2:PaintBall.LightBlue ae2:PaintBall.LightBlue - -> 8 ae2:LumenPaintBall.LightBlue + ae2:paint_ball.light_blue ae2:paint_ball.light_blue ae2:paint_ball.light_blue, + ae2:paint_ball.light_blue oredictionary:dustGlowstone ae2:paint_ball.light_blue, + ae2:paint_ball.light_blue ae2:paint_ball.light_blue ae2:paint_ball.light_blue + -> 8 ae2:lumen_paint_ball.light_blue shaped= - ae2:PaintBall.Magenta ae2:PaintBall.Magenta ae2:PaintBall.Magenta, - ae2:PaintBall.Magenta oredictionary:dustGlowstone ae2:PaintBall.Magenta, - ae2:PaintBall.Magenta ae2:PaintBall.Magenta ae2:PaintBall.Magenta - -> 8 ae2:LumenPaintBall.Magenta + ae2:paint_ball.magenta ae2:paint_ball.magenta ae2:paint_ball.magenta, + ae2:paint_ball.magenta oredictionary:dustGlowstone ae2:paint_ball.magenta, + ae2:paint_ball.magenta ae2:paint_ball.magenta ae2:paint_ball.magenta + -> 8 ae2:lumen_paint_ball.magenta shaped= - ae2:PaintBall.Orange ae2:PaintBall.Orange ae2:PaintBall.Orange, - ae2:PaintBall.Orange oredictionary:dustGlowstone ae2:PaintBall.Orange, - ae2:PaintBall.Orange ae2:PaintBall.Orange ae2:PaintBall.Orange - -> 8 ae2:LumenPaintBall.Orange + ae2:paint_ball.orange ae2:paint_ball.orange ae2:paint_ball.orange, + ae2:paint_ball.orange oredictionary:dustGlowstone ae2:paint_ball.orange, + ae2:paint_ball.orange ae2:paint_ball.orange ae2:paint_ball.orange + -> 8 ae2:lumen_paint_ball.orange