diff --git a/src/main/java/appeng/bootstrap/FeatureFactory.java b/src/main/java/appeng/bootstrap/FeatureFactory.java index 11fe614ed..9ccacd52f 100644 --- a/src/main/java/appeng/bootstrap/FeatureFactory.java +++ b/src/main/java/appeng/bootstrap/FeatureFactory.java @@ -114,23 +114,6 @@ public class FeatureFactory return new TileEntityBuilder<>( this, id, teClass, factory ).features( this.defaultFeatures ); } - public AEColoredItemDefinition colored( IItemDefinition target ) - { - ColoredItemDefinition definition = new ColoredItemDefinition(); - - target.maybeItem().ifPresent( targetItem -> - { - for( final AEColor color : AEColor.VALID_COLORS ) - { - final ActivityState state = ActivityState.from( true ); - - definition.add( color, new ItemStackSrc( targetItem, state ) ); - } - } ); - - return definition; - } - public FeatureFactory features( AEFeature... features ) { return new FeatureFactory( this, features ); diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index aa86c57ba..9aa3c6b50 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -96,7 +96,6 @@ import appeng.fluids.registries.BasicFluidCellGuiHandler; import appeng.me.cache.*; import appeng.recipes.conditions.FeaturesEnabled; import appeng.recipes.game.DisassembleRecipe; -import appeng.recipes.ingredients.PartIngredientSerializer; import appeng.server.AECommand; import appeng.tile.AEBaseTile; import net.minecraft.advancements.CriteriaTriggers; diff --git a/src/main/java/appeng/core/api/definitions/ApiItems.java b/src/main/java/appeng/core/api/definitions/ApiItems.java index ff5915bd1..22787123a 100644 --- a/src/main/java/appeng/core/api/definitions/ApiItems.java +++ b/src/main/java/appeng/core/api/definitions/ApiItems.java @@ -21,12 +21,16 @@ package appeng.core.api.definitions; import appeng.api.definitions.IItemDefinition; import appeng.api.definitions.IItems; +import appeng.api.util.AEColor; import appeng.api.util.AEColoredItemDefinition; import appeng.bootstrap.FeatureFactory; import appeng.api.features.AEFeature; import appeng.client.render.crafting.EncodedPatternRenderer; import appeng.client.render.crafting.ItemEncodedPatternRendering; import appeng.core.CreativeTabFacade; +import appeng.core.features.ActivityState; +import appeng.core.features.ColoredItemDefinition; +import appeng.core.features.ItemStackSrc; import appeng.debug.*; import appeng.entity.EntityGrowingCrystal; import appeng.fluids.items.BasicFluidStorageCell; @@ -290,17 +294,8 @@ public final class ApiItems implements IItems .rendering( new ItemEncodedPatternRendering() ) .build(); - IItemDefinition paintBall = registry.item( "paint_ball", props -> new ItemPaintBall(props, false) ) - .features( AEFeature.PAINT_BALLS ) - .rendering( new ItemPaintBallRendering() ) - .build(); - // FIXME these are both wrong - this.coloredPaintBall = registry.colored( paintBall ); - IItemDefinition lumenPaintBall = registry.item( "lumen_paint_ball", props -> new ItemPaintBall(props, true) ) - .features( AEFeature.PAINT_BALLS ) - .rendering( new ItemPaintBallRendering() ) - .build(); - this.coloredLumenPaintBall = registry.colored( lumenPaintBall ); + this.coloredPaintBall = createPaintBalls(registry, "_paint_ball", false); + this.coloredLumenPaintBall = createPaintBalls(registry, "_lumen_paint_ball", true); FeatureFactory debugTools = registry.features( AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE ); this.toolEraser = debugTools.item( "debug_eraser", ToolEraser::new ).build(); @@ -312,6 +307,19 @@ public final class ApiItems implements IItems this.dummyFluidItem = registry.item( "dummy_fluid_item", FluidDummyItem::new ).rendering( new FluidDummyItemRendering() ).build(); } + private static AEColoredItemDefinition createPaintBalls(FeatureFactory registry, String idSuffix, boolean lumen) { + ColoredItemDefinition colors = new ColoredItemDefinition(); + for (AEColor color : AEColor.values()) { + String id = color.registryPrefix + idSuffix; + IItemDefinition paintBall = registry.item(id, props -> new ItemPaintBall(props, color, lumen)) + .features(AEFeature.PAINT_BALLS) + .rendering(new ItemPaintBallRendering(color, lumen)) + .build(); + colors.add(color, new ItemStackSrc(paintBall.item(), ActivityState.Enabled)); + } + return colors; + } + @Override public IItemDefinition certusQuartzAxe() { diff --git a/src/main/java/appeng/items/misc/ItemPaintBall.java b/src/main/java/appeng/items/misc/ItemPaintBall.java index 3054aab09..2d08fe11e 100644 --- a/src/main/java/appeng/items/misc/ItemPaintBall.java +++ b/src/main/java/appeng/items/misc/ItemPaintBall.java @@ -21,6 +21,7 @@ package appeng.items.misc; import appeng.api.util.AEColor; import appeng.items.AEBaseItem; +import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -32,12 +33,13 @@ import net.minecraft.util.text.TranslationTextComponent; public class ItemPaintBall extends AEBaseItem { - private static final String TAG_COLOR = "c"; + private final AEColor color; private final boolean lumen; - public ItemPaintBall(Properties properties, boolean lumen) { + public ItemPaintBall(Properties properties, AEColor color, boolean lumen) { super(properties); + this.color = color; this.lumen = lumen; } @@ -56,21 +58,11 @@ public class ItemPaintBall extends AEBaseItem public AEColor getColor( final ItemStack is ) { - CompoundNBT tag = is.getTag(); - if (tag == null || !tag.contains(TAG_COLOR)) { - return AEColor.TRANSPARENT; + Item item = is.getItem(); + if (item instanceof ItemPaintBall) { + return ((ItemPaintBall) item).color; } - int c = tag.getInt(TAG_COLOR); - if (c < 0 || c >= AEColor.values().length) { - return AEColor.TRANSPARENT; - } - return AEColor.values()[c]; - } - - public ItemStack setColor( final ItemStack is, AEColor color ) - { - is.getOrCreateTag().putInt(TAG_COLOR, color.ordinal()); - return is; + return AEColor.TRANSPARENT; } public boolean isLumen() @@ -78,20 +70,4 @@ public class ItemPaintBall extends AEBaseItem return lumen; } - @Override - public void fillItemGroup(ItemGroup group, NonNullList itemStacks) { - - if (!isInGroup(group)) { - return; - } - - for( final AEColor c : AEColor.values() ) - { - if( c != AEColor.TRANSPARENT ) - { - itemStacks.add( setColor(new ItemStack( this ), c) ); - } - } - } - } diff --git a/src/main/java/appeng/items/misc/ItemPaintBallRendering.java b/src/main/java/appeng/items/misc/ItemPaintBallRendering.java index bb1f46afc..21234f535 100644 --- a/src/main/java/appeng/items/misc/ItemPaintBallRendering.java +++ b/src/main/java/appeng/items/misc/ItemPaintBallRendering.java @@ -20,9 +20,6 @@ package appeng.items.misc; -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraft.item.ItemStack; - import appeng.api.util.AEColor; import appeng.bootstrap.IItemRendering; import appeng.bootstrap.ItemRenderingCustomizer; @@ -31,33 +28,36 @@ import appeng.bootstrap.ItemRenderingCustomizer; public class ItemPaintBallRendering extends ItemRenderingCustomizer { + private final boolean lumen; + + private final AEColor color; + + public ItemPaintBallRendering(AEColor color, boolean lumen) { + this.lumen = lumen; + this.color = color; + } + @Override public void customize( IItemRendering rendering ) { - rendering.color( ItemPaintBallRendering::getColorFromItemstack ); - // FIXME rendering.meshDefinition( is -> ItemPaintBall.isLumen( is ) ? MODEL_SHIMMER : MODEL_NORMAL ); - } - - private static int getColorFromItemstack( ItemStack stack, int tintIndex ) - { - ItemPaintBall item = (ItemPaintBall) stack.getItem(); - final AEColor col = item.getColor( stack ); - - boolean lumen = item.isLumen(); - final int colorValue = lumen ? col.mediumVariant : col.mediumVariant; + final int colorValue = lumen ? color.mediumVariant : color.mediumVariant; final int r = ( colorValue >> 16 ) & 0xff; final int g = ( colorValue >> 8 ) & 0xff; final int b = ( colorValue ) & 0xff; + int renderColor; if( lumen ) { final float fail = 0.7f; final int full = (int) ( 255 * 0.3 ); - return (int) ( full + r * fail ) << 16 | (int) ( full + g * fail ) << 8 | (int) ( full + b * fail ) | 0xff << 24; + renderColor = (int) ( full + r * fail ) << 16 | (int) ( full + g * fail ) << 8 | (int) ( full + b * fail ) | 0xff << 24; } else { - return r << 16 | g << 8 | b | 0xff << 24; + renderColor = r << 16 | g << 8 | b | 0xff << 24; } + + rendering.color( (is, tintIndex) -> renderColor ); } + } diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/cable_glass.json b/src/main/resources/data/appliedenergistics2/advancements/main/cable_glass.json index 0b731f3bf..a185853c1 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/cable_glass.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/cable_glass.json @@ -1,28 +1,27 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:part", - "data": 16 - }, - "title": { - "translate": "achievement.ae2.GlassCable" - }, - "description": { - "translate": "achievement.ae2.GlassCable.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:part", + "data": 16 }, - "parent": "appliedenergistics2:main/fluix", - "criteria": { - "certus": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "appliedenergistics2:part", - "part": "CABLE_GLASS" - } - ] - } - } + "title": { + "translate": "achievement.ae2.GlassCable" + }, + "description": { + "translate": "achievement.ae2.GlassCable.desc" } -} + }, + "parent": "appliedenergistics2:main/fluix", + "criteria": { + "certus": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "appliedenergistics2:glass_cable" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/charged_quartz.json b/src/main/resources/data/appliedenergistics2/advancements/main/charged_quartz.json index 35681b0ff..2bee88611 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/charged_quartz.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/charged_quartz.json @@ -1,28 +1,28 @@ { - "display": { - "icon": { + "display": { + "icon": { + "item": "appliedenergistics2:material", + "data": 1 + }, + "title": { + "translate": "achievement.ae2.ChargedQuartz" + }, + "description": { + "translate": "achievement.ae2.ChargedQuartz.desc" + } + }, + "parent": "appliedenergistics2:main/root", + "criteria": { + "certus": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "item": "appliedenergistics2:material", "data": 1 - }, - "title": { - "translate": "achievement.ae2.ChargedQuartz" - }, - "description": { - "translate": "achievement.ae2.ChargedQuartz.desc" - } - }, - "parent": "appliedenergistics2:main/root", - "criteria": { - "certus": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:material", - "data": 1 - } - ] - } - } + } + ] + } } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/charger.json b/src/main/resources/data/appliedenergistics2/advancements/main/charger.json index f710dfaec..3cc527a64 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/charger.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/charger.json @@ -1,26 +1,26 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:charger" - }, - "title": { - "translate": "achievement.ae2.Charger" - }, - "description": { - "translate": "achievement.ae2.Charger.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:charger" }, - "parent": "appliedenergistics2:main/charged_quartz", - "criteria": { - "certus": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:charger" - } - ] - } - } + "title": { + "translate": "achievement.ae2.Charger" + }, + "description": { + "translate": "achievement.ae2.Charger.desc" } -} + }, + "parent": "appliedenergistics2:main/charged_quartz", + "criteria": { + "certus": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:charger" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/compass.json b/src/main/resources/data/appliedenergistics2/advancements/main/compass.json index eb8b08538..e4c133113 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/compass.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/compass.json @@ -1,26 +1,26 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:sky_compass" - }, - "title": { - "translate": "achievement.ae2.Compass" - }, - "description": { - "translate": "achievement.ae2.Compass.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:sky_compass" }, - "parent": "appliedenergistics2:main/root", - "criteria": { - "compass": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:sky_compass" - } - ] - } - } + "title": { + "translate": "achievement.ae2.Compass" + }, + "description": { + "translate": "achievement.ae2.Compass.desc" } -} + }, + "parent": "appliedenergistics2:main/root", + "criteria": { + "compass": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:sky_compass" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/controller.json b/src/main/resources/data/appliedenergistics2/advancements/main/controller.json index b354609c4..a956f3f7c 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/controller.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/controller.json @@ -1,26 +1,26 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:controller" - }, - "title": { - "translate": "achievement.ae2.Controller" - }, - "description": { - "translate": "achievement.ae2.Controller.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:controller" }, - "parent": "appliedenergistics2:main/presses", - "criteria": { - "certus": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:controller" - } - ] - } - } + "title": { + "translate": "achievement.ae2.Controller" + }, + "description": { + "translate": "achievement.ae2.Controller.desc" } -} + }, + "parent": "appliedenergistics2:main/presses", + "criteria": { + "certus": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:controller" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/crafting_cpu.json b/src/main/resources/data/appliedenergistics2/advancements/main/crafting_cpu.json index 0088de722..ee30dfc0a 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/crafting_cpu.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/crafting_cpu.json @@ -1,64 +1,64 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:crafting_storage_64k" - }, - "title": { - "translate": "achievement.ae2.CraftingCPU" - }, - "description": { - "translate": "achievement.ae2.CraftingCPU.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:crafting_storage_64k" }, - "parent": "appliedenergistics2:main/pattern_terminal", - "criteria": { - "c1k": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:crafting_storage_1k" - } - ] - } - }, - "c4k": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:crafting_storage_4k" - } - ] - } - }, - "c16k": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:crafting_storage_16k" - } - ] - } - }, - "c64k": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:crafting_storage_64k" - } - ] - } - } + "title": { + "translate": "achievement.ae2.CraftingCPU" }, - "requirements": [ - [ - "c1k", - "c4k", - "c16k", - "c64k" + "description": { + "translate": "achievement.ae2.CraftingCPU.desc" + } + }, + "parent": "appliedenergistics2:main/pattern_terminal", + "criteria": { + "c1k": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:crafting_storage_1k" + } ] + } + }, + "c4k": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:crafting_storage_4k" + } + ] + } + }, + "c16k": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:crafting_storage_16k" + } + ] + } + }, + "c64k": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:crafting_storage_64k" + } + ] + } + } + }, + "requirements": [ + [ + "c1k", + "c4k", + "c16k", + "c64k" ] -} + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/crafting_terminal.json b/src/main/resources/data/appliedenergistics2/advancements/main/crafting_terminal.json index 54003cca3..207b61830 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/crafting_terminal.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/crafting_terminal.json @@ -1,28 +1,27 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:part", - "data": 360 - }, - "title": { - "translate": "achievement.ae2.CraftingTerminal" - }, - "description": { - "translate": "achievement.ae2.CraftingTerminal.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:part", + "data": 360 }, - "parent": "appliedenergistics2:main/controller", - "criteria": { - "certus": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "appliedenergistics2:part", - "part": "CRAFTING_TERMINAL" - } - ] - } - } + "title": { + "translate": "achievement.ae2.CraftingTerminal" + }, + "description": { + "translate": "achievement.ae2.CraftingTerminal.desc" } -} + }, + "parent": "appliedenergistics2:main/controller", + "criteria": { + "certus": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:crafting_terminal" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/facade.json b/src/main/resources/data/appliedenergistics2/advancements/main/facade.json index 9f9de8b1f..9476c6158 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/facade.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/facade.json @@ -1,26 +1,26 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:facade" - }, - "title": { - "translate": "achievement.ae2.Facade" - }, - "description": { - "translate": "achievement.ae2.Facade.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:facade" }, - "parent": "appliedenergistics2:main/cable_glass", - "criteria": { - "facade": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:facade" - } - ] - } - } + "title": { + "translate": "achievement.ae2.Facade" + }, + "description": { + "translate": "achievement.ae2.Facade.desc" } -} + }, + "parent": "appliedenergistics2:main/cable_glass", + "criteria": { + "facade": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:facade" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/fluix.json b/src/main/resources/data/appliedenergistics2/advancements/main/fluix.json index 4faa334d9..37e60dd4b 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/fluix.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/fluix.json @@ -1,28 +1,28 @@ { - "display": { - "icon": { + "display": { + "icon": { + "item": "appliedenergistics2:material", + "data": 7 + }, + "title": { + "translate": "achievement.ae2.Fluix" + }, + "description": { + "translate": "achievement.ae2.Fluix.desc" + } + }, + "parent": "appliedenergistics2:main/charged_quartz", + "criteria": { + "certus": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "item": "appliedenergistics2:material", "data": 7 - }, - "title": { - "translate": "achievement.ae2.Fluix" - }, - "description": { - "translate": "achievement.ae2.Fluix.desc" - } - }, - "parent": "appliedenergistics2:main/charged_quartz", - "criteria": { - "certus": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:material", - "data": 7 - } - ] - } - } + } + ] + } } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/growth_accelerator.json b/src/main/resources/data/appliedenergistics2/advancements/main/growth_accelerator.json index 567c6a681..af3680ba9 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/growth_accelerator.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/growth_accelerator.json @@ -1,26 +1,26 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:quartz_growth_accelerator" - }, - "title": { - "translate": "achievement.ae2.CrystalGrowthAccelerator" - }, - "description": { - "translate": "achievement.ae2.CrystalGrowthAccelerator.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:quartz_growth_accelerator" }, - "parent": "appliedenergistics2:main/fluix", - "criteria": { - "certus": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:quartz_growth_accelerator" - } - ] - } - } + "title": { + "translate": "achievement.ae2.CrystalGrowthAccelerator" + }, + "description": { + "translate": "achievement.ae2.CrystalGrowthAccelerator.desc" } -} + }, + "parent": "appliedenergistics2:main/fluix", + "criteria": { + "certus": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:quartz_growth_accelerator" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/interface.json b/src/main/resources/data/appliedenergistics2/advancements/main/interface.json index 9497394c6..f2adc8aa4 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/interface.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/interface.json @@ -1,26 +1,26 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:interface" - }, - "title": { - "translate": "achievement.ae2.Recursive" - }, - "description": { - "translate": "achievement.ae2.Recursive.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:interface" }, - "parent": "appliedenergistics2:main/cable_glass", - "criteria": { - "certus": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:interface" - } - ] - } - } + "title": { + "translate": "achievement.ae2.Recursive" + }, + "description": { + "translate": "achievement.ae2.Recursive.desc" } -} + }, + "parent": "appliedenergistics2:main/cable_glass", + "criteria": { + "certus": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:interface" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/ioport.json b/src/main/resources/data/appliedenergistics2/advancements/main/ioport.json index 22feab917..9e82d2cc7 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/ioport.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/ioport.json @@ -1,26 +1,26 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:io_port" - }, - "title": { - "translate": "achievement.ae2.IOPort" - }, - "description": { - "translate": "achievement.ae2.IOPort.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:io_port" }, - "parent": "appliedenergistics2:main/storage_cell", - "criteria": { - "certus": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:io_port" - } - ] - } - } + "title": { + "translate": "achievement.ae2.IOPort" + }, + "description": { + "translate": "achievement.ae2.IOPort.desc" } -} + }, + "parent": "appliedenergistics2:main/storage_cell", + "criteria": { + "certus": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:io_port" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/network1.json b/src/main/resources/data/appliedenergistics2/advancements/main/network1.json index 0399b494c..4ab0eeab4 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/network1.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/network1.json @@ -1,20 +1,20 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:part", - "data": 36 - }, - "title": { - "translate": "achievement.ae2.Networking1" - }, - "description": { - "translate": "achievement.ae2.Networking1.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:part", + "data": 36 }, - "parent": "appliedenergistics2:main/cable_glass", - "criteria": { - "cable": { - "trigger": "appliedenergistics2:network_apprentice" - } + "title": { + "translate": "achievement.ae2.Networking1" + }, + "description": { + "translate": "achievement.ae2.Networking1.desc" } -} + }, + "parent": "appliedenergistics2:main/cable_glass", + "criteria": { + "cable": { + "trigger": "appliedenergistics2:network_apprentice" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/network2.json b/src/main/resources/data/appliedenergistics2/advancements/main/network2.json index 9dcafdf10..4fc871073 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/network2.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/network2.json @@ -1,20 +1,20 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:part", - "data": 56 - }, - "title": { - "translate": "achievement.ae2.Networking2" - }, - "description": { - "translate": "achievement.ae2.Networking2.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:part", + "data": 56 }, - "parent": "appliedenergistics2:main/network1", - "criteria": { - "cable": { - "trigger": "appliedenergistics2:network_engineer" - } + "title": { + "translate": "achievement.ae2.Networking2" + }, + "description": { + "translate": "achievement.ae2.Networking2.desc" } -} + }, + "parent": "appliedenergistics2:main/network1", + "criteria": { + "cable": { + "trigger": "appliedenergistics2:network_engineer" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/network3.json b/src/main/resources/data/appliedenergistics2/advancements/main/network3.json index 32c33c2d6..748eed459 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/network3.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/network3.json @@ -1,20 +1,20 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:part", - "data": 76 - }, - "title": { - "translate": "achievement.ae2.Networking3" - }, - "description": { - "translate": "achievement.ae2.Networking3.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:part", + "data": 76 }, - "parent": "appliedenergistics2:main/network2", - "criteria": { - "cable": { - "trigger": "appliedenergistics2:network_admin" - } + "title": { + "translate": "achievement.ae2.Networking3" + }, + "description": { + "translate": "achievement.ae2.Networking3.desc" } -} + }, + "parent": "appliedenergistics2:main/network2", + "criteria": { + "cable": { + "trigger": "appliedenergistics2:network_admin" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/network_tool.json b/src/main/resources/data/appliedenergistics2/advancements/main/network_tool.json index 38d205592..83927d874 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/network_tool.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/network_tool.json @@ -1,26 +1,26 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:network_tool" - }, - "title": { - "translate": "achievement.ae2.NetworkTool" - }, - "description": { - "translate": "achievement.ae2.NetworkTool.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:network_tool" }, - "parent": "appliedenergistics2:main/controller", - "criteria": { - "network_tool": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:network_tool" - } - ] - } - } + "title": { + "translate": "achievement.ae2.NetworkTool" + }, + "description": { + "translate": "achievement.ae2.NetworkTool.desc" } -} + }, + "parent": "appliedenergistics2:main/controller", + "criteria": { + "network_tool": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:network_tool" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/p2p.json b/src/main/resources/data/appliedenergistics2/advancements/main/p2p.json index c08fd895b..4b3f60e07 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/p2p.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/p2p.json @@ -1,28 +1,27 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:part", - "data": 460 - }, - "title": { - "translate": "achievement.ae2.P2P" - }, - "description": { - "translate": "achievement.ae2.P2P.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:part", + "data": 460 }, - "parent": "appliedenergistics2:main/cable_glass", - "criteria": { - "certus": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "appliedenergistics2:part", - "part": "P2P_TUNNEL_ME" - } - ] - } - } + "title": { + "translate": "achievement.ae2.P2P" + }, + "description": { + "translate": "achievement.ae2.P2P.desc" } -} + }, + "parent": "appliedenergistics2:main/cable_glass", + "criteria": { + "certus": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:me_p2p_tunnel" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/pattern_terminal.json b/src/main/resources/data/appliedenergistics2/advancements/main/pattern_terminal.json index 2e752caaa..255458804 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/pattern_terminal.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/pattern_terminal.json @@ -1,28 +1,27 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:part", - "data": 340 - }, - "title": { - "translate": "achievement.ae2.PatternTerminal" - }, - "description": { - "translate": "achievement.ae2.PatternTerminal.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:part", + "data": 340 }, - "parent": "appliedenergistics2:main/crafting_terminal", - "criteria": { - "certus": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "appliedenergistics2:part", - "part": "PATTERN_TERMINAL" - } - ] - } - } + "title": { + "translate": "achievement.ae2.PatternTerminal" + }, + "description": { + "translate": "achievement.ae2.PatternTerminal.desc" } -} + }, + "parent": "appliedenergistics2:main/crafting_terminal", + "criteria": { + "certus": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:pattern_terminal" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/portable_cell.json b/src/main/resources/data/appliedenergistics2/advancements/main/portable_cell.json index 845907bb1..da5943df0 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/portable_cell.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/portable_cell.json @@ -1,26 +1,26 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:portable_cell" - }, - "title": { - "translate": "achievement.ae2.PortableCell" - }, - "description": { - "translate": "achievement.ae2.PortableCell.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:portable_cell" }, - "parent": "appliedenergistics2:main/storage_cell", - "criteria": { - "portable_cell": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:portable_cell" - } - ] - } - } + "title": { + "translate": "achievement.ae2.PortableCell" + }, + "description": { + "translate": "achievement.ae2.PortableCell.desc" } -} + }, + "parent": "appliedenergistics2:main/storage_cell", + "criteria": { + "portable_cell": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:portable_cell" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/presses.json b/src/main/resources/data/appliedenergistics2/advancements/main/presses.json index 91be97d1a..fe8e8e6e9 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/presses.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/presses.json @@ -1,69 +1,69 @@ { - "display": { - "icon": { + "display": { + "icon": { + "item": "appliedenergistics2:material", + "data": 15 + }, + "title": { + "translate": "achievement.ae2.Presses" + }, + "description": { + "translate": "achievement.ae2.Presses.desc" + } + }, + "parent": "appliedenergistics2:main/root", + "criteria": { + "calc": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:material", + "data": 13 + } + ] + } + }, + "eng": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:material", + "data": 14 + } + ] + } + }, + "logic": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "item": "appliedenergistics2:material", "data": 15 - }, - "title": { - "translate": "achievement.ae2.Presses" - }, - "description": { - "translate": "achievement.ae2.Presses.desc" - } - }, - "parent": "appliedenergistics2:main/root", - "criteria": { - "calc": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:material", - "data": 13 - } - ] - } - }, - "eng": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:material", - "data": 14 - } - ] - } - }, - "logic": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:material", - "data": 15 - } - ] - } - }, - "silicon": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:material", - "data": 19 - } - ] - } - } - }, - "requirements": [ - [ - "calc", - "eng", - "logic", - "silicon" + } ] + } + }, + "silicon": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:material", + "data": 19 + } + ] + } + } + }, + "requirements": [ + [ + "calc", + "eng", + "logic", + "silicon" ] -} + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/qnb.json b/src/main/resources/data/appliedenergistics2/advancements/main/qnb.json index 20ab8a787..0ae0e5493 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/qnb.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/qnb.json @@ -1,26 +1,26 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:quantum_link" - }, - "title": { - "translate": "achievement.ae2.QNB" - }, - "description": { - "translate": "achievement.ae2.QNB.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:quantum_link" }, - "parent": "appliedenergistics2:main/p2p", - "criteria": { - "certus": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:quantum_link" - } - ] - } - } + "title": { + "translate": "achievement.ae2.QNB" + }, + "description": { + "translate": "achievement.ae2.QNB.desc" } -} + }, + "parent": "appliedenergistics2:main/p2p", + "criteria": { + "certus": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:quantum_link" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/root.json b/src/main/resources/data/appliedenergistics2/advancements/main/root.json index 3e8da1e27..5e50d2bb8 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/root.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/root.json @@ -1,30 +1,30 @@ { - "display": { - "icon": { + "display": { + "icon": { + "item": "appliedenergistics2:material", + "data": 0 + }, + "title": { + "translate": "achievement.ae2.Root" + }, + "description": { + "translate": "achievement.ae2.Root.desc" + }, + "background": "appliedenergistics2:textures/block/sky_stone_brick.png", + "show_toast": false, + "announce_to_chat": false + }, + "criteria": { + "certus": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "item": "appliedenergistics2:material", "data": 0 - }, - "title": { - "translate": "achievement.ae2.Root" - }, - "description": { - "translate": "achievement.ae2.Root.desc" - }, - "background": "appliedenergistics2:textures/block/sky_stone_brick.png", - "show_toast": false, - "announce_to_chat": false - }, - "criteria": { - "certus": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:material", - "data": 0 - } - ] - } - } + } + ] + } } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/spatial_explorer.json b/src/main/resources/data/appliedenergistics2/advancements/main/spatial_explorer.json index eb8ffa78a..779bf9018 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/spatial_explorer.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/spatial_explorer.json @@ -1,19 +1,19 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:spatial_storage_cell_128_cubed" - }, - "title": { - "translate": "achievement.ae2.SpatialIOExplorer" - }, - "description": { - "translate": "achievement.ae2.SpatialIOExplorer.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:spatial_storage_cell_128_cubed" }, - "parent": "appliedenergistics2:main/spatial_ioport", - "criteria": { - "explorer": { - "trigger": "appliedenergistics2:spatial_explorer" - } + "title": { + "translate": "achievement.ae2.SpatialIOExplorer" + }, + "description": { + "translate": "achievement.ae2.SpatialIOExplorer.desc" } -} + }, + "parent": "appliedenergistics2:main/spatial_ioport", + "criteria": { + "explorer": { + "trigger": "appliedenergistics2:spatial_explorer" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/spatial_ioport.json b/src/main/resources/data/appliedenergistics2/advancements/main/spatial_ioport.json index af440b95d..02f474d91 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/spatial_ioport.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/spatial_ioport.json @@ -1,26 +1,26 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:spatial_io_port" - }, - "title": { - "translate": "achievement.ae2.SpatialIO" - }, - "description": { - "translate": "achievement.ae2.SpatialIO.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:spatial_io_port" }, - "parent": "appliedenergistics2:main/ioport", - "criteria": { - "certus": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:spatial_io_port" - } - ] - } - } + "title": { + "translate": "achievement.ae2.SpatialIO" + }, + "description": { + "translate": "achievement.ae2.SpatialIO.desc" } -} + }, + "parent": "appliedenergistics2:main/ioport", + "criteria": { + "certus": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:spatial_io_port" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/storage_bus.json b/src/main/resources/data/appliedenergistics2/advancements/main/storage_bus.json index cac69329a..e64fcf15e 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/storage_bus.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/storage_bus.json @@ -1,28 +1,27 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:part", - "data": 220 - }, - "title": { - "translate": "achievement.ae2.StorageBus" - }, - "description": { - "translate": "achievement.ae2.StorageBus.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:part", + "data": 220 }, - "parent": "appliedenergistics2:main/interface", - "criteria": { - "part": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "type": "appliedenergistics2:part", - "part": "STORAGE_BUS" - } - ] - } - } + "title": { + "translate": "achievement.ae2.StorageBus" + }, + "description": { + "translate": "achievement.ae2.StorageBus.desc" } -} + }, + "parent": "appliedenergistics2:main/interface", + "criteria": { + "part": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:storage_bus" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/advancements/main/storage_cell.json b/src/main/resources/data/appliedenergistics2/advancements/main/storage_cell.json index 8cc4e35b1..8f588e341 100644 --- a/src/main/resources/data/appliedenergistics2/advancements/main/storage_cell.json +++ b/src/main/resources/data/appliedenergistics2/advancements/main/storage_cell.json @@ -1,64 +1,64 @@ { - "display": { - "icon": { - "item": "appliedenergistics2:storage_cell_64k" - }, - "title": { - "translate": "achievement.ae2.StorageCell" - }, - "description": { - "translate": "achievement.ae2.StorageCell.desc" - } + "display": { + "icon": { + "item": "appliedenergistics2:storage_cell_64k" }, - "parent": "appliedenergistics2:main/controller", - "criteria": { - "c1k": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:storage_cell_1k" - } - ] - } - }, - "c4k": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:storage_cell_4k" - } - ] - } - }, - "c16k": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:storage_cell_16k" - } - ] - } - }, - "c64k": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "appliedenergistics2:storage_cell_64k" - } - ] - } - } + "title": { + "translate": "achievement.ae2.StorageCell" }, - "requirements": [ - [ - "c1k", - "c4k", - "c16k", - "c64k" + "description": { + "translate": "achievement.ae2.StorageCell.desc" + } + }, + "parent": "appliedenergistics2:main/controller", + "criteria": { + "c1k": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:storage_cell_1k" + } ] + } + }, + "c4k": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:storage_cell_4k" + } + ] + } + }, + "c16k": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:storage_cell_16k" + } + ] + } + }, + "c64k": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "appliedenergistics2:storage_cell_64k" + } + ] + } + } + }, + "requirements": [ + [ + "c1k", + "c4k", + "c16k", + "c64k" ] -} + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/_constants.json b/src/main/resources/data/appliedenergistics2/recipes/_constants.json deleted file mode 100644 index 508327546..000000000 --- a/src/main/resources/data/appliedenergistics2/recipes/_constants.json +++ /dev/null @@ -1,241 +0,0 @@ -[ - { - "name": "appliedenergistics2:interface", - "conditions": [ - { - "type": "appliedenergistics2:features", - "features": [ - "interface" - ] - } - ], - "ingredient": [ - { - "item": "appliedenergistics2:interface" - }, - { - "type": "appliedenergistics2:part", - "part": "part.interface" - } - ] - }, - { - "name": "appliedenergistics2:fluid_interface", - "conditions": [ - { - "type": "appliedenergistics2:features", - "features": [ - "fluid_interface" - ] - } - ], - "ingredient": [ - { - "item": "appliedenergistics2:fluid_interface" - }, - { - "type": "appliedenergistics2:part", - "part": "part.fluid_interface" - } - ] - }, - { - "name": "appliedenergistics2:knife", - "conditions": [ - { - "type": "appliedenergistics2:features", - "features": "quartz_knife" - } - ], - "ingredient": [ - { - "item": "appliedenergistics2:certus_quartz_cutting_knife", - "data": 32767 - }, - { - "item": "appliedenergistics2:nether_quartz_cutting_knife", - "data": 32767 - } - ] - }, - { - "name": "appliedenergistics2:cable", - "ingredient": [ - { - "type": "appliedenergistics2:part", - "part": "cable_glass" - }, - { - "type": "appliedenergistics2:part", - "part": "cable_covered" - }, - { - "type": "appliedenergistics2:part", - "part": "cable_smart" - } - ] - }, - { - "name": "appliedenergistics2:metalIngots", - "ingredient": [ - { - "item": "minecraft:iron_ingot" - }, - { - "type": "forge:ore_dict", - "ore": "ingotCopper" - }, - { - "type": "forge:ore_dict", - "ore": "ingotTin" - }, - { - "type": "forge:ore_dict", - "ore": "ingotSilver" - }, - { - "type": "forge:ore_dict", - "ore": "ingotLead" - }, - { - "type": "forge:ore_dict", - "ore": "ingotBronze" - }, - { - "type": "forge:ore_dict", - "ore": "ingotBrass" - }, - { - "type": "forge:ore_dict", - "ore": "ingotNickel" - }, - { - "type": "forge:ore_dict", - "ore": "ingotInvar" - }, - { - "type": "forge:ore_dict", - "ore": "ingotAluminium" - }, - { - "type": "forge:ore_dict", - "ore": "ingotAluminum" - } - ] - }, - { - "name": "appliedenergistics2:dustEnder", - "ingredient": [ - { - "type": "forge:ore_dict", - "ore": "dustEnder" - }, - { - "type": "forge:ore_dict", - "ore": "dustEnderPearl" - } - ] - }, - { - "name": "appliedenergistics2:glass", - "ingredient": [ - { - "type": "forge:ore_dict", - "ore": "blockGlass" - }, - { - "type": "forge:ore_dict", - "ore": "glass" - }, - { - "item": "minecraft:glass" - } - ] - }, - { - "name": "appliedenergistics2:wool", - "ingredient": [ - { - "type": "forge:ore_dict", - "ore": "wool" - }, - { - "item": "minecraft:wool", - "data": 32767 - } - ] - }, - { - "name": "appliedenergistics2:crystalQuartz", - "ingredient": [ - { - "type": "forge:ore_dict", - "ore": "crystalCertusQuartz" - }, - { - "type": "forge:ore_dict", - "ore": "gemQuartz" - }, - { - "type": "appliedenergistics2:part", - "part": "material.certus_quartz_crystal_charged" - } - ] - }, - { - "name": "appliedenergistics2:dustQuartz", - "ingredient": [ - { - "type": "forge:ore_dict", - "ore": "dustCertusQuartz" - }, - { - "type": "forge:ore_dict", - "ore": "dustNetherQuartz" - } - ] - }, - { - "name": "appliedenergistics2:certusCrystal", - "ingredient": [ - { - "type": "forge:ore_dict", - "ore": "crystalCertusQuartz" - }, - { - "type": "appliedenergistics2:part", - "part": "material.certus_quartz_crystal_charged" - }, - { - "type": "appliedenergistics2:part", - "part": "material.purified_certus_quartz_crystal" - } - ] - }, - { - "name": "appliedenergistics2:netherCrystal", - "ingredient": [ - { - "type": "forge:ore_dict", - "ore": "gemQuartz" - }, - { - "type": "appliedenergistics2:part", - "part": "material.purified_nether_quartz_crystal" - } - ] - }, - { - "name": "appliedenergistics2:fluixCrystal", - "ingredient": [ - { - "type": "forge:ore_dict", - "ore": "crystalFluix" - }, - { - "type": "appliedenergistics2:part", - "part": "material.purified_fluix_crystal" - } - ] - } -] diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_block.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_block.json index 051440ea8..3b384bdc5 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_block.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_block.json @@ -1,16 +1,15 @@ { - "result": { - "item": "appliedenergistics2:quartz_block" - }, - "type": "forge:ore_shaped", - "pattern": [ - "aa", - "aa" - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "crystalCertusQuartz" - } + "result": { + "item": "appliedenergistics2:quartz_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aa", + "aa" + ], + "key": { + "a": { + "tag": "appliedenergistics2:crystals/certus_quartz" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json index 8a9023627..2f0fbd8dc 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json @@ -1,17 +1,16 @@ { - "result": { - "item": "appliedenergistics2:quartz_block" - }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa", - "a a", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "material.purified_certus_quartz_crystal" - } + "result": { + "item": "appliedenergistics2:quartz_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa", + "a a", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:purified_certus_quartz_crystal" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_pillar.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_pillar.json index 934c86278..fdc7d40d3 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_pillar.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_pillar.json @@ -1,16 +1,16 @@ { - "result": { - "item": "appliedenergistics2:quartz_pillar", - "count": 2 - }, - "type": "forge:ore_shaped", - "pattern": [ - "a", - "a" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_block" - } + "result": { + "item": "appliedenergistics2:quartz_pillar", + "count": 2 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "a", + "a" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_block" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/chiseled_quartz_block.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/chiseled_quartz_block.json index 2a73193d0..2a8db58ca 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/chiseled_quartz_block.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/chiseled_quartz_block.json @@ -1,15 +1,15 @@ { - "result": { - "item": "appliedenergistics2:chiseled_quartz_block", - "count": 2 - }, - "type": "forge:ore_shaped", - "pattern": [ - "aa" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_block" - } + "result": { + "item": "appliedenergistics2:chiseled_quartz_block", + "count": 2 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aa" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_block" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/fluix_block.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/fluix_block.json index b486e5a7f..b3b5c814a 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/fluix_block.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/fluix_block.json @@ -1,16 +1,15 @@ { - "result": { - "item": "appliedenergistics2:fluix_block" - }, - "type": "forge:ore_shaped", - "pattern": [ - "aa", - "aa" - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "crystalFluix" - } + "result": { + "item": "appliedenergistics2:fluix_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aa", + "aa" + ], + "key": { + "a": { + "tag": "appliedenergistics2:crystals/fluix" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/fluix_block_pure.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/fluix_block_pure.json index 6cde2145f..4d273aae1 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/fluix_block_pure.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/fluix_block_pure.json @@ -1,17 +1,16 @@ { - "result": { - "item": "appliedenergistics2:fluix_block" - }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa", - "a a", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "material.purified_fluix_crystal" - } + "result": { + "item": "appliedenergistics2:fluix_block" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa", + "a a", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:purified_fluix_crystal" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/light_detector.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/light_detector.json index e0514bf0e..47ee522c6 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/light_detector.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/light_detector.json @@ -1,17 +1,17 @@ { - "result": { - "item": "appliedenergistics2:light_detector" + "result": { + "item": "appliedenergistics2:light_detector" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ab" + ], + "key": { + "a": { + "tag": "appliedenergistics2:crystals/nether" }, - "type": "forge:ore_shaped", - "pattern": [ - "ab" - ], - "key": { - "a": { - "item": "#appliedenergistics2:netherCrystal" - }, - "b": { - "item": "minecraft:iron_ingot" - } + "b": { + "item": "minecraft:iron_ingot" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_block_pure.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_block_pure.json index e0d03852b..8c87024d9 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_block_pure.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_block_pure.json @@ -1,18 +1,17 @@ { - "result": { - "item": "minecraft:quartz_block", - "data": 0 - }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa", - "a a", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "material.purified_nether_quartz_crystal" - } + "result": { + "item": "minecraft:quartz_block", + "data": 0 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa", + "a a", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:purified_nether_quartz_crystal" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_fixture.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_fixture.json index daa3b2cfb..e34b5bea4 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_fixture.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_fixture.json @@ -1,19 +1,18 @@ { - "result": { - "item": "appliedenergistics2:quartz_fixture", - "count": 2 + "result": { + "item": "appliedenergistics2:quartz_fixture", + "count": 2 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ab" + ], + "key": { + "b": { + "item": "minecraft:iron_ingot" }, - "type": "forge:ore_shaped", - "pattern": [ - "ab" - ], - "key": { - "b": { - "item": "minecraft:iron_ingot" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "material.certus_quartz_crystal_charged" - } + "a": { + "item": "appliedenergistics2:certus_quartz_crystal_charged" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_glass.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_glass.json index 988c353e5..e541597ae 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_glass.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_glass.json @@ -1,20 +1,20 @@ { - "result": { - "item": "appliedenergistics2:quartz_glass", - "count": 4 + "result": { + "item": "appliedenergistics2:quartz_glass", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bab", + "aba" + ], + "key": { + "b": { + "tag": "appliedenergistics2:glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "bab", - "aba" - ], - "key": { - "b": { - "item": "#appliedenergistics2:glass" - }, - "a": { - "item": "#appliedenergistics2:dustQuartz" - } + "a": { + "tag": "appliedenergistics2:dusts/quartz" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_vibrant_glass.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_vibrant_glass.json index 042d5b763..3de5344e0 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_vibrant_glass.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_vibrant_glass.json @@ -1,17 +1,17 @@ { - "result": { - "item": "appliedenergistics2:quartz_vibrant_glass" + "result": { + "item": "appliedenergistics2:quartz_vibrant_glass" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba" + ], + "key": { + "a": { + "item": "minecraft:glowstone_dust" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba" - ], - "key": { - "a": { - "item": "minecraft:glowstone_dust" - }, - "b": { - "item": "appliedenergistics2:quartz_glass" - } + "b": { + "item": "appliedenergistics2:quartz_glass" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_brick.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_brick.json index 8088a81f8..25383fc75 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_brick.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_brick.json @@ -1,11 +1,11 @@ { - "result": { - "item": "appliedenergistics2:sky_stone_brick" - }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "item": "appliedenergistics2:smooth_sky_stone_block" - } - ] -} + "result": { + "item": "appliedenergistics2:sky_stone_brick" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:smooth_sky_stone_block" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_small_brick.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_small_brick.json index f79f4e0ee..8d49a024e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_small_brick.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_small_brick.json @@ -1,11 +1,11 @@ { - "result": { - "item": "appliedenergistics2:sky_stone_small_brick" - }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "item": "appliedenergistics2:sky_stone_brick" - } - ] -} + "result": { + "item": "appliedenergistics2:sky_stone_small_brick" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:sky_stone_brick" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_smooth.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_smooth.json index 60284e71f..53d564062 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_smooth.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_smooth.json @@ -1,11 +1,11 @@ { - "result": { - "item": "appliedenergistics2:smooth_sky_stone_block" - }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "item": "appliedenergistics2:sky_stone_small_brick" - } - ] -} + "result": { + "item": "appliedenergistics2:smooth_sky_stone_block" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:sky_stone_small_brick" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_chiseled_quartz.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_chiseled_quartz.json index a5724a1b4..20bdfd3ff 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_chiseled_quartz.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_chiseled_quartz.json @@ -1,16 +1,16 @@ { - "result": { - "item": "appliedenergistics2:chiseled_quartz_slab", - "data": 0, - "count": 6 - }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa" - ], - "key": { - "a": { - "item": "appliedenergistics2:chiseled_quartz_block" - } + "result": { + "item": "appliedenergistics2:chiseled_quartz_slab", + "data": 0, + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:chiseled_quartz_block" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_fluix.json index acdabed92..1a2e2a8b2 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_fluix.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_fluix.json @@ -1,16 +1,16 @@ { - "result": { - "item": "appliedenergistics2:fluix_slab", - "data": 0, - "count": 6 - }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa" - ], - "key": { - "a": { - "item": "appliedenergistics2:fluix_block" - } + "result": { + "item": "appliedenergistics2:fluix_slab", + "data": 0, + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_block" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_quartz.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_quartz.json index 79956c104..40d8d3a9b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_quartz.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_quartz.json @@ -1,16 +1,16 @@ { - "result": { - "item": "appliedenergistics2:quartz_slab", - "data": 0, - "count": 6 - }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_block" - } + "result": { + "item": "appliedenergistics2:quartz_slab", + "data": 0, + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_block" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_quartz_pillar.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_quartz_pillar.json index ed418864b..576fef98e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_quartz_pillar.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_quartz_pillar.json @@ -1,16 +1,16 @@ { - "result": { - "item": "appliedenergistics2:quartz_pillar_slab", - "data": 0, - "count": 6 - }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_pillar" - } + "result": { + "item": "appliedenergistics2:quartz_pillar_slab", + "data": 0, + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_pillar" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone.json index a3f07d820..61353d15d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone.json @@ -1,16 +1,16 @@ { - "result": { - "item": "appliedenergistics2:sky_stone_slab", - "data": 0, - "count": 6 - }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa" - ], - "key": { - "a": { - "item": "appliedenergistics2:sky_stone_block" - } + "result": { + "item": "appliedenergistics2:sky_stone_slab", + "data": 0, + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:sky_stone_block" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone_brick.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone_brick.json index e45e02770..a51ab64c7 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone_brick.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone_brick.json @@ -1,16 +1,16 @@ { - "result": { - "item": "appliedenergistics2:sky_stone_brick_slab", - "data": 0, - "count": 6 - }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa" - ], - "key": { - "a": { - "item": "appliedenergistics2:sky_stone_brick" - } + "result": { + "item": "appliedenergistics2:sky_stone_brick_slab", + "data": 0, + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:sky_stone_brick" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone_small_brick.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone_small_brick.json index 5509c7dba..7bf9a32bb 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone_small_brick.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone_small_brick.json @@ -1,16 +1,16 @@ { - "result": { - "item": "appliedenergistics2:sky_stone_small_brick_slab", - "data": 0, - "count": 6 - }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa" - ], - "key": { - "a": { - "item": "appliedenergistics2:sky_stone_small_brick" - } + "result": { + "item": "appliedenergistics2:sky_stone_small_brick_slab", + "data": 0, + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:sky_stone_small_brick" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_smooth_sky_stone.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_smooth_sky_stone.json index 36810bea1..91c066b29 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_smooth_sky_stone.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_smooth_sky_stone.json @@ -1,16 +1,16 @@ { - "result": { - "item": "appliedenergistics2:smooth_sky_stone_slab", - "data": 0, - "count": 6 - }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa" - ], - "key": { - "a": { - "item": "appliedenergistics2:smooth_sky_stone_block" - } + "result": { + "item": "appliedenergistics2:smooth_sky_stone_slab", + "data": 0, + "count": 6 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:smooth_sky_stone_block" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_chiseled_quartz.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_chiseled_quartz.json index 6669f7cd2..76d5aa374 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_chiseled_quartz.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_chiseled_quartz.json @@ -1,17 +1,17 @@ { - "result": { - "item": "appliedenergistics2:chiseled_quartz_stairs", - "count": 4 - }, - "type": "forge:ore_shaped", - "pattern": [ - "a ", - "aa ", - "aaa" - ], - "key": { - "a": { - "item": "appliedenergistics2:chiseled_quartz_block" - } + "result": { + "item": "appliedenergistics2:chiseled_quartz_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "a ", + "aa ", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:chiseled_quartz_block" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_fluix.json index 556985cf7..5bc294a79 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_fluix.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_fluix.json @@ -1,17 +1,17 @@ { - "result": { - "item": "appliedenergistics2:fluix_stairs", - "count": 4 - }, - "type": "forge:ore_shaped", - "pattern": [ - "a ", - "aa ", - "aaa" - ], - "key": { - "a": { - "item": "appliedenergistics2:fluix_block" - } + "result": { + "item": "appliedenergistics2:fluix_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "a ", + "aa ", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_block" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_quartz.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_quartz.json index ce988ae65..7f4450556 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_quartz.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_quartz.json @@ -1,17 +1,17 @@ { - "result": { - "item": "appliedenergistics2:quartz_stairs", - "count": 4 - }, - "type": "forge:ore_shaped", - "pattern": [ - "a ", - "aa ", - "aaa" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_block" - } + "result": { + "item": "appliedenergistics2:quartz_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "a ", + "aa ", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_block" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_quartz_pillar.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_quartz_pillar.json index 2f7e49a78..f3e6f8b89 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_quartz_pillar.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_quartz_pillar.json @@ -1,17 +1,17 @@ { - "result": { - "item": "appliedenergistics2:quartz_pillar_stairs", - "count": 4 - }, - "type": "forge:ore_shaped", - "pattern": [ - "a ", - "aa ", - "aaa" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_pillar" - } + "result": { + "item": "appliedenergistics2:quartz_pillar_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "a ", + "aa ", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_pillar" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone.json index e497d29e3..e705f8e4b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone.json @@ -1,17 +1,17 @@ { - "result": { - "item": "appliedenergistics2:sky_stone_stairs", - "count": 4 - }, - "type": "forge:ore_shaped", - "pattern": [ - "a ", - "aa ", - "aaa" - ], - "key": { - "a": { - "item": "appliedenergistics2:sky_stone_block" - } + "result": { + "item": "appliedenergistics2:sky_stone_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "a ", + "aa ", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:sky_stone_block" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone_brick.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone_brick.json index ee6b6a84c..deefb630b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone_brick.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone_brick.json @@ -1,17 +1,17 @@ { - "result": { - "item": "appliedenergistics2:sky_stone_brick_stairs", - "count": 4 - }, - "type": "forge:ore_shaped", - "pattern": [ - "a ", - "aa ", - "aaa" - ], - "key": { - "a": { - "item": "appliedenergistics2:sky_stone_brick" - } + "result": { + "item": "appliedenergistics2:sky_stone_brick_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "a ", + "aa ", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:sky_stone_brick" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone_small_brick.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone_small_brick.json index 5b2fe6d23..718083387 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone_small_brick.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone_small_brick.json @@ -1,17 +1,17 @@ { - "result": { - "item": "appliedenergistics2:sky_stone_small_brick_stairs", - "count": 4 - }, - "type": "forge:ore_shaped", - "pattern": [ - "a ", - "aa ", - "aaa" - ], - "key": { - "a": { - "item": "appliedenergistics2:sky_stone_small_brick" - } + "result": { + "item": "appliedenergistics2:sky_stone_small_brick_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "a ", + "aa ", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:sky_stone_small_brick" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_smooth_sky_stone.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_smooth_sky_stone.json index f2bfce744..6aed8ddef 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_smooth_sky_stone.json +++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_smooth_sky_stone.json @@ -1,17 +1,17 @@ { - "result": { - "item": "appliedenergistics2:smooth_sky_stone_stairs", - "count": 4 - }, - "type": "forge:ore_shaped", - "pattern": [ - "a ", - "aa ", - "aaa" - ], - "key": { - "a": { - "item": "appliedenergistics2:smooth_sky_stone_block" - } + "result": { + "item": "appliedenergistics2:smooth_sky_stone_stairs", + "count": 4 + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "a ", + "aa ", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:smooth_sky_stone_block" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/grinder/bonemeal.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/bonemeal.json index 554c97825..2812a2a19 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/grinder/bonemeal.json +++ b/src/main/resources/data/appliedenergistics2/recipes/grinder/bonemeal.json @@ -1,14 +1,14 @@ { - "type": "appliedenergistics2:grinder", - "input": { - "item": "minecraft:bone" - }, - "result": { - "primary": { - "item": "minecraft:dye", - "data": 15, - "count": 4 - } - }, - "turns": 8 + "type": "appliedenergistics2:grinder", + "input": { + "item": "minecraft:bone" + }, + "result": { + "primary": { + "item": "minecraft:dye", + "data": 15, + "count": 4 + } + }, + "turns": 8 } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/grinder/flint.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/flint.json index 05db5cc7a..7da54fd4e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/grinder/flint.json +++ b/src/main/resources/data/appliedenergistics2/recipes/grinder/flint.json @@ -1,12 +1,12 @@ { - "type": "appliedenergistics2:grinder", - "input": { - "item": "minecraft:gravel" - }, - "result": { - "primary": { - "item": "minecraft:flint" - } - }, - "turns": 8 + "type": "appliedenergistics2:grinder", + "input": { + "item": "minecraft:gravel" + }, + "result": { + "primary": { + "item": "minecraft:flint" + } + }, + "turns": 8 } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/grinder/fluix_dust.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/fluix_dust.json index b916a8728..b58c80904 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/grinder/fluix_dust.json +++ b/src/main/resources/data/appliedenergistics2/recipes/grinder/fluix_dust.json @@ -1,13 +1,12 @@ { - "type": "appliedenergistics2:grinder", - "input": { - "type": "forge:ore_dict", - "ore": "crystalFluix" - }, - "result": { - "primary": { - "part": "material.fluix_dust" - } - }, - "turns": 8 + "type": "appliedenergistics2:grinder", + "input": { + "tag": "appliedenergistics2:crystals/fluix" + }, + "result": { + "primary": { + "part": "material.fluix_dust" + } + }, + "turns": 8 } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/grinder/sky_dust.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/sky_dust.json index 96496c44d..7e295430a 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/grinder/sky_dust.json +++ b/src/main/resources/data/appliedenergistics2/recipes/grinder/sky_dust.json @@ -1,12 +1,12 @@ { - "type": "appliedenergistics2:grinder", - "input": { - "item": "appliedenergistics2:sky_stone_block" - }, - "result": { - "primary": { - "part": "material.sky_dust" - } - }, - "turns": 8 + "type": "appliedenergistics2:grinder", + "input": { + "item": "appliedenergistics2:sky_stone_block" + }, + "result": { + "primary": { + "part": "material.sky_dust" + } + }, + "turns": 8 } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json index 13d75c514..b1a37d238 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json +++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json @@ -1,21 +1,18 @@ { - "type": "appliedenergistics2:inscriber", - "mode": "press", - "result": { - "part": "material.engineering_processor" - }, - "ingredients": { - "top": { - "type": "appliedenergistics2:part", - "part": "material.engineering_processor_print" - }, - "middle": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "bottom": { - "type": "appliedenergistics2:part", - "part": "material.silicon_print" - } - } + "type": "appliedenergistics2:inscriber", + "mode": "press", + "result": { + "part": "material.engineering_processor" + }, + "ingredients": { + "top": { + "item": "appliedenergistics2:engineering_processor_print" + }, + "middle": { + "tag": "forge:dusts/redstone" + }, + "bottom": { + "item": "appliedenergistics2:silicon_print" + } + } } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_press.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_press.json index 32f8f1eed..d721957ec 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_press.json +++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_press.json @@ -1,17 +1,15 @@ { - "type": "appliedenergistics2:inscriber", - "mode": "inscribe", - "result": { - "part": "material.calculation_processor_press" - }, - "ingredients": { - "top": { - "type": "appliedenergistics2:part", - "part": "material.calculation_processor_press" - }, - "middle": { - "type": "forge:ore_dict", - "ore": "blockIron" - } - } + "type": "appliedenergistics2:inscriber", + "mode": "inscribe", + "result": { + "part": "material.calculation_processor_press" + }, + "ingredients": { + "top": { + "item": "appliedenergistics2:calculation_processor_press" + }, + "middle": { + "tag": "forge:storage_blocks/iron" + } + } } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_print.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_print.json index 1f83a08b0..efb65082f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_print.json +++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_print.json @@ -1,17 +1,15 @@ { - "type": "appliedenergistics2:inscriber", - "mode": "inscribe", - "result": { - "part": "material.calculation_processor_print" - }, - "ingredients": { - "top": { - "type": "appliedenergistics2:part", - "part": "material.calculation_processor_press" - }, - "middle": { - "type": "appliedenergistics2:part", - "part": "material.purified_certus_quartz_crystal" - } - } + "type": "appliedenergistics2:inscriber", + "mode": "inscribe", + "result": { + "part": "material.calculation_processor_print" + }, + "ingredients": { + "top": { + "item": "appliedenergistics2:calculation_processor_press" + }, + "middle": { + "item": "appliedenergistics2:purified_certus_quartz_crystal" + } + } } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json index 6e21c3799..201d14725 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json +++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json @@ -1,21 +1,18 @@ { - "type": "appliedenergistics2:inscriber", - "mode": "press", - "result": { - "part": "material.calculation_processor" - }, - "ingredients": { - "top": { - "type": "appliedenergistics2:part", - "part": "material.calculation_processor_print" - }, - "middle": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "bottom": { - "type": "appliedenergistics2:part", - "part": "material.silicon_print" - } - } + "type": "appliedenergistics2:inscriber", + "mode": "press", + "result": { + "part": "material.calculation_processor" + }, + "ingredients": { + "top": { + "item": "appliedenergistics2:calculation_processor_print" + }, + "middle": { + "tag": "forge:dusts/redstone" + }, + "bottom": { + "item": "appliedenergistics2:silicon_print" + } + } } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_press.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_press.json index 47797029f..be407bcbf 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_press.json +++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_press.json @@ -1,17 +1,15 @@ { - "type": "appliedenergistics2:inscriber", - "mode": "inscribe", - "result": { - "part": "material.engineering_processor_press" - }, - "ingredients": { - "top": { - "type": "appliedenergistics2:part", - "part": "material.engineering_processor_press" - }, - "middle": { - "type": "forge:ore_dict", - "ore": "blockIron" - } - } + "type": "appliedenergistics2:inscriber", + "mode": "inscribe", + "result": { + "part": "material.engineering_processor_press" + }, + "ingredients": { + "top": { + "item": "appliedenergistics2:engineering_processor_press" + }, + "middle": { + "tag": "forge:storage_blocks/iron" + } + } } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json index 12649ae21..9bb1408e9 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json +++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json @@ -1,17 +1,15 @@ { - "type": "appliedenergistics2:inscriber", - "mode": "inscribe", - "result": { - "part": "material.engineering_processor_print" - }, - "ingredients": { - "top": { - "type": "appliedenergistics2:part", - "part": "material.engineering_processor_press" - }, - "middle": { - "type": "forge:ore_dict", - "ore": "gemDiamond" - } - } + "type": "appliedenergistics2:inscriber", + "mode": "inscribe", + "result": { + "part": "material.engineering_processor_print" + }, + "ingredients": { + "top": { + "item": "appliedenergistics2:engineering_processor_press" + }, + "middle": { + "tag": "forge:gems/diamond" + } + } } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json index 47ab83c98..84cf09e53 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json +++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json @@ -1,21 +1,18 @@ { - "type": "appliedenergistics2:inscriber", - "mode": "press", - "result": { - "part": "material.logic_processor" - }, - "ingredients": { - "top": { - "type": "appliedenergistics2:part", - "part": "material.logic_processor_print" - }, - "middle": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "bottom": { - "type": "appliedenergistics2:part", - "part": "material.silicon_print" - } - } + "type": "appliedenergistics2:inscriber", + "mode": "press", + "result": { + "part": "material.logic_processor" + }, + "ingredients": { + "top": { + "item": "appliedenergistics2:logic_processor_print" + }, + "middle": { + "tag": "forge:dusts/redstone" + }, + "bottom": { + "item": "appliedenergistics2:silicon_print" + } + } } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_press.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_press.json index aa85757bf..92b1d48e6 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_press.json +++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_press.json @@ -1,17 +1,15 @@ { - "type": "appliedenergistics2:inscriber", - "mode": "inscribe", - "result": { - "part": "material.logic_processor_press" - }, - "ingredients": { - "top": { - "type": "appliedenergistics2:part", - "part": "material.logic_processor_press" - }, - "middle": { - "type": "forge:ore_dict", - "ore": "blockIron" - } - } + "type": "appliedenergistics2:inscriber", + "mode": "inscribe", + "result": { + "part": "material.logic_processor_press" + }, + "ingredients": { + "top": { + "item": "appliedenergistics2:logic_processor_press" + }, + "middle": { + "tag": "forge:storage_blocks/iron" + } + } } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json index 7eb63773c..5fc934c6d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json +++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json @@ -1,17 +1,15 @@ { - "type": "appliedenergistics2:inscriber", - "mode": "inscribe", - "result": { - "part": "material.logic_processor_print" - }, - "ingredients": { - "top": { - "type": "appliedenergistics2:part", - "part": "material.logic_processor_press" - }, - "middle": { - "type": "forge:ore_dict", - "ore": "ingotGold" - } - } + "type": "appliedenergistics2:inscriber", + "mode": "inscribe", + "result": { + "part": "material.logic_processor_print" + }, + "ingredients": { + "top": { + "item": "appliedenergistics2:logic_processor_press" + }, + "middle": { + "tag": "forge:ingots/gold" + } + } } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_press.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_press.json index d6e43e32a..bd2d37f0f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_press.json +++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_press.json @@ -1,17 +1,15 @@ { - "type": "appliedenergistics2:inscriber", - "mode": "inscribe", - "result": { - "part": "material.silicon_press" - }, - "ingredients": { - "top": { - "type": "appliedenergistics2:part", - "part": "material.silicon_press" - }, - "middle": { - "type": "forge:ore_dict", - "ore": "blockIron" - } - } + "type": "appliedenergistics2:inscriber", + "mode": "inscribe", + "result": { + "part": "material.silicon_press" + }, + "ingredients": { + "top": { + "item": "appliedenergistics2:silicon_press" + }, + "middle": { + "tag": "forge:storage_blocks/iron" + } + } } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_print.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_print.json index e79d39b6c..468084a42 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_print.json +++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_print.json @@ -1,17 +1,15 @@ { - "type": "appliedenergistics2:inscriber", - "mode": "inscribe", - "result": { - "part": "material.silicon_print" - }, - "ingredients": { - "top": { - "type": "appliedenergistics2:part", - "part": "material.silicon_press" - }, - "middle": { - "type": "forge:ore_dict", - "ore": "itemSilicon" - } - } + "type": "appliedenergistics2:inscriber", + "mode": "inscribe", + "result": { + "part": "material.silicon_print" + }, + "ingredients": { + "top": { + "item": "appliedenergistics2:silicon_press" + }, + "middle": { + "tag": "appliedenergistics2:silicon" + } + } } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/advancedcard.json b/src/main/resources/data/appliedenergistics2/recipes/materials/advancedcard.json index 39703ea92..a684b14dc 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/materials/advancedcard.json +++ b/src/main/resources/data/appliedenergistics2/recipes/materials/advancedcard.json @@ -1,37 +1,33 @@ { - "conditions": [ - { - "type": "appliedenergistics2:material_exists", - "material": "material.advanced_card" - } - ], - "result": { - "type": "appliedenergistics2:part", - "part": "material.advanced_card", - "count": 2 - }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "ab ", - "cdb", - "ab " - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "a": { - "type": "forge:ore_dict", - "ore": "gemDiamond" - }, - "d": { - "type": "appliedenergistics2:part", - "part": "material.calculation_processor" - } + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.advanced_card" } -} + ], + "result": { + "type": "appliedenergistics2:part", + "part": "material.advanced_card", + "count": 2 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "ab ", + "cdb", + "ab " + ], + "key": { + "b": { + "tag": "forge:ingots/iron" + }, + "c": { + "tag": "forge:dusts/redstone" + }, + "a": { + "tag": "forge:gems/diamond" + }, + "d": { + "item": "appliedenergistics2:calculation_processor" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/annihilationcore.json b/src/main/resources/data/appliedenergistics2/recipes/materials/annihilationcore.json index 72bc743a4..05386cdba 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/materials/annihilationcore.json +++ b/src/main/resources/data/appliedenergistics2/recipes/materials/annihilationcore.json @@ -1,30 +1,28 @@ { - "conditions": [ - { - "type": "appliedenergistics2:material_exists", - "material": "material.annihilation_core" - } - ], - "result": { - "type": "appliedenergistics2:part", - "part": "material.annihilation_core", - "count": 2 - }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "abc" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dustFluix" - }, - "a": { - "item": "#appliedenergistics2:netherCrystal" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.logic_processor" - } + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.annihilation_core" } -} + ], + "result": { + "type": "appliedenergistics2:part", + "part": "material.annihilation_core", + "count": 2 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "abc" + ], + "key": { + "b": { + "tag": "appliedenergistics2:dusts/fluix" + }, + "a": { + "tag": "appliedenergistics2:crystals/nether" + }, + "c": { + "item": "appliedenergistics2:logic_processor" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/basiccard.json b/src/main/resources/data/appliedenergistics2/recipes/materials/basiccard.json index 3aa357409..2b41bb760 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/materials/basiccard.json +++ b/src/main/resources/data/appliedenergistics2/recipes/materials/basiccard.json @@ -1,37 +1,33 @@ { - "conditions": [ - { - "type": "appliedenergistics2:material_exists", - "material": "material.basic_card" - } - ], - "result": { - "type": "appliedenergistics2:part", - "part": "material.basic_card", - "count": 2 - }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "ab ", - "cdb", - "ab " - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "a": { - "type": "forge:ore_dict", - "ore": "ingotGold" - }, - "d": { - "type": "appliedenergistics2:part", - "part": "material.calculation_processor" - } + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.basic_card" } -} + ], + "result": { + "type": "appliedenergistics2:part", + "part": "material.basic_card", + "count": 2 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "ab ", + "cdb", + "ab " + ], + "key": { + "b": { + "tag": "forge:ingots/iron" + }, + "c": { + "tag": "forge:dusts/redstone" + }, + "a": { + "tag": "forge:ingots/gold" + }, + "d": { + "item": "appliedenergistics2:calculation_processor" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/cardcapacity.json b/src/main/resources/data/appliedenergistics2/recipes/materials/cardcapacity.json index 66f2aff7f..d849a3869 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/materials/cardcapacity.json +++ b/src/main/resources/data/appliedenergistics2/recipes/materials/cardcapacity.json @@ -1,22 +1,20 @@ { - "conditions": [ - { - "type": "appliedenergistics2:material_exists", - "material": "material.card_capacity" - } - ], - "result": { - "type": "appliedenergistics2:part", - "part": "material.card_capacity" + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.card_capacity" + } + ], + "result": { + "item": "appliedenergistics2:card_capacity" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "tag": "appliedenergistics2:crystals/certus" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "item": "#appliedenergistics2:certusCrystal" - }, - { - "type": "appliedenergistics2:part", - "part": "material.basic_card" - } - ] -} + { + "item": "appliedenergistics2:basic_card" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/cardcrafting.json b/src/main/resources/data/appliedenergistics2/recipes/materials/cardcrafting.json index a892f9b45..71087ad4e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/materials/cardcrafting.json +++ b/src/main/resources/data/appliedenergistics2/recipes/materials/cardcrafting.json @@ -1,23 +1,20 @@ { - "conditions": [ - { - "type": "appliedenergistics2:material_exists", - "material": "material.card_crafting" - } - ], - "result": { - "type": "appliedenergistics2:part", - "part": "material.card_crafting" + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.card_crafting" + } + ], + "result": { + "item": "appliedenergistics2:card_crafting" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "tag": "appliedenergistics2:workbench" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "forge:ore_dict", - "ore": "workbench" - }, - { - "type": "appliedenergistics2:part", - "part": "material.basic_card" - } - ] -} + { + "item": "appliedenergistics2:basic_card" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/cardfuzzy.json b/src/main/resources/data/appliedenergistics2/recipes/materials/cardfuzzy.json index 5dbd0ba0b..896868cf1 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/materials/cardfuzzy.json +++ b/src/main/resources/data/appliedenergistics2/recipes/materials/cardfuzzy.json @@ -1,22 +1,20 @@ { - "conditions": [ - { - "type": "appliedenergistics2:material_exists", - "material": "material.card_fuzzy" - } - ], - "result": { - "type": "appliedenergistics2:part", - "part": "material.card_fuzzy" + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.card_fuzzy" + } + ], + "result": { + "item": "appliedenergistics2:card_fuzzy" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:advanced_card" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "material.advanced_card" - }, - { - "item": "#appliedenergistics2:wool" - } - ] -} + { + "tag": "appliedenergistics2:wool" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/cardinverter.json b/src/main/resources/data/appliedenergistics2/recipes/materials/cardinverter.json index 8a70d537e..0e2714026 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/materials/cardinverter.json +++ b/src/main/resources/data/appliedenergistics2/recipes/materials/cardinverter.json @@ -6,8 +6,7 @@ } ], "result": { - "type": "appliedenergistics2:part", - "part": "material.card_inverter" + "item": "appliedenergistics2:card_inverter" }, "type": "appliedenergistics2:part_shapeless", "ingredients": [ @@ -15,8 +14,7 @@ "item": "minecraft:redstone_torch" }, { - "type": "appliedenergistics2:part", - "part": "material.advanced_card" + "item": "appliedenergistics2:advanced_card" } ] } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/cardredstone.json b/src/main/resources/data/appliedenergistics2/recipes/materials/cardredstone.json index 82365d8ce..8473aab11 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/materials/cardredstone.json +++ b/src/main/resources/data/appliedenergistics2/recipes/materials/cardredstone.json @@ -1,22 +1,20 @@ { - "conditions": [ - { - "type": "appliedenergistics2:material_exists", - "material": "material.card_redstone" - } - ], - "result": { - "type": "appliedenergistics2:part", - "part": "material.card_redstone" + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.card_redstone" + } + ], + "result": { + "item": "appliedenergistics2:card_redstone" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "minecraft:redstone_torch" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "item": "minecraft:redstone_torch" - }, - { - "type": "appliedenergistics2:part", - "part": "material.basic_card" - } - ] -} + { + "item": "appliedenergistics2:basic_card" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/cardspeed.json b/src/main/resources/data/appliedenergistics2/recipes/materials/cardspeed.json index 939dbdaad..a154f9b17 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/materials/cardspeed.json +++ b/src/main/resources/data/appliedenergistics2/recipes/materials/cardspeed.json @@ -1,22 +1,20 @@ { - "conditions": [ - { - "type": "appliedenergistics2:material_exists", - "material": "material.card_speed" - } - ], - "result": { - "type": "appliedenergistics2:part", - "part": "material.card_speed" + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.card_speed" + } + ], + "result": { + "item": "appliedenergistics2:card_speed" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:advanced_card" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "material.advanced_card" - }, - { - "item": "#appliedenergistics2:fluixCrystal" - } - ] -} + { + "tag": "appliedenergistics2:crystals/fluix" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/formationcore.json b/src/main/resources/data/appliedenergistics2/recipes/materials/formationcore.json index 39d42885e..98bf62fc8 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/materials/formationcore.json +++ b/src/main/resources/data/appliedenergistics2/recipes/materials/formationcore.json @@ -1,30 +1,28 @@ { - "conditions": [ - { - "type": "appliedenergistics2:material_exists", - "material": "material.formation_core" - } - ], - "result": { - "type": "appliedenergistics2:part", - "part": "material.formation_core", - "count": 2 - }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "abc" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dustFluix" - }, - "a": { - "item": "#appliedenergistics2:certusCrystal" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.logic_processor" - } + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.formation_core" } -} + ], + "result": { + "type": "appliedenergistics2:part", + "part": "material.formation_core", + "count": 2 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "abc" + ], + "key": { + "b": { + "tag": "appliedenergistics2:dusts/fluix" + }, + "a": { + "tag": "appliedenergistics2:crystals/certus" + }, + "c": { + "item": "appliedenergistics2:logic_processor" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/chests_sky_stone.json b/src/main/resources/data/appliedenergistics2/recipes/misc/chests_sky_stone.json index 80a8cca68..c03817ea0 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/chests_sky_stone.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/chests_sky_stone.json @@ -1,16 +1,16 @@ { - "result": { - "item": "appliedenergistics2:sky_stone_chest" - }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa", - "a a", - "aaa" - ], - "key": { - "a": { - "item": "appliedenergistics2:sky_stone_block" - } + "result": { + "item": "appliedenergistics2:sky_stone_chest" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa", + "a a", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:sky_stone_block" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/chests_smooth_sky_stone.json b/src/main/resources/data/appliedenergistics2/recipes/misc/chests_smooth_sky_stone.json index 92f090757..fc9dda804 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/chests_smooth_sky_stone.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/chests_smooth_sky_stone.json @@ -1,16 +1,16 @@ { - "result": { - "item": "appliedenergistics2:smooth_sky_stone_chest" - }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa", - "a a", - "aaa" - ], - "key": { - "a": { - "item": "appliedenergistics2:smooth_sky_stone_block" - } + "result": { + "item": "appliedenergistics2:smooth_sky_stone_chest" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa", + "a a", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:smooth_sky_stone_block" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json b/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json index f0ac1394d..a027dd33e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json @@ -1,19 +1,19 @@ { - "conditions": [ - { - "type": "appliedenergistics2:material_exists", - "material": "material.certus_quartz_crystal" - } - ], - "result": { - "type": "appliedenergistics2:part", - "part": "material.certus_quartz_crystal", - "count": 4 - }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "item": "appliedenergistics2:chiseled_quartz_block" - } - ] -} + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.certus_quartz_crystal" + } + ], + "result": { + "type": "appliedenergistics2:part", + "part": "material.certus_quartz_crystal", + "count": 4 + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:chiseled_quartz_block" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json b/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json index feaec1648..d51cbff7e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json @@ -1,19 +1,19 @@ { - "conditions": [ - { - "type": "appliedenergistics2:material_exists", - "material": "material.certus_quartz_crystal" - } - ], - "result": { - "type": "appliedenergistics2:part", - "part": "material.certus_quartz_crystal", - "count": 4 - }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "item": "appliedenergistics2:quartz_block" - } - ] -} + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.certus_quartz_crystal" + } + ], + "result": { + "type": "appliedenergistics2:part", + "part": "material.certus_quartz_crystal", + "count": 4 + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:quartz_block" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json b/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json index 445d7498c..9dcc686e4 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json @@ -1,19 +1,19 @@ { - "conditions": [ - { - "type": "appliedenergistics2:material_exists", - "material": "material.certus_quartz_crystal" - } - ], - "result": { - "type": "appliedenergistics2:part", - "part": "material.certus_quartz_crystal", - "count": 4 - }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "item": "appliedenergistics2:quartz_pillar" - } - ] -} + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.certus_quartz_crystal" + } + ], + "result": { + "type": "appliedenergistics2:part", + "part": "material.certus_quartz_crystal", + "count": 4 + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:quartz_pillar" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json b/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json index 8c03f97f1..d8619ce8e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json @@ -1,19 +1,19 @@ { - "conditions": [ - { - "type": "appliedenergistics2:material_exists", - "material": "material.fluix_crystal" - } - ], - "result": { - "type": "appliedenergistics2:part", - "part": "material.fluix_crystal", - "count": 4 - }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "item": "appliedenergistics2:fluix_block" - } - ] -} + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluix_crystal" + } + ], + "result": { + "type": "appliedenergistics2:part", + "part": "material.fluix_crystal", + "count": 4 + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:fluix_block" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/fluixpearl.json b/src/main/resources/data/appliedenergistics2/recipes/misc/fluixpearl.json index 365c217f0..313eb46b5 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/fluixpearl.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/fluixpearl.json @@ -1,30 +1,28 @@ { - "conditions": [ - { - "type": "appliedenergistics2:material_exists", - "material": "material.fluix_pearl" - } - ], - "result": { - "type": "appliedenergistics2:part", - "part": "material.fluix_pearl" - }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aba", - "bcb", - "aba" - ], - "key": { - "c": { - "item": "minecraft:ender_pearl" - }, - "a": { - "type": "forge:ore_dict", - "ore": "dustFluix" - }, - "b": { - "item": "#appliedenergistics2:fluixCrystal" - } + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.fluix_pearl" } -} + ], + "result": { + "item": "appliedenergistics2:fluix_pearl" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "c": { + "item": "minecraft:ender_pearl" + }, + "a": { + "tag": "appliedenergistics2:dusts/fluix" + }, + "b": { + "tag": "appliedenergistics2:crystals/fluix" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone.json b/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone.json index b5de160a2..4c05d488f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone.json @@ -1,28 +1,25 @@ { - "result": { - "item": "appliedenergistics2:grindstone" + "result": { + "item": "appliedenergistics2:grindstone" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "cac", + "dcd" + ], + "key": { + "c": { + "tag": "appliedenergistics2:crystals/quartz" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "cac", - "dcd" - ], - "key": { - "c": { - "item": "#appliedenergistics2:crystalQuartz" - }, - "a": { - "type": "forge:ore_dict", - "ore": "stone" - }, - "d": { - "type": "forge:ore_dict", - "ore": "cobblestone" - }, - "b": { - "type": "forge:ore_dict", - "ore": "gearWood" - } + "a": { + "tag": "forge:stone" + }, + "d": { + "tag": "forge:cobblestone" + }, + "b": { + "tag": "appliedenergistics2:gears/wooden" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_crank.json b/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_crank.json index a82389a8a..fdc335338 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_crank.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_crank.json @@ -1,17 +1,16 @@ { - "result": { - "item": "appliedenergistics2:crank" - }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa", - " a", - " a" - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "stickWood" - } + "result": { + "item": "appliedenergistics2:crank" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa", + " a", + " a" + ], + "key": { + "a": { + "tag": "forge:rods/wooden" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_woodengear.json b/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_woodengear.json index 3d8fb5371..025619584 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_woodengear.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_woodengear.json @@ -1,24 +1,22 @@ { - "conditions": [ - { - "type": "appliedenergistics2:material_exists", - "material": "material.wooden_gear" - } - ], - "result": { - "type": "appliedenergistics2:part", - "part": "material.wooden_gear" - }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - " a ", - "a a", - " a " - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "stickWood" - } + "conditions": [ + { + "type": "appliedenergistics2:material_exists", + "material": "material.wooden_gear" } -} + ], + "result": { + "item": "appliedenergistics2:wooden_gear" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + " a ", + "a a", + " a " + ], + "key": { + "a": { + "tag": "forge:rods/wooden" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/meteors_sky_compass.json b/src/main/resources/data/appliedenergistics2/recipes/misc/meteors_sky_compass.json index a38c1b34c..aceb4b09d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/meteors_sky_compass.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/meteors_sky_compass.json @@ -1,21 +1,19 @@ { - "result": { - "item": "appliedenergistics2:sky_compass" + "result": { + "item": "appliedenergistics2:sky_compass" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " a ", + "aba", + " a " + ], + "key": { + "a": { + "tag": "forge:ingots/iron" }, - "type": "forge:ore_shaped", - "pattern": [ - " a ", - "aba", - " a " - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "material.certus_quartz_crystal_charged" - } + "b": { + "item": "appliedenergistics2:certus_quartz_crystal_charged" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_certus.json b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_certus.json index db1b04d0f..d507a0ac1 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_certus.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_certus.json @@ -1,18 +1,16 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "crystal_seed.certus", - "count": 2 + "result": { + "type": "appliedenergistics2:part", + "part": "crystal_seed.certus", + "count": 2 + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "tag": "forge:sand" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "forge:ore_dict", - "ore": "sand" - }, - { - "type": "forge:ore_dict", - "ore": "dustCertusQuartz" - } - ] -} + { + "tag": "appliedenergistics2:dusts/certus_quartz" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_fluix.json index 7c5a27ed0..a5bbf30cc 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_fluix.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_fluix.json @@ -1,18 +1,16 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "crystal_seed.fluix", - "count": 2 + "result": { + "type": "appliedenergistics2:part", + "part": "crystal_seed.fluix", + "count": 2 + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "tag": "forge:sand" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "forge:ore_dict", - "ore": "sand" - }, - { - "type": "forge:ore_dict", - "ore": "dustFluix" - } - ] -} + { + "tag": "appliedenergistics2:dusts/fluix" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_nether.json b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_nether.json index 9b68c77d0..ba90b27ec 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_nether.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_nether.json @@ -1,18 +1,16 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "crystal_seed.nether", - "count": 2 + "result": { + "type": "appliedenergistics2:part", + "part": "crystal_seed.nether", + "count": 2 + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "tag": "forge:sand" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "forge:ore_dict", - "ore": "sand" - }, - { - "type": "forge:ore_dict", - "ore": "dustNetherQuartz" - } - ] -} + { + "tag": "appliedenergistics2:dusts/nether_quartz" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/tiny_tnt.json b/src/main/resources/data/appliedenergistics2/recipes/misc/tiny_tnt.json index 805175f75..2342b1484 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/tiny_tnt.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/tiny_tnt.json @@ -1,18 +1,18 @@ { - "result": { - "item": "appliedenergistics2:tiny_tnt" + "result": { + "item": "appliedenergistics2:tiny_tnt" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ab", + "ba" + ], + "key": { + "b": { + "item": "minecraft:gunpowder" }, - "type": "forge:ore_shaped", - "pattern": [ - "ab", - "ba" - ], - "key": { - "b": { - "item": "minecraft:gunpowder" - }, - "a": { - "item": "#appliedenergistics2:dustQuartz" - } + "a": { + "tag": "appliedenergistics2:dusts/quartz" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_comparator.json b/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_comparator.json index 11dfb7627..820a56e01 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_comparator.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_comparator.json @@ -1,23 +1,22 @@ { - "result": { - "item": "minecraft:comparator" + "result": { + "item": "minecraft:comparator" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " a ", + "aba", + "ccc" + ], + "key": { + "b": { + "tag": "appliedenergistics2:crystals/nether" }, - "type": "forge:ore_shaped", - "pattern": [ - " a ", - "aba", - "ccc" - ], - "key": { - "b": { - "item": "#appliedenergistics2:netherCrystal" - }, - "a": { - "item": "minecraft:redstone_torch" - }, - "c": { - "type": "forge:ore_dict", - "ore": "stone" - } + "a": { + "item": "minecraft:redstone_torch" + }, + "c": { + "tag": "forge:stone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json b/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json index abdd397d3..a65804a9d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json +++ b/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json @@ -1,23 +1,22 @@ { - "result": { - "item": "minecraft:daylight_detector" + "result": { + "item": "minecraft:daylight_detector" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa", + "bbb", + "ccc" + ], + "key": { + "a": { + "tag": "appliedenergistics2:glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa", - "bbb", - "ccc" - ], - "key": { - "a": { - "item": "#appliedenergistics2:glass" - }, - "b": { - "item": "#appliedenergistics2:netherCrystal" - }, - "c": { - "type": "forge:ore_dict", - "ore": "slabWood" - } + "b": { + "tag": "appliedenergistics2:crystals/nether" + }, + "c": { + "tag": "minecraft:wooden_slabs" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/cell_workbench.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/cell_workbench.json index 6f1c66dc5..a58c54a3e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/cell_workbench.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/cell_workbench.json @@ -1,28 +1,25 @@ { - "result": { - "item": "appliedenergistics2:cell_workbench" + "result": { + "item": "appliedenergistics2:cell_workbench" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "cdc", + "ccc" + ], + "key": { + "c": { + "tag": "forge:ingots/iron" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "cdc", - "ccc" - ], - "key": { - "c": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "a": { - "item": "#appliedenergistics2:wool" - }, - "d": { - "type": "forge:ore_dict", - "ore": "chestWood" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "material.calculation_processor" - } + "a": { + "tag": "appliedenergistics2:wool" + }, + "d": { + "tag": "forge:chests/wooden" + }, + "b": { + "item": "appliedenergistics2:calculation_processor" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/controller.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/controller.json index f7b358ba5..e5ac428e7 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/controller.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/controller.json @@ -1,24 +1,22 @@ { - "result": { - "item": "appliedenergistics2:controller" + "result": { + "item": "appliedenergistics2:controller" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "c": { + "item": "appliedenergistics2:engineering_processor" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "bcb", - "aba" - ], - "key": { - "c": { - "type": "appliedenergistics2:part", - "part": "material.engineering_processor" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "material.purified_fluix_crystal" - }, - "a": { - "item": "appliedenergistics2:smooth_sky_stone_block" - } + "b": { + "item": "appliedenergistics2:purified_fluix_crystal" + }, + "a": { + "item": "appliedenergistics2:smooth_sky_stone_block" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json index 44a6df978..922897958 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json @@ -1,20 +1,19 @@ { - "result": { - "item": "appliedenergistics2:charger" + "result": { + "item": "appliedenergistics2:charger" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "a ", + "aba" + ], + "key": { + "a": { + "tag": "forge:ingots/iron" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "a ", - "aba" - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "item": "#appliedenergistics2:fluixCrystal" - } + "b": { + "tag": "appliedenergistics2:crystals/fluix" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json index 476622001..72e342a42 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json @@ -1,27 +1,25 @@ { - "result": { - "item": "appliedenergistics2:quartz_growth_accelerator" + "result": { + "item": "appliedenergistics2:quartz_growth_accelerator" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "cdc", + "aba" + ], + "key": { + "c": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "cdc", - "aba" - ], - "key": { - "c": { - "item": "appliedenergistics2:quartz_glass" - }, - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - }, - "d": { - "item": "appliedenergistics2:fluix_block" - } + "a": { + "tag": "forge:ingots/iron" + }, + "b": { + "item": "appliedenergistics2:fluix_cable_glass" + }, + "d": { + "item": "appliedenergistics2:fluix_block" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_dense_energy_cell.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_dense_energy_cell.json index 28f0e8afd..9294b78f4 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_dense_energy_cell.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_dense_energy_cell.json @@ -1,20 +1,19 @@ { - "result": { - "item": "appliedenergistics2:dense_energy_cell" + "result": { + "item": "appliedenergistics2:dense_energy_cell" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:energy_cell" }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "item": "appliedenergistics2:energy_cell" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "material.calculation_processor" - } + "b": { + "item": "appliedenergistics2:calculation_processor" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json index b71d45516..31b63b6b3 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json @@ -1,23 +1,22 @@ { - "result": { - "item": "appliedenergistics2:energy_acceptor" + "result": { + "item": "appliedenergistics2:energy_acceptor" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "b": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "bcb", - "aba" - ], - "key": { - "b": { - "item": "appliedenergistics2:quartz_glass" - }, - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "item": "#appliedenergistics2:fluixCrystal" - } + "a": { + "tag": "forge:ingots/iron" + }, + "c": { + "tag": "appliedenergistics2:crystals/fluix" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_cell.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_cell.json index 487364256..40046791e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_cell.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_cell.json @@ -1,23 +1,22 @@ { - "result": { - "item": "appliedenergistics2:energy_cell" + "result": { + "item": "appliedenergistics2:energy_cell" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "c": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "bcb", - "aba" - ], - "key": { - "c": { - "item": "appliedenergistics2:quartz_glass" - }, - "a": { - "item": "#appliedenergistics2:certusCrystal" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustFluix" - } + "a": { + "tag": "appliedenergistics2:crystals/certus" + }, + "b": { + "tag": "appliedenergistics2:dusts/fluix" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_vibration_chamber.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_vibration_chamber.json index 712cae96e..ce36b546d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_vibration_chamber.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_vibration_chamber.json @@ -1,23 +1,22 @@ { - "result": { - "item": "appliedenergistics2:vibration_chamber" + "result": { + "item": "appliedenergistics2:vibration_chamber" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa", + "aba", + "aca" + ], + "key": { + "a": { + "tag": "forge:ingots/iron" }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa", - "aba", - "aca" - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "item": "appliedenergistics2:energy_acceptor" - }, - "b": { - "item": "minecraft:furnace" - } + "c": { + "item": "appliedenergistics2:energy_acceptor" + }, + "b": { + "item": "minecraft:furnace" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface.json index 816170e68..74b9b993e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface.json @@ -1,29 +1,25 @@ { - "result": { - "item": "appliedenergistics2:fluid_interface" + "result": { + "item": "appliedenergistics2:fluid_interface" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "c d", + "aba" + ], + "key": { + "d": { + "item": "appliedenergistics2:formation_core" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "c d", - "aba" - ], - "key": { - "d": { - "type": "appliedenergistics2:part", - "part": "material.formation_core" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeBlue" - }, - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.annihilation_core" - } + "b": { + "tag": "forge:dyes/blue" + }, + "a": { + "tag": "forge:ingots/iron" + }, + "c": { + "item": "appliedenergistics2:annihilation_core" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_alt.json index d634987f9..06386c0ab 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_alt.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_alt.json @@ -1,12 +1,11 @@ { - "result": { - "item": "appliedenergistics2:fluid_interface" - }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "part.fluid_interface" - } - ] -} + "result": { + "item": "appliedenergistics2:fluid_interface" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:cable_fluid_interface" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_part.json index 6cce7e4d4..ed6d40762 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_part.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_part.json @@ -1,12 +1,11 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.fluid_interface" - }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "item": "appliedenergistics2:fluid_interface" - } - ] -} + "result": { + "item": "appliedenergistics2:cable_fluid_interface" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:fluid_interface" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/inscribers.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/inscribers.json index f9906f2d1..17a854913 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/inscribers.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/inscribers.json @@ -1,23 +1,22 @@ { - "result": { - "item": "appliedenergistics2:inscriber" + "result": { + "item": "appliedenergistics2:inscriber" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "c a", + "aba" + ], + "key": { + "b": { + "item": "minecraft:sticky_piston" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "c a", - "aba" - ], - "key": { - "b": { - "item": "minecraft:sticky_piston" - }, - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "item": "#appliedenergistics2:fluixCrystal" - } + "a": { + "tag": "forge:ingots/iron" + }, + "c": { + "tag": "appliedenergistics2:crystals/fluix" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface.json index 50dca96df..34db614ce 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface.json @@ -1,28 +1,25 @@ { - "result": { - "item": "appliedenergistics2:interface" + "result": { + "item": "appliedenergistics2:interface" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "c d", + "aba" + ], + "key": { + "d": { + "item": "appliedenergistics2:formation_core" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "c d", - "aba" - ], - "key": { - "d": { - "type": "appliedenergistics2:part", - "part": "material.formation_core" - }, - "b": { - "item": "#appliedenergistics2:glass" - }, - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.annihilation_core" - } + "b": { + "tag": "appliedenergistics2:glass" + }, + "a": { + "tag": "forge:ingots/iron" + }, + "c": { + "item": "appliedenergistics2:annihilation_core" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_alt.json index 580d6ea76..21575b01d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_alt.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_alt.json @@ -1,12 +1,11 @@ { - "result": { - "item": "appliedenergistics2:interface" - }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "part.interface" - } - ] -} + "result": { + "item": "appliedenergistics2:interface" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:cable_interface" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json index 62543387d..4caf5e0a7 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json @@ -1,12 +1,11 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.interface" - }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "item": "appliedenergistics2:interface" - } - ] -} + "result": { + "item": "appliedenergistics2:cable_interface" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:interface" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_condenser.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_condenser.json index a58c91c06..c9bc7f2c1 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_condenser.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_condenser.json @@ -1,24 +1,22 @@ { - "result": { - "item": "appliedenergistics2:condenser" + "result": { + "item": "appliedenergistics2:condenser" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "b": { + "tag": "appliedenergistics2:glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "bcb", - "aba" - ], - "key": { - "b": { - "item": "#appliedenergistics2:glass" - }, - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "type": "forge:ore_dict", - "ore": "dustFluix" - } + "a": { + "tag": "forge:ingots/iron" + }, + "c": { + "tag": "appliedenergistics2:dusts/fluix" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_port.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_port.json index 2b08f20fd..3cfae4d4e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_port.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_port.json @@ -1,31 +1,28 @@ { - "result": { - "item": "appliedenergistics2:io_port" + "result": { + "item": "appliedenergistics2:io_port" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa", + "bcb", + "ded" + ], + "key": { + "a": { + "tag": "appliedenergistics2:glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa", - "bcb", - "ded" - ], - "key": { - "a": { - "item": "#appliedenergistics2:glass" - }, - "d": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "item": "appliedenergistics2:drive" - }, - "e": { - "type": "appliedenergistics2:part", - "part": "material.logic_processor" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - } + "d": { + "tag": "forge:ingots/iron" + }, + "b": { + "item": "appliedenergistics2:drive" + }, + "e": { + "item": "appliedenergistics2:logic_processor" + }, + "c": { + "item": "appliedenergistics2:fluix_cable_glass" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_link.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_link.json index 14eed4e90..bd6aca1f4 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_link.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_link.json @@ -1,20 +1,19 @@ { - "result": { - "item": "appliedenergistics2:quantum_link" + "result": { + "item": "appliedenergistics2:quantum_link" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "b b", + "aba" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "b b", - "aba" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_glass" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "material.fluix_pearl" - } + "b": { + "item": "appliedenergistics2:fluix_pearl" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_ring.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_ring.json index 4b15a682f..850a4232f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_ring.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_ring.json @@ -1,32 +1,28 @@ { - "result": { - "item": "appliedenergistics2:quantum_ring" + "result": { + "item": "appliedenergistics2:quantum_ring" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "cde", + "aba" + ], + "key": { + "c": { + "item": "appliedenergistics2:engineering_processor" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "cde", - "aba" - ], - "key": { - "c": { - "type": "appliedenergistics2:part", - "part": "material.engineering_processor" - }, - "e": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.fluix" - }, - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "d": { - "item": "appliedenergistics2:energy_cell" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "material.logic_processor" - } + "e": { + "item": "appliedenergistics2:fluix_cable_dense_smart" + }, + "a": { + "tag": "forge:ingots/iron" + }, + "d": { + "item": "appliedenergistics2:energy_cell" + }, + "b": { + "item": "appliedenergistics2:logic_processor" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json index 83b333f3c..69dfc9108 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json @@ -1,32 +1,28 @@ { - "result": { - "item": "appliedenergistics2:security_station" + "result": { + "item": "appliedenergistics2:security_station" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "cdc", + "aea" + ], + "key": { + "d": { + "item": "appliedenergistics2:cell16k_part" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "cdc", - "aea" - ], - "key": { - "d": { - "type": "appliedenergistics2:part", - "part": "material.cell16k_part" - }, - "e": { - "type": "appliedenergistics2:part", - "part": "material.engineering_processor" - }, - "b": { - "item": "appliedenergistics2:chest" - }, - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - } + "e": { + "item": "appliedenergistics2:engineering_processor" + }, + "b": { + "item": "appliedenergistics2:chest" + }, + "a": { + "tag": "forge:ingots/iron" + }, + "c": { + "item": "appliedenergistics2:fluix_cable_glass" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_port.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_port.json index 5e1862e00..df7f5d181 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_port.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_port.json @@ -1,31 +1,28 @@ { - "result": { - "item": "appliedenergistics2:spatial_io_port" + "result": { + "item": "appliedenergistics2:spatial_io_port" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa", + "bcb", + "ded" + ], + "key": { + "a": { + "tag": "appliedenergistics2:glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa", - "bcb", - "ded" - ], - "key": { - "a": { - "item": "#appliedenergistics2:glass" - }, - "e": { - "type": "appliedenergistics2:part", - "part": "material.engineering_processor" - }, - "d": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "item": "appliedenergistics2:io_port" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - } + "e": { + "item": "appliedenergistics2:engineering_processor" + }, + "d": { + "tag": "forge:ingots/iron" + }, + "c": { + "item": "appliedenergistics2:io_port" + }, + "b": { + "item": "appliedenergistics2:fluix_cable_glass" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json index ebcdac7f4..e0213bec2 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json @@ -1,27 +1,25 @@ { - "result": { - "item": "appliedenergistics2:spatial_pylon" + "result": { + "item": "appliedenergistics2:spatial_pylon" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "cdc", + "aba" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "cdc", - "aba" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_glass" - }, - "c": { - "type": "forge:ore_dict", - "ore": "dustFluix" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - }, - "d": { - "item": "#appliedenergistics2:fluixCrystal" - } + "c": { + "tag": "appliedenergistics2:dusts/fluix" + }, + "b": { + "item": "appliedenergistics2:fluix_cable_glass" + }, + "d": { + "tag": "appliedenergistics2:crystals/fluix" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_chest.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_chest.json index a8f5f60c9..cf2d2650e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_chest.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_chest.json @@ -1,31 +1,28 @@ { - "result": { - "item": "appliedenergistics2:chest" + "result": { + "item": "appliedenergistics2:chest" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "c c", + "ded" + ], + "key": { + "a": { + "tag": "appliedenergistics2:glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "c c", - "ded" - ], - "key": { - "a": { - "item": "#appliedenergistics2:glass" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "part.terminal" - }, - "d": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - }, - "e": { - "item": "#appliedenergistics2:fluixCrystal" - } + "b": { + "item": "appliedenergistics2:terminal" + }, + "d": { + "tag": "forge:ingots/iron" + }, + "c": { + "item": "appliedenergistics2:fluix_cable_glass" + }, + "e": { + "tag": "appliedenergistics2:crystals/fluix" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_drive.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_drive.json index 8bb8b5b71..772aef4e8 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_drive.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_drive.json @@ -1,25 +1,22 @@ { - "result": { - "item": "appliedenergistics2:drive" + "result": { + "item": "appliedenergistics2:drive" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "c c", + "aba" + ], + "key": { + "b": { + "item": "appliedenergistics2:engineering_processor" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "c c", - "aba" - ], - "key": { - "b": { - "type": "appliedenergistics2:part", - "part": "material.engineering_processor" - }, - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - } + "a": { + "tag": "forge:ingots/iron" + }, + "c": { + "item": "appliedenergistics2:fluix_cable_glass" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_black.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_black.json index 504b8a07f..1ef02da3b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_black.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_black.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_covered.black", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_covered.black", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_covered" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeBlack" - } + "b": { + "tag": "forge:dyes/black" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_blue.json index 7b022cdfd..9127314d5 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_blue.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_covered.blue", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_covered.blue", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_covered" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeBlue" - } + "b": { + "tag": "forge:dyes/blue" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_brown.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_brown.json index 0c60befed..69a38c348 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_brown.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_brown.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_covered.brown", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_covered.brown", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/brown" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeBrown" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_covered" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_cyan.json index 1f322182d..bd8fd3a05 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_cyan.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_cyan.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_covered.cyan", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_covered.cyan", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/cyan" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeCyan" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_covered" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix.json index 52a30d178..f96b95a4e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix.json @@ -1,16 +1,14 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" + "result": { + "item": "appliedenergistics2:fluix_cable_covered" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "tag": "appliedenergistics2:wool" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "item": "#appliedenergistics2:wool" - }, - { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - } - ] -} + { + "item": "appliedenergistics2:fluix_cable_glass" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix_clean.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix_clean.json index a374d9b6a..ac82ffa31 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix_clean.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix_clean.json @@ -1,16 +1,14 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" + "result": { + "item": "appliedenergistics2:fluix_cable_covered" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "tag": "appliedenergistics2:covered_cable" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "cable_covered" - }, - { - "item": "minecraft:water_bucket" - } - ] -} + { + "item": "minecraft:water_bucket" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_gray.json index 920b0210c..be676c022 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_gray.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_covered.gray", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_covered.gray", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/gray" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeGray" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_covered" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_green.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_green.json index c75bf6a05..ed2903065 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_green.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_green.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_covered.green", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_covered.green", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/green" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeGreen" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_covered" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_blue.json index 44ae617dd..e98b3e053 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_blue.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_covered.light_blue", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_covered.light_blue", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_covered" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeLightBlue" - } + "b": { + "tag": "forge:dyes/light_blue" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_gray.json index bb782b7e8..d6c58a9a9 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_gray.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_covered.light_gray", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_covered.light_gray", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_covered" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeLightGray" - } + "b": { + "tag": "forge:dyes/light_gray" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_lime.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_lime.json index ce0e797f7..7eb331b99 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_lime.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_lime.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_covered.lime", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_covered.lime", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_covered" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeLime" - } + "b": { + "tag": "forge:dyes/lime" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_magenta.json index 853cbc3cc..ad4f2d2f7 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_magenta.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_magenta.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_covered.magenta", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_covered.magenta", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/magenta" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeMagenta" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_covered" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_orange.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_orange.json index a5200ffb4..022266c00 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_orange.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_orange.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_covered.orange", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_covered.orange", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_covered" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeOrange" - } + "b": { + "tag": "forge:dyes/orange" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_pink.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_pink.json index 09a93a9c4..d97286e33 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_pink.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_pink.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_covered.pink", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_covered.pink", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/pink" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyePink" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_covered" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_purple.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_purple.json index 477eaf8c8..ab2723d42 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_purple.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_purple.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_covered.purple", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_covered.purple", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/purple" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyePurple" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_covered" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_red.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_red.json index 210181ac7..4fcdebc08 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_red.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_red.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_covered.red", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_covered.red", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_covered" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeRed" - } + "b": { + "tag": "forge:dyes/red" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_white.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_white.json index 5985130cf..1268ef1d0 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_white.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_white.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_covered.white", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_covered.white", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_covered" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeWhite" - } + "b": { + "tag": "forge:dyes/white" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_yellow.json index 724412be5..40970ab0b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_yellow.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_yellow.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_covered.yellow", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_covered.yellow", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/yellow" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeYellow" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_covered" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_black.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_black.json index 09df187fd..239bde93d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_black.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_black.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.black", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_covered.black", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_covered" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeBlack" - } + "b": { + "tag": "forge:dyes/black" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_blue.json index 4204d03fb..2d54a70d7 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_blue.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.blue", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_covered.blue", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_covered" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeBlue" - } + "b": { + "tag": "forge:dyes/blue" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_brown.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_brown.json index af87bb968..133fe16f0 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_brown.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_brown.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.brown", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_covered.brown", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/brown" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeBrown" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_dense_covered" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json index a8113072c..532328f33 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.cyan", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_covered.cyan", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_covered" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeCyan" - } + "b": { + "tag": "forge:dyes/cyan" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json index 5bc62ef28..e36bd6f35 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json @@ -1,25 +1,20 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.fluix" + "result": { + "item": "appliedenergistics2:fluix_cable_dense_covered" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:fluix_cable_covered" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - }, - { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - }, - { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - }, - { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - } - ] -} + { + "item": "appliedenergistics2:fluix_cable_covered" + }, + { + "item": "appliedenergistics2:fluix_cable_covered" + }, + { + "item": "appliedenergistics2:fluix_cable_covered" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json index fdf707b7b..53d0e2e41 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json @@ -1,16 +1,14 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.fluix" + "result": { + "item": "appliedenergistics2:fluix_cable_dense_covered" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "tag": "appliedenergistics2:covered_dense_cable" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered" - }, - { - "item": "minecraft:water_bucket" - } - ] -} + { + "item": "minecraft:water_bucket" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_gray.json index dd12b985b..f6b072174 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_gray.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.gray", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_covered.gray", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_covered" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeGray" - } + "b": { + "tag": "forge:dyes/gray" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_green.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_green.json index 28a27633b..a5543bc48 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_green.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_green.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.green", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_covered.green", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/green" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeGreen" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_dense_covered" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json index a0dda5b32..75a363a03 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.light_blue", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_covered.light_blue", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_covered" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeLightBlue" - } + "b": { + "tag": "forge:dyes/light_blue" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json index 1b33b1116..f2c1bfe42 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.light_gray", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_covered.light_gray", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_covered" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeLightGray" - } + "b": { + "tag": "forge:dyes/light_gray" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_lime.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_lime.json index 9512b98fc..5c9233aff 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_lime.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_lime.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.lime", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_covered.lime", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_covered" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeLime" - } + "b": { + "tag": "forge:dyes/lime" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json index c8bd6fa55..006c2e8cb 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.magenta", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_covered.magenta", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_covered" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeMagenta" - } + "b": { + "tag": "forge:dyes/magenta" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_orange.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_orange.json index ce8b17068..058672059 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_orange.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_orange.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.orange", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_covered.orange", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_covered" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeOrange" - } + "b": { + "tag": "forge:dyes/orange" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_pink.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_pink.json index cd7fd0926..ec5602ac8 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_pink.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_pink.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.pink", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_covered.pink", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_covered" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyePink" - } + "b": { + "tag": "forge:dyes/pink" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_purple.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_purple.json index 1bea08ac6..ce719d209 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_purple.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_purple.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.purple", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_covered.purple", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/purple" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyePurple" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_dense_covered" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_red.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_red.json index 585342c77..64fcd92f8 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_red.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_red.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.red", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_covered.red", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_covered" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeRed" - } + "b": { + "tag": "forge:dyes/red" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_white.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_white.json index b7b813bbe..3b90f1757 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_white.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_white.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.white", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_covered.white", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_covered" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeWhite" - } + "b": { + "tag": "forge:dyes/white" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json index bbd0c2d4d..7ee09ef45 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.yellow", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_covered.yellow", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/yellow" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeYellow" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_dense_covered" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_black.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_black.json index 20091a048..6d23b6e7e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_black.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_black.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.black", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_smart.black", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_smart" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeBlack" - } + "b": { + "tag": "forge:dyes/black" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_blue.json index 984e8baeb..c950c1aeb 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_blue.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.blue", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_smart.blue", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_smart" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeBlue" - } + "b": { + "tag": "forge:dyes/blue" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_brown.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_brown.json index b7c2983d5..eeceb363b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_brown.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_brown.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.brown", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_smart.brown", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/brown" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeBrown" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_dense_smart" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json index 7849926b1..424ed4c06 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.cyan", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_smart.cyan", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_smart" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeCyan" - } + "b": { + "tag": "forge:dyes/cyan" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json index 61ab926cf..034af7d9e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json @@ -1,21 +1,17 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.fluix" + "result": { + "item": "appliedenergistics2:fluix_cable_dense_smart" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:fluix_cable_dense_covered" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "cable_dense_covered.fluix" - }, - { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } - ] -} + { + "tag": "forge:dusts/redstone" + }, + { + "tag": "forge:dust/glowstone" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json index 25e9d4e01..e86b05ca2 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json @@ -1,16 +1,14 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.fluix" + "result": { + "item": "appliedenergistics2:fluix_cable_dense_smart" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "tag": "appliedenergistics2:smart_dense_cable" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart" - }, - { - "item": "minecraft:water_bucket" - } - ] -} + { + "item": "minecraft:water_bucket" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_gray.json index 4da4fdd40..ed78fa413 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_gray.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.gray", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_smart.gray", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_smart" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeGray" - } + "b": { + "tag": "forge:dyes/gray" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_green.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_green.json index d886a5438..4a7598c57 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_green.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_green.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.green", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_smart.green", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/green" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeGreen" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_dense_smart" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json index 222238fe3..2a981cb2d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.light_blue", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_smart.light_blue", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_smart" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeLightBlue" - } + "b": { + "tag": "forge:dyes/light_blue" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json index b260f66f6..1f4495abd 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.light_gray", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_smart.light_gray", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_smart" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeLightGray" - } + "b": { + "tag": "forge:dyes/light_gray" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_lime.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_lime.json index 55b926499..83fc7549e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_lime.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_lime.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.lime", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_smart.lime", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_smart" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeLime" - } + "b": { + "tag": "forge:dyes/lime" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json index 5587b5b87..2a5da0fa7 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.magenta", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_smart.magenta", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_smart" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeMagenta" - } + "b": { + "tag": "forge:dyes/magenta" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_orange.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_orange.json index 72edc3846..70d2d824c 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_orange.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_orange.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.orange", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_smart.orange", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_smart" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeOrange" - } + "b": { + "tag": "forge:dyes/orange" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_pink.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_pink.json index 1e465de59..31e7c2d38 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_pink.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_pink.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.pink", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_smart.pink", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_smart" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyePink" - } + "b": { + "tag": "forge:dyes/pink" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_purple.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_purple.json index 7c61b289f..26312b453 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_purple.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_purple.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.purple", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_smart.purple", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/purple" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyePurple" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_dense_smart" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_red.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_red.json index 01aff0bb2..d040ed2b2 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_red.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_red.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.red", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_smart.red", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_smart" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeRed" - } + "b": { + "tag": "forge:dyes/red" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_white.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_white.json index f314ea2de..c96d2cc8a 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_white.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_white.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.white", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_smart.white", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_dense_smart" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeWhite" - } + "b": { + "tag": "forge:dyes/white" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json index 4923b06a7..20c133260 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.yellow", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_dense_smart.yellow", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/yellow" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeYellow" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_dense_smart.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_dense_smart" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_black.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_black.json index 2271b4ec1..36e100143 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_black.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_black.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_glass.black", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_glass.black", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeBlack" - } + "b": { + "tag": "forge:dyes/black" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_blue.json index 846305020..76c2beade 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_blue.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_glass.blue", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_glass.blue", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeBlue" - } + "b": { + "tag": "forge:dyes/blue" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_brown.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_brown.json index 291153b93..a8b3dc285 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_brown.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_brown.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_glass.brown", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_glass.brown", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/brown" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeBrown" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_glass" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_cyan.json index 315f914ab..385ebd9e2 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_cyan.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_cyan.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_glass.cyan", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_glass.cyan", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeCyan" - } + "b": { + "tag": "forge:dyes/cyan" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix.json index e484a0407..c7ae5c7a0 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix.json @@ -1,20 +1,19 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix", - "count": 4 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_glass.fluix", + "count": 4 + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:quartz_fiber" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "part.quartz_fiber" - }, - { - "item": "#appliedenergistics2:fluixCrystal" - }, - { - "item": "#appliedenergistics2:fluixCrystal" - } - ] -} + { + "tag": "appliedenergistics2:crystals/fluix" + }, + { + "tag": "appliedenergistics2:crystals/fluix" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix_clean.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix_clean.json index af5c7ca74..4c40dccd8 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix_clean.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix_clean.json @@ -1,16 +1,14 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" + "result": { + "item": "appliedenergistics2:fluix_cable_glass" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "tag": "appliedenergistics2:glass_cable" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "cable_glass" - }, - { - "item": "minecraft:water_bucket" - } - ] -} + { + "item": "minecraft:water_bucket" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_gray.json index c6dc3a203..71b2f2947 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_gray.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_glass.gray", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_glass.gray", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeGray" - } + "b": { + "tag": "forge:dyes/gray" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_green.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_green.json index b3a246070..4b3b866ed 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_green.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_green.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_glass.green", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_glass.green", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/green" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeGreen" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_glass" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_blue.json index dcbe56c8b..7f7001a23 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_blue.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_glass.light_blue", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_glass.light_blue", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeLightBlue" - } + "b": { + "tag": "forge:dyes/light_blue" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_gray.json index bc4bde2c5..028592760 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_gray.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_glass.light_gray", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_glass.light_gray", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeLightGray" - } + "b": { + "tag": "forge:dyes/light_gray" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_lime.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_lime.json index 558ce0e8f..48706f633 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_lime.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_lime.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_glass.lime", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_glass.lime", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeLime" - } + "b": { + "tag": "forge:dyes/lime" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_magenta.json index d28da3e0a..d771d7e1d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_magenta.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_magenta.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_glass.magenta", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_glass.magenta", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeMagenta" - } + "b": { + "tag": "forge:dyes/magenta" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_orange.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_orange.json index e3260609c..72e546231 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_orange.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_orange.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_glass.orange", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_glass.orange", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeOrange" - } + "b": { + "tag": "forge:dyes/orange" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_pink.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_pink.json index b64a638e7..e023b417e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_pink.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_pink.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_glass.pink", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_glass.pink", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyePink" - } + "b": { + "tag": "forge:dyes/pink" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_purple.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_purple.json index 6bafa676b..142915c91 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_purple.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_purple.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_glass.purple", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_glass.purple", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/purple" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyePurple" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_glass" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_red.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_red.json index d784bb371..03a2a1b9a 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_red.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_red.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_glass.red", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_glass.red", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeRed" - } + "b": { + "tag": "forge:dyes/red" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_white.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_white.json index 143943f29..eda5449bd 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_white.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_white.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_glass.white", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_glass.white", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeWhite" - } + "b": { + "tag": "forge:dyes/white" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_yellow.json index 899d0b64c..b4f5c241a 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_yellow.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_yellow.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_glass.yellow", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_glass.yellow", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeYellow" - } + "b": { + "tag": "forge:dyes/yellow" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_black.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_black.json index 6f06204b5..96d05be10 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_black.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_black.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_smart.black", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_smart.black", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/black" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeBlack" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_smart.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_smart" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_blue.json index 75ba88022..9f1945186 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_blue.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_smart.blue", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_smart.blue", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_smart" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_smart.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeBlue" - } + "b": { + "tag": "forge:dyes/blue" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_brown.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_brown.json index 7ae90ee82..40287d3d8 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_brown.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_brown.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_smart.brown", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_smart.brown", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/brown" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeBrown" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_smart.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_smart" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_cyan.json index 437366678..e0747f8d0 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_cyan.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_cyan.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_smart.cyan", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_smart.cyan", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/cyan" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeCyan" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_smart.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_smart" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix.json index caa460cf2..22b77df4b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix.json @@ -1,21 +1,17 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_smart.fluix" + "result": { + "item": "appliedenergistics2:fluix_cable_smart" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:fluix_cable_covered" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "cable_covered.fluix" - }, - { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } - ] -} + { + "tag": "forge:dusts/redstone" + }, + { + "tag": "forge:dust/glowstone" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix_clean.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix_clean.json index c32f3bace..e290caa22 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix_clean.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix_clean.json @@ -1,16 +1,14 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_smart.fluix" + "result": { + "item": "appliedenergistics2:fluix_cable_smart" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "tag": "appliedenergistics2:smart_cable" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "cable_smart" - }, - { - "item": "minecraft:water_bucket" - } - ] -} + { + "item": "minecraft:water_bucket" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_gray.json index 6e09c52e4..a9cedf9fb 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_gray.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_smart.gray", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_smart.gray", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/gray" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeGray" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_smart.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_smart" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_green.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_green.json index 42e68b56d..66689b7a0 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_green.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_green.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_smart.green", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_smart.green", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/green" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeGreen" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_smart.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_smart" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_blue.json index e56b10fb4..25c159c7d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_blue.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_smart.light_blue", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_smart.light_blue", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/light_blue" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeLightBlue" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_smart.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_smart" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_gray.json index d053f901d..46bdca383 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_gray.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_smart.light_gray", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_smart.light_gray", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/light_gray" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeLightGray" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_smart.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_smart" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_lime.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_lime.json index 115a5165e..edcfb886b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_lime.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_lime.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_smart.lime", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_smart.lime", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_smart" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_smart.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeLime" - } + "b": { + "tag": "forge:dyes/lime" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_magenta.json index 32f5deec3..265478a1e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_magenta.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_magenta.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_smart.magenta", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_smart.magenta", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/magenta" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeMagenta" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_smart.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_smart" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_orange.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_orange.json index 2428c3650..18be6f2b5 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_orange.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_orange.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_smart.orange", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_smart.orange", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/orange" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeOrange" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_smart.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_smart" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_pink.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_pink.json index 97c02fe60..83a490bc1 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_pink.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_pink.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_smart.pink", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_smart.pink", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/pink" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyePink" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_smart.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_smart" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_purple.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_purple.json index 313c09fcc..794543f05 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_purple.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_purple.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_smart.purple", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_smart.purple", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/purple" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyePurple" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_smart.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_smart" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_red.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_red.json index bafc795d9..e0c9c9b7a 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_red.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_red.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_smart.red", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_smart.red", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:fluix_cable_smart" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "cable_smart.fluix" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeRed" - } + "b": { + "tag": "forge:dyes/red" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_white.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_white.json index f4785fd53..5266dfacc 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_white.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_white.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_smart.white", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_smart.white", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/white" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeWhite" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_smart.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_smart" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_yellow.json index 40aa80201..577c443f8 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_yellow.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_yellow.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "cable_smart.yellow", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "cable_smart.yellow", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/yellow" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeYellow" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "cable_smart.fluix" - } + "a": { + "item": "appliedenergistics2:fluix_cable_smart" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/empty_storage_cell.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/empty_storage_cell.json index 0882b5520..e55e3f4f2 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/empty_storage_cell.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/empty_storage_cell.json @@ -1,25 +1,22 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "material.empty_storage_cell" + "result": { + "item": "appliedenergistics2:empty_storage_cell" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aba", + "b b", + "ccc" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aba", - "b b", - "ccc" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_glass" - }, - "c": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - } + "c": { + "tag": "forge:ingots/iron" + }, + "b": { + "tag": "forge:dusts/redstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json index 204c10943..f1d27cd84 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json @@ -1,28 +1,25 @@ { - "result": { - "item": "appliedenergistics2:fluid_storage_cell_16k" + "result": { + "item": "appliedenergistics2:fluid_storage_cell_16k" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "ddd" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "bcb", - "ddd" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_glass" - }, - "d": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.fluid_cell16k_part" - } + "d": { + "tag": "forge:ingots/iron" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "appliedenergistics2:fluid_cell16k_part" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k_storage.json index 2360decc8..ae5d0870e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k_storage.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k_storage.json @@ -1,16 +1,14 @@ { - "result": { - "item": "appliedenergistics2:fluid_storage_cell_16k" + "result": { + "item": "appliedenergistics2:fluid_storage_cell_16k" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:empty_storage_cell" }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "material.empty_storage_cell" - }, - { - "type": "appliedenergistics2:part", - "part": "material.fluid_cell16k_part" - } - ] -} + { + "item": "appliedenergistics2:fluid_cell16k_part" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json index 537923a61..4f9ec2fc1 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json @@ -1,28 +1,25 @@ { - "result": { - "item": "appliedenergistics2:fluid_storage_cell_1k" + "result": { + "item": "appliedenergistics2:fluid_storage_cell_1k" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "ddd" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "bcb", - "ddd" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_glass" - }, - "d": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.fluid_cell1k_part" - } + "d": { + "tag": "forge:ingots/iron" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "appliedenergistics2:fluid_cell1k_part" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k_storage.json index 742363776..50934f645 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k_storage.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k_storage.json @@ -1,16 +1,14 @@ { - "result": { - "item": "appliedenergistics2:fluid_storage_cell_1k" + "result": { + "item": "appliedenergistics2:fluid_storage_cell_1k" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:empty_storage_cell" }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "material.empty_storage_cell" - }, - { - "type": "appliedenergistics2:part", - "part": "material.fluid_cell1k_part" - } - ] -} + { + "item": "appliedenergistics2:fluid_cell1k_part" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json index 008826386..cb2f3beaa 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json @@ -1,28 +1,25 @@ { - "result": { - "item": "appliedenergistics2:fluid_storage_cell_4k" + "result": { + "item": "appliedenergistics2:fluid_storage_cell_4k" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "ddd" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "bcb", - "ddd" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_glass" - }, - "d": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.fluid_cell4k_part" - } + "d": { + "tag": "forge:ingots/iron" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "appliedenergistics2:fluid_cell4k_part" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k_storage.json index 66c9da0a0..8031640d5 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k_storage.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k_storage.json @@ -1,16 +1,14 @@ { - "result": { - "item": "appliedenergistics2:fluid_storage_cell_4k" + "result": { + "item": "appliedenergistics2:fluid_storage_cell_4k" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:empty_storage_cell" }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "material.empty_storage_cell" - }, - { - "type": "appliedenergistics2:part", - "part": "material.fluid_cell4k_part" - } - ] -} + { + "item": "appliedenergistics2:fluid_cell4k_part" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json index 0f9bc2225..3190d2c97 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json @@ -1,28 +1,25 @@ { - "result": { - "item": "appliedenergistics2:fluid_storage_cell_64k" + "result": { + "item": "appliedenergistics2:fluid_storage_cell_64k" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "ddd" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "bcb", - "ddd" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_glass" - }, - "d": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.fluid_cell64k_part" - } + "d": { + "tag": "forge:ingots/iron" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "appliedenergistics2:fluid_cell64k_part" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k_storage.json index 2f98dcc19..25594203d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k_storage.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k_storage.json @@ -1,16 +1,14 @@ { - "result": { - "item": "appliedenergistics2:fluid_storage_cell_64k" + "result": { + "item": "appliedenergistics2:fluid_storage_cell_64k" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:empty_storage_cell" }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "material.empty_storage_cell" - }, - { - "type": "appliedenergistics2:part", - "part": "material.fluid_cell64k_part" - } - ] -} + { + "item": "appliedenergistics2:fluid_cell64k_part" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json index 9bb67ab12..9a9e6e994 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json @@ -1,29 +1,26 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "material.fluid_cell16k_part" + "result": { + "item": "appliedenergistics2:fluid_cell16k_part" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aba", + "cdc", + "aca" + ], + "key": { + "d": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aba", - "cdc", - "aca" - ], - "key": { - "d": { - "item": "appliedenergistics2:quartz_glass" - }, - "a": { - "item": "minecraft:dye", - "data": 4 - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.fluid_cell4k_part" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "material.calculation_processor" - } + "a": { + "item": "minecraft:dye", + "data": 4 + }, + "c": { + "item": "appliedenergistics2:fluid_cell4k_part" + }, + "b": { + "item": "appliedenergistics2:calculation_processor" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json index 2a28d493e..7cd1def4b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json @@ -1,25 +1,23 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "material.fluid_cell1k_part" + "result": { + "item": "appliedenergistics2:fluid_cell1k_part" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "a": { + "item": "minecraft:dye", + "data": 4 }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aba", - "bcb", - "aba" - ], - "key": { - "a": { - "item": "minecraft:dye", - "data": 4 - }, - "b": { - "item": "#appliedenergistics2:certusCrystal" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.logic_processor" - } + "b": { + "tag": "appliedenergistics2:crystals/certus" + }, + "c": { + "item": "appliedenergistics2:logic_processor" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json index f3b2672bb..3de771665 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json @@ -1,29 +1,26 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "material.fluid_cell4k_part" + "result": { + "item": "appliedenergistics2:fluid_cell4k_part" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aba", + "cdc", + "aca" + ], + "key": { + "d": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aba", - "cdc", - "aca" - ], - "key": { - "d": { - "item": "appliedenergistics2:quartz_glass" - }, - "a": { - "item": "minecraft:dye", - "data": 4 - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.fluid_cell1k_part" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "material.calculation_processor" - } + "a": { + "item": "minecraft:dye", + "data": 4 + }, + "c": { + "item": "appliedenergistics2:fluid_cell1k_part" + }, + "b": { + "item": "appliedenergistics2:calculation_processor" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json index 9b83d3a80..81a1cf9e4 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json @@ -1,29 +1,26 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "material.fluid_cell64k_part" + "result": { + "item": "appliedenergistics2:fluid_cell64k_part" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aba", + "cdc", + "aca" + ], + "key": { + "d": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aba", - "cdc", - "aca" - ], - "key": { - "d": { - "item": "appliedenergistics2:quartz_glass" - }, - "a": { - "item": "minecraft:dye", - "data": 4 - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.fluid_cell16k_part" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "material.calculation_processor" - } + "a": { + "item": "minecraft:dye", + "data": 4 + }, + "c": { + "item": "appliedenergistics2:fluid_cell16k_part" + }, + "b": { + "item": "appliedenergistics2:calculation_processor" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components.json index 4f2c859e3..d0e31e59e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components.json @@ -1,26 +1,22 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "material.cell2_spatial_part" + "result": { + "item": "appliedenergistics2:cell2_spatial_part" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "c": { + "item": "appliedenergistics2:engineering_processor" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aba", - "bcb", - "aba" - ], - "key": { - "c": { - "type": "appliedenergistics2:part", - "part": "material.engineering_processor" - }, - "a": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "material.fluix_pearl" - } + "a": { + "tag": "forge:dust/glowstone" + }, + "b": { + "item": "appliedenergistics2:fluix_pearl" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_0.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_0.json index abefec632..5e0931e3f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_0.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_0.json @@ -1,26 +1,22 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "material.cell16_spatial_part" + "result": { + "item": "appliedenergistics2:cell16_spatial_part" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "c": { + "item": "appliedenergistics2:engineering_processor" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aba", - "bcb", - "aba" - ], - "key": { - "c": { - "type": "appliedenergistics2:part", - "part": "material.engineering_processor" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "material.cell2_spatial_part" - }, - "a": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "b": { + "item": "appliedenergistics2:cell2_spatial_part" + }, + "a": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_1.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_1.json index 3a59d525c..9bb8c0f6d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_1.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_1.json @@ -1,26 +1,22 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "material.cell128_spatial_part" + "result": { + "item": "appliedenergistics2:cell128_spatial_part" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "c": { + "item": "appliedenergistics2:engineering_processor" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aba", - "bcb", - "aba" - ], - "key": { - "c": { - "type": "appliedenergistics2:part", - "part": "material.engineering_processor" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "material.cell16_spatial_part" - }, - "a": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "b": { + "item": "appliedenergistics2:cell16_spatial_part" + }, + "a": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json index 71a84c6b5..cbd58274e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json @@ -1,28 +1,25 @@ { - "result": { - "item": "appliedenergistics2:spatial_storage_cell_128_cubed" + "result": { + "item": "appliedenergistics2:spatial_storage_cell_128_cubed" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "ddd" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "bcb", - "ddd" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_glass" - }, - "d": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.cell128_spatial_part" - } + "d": { + "tag": "forge:ingots/iron" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "appliedenergistics2:cell128_spatial_part" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json index 54a9b00df..407420fe7 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json @@ -1,16 +1,14 @@ { - "result": { - "item": "appliedenergistics2:spatial_storage_cell_128_cubed" + "result": { + "item": "appliedenergistics2:spatial_storage_cell_128_cubed" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:empty_storage_cell" }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "material.empty_storage_cell" - }, - { - "type": "appliedenergistics2:part", - "part": "material.cell128_spatial_part" - } - ] -} + { + "item": "appliedenergistics2:cell128_spatial_part" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json index 45d6feeca..0fc006cf9 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json @@ -1,28 +1,25 @@ { - "result": { - "item": "appliedenergistics2:spatial_storage_cell_16_cubed" + "result": { + "item": "appliedenergistics2:spatial_storage_cell_16_cubed" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "ddd" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "bcb", - "ddd" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_glass" - }, - "d": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.cell16_spatial_part" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - } + "d": { + "tag": "forge:ingots/iron" + }, + "c": { + "item": "appliedenergistics2:cell16_spatial_part" + }, + "b": { + "tag": "forge:dusts/redstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json index ee29c74da..34a8baed1 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json @@ -1,16 +1,14 @@ { - "result": { - "item": "appliedenergistics2:spatial_storage_cell_16_cubed" + "result": { + "item": "appliedenergistics2:spatial_storage_cell_16_cubed" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:empty_storage_cell" }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "material.empty_storage_cell" - }, - { - "type": "appliedenergistics2:part", - "part": "material.cell16_spatial_part" - } - ] -} + { + "item": "appliedenergistics2:cell16_spatial_part" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json index ab98d1efe..3c8363758 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json @@ -1,28 +1,25 @@ { - "result": { - "item": "appliedenergistics2:spatial_storage_cell_2_cubed" + "result": { + "item": "appliedenergistics2:spatial_storage_cell_2_cubed" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "ddd" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "bcb", - "ddd" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_glass" - }, - "d": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.cell2_spatial_part" - } + "d": { + "tag": "forge:ingots/iron" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "appliedenergistics2:cell2_spatial_part" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json index c5fa547d1..6b3ad406d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json @@ -1,16 +1,14 @@ { - "result": { - "item": "appliedenergistics2:spatial_storage_cell_2_cubed" + "result": { + "item": "appliedenergistics2:spatial_storage_cell_2_cubed" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:empty_storage_cell" }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "material.empty_storage_cell" - }, - { - "type": "appliedenergistics2:part", - "part": "material.cell2_spatial_part" - } - ] -} + { + "item": "appliedenergistics2:cell2_spatial_part" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k.json index e4263bbe1..3363cf0ac 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k.json @@ -1,28 +1,25 @@ { - "result": { - "item": "appliedenergistics2:storage_cell_16k" + "result": { + "item": "appliedenergistics2:storage_cell_16k" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "ddd" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "bcb", - "ddd" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_glass" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.cell16k_part" - }, - "d": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - } + "c": { + "item": "appliedenergistics2:cell16k_part" + }, + "d": { + "tag": "forge:ingots/iron" + }, + "b": { + "tag": "forge:dusts/redstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k_storage.json index db1de7ad0..d7ae6f169 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k_storage.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k_storage.json @@ -1,16 +1,14 @@ { - "result": { - "item": "appliedenergistics2:storage_cell_16k" + "result": { + "item": "appliedenergistics2:storage_cell_16k" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:cell16k_part" }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "material.cell16k_part" - }, - { - "type": "appliedenergistics2:part", - "part": "material.empty_storage_cell" - } - ] -} + { + "item": "appliedenergistics2:empty_storage_cell" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k.json index 6fed11c9a..352e236b2 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k.json @@ -1,28 +1,25 @@ { - "result": { - "item": "appliedenergistics2:storage_cell_1k" + "result": { + "item": "appliedenergistics2:storage_cell_1k" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "ddd" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "bcb", - "ddd" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_glass" - }, - "d": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.cell1k_part" - } + "d": { + "tag": "forge:ingots/iron" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "appliedenergistics2:cell1k_part" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k_storage.json index 3fa6d507f..ecbe3f027 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k_storage.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k_storage.json @@ -1,16 +1,14 @@ { - "result": { - "item": "appliedenergistics2:storage_cell_1k" + "result": { + "item": "appliedenergistics2:storage_cell_1k" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:empty_storage_cell" }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "material.empty_storage_cell" - }, - { - "type": "appliedenergistics2:part", - "part": "material.cell1k_part" - } - ] -} + { + "item": "appliedenergistics2:cell1k_part" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k.json index 08322c9ac..7587b6117 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k.json @@ -1,28 +1,25 @@ { - "result": { - "item": "appliedenergistics2:storage_cell_4k" + "result": { + "item": "appliedenergistics2:storage_cell_4k" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "ddd" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "bcb", - "ddd" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_glass" - }, - "d": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.cell4k_part" - } + "d": { + "tag": "forge:ingots/iron" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "appliedenergistics2:cell4k_part" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k_storage.json index 8bb5f344f..37f02210b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k_storage.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k_storage.json @@ -1,16 +1,14 @@ { - "result": { - "item": "appliedenergistics2:storage_cell_4k" + "result": { + "item": "appliedenergistics2:storage_cell_4k" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:empty_storage_cell" }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "material.empty_storage_cell" - }, - { - "type": "appliedenergistics2:part", - "part": "material.cell4k_part" - } - ] -} + { + "item": "appliedenergistics2:cell4k_part" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k.json index f7cdc6960..c41f40755 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k.json @@ -1,28 +1,25 @@ { - "result": { - "item": "appliedenergistics2:storage_cell_64k" + "result": { + "item": "appliedenergistics2:storage_cell_64k" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "ddd" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "bcb", - "ddd" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_glass" - }, - "d": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.cell64k_part" - } + "d": { + "tag": "forge:ingots/iron" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "appliedenergistics2:cell64k_part" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k_storage.json index 64a158e15..7b9c3dcf3 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k_storage.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k_storage.json @@ -1,16 +1,14 @@ { - "result": { - "item": "appliedenergistics2:storage_cell_64k" + "result": { + "item": "appliedenergistics2:storage_cell_64k" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:empty_storage_cell" }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "material.empty_storage_cell" - }, - { - "type": "appliedenergistics2:part", - "part": "material.cell64k_part" - } - ] -} + { + "item": "appliedenergistics2:cell64k_part" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json index e57700510..8cdfe88de 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json @@ -1,29 +1,25 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "material.cell16k_part" + "result": { + "item": "appliedenergistics2:cell16k_part" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aba", + "cdc", + "aca" + ], + "key": { + "b": { + "item": "appliedenergistics2:calculation_processor" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aba", - "cdc", - "aca" - ], - "key": { - "b": { - "type": "appliedenergistics2:part", - "part": "material.calculation_processor" - }, - "d": { - "item": "appliedenergistics2:quartz_glass" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.cell4k_part" - }, - "a": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "d": { + "item": "appliedenergistics2:quartz_glass" + }, + "c": { + "item": "appliedenergistics2:cell4k_part" + }, + "a": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json index 7810fb634..a43f358d4 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json @@ -1,25 +1,22 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "material.cell1k_part" + "result": { + "item": "appliedenergistics2:cell1k_part" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "a": { + "tag": "forge:dusts/redstone" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aba", - "bcb", - "aba" - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "b": { - "item": "#appliedenergistics2:certusCrystal" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.logic_processor" - } + "b": { + "tag": "appliedenergistics2:crystals/certus" + }, + "c": { + "item": "appliedenergistics2:logic_processor" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json index c32a151f7..bb4713acd 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json @@ -1,29 +1,25 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "material.cell4k_part" + "result": { + "item": "appliedenergistics2:cell4k_part" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aba", + "cdc", + "aca" + ], + "key": { + "d": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aba", - "cdc", - "aca" - ], - "key": { - "d": { - "item": "appliedenergistics2:quartz_glass" - }, - "a": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.cell1k_part" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "material.calculation_processor" - } + "a": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "appliedenergistics2:cell1k_part" + }, + "b": { + "item": "appliedenergistics2:calculation_processor" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json index 4a6480430..634e3fbad 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json @@ -1,29 +1,25 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "material.cell64k_part" + "result": { + "item": "appliedenergistics2:cell64k_part" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aba", + "cdc", + "aca" + ], + "key": { + "b": { + "item": "appliedenergistics2:calculation_processor" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aba", - "cdc", - "aca" - ], - "key": { - "b": { - "type": "appliedenergistics2:part", - "part": "material.calculation_processor" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.cell16k_part" - }, - "d": { - "item": "appliedenergistics2:quartz_glass" - }, - "a": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "c": { + "item": "appliedenergistics2:cell16k_part" + }, + "d": { + "item": "appliedenergistics2:quartz_glass" + }, + "a": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/view_cell.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/view_cell.json index 456ea2337..67725efa3 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/view_cell.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/view_cell.json @@ -1,27 +1,25 @@ { - "result": { - "item": "appliedenergistics2:view_cell" + "result": { + "item": "appliedenergistics2:view_cell" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "ddd" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "bcb", - "ddd" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_glass" - }, - "d": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "c": { - "item": "#appliedenergistics2:certusCrystal" - } + "d": { + "tag": "forge:ingots/iron" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "tag": "appliedenergistics2:crystals/certus" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/view_cell_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/view_cell_storage.json index 30095a3f2..3125fe4ff 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/view_cell_storage.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/view_cell_storage.json @@ -1,15 +1,14 @@ { - "result": { - "item": "appliedenergistics2:view_cell" + "result": { + "item": "appliedenergistics2:view_cell" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:empty_storage_cell" }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "material.empty_storage_cell" - }, - { - "item": "#appliedenergistics2:certusCrystal" - } - ] -} + { + "tag": "appliedenergistics2:crystals/certus" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_accelerator.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_accelerator.json index 86607e2d0..409499a07 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_accelerator.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_accelerator.json @@ -1,15 +1,14 @@ { - "result": { - "item": "appliedenergistics2:crafting_accelerator" + "result": { + "item": "appliedenergistics2:crafting_accelerator" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:engineering_processor" }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "material.engineering_processor" - }, - { - "item": "appliedenergistics2:crafting_unit" - } - ] -} + { + "item": "appliedenergistics2:crafting_unit" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_monitor.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_monitor.json index 5c3db0652..d8cabf287 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_monitor.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_monitor.json @@ -1,15 +1,14 @@ { - "result": { - "item": "appliedenergistics2:crafting_monitor" + "result": { + "item": "appliedenergistics2:crafting_monitor" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:storage_monitor" }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "part.storage_monitor" - }, - { - "item": "appliedenergistics2:crafting_unit" - } - ] -} + { + "item": "appliedenergistics2:crafting_unit" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_16k.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_16k.json index 8aedc0be6..02e6fde64 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_16k.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_16k.json @@ -1,15 +1,14 @@ { - "result": { - "item": "appliedenergistics2:crafting_storage_16k" + "result": { + "item": "appliedenergistics2:crafting_storage_16k" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:cell16k_part" }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "material.cell16k_part" - }, - { - "item": "appliedenergistics2:crafting_unit" - } - ] -} + { + "item": "appliedenergistics2:crafting_unit" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_1k.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_1k.json index 7de424146..54b395802 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_1k.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_1k.json @@ -1,15 +1,14 @@ { - "result": { - "item": "appliedenergistics2:crafting_storage_1k" + "result": { + "item": "appliedenergistics2:crafting_storage_1k" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:crafting_unit" }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "item": "appliedenergistics2:crafting_unit" - }, - { - "type": "appliedenergistics2:part", - "part": "material.cell1k_part" - } - ] -} + { + "item": "appliedenergistics2:cell1k_part" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_4k.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_4k.json index a2d0429d4..2347d23c7 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_4k.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_4k.json @@ -1,15 +1,14 @@ { - "result": { - "item": "appliedenergistics2:crafting_storage_4k" + "result": { + "item": "appliedenergistics2:crafting_storage_4k" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:cell4k_part" }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "material.cell4k_part" - }, - { - "item": "appliedenergistics2:crafting_unit" - } - ] -} + { + "item": "appliedenergistics2:crafting_unit" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_64k.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_64k.json index e9e56f039..25f534f2c 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_64k.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_storage_64k.json @@ -1,15 +1,14 @@ { - "result": { - "item": "appliedenergistics2:crafting_storage_64k" + "result": { + "item": "appliedenergistics2:crafting_storage_64k" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:crafting_unit" }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "item": "appliedenergistics2:crafting_unit" - }, - { - "type": "appliedenergistics2:part", - "part": "material.cell64k_part" - } - ] -} + { + "item": "appliedenergistics2:cell64k_part" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json index 1799326bd..16ef87097 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json @@ -1,29 +1,25 @@ { - "result": { - "item": "appliedenergistics2:crafting_unit" + "result": { + "item": "appliedenergistics2:crafting_unit" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "cdc", + "aba" + ], + "key": { + "a": { + "tag": "forge:ingots/iron" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "cdc", - "aba" - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "d": { - "type": "appliedenergistics2:part", - "part": "material.logic_processor" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "material.calculation_processor" - } + "d": { + "item": "appliedenergistics2:logic_processor" + }, + "c": { + "item": "appliedenergistics2:fluix_cable_glass" + }, + "b": { + "item": "appliedenergistics2:calculation_processor" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/molecular_assembler.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/molecular_assembler.json index 97247f7b1..d7c65f44a 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/molecular_assembler.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/molecular_assembler.json @@ -1,32 +1,28 @@ { - "result": { - "item": "appliedenergistics2:molecular_assembler" + "result": { + "item": "appliedenergistics2:molecular_assembler" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "cde", + "aba" + ], + "key": { + "e": { + "item": "appliedenergistics2:formation_core" }, - "type": "forge:ore_shaped", - "pattern": [ - "aba", - "cde", - "aba" - ], - "key": { - "e": { - "type": "appliedenergistics2:part", - "part": "material.formation_core" - }, - "b": { - "item": "appliedenergistics2:quartz_glass" - }, - "d": { - "type": "forge:ore_dict", - "ore": "workbench" - }, - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.annihilation_core" - } + "b": { + "item": "appliedenergistics2:quartz_glass" + }, + "d": { + "tag": "appliedenergistics2:workbench" + }, + "a": { + "tag": "forge:ingots/iron" + }, + "c": { + "item": "appliedenergistics2:annihilation_core" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/patterns_blank.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/patterns_blank.json index f9b47951d..253263144 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/patterns_blank.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/patterns_blank.json @@ -1,28 +1,25 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "material.blank_pattern" + "result": { + "item": "appliedenergistics2:blank_pattern" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aba", + "bcb", + "ddd" + ], + "key": { + "a": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aba", - "bcb", - "ddd" - ], - "key": { - "a": { - "item": "appliedenergistics2:quartz_glass" - }, - "d": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "item": "#appliedenergistics2:certusCrystal" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "d": { + "tag": "forge:ingots/iron" + }, + "c": { + "tag": "appliedenergistics2:crystals/certus" + }, + "b": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/cable_anchor.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/cable_anchor.json index f1b45ab16..db1292e69 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/cable_anchor.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/cable_anchor.json @@ -1,15 +1,15 @@ { - "type": "appliedenergistics2:part_shapeless", - "result": { - "part": "part.cable_anchor", - "count": 3 + "type": "appliedenergistics2:part_shapeless", + "result": { + "part": "part.cable_anchor", + "count": 3 + }, + "ingredients": [ + { + "tag": "appliedenergistics2:metal_ingots" }, - "ingredients": [ - { - "item": "#appliedenergistics2:metalIngots" - }, - { - "item": "#appliedenergistics2:knife" - } - ] -} + { + "tag": "appliedenergistics2:knife" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus.json index 6f782185c..511f5c8f4 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus.json @@ -1,24 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.export_bus" + "result": { + "item": "appliedenergistics2:export_bus" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aba", + " c " + ], + "key": { + "b": { + "item": "appliedenergistics2:formation_core" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aba", - " c " - ], - "key": { - "b": { - "type": "appliedenergistics2:part", - "part": "material.formation_core" - }, - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "item": "minecraft:piston" - } + "a": { + "tag": "forge:ingots/iron" + }, + "c": { + "item": "minecraft:piston" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus_fluid.json index 29d631a01..5ae986fdb 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus_fluid.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus_fluid.json @@ -1,28 +1,25 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.fluid_export_bus" + "result": { + "item": "appliedenergistics2:fluid_export_bus" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aba", + "lcl" + ], + "key": { + "b": { + "item": "appliedenergistics2:formation_core" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aba", - "lcl" - ], - "key": { - "b": { - "type": "appliedenergistics2:part", - "part": "material.formation_core" - }, - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "item": "minecraft:piston" - }, - "l": { - "item": "minecraft:dye", - "data": 4 - } + "a": { + "tag": "forge:ingots/iron" + }, + "c": { + "item": "minecraft:piston" + }, + "l": { + "item": "minecraft:dye", + "data": 4 } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json index 193dce5ab..6bb2694ab 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json @@ -1,20 +1,17 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.fluid_level_emitter" + "result": { + "item": "appliedenergistics2:fluid_level_emitter" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "minecraft:redstone_torch" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "item": "minecraft:redstone_torch" - }, - { - "type": "forge:ore_dict", - "ore": "dyeBlue" - }, - { - "type": "appliedenergistics2:part", - "part": "material.calculation_processor" - } - ] -} + { + "tag": "forge:dyes/blue" + }, + { + "item": "appliedenergistics2:calculation_processor" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus.json index e0445bf30..7a3be807b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus.json @@ -1,24 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.import_bus" + "result": { + "item": "appliedenergistics2:import_bus" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + " a ", + "bcb" + ], + "key": { + "c": { + "item": "minecraft:sticky_piston" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - " a ", - "bcb" - ], - "key": { - "c": { - "item": "minecraft:sticky_piston" - }, - "b": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "material.annihilation_core" - } + "b": { + "tag": "forge:ingots/iron" + }, + "a": { + "item": "appliedenergistics2:annihilation_core" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus_fluid.json index 978609f56..f67c66901 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus_fluid.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus_fluid.json @@ -1,28 +1,25 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.fluid_import_bus" + "result": { + "item": "appliedenergistics2:fluid_import_bus" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "lal", + "bcb" + ], + "key": { + "c": { + "item": "minecraft:sticky_piston" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "lal", - "bcb" - ], - "key": { - "c": { - "item": "minecraft:sticky_piston" - }, - "b": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "material.annihilation_core" - }, - "l": { - "item": "minecraft:dye", - "data": 4 - } + "b": { + "tag": "forge:ingots/iron" + }, + "a": { + "item": "appliedenergistics2:annihilation_core" + }, + "l": { + "item": "minecraft:dye", + "data": 4 } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/level_emitter.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/level_emitter.json index 6db170d45..c4ae0bbc7 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/level_emitter.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/level_emitter.json @@ -1,16 +1,14 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.level_emitter" + "result": { + "item": "appliedenergistics2:level_emitter" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "minecraft:redstone_torch" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "item": "minecraft:redstone_torch" - }, - { - "type": "appliedenergistics2:part", - "part": "material.calculation_processor" - } - ] -} + { + "item": "appliedenergistics2:calculation_processor" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_conversion.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_conversion.json index eb388ada6..39764da47 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_conversion.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_conversion.json @@ -1,21 +1,17 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.conversion_monitor" + "result": { + "item": "appliedenergistics2:conversion_monitor" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:formation_core" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "material.formation_core" - }, - { - "type": "appliedenergistics2:part", - "part": "part.storage_monitor" - }, - { - "type": "appliedenergistics2:part", - "part": "material.annihilation_core" - } - ] -} + { + "item": "appliedenergistics2:storage_monitor" + }, + { + "item": "appliedenergistics2:annihilation_core" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_storage.json index 6696df07a..561694416 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_storage.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_storage.json @@ -1,17 +1,14 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.storage_monitor" + "result": { + "item": "appliedenergistics2:storage_monitor" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:level_emitter" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "part.level_emitter" - }, - { - "type": "forge:ore_dict", - "ore": "itemIlluminatedPanel" - } - ] -} + { + "tag": "appliedenergistics2:illuminated_panel" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json index be640b3a6..6e7418177 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json @@ -1,13 +1,11 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.dark_monitor" - }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "part.monitor" - } - ] -} + "result": { + "item": "appliedenergistics2:dark_monitor" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:monitor" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_monitor.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_monitor.json index 7b45e1eda..92b7bc961 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_monitor.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_monitor.json @@ -1,13 +1,11 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.monitor" - }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "part.semi_dark_monitor" - } - ] -} + "result": { + "item": "appliedenergistics2:monitor" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:semi_dark_monitor" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json index 4a14d254f..679c17f34 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json @@ -1,30 +1,27 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.semi_dark_monitor", - "count": 3 + "result": { + "type": "appliedenergistics2:part", + "part": "part.semi_dark_monitor", + "count": 3 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + " ab", + "cdb", + " ab" + ], + "key": { + "b": { + "item": "appliedenergistics2:quartz_glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - " ab", - "cdb", - " ab" - ], - "key": { - "b": { - "item": "appliedenergistics2:quartz_glass" - }, - "c": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "d": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "a": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "c": { + "tag": "forge:ingots/iron" + }, + "d": { + "tag": "forge:dusts/redstone" + }, + "a": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json index 19eda0c34..dbc4861fd 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json @@ -1,13 +1,11 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.semi_dark_monitor" - }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "part.dark_monitor" - } - ] -} + "result": { + "item": "appliedenergistics2:semi_dark_monitor" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:dark_monitor" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json index b7063599f..07320da36 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json @@ -1,24 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.annihilation_plane" + "result": { + "item": "appliedenergistics2:annihilation_plane" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "bcb" + ], + "key": { + "b": { + "tag": "forge:ingots/iron" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "bcb" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "a": { - "item": "#appliedenergistics2:fluixCrystal" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.annihilation_core" - } + "a": { + "tag": "appliedenergistics2:crystals/fluix" + }, + "c": { + "item": "appliedenergistics2:annihilation_core" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json index c800223a5..3dddb9609 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json @@ -1,25 +1,22 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.annihilation_plane" + "result": { + "item": "appliedenergistics2:annihilation_plane" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "ab", + "cb", + "ab" + ], + "key": { + "a": { + "tag": "forge:ingots/iron" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "ab", - "cb", - "ab" - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "item": "#appliedenergistics2:fluixCrystal" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.annihilation_core" - } + "b": { + "tag": "appliedenergistics2:crystals/fluix" + }, + "c": { + "item": "appliedenergistics2:annihilation_core" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json index 6409acc3a..166933559 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json @@ -1,29 +1,25 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.fluid_annihilation_plane" + "result": { + "item": "appliedenergistics2:fluid_annihilation_plane" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "ddd", + "bcb" + ], + "key": { + "b": { + "tag": "forge:ingots/iron" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "ddd", - "bcb" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "a": { - "item": "#appliedenergistics2:fluixCrystal" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.annihilation_core" - }, - "d": { - "type": "forge:ore_dict", - "ore": "dyeBlue" - } + "a": { + "tag": "appliedenergistics2:crystals/fluix" + }, + "c": { + "item": "appliedenergistics2:annihilation_core" + }, + "d": { + "tag": "forge:dyes/blue" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json index 97f09cf80..7d994dc1c 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json @@ -1,29 +1,25 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.fluid_annihilation_plane" + "result": { + "item": "appliedenergistics2:fluid_annihilation_plane" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "adb", + "cdb", + "adb" + ], + "key": { + "a": { + "tag": "forge:ingots/iron" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "adb", - "cdb", - "adb" - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "item": "#appliedenergistics2:fluixCrystal" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.annihilation_core" - }, - "d": { - "type": "forge:ore_dict", - "ore": "dyeBlue" - } + "b": { + "tag": "appliedenergistics2:crystals/fluix" + }, + "c": { + "item": "appliedenergistics2:annihilation_core" + }, + "d": { + "tag": "forge:dyes/blue" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json index 0bbdcf882..a3494d255 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json @@ -1,17 +1,14 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.identity_annihilation_plane" + "result": { + "item": "appliedenergistics2:identity_annihilation_plane" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:annihilation_plane" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "part.annihilation_plane" - }, - { - "type": "appliedenergistics2:part", - "part": "material.fluix_pearl" - } - ] -} + { + "item": "appliedenergistics2:fluix_pearl" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation.json index d647a2108..cef5335c8 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation.json @@ -1,24 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.formation_plane" + "result": { + "item": "appliedenergistics2:formation_plane" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "bcb" + ], + "key": { + "c": { + "item": "appliedenergistics2:formation_core" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "bcb" - ], - "key": { - "c": { - "type": "appliedenergistics2:part", - "part": "material.formation_core" - }, - "b": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "a": { - "item": "#appliedenergistics2:fluixCrystal" - } + "b": { + "tag": "forge:ingots/iron" + }, + "a": { + "tag": "appliedenergistics2:crystals/fluix" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_alt.json index 93b6111f3..260ba8480 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_alt.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_alt.json @@ -1,25 +1,22 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.formation_plane" + "result": { + "item": "appliedenergistics2:formation_plane" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "ab", + "cb", + "ab" + ], + "key": { + "c": { + "item": "appliedenergistics2:formation_core" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "ab", - "cb", - "ab" - ], - "key": { - "c": { - "type": "appliedenergistics2:part", - "part": "material.formation_core" - }, - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "item": "#appliedenergistics2:fluixCrystal" - } + "a": { + "tag": "forge:ingots/iron" + }, + "b": { + "tag": "appliedenergistics2:crystals/fluix" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json index 7cee4d655..6c8b0bf3f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json @@ -1,29 +1,25 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.fluid_formation_plane" + "result": { + "item": "appliedenergistics2:fluid_formation_plane" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "adb", + "cdb", + "adb" + ], + "key": { + "c": { + "item": "appliedenergistics2:formation_core" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "adb", - "cdb", - "adb" - ], - "key": { - "c": { - "type": "appliedenergistics2:part", - "part": "material.formation_core" - }, - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "item": "#appliedenergistics2:fluixCrystal" - }, - "d": { - "type": "forge:ore_dict", - "ore": "dyeBlue" - } + "a": { + "tag": "forge:ingots/iron" + }, + "b": { + "tag": "appliedenergistics2:crystals/fluix" + }, + "d": { + "tag": "forge:dyes/blue" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json index ea7d97e15..3055db61c 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json @@ -1,29 +1,25 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.fluid_formation_plane" + "result": { + "item": "appliedenergistics2:fluid_formation_plane" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "ddd", + "bcb" + ], + "key": { + "c": { + "item": "appliedenergistics2:formation_core" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "ddd", - "bcb" - ], - "key": { - "c": { - "type": "appliedenergistics2:part", - "part": "material.formation_core" - }, - "b": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "a": { - "item": "#appliedenergistics2:fluixCrystal" - }, - "d": { - "type": "forge:ore_dict", - "ore": "dyeBlue" - } + "b": { + "tag": "forge:ingots/iron" + }, + "a": { + "tag": "appliedenergistics2:crystals/fluix" + }, + "d": { + "tag": "forge:dyes/blue" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json index f91968f93..65fe6ec2f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json @@ -1,21 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.quartz_fiber", - "count": 3 + "result": { + "type": "appliedenergistics2:part", + "part": "part.quartz_fiber", + "count": 3 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "bbb", + "aaa" + ], + "key": { + "a": { + "tag": "appliedenergistics2:glass" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "bbb", - "aaa" - ], - "key": { - "a": { - "item": "#appliedenergistics2:glass" - }, - "b": { - "item": "#appliedenergistics2:dustQuartz" - } + "b": { + "tag": "appliedenergistics2:dusts/quartz" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus.json index 9d0191e8f..907fac7f2 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus.json @@ -1,18 +1,17 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.storage_bus" + "result": { + "item": "appliedenergistics2:storage_bus" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "minecraft:sticky_piston" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "item": "minecraft:sticky_piston" - }, - { - "item": "#appliedenergistics2:interface" - }, - { - "item": "minecraft:piston" - } - ] -} + { + "tag": "appliedenergistics2:interface" + }, + { + "item": "minecraft:piston" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json index 9440a3b33..77c478f6f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json @@ -1,22 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.fluid_storage_bus" + "result": { + "item": "appliedenergistics2:fluid_storage_bus" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "minecraft:sticky_piston" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "item": "minecraft:sticky_piston" - }, - { - "item": "#appliedenergistics2:fluid_interface" - }, - { - "item": "minecraft:piston" - }, - { - "item": "minecraft:dye", - "data": 4 - } - ] -} + { + "tag": "appliedenergistics2:fluid_interface" + }, + { + "item": "minecraft:piston" + }, + { + "item": "minecraft:dye", + "data": 4 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals.json index 14a1ea713..aa6da0203 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals.json @@ -1,25 +1,20 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.terminal" + "result": { + "item": "appliedenergistics2:terminal" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:formation_core" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "material.formation_core" - }, - { - "type": "forge:ore_dict", - "ore": "itemIlluminatedPanel" - }, - { - "type": "appliedenergistics2:part", - "part": "material.logic_processor" - }, - { - "type": "appliedenergistics2:part", - "part": "material.annihilation_core" - } - ] -} + { + "tag": "appliedenergistics2:illuminated_panel" + }, + { + "item": "appliedenergistics2:logic_processor" + }, + { + "item": "appliedenergistics2:annihilation_core" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_crafting.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_crafting.json index 1c6519584..57ffec2ee 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_crafting.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_crafting.json @@ -1,21 +1,17 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.crafting_terminal" + "result": { + "item": "appliedenergistics2:crafting_terminal" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:terminal" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "part.terminal" - }, - { - "type": "forge:ore_dict", - "ore": "workbench" - }, - { - "type": "appliedenergistics2:part", - "part": "material.calculation_processor" - } - ] -} + { + "tag": "appliedenergistics2:workbench" + }, + { + "item": "appliedenergistics2:calculation_processor" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_fluid.json index 38fb67c29..d6cea8f14 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_fluid.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_fluid.json @@ -1,21 +1,18 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.fluid_terminal" + "result": { + "item": "appliedenergistics2:fluid_terminal" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:terminal" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "part.terminal" - }, - { - "item": "minecraft:dye", - "data": 4 - }, - { - "type": "appliedenergistics2:part", - "part": "material.logic_processor" - } - ] -} + { + "item": "minecraft:dye", + "data": 4 + }, + { + "item": "appliedenergistics2:logic_processor" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_interface.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_interface.json index cb664ef43..c6e16825a 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_interface.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_interface.json @@ -1,20 +1,17 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.interface_terminal" + "result": { + "item": "appliedenergistics2:interface_terminal" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "tag": "appliedenergistics2:illuminated_panel" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "forge:ore_dict", - "ore": "itemIlluminatedPanel" - }, - { - "type": "appliedenergistics2:part", - "part": "material.engineering_processor" - }, - { - "item": "#appliedenergistics2:interface" - } - ] -} + { + "item": "appliedenergistics2:engineering_processor" + }, + { + "tag": "appliedenergistics2:interface" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_pattern.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_pattern.json index 47ed814e4..e98f53a2c 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_pattern.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_pattern.json @@ -1,17 +1,14 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.pattern_terminal" + "result": { + "item": "appliedenergistics2:pattern_terminal" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:engineering_processor" }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "material.engineering_processor" - }, - { - "type": "appliedenergistics2:part", - "part": "part.crafting_terminal" - } - ] -} + { + "item": "appliedenergistics2:crafting_terminal" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus.json index ccd763acf..709be6e43 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus.json @@ -1,25 +1,22 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.toggle_bus" + "result": { + "item": "appliedenergistics2:toggle_bus" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + " a ", + "bcb", + " a " + ], + "key": { + "c": { + "item": "minecraft:lever" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - " a ", - "bcb", - " a " - ], - "key": { - "c": { - "item": "minecraft:lever" - }, - "a": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - } + "a": { + "tag": "forge:dusts/redstone" + }, + "b": { + "item": "appliedenergistics2:fluix_cable_glass" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json index d49f5d5f6..3a3bb3468 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json @@ -1,13 +1,11 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.toggle_bus" - }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "part.inverted_toggle_bus" - } - ] -} + "result": { + "item": "appliedenergistics2:toggle_bus" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:inverted_toggle_bus" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json index c30760b2a..b4fc21da7 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json @@ -1,13 +1,11 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.inverted_toggle_bus" - }, - "type": "appliedenergistics2:part_shapeless", - "ingredients": [ - { - "type": "appliedenergistics2:part", - "part": "part.toggle_bus" - } - ] -} + "result": { + "item": "appliedenergistics2:inverted_toggle_bus" + }, + "type": "appliedenergistics2:part_shapeless", + "ingredients": [ + { + "item": "appliedenergistics2:toggle_bus" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/tunnels_me.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/tunnels_me.json index c186f522f..746109e20 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/tunnels_me.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/tunnels_me.json @@ -1,25 +1,22 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "part.p2p_tunnel_me" + "result": { + "item": "appliedenergistics2:me_p2p_tunnel" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + " a ", + "aba", + "ccc" + ], + "key": { + "b": { + "item": "appliedenergistics2:engineering_processor" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - " a ", - "aba", - "ccc" - ], - "key": { - "b": { - "type": "appliedenergistics2:part", - "part": "material.engineering_processor" - }, - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "item": "#appliedenergistics2:fluixCrystal" - } + "a": { + "tag": "forge:ingots/iron" + }, + "c": { + "tag": "appliedenergistics2:crystals/fluix" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/wireless_access_point.json b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_access_point.json index a5618659f..02b699012 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/wireless_access_point.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_access_point.json @@ -1,25 +1,22 @@ { - "result": { - "item": "appliedenergistics2:wireless_access_point" + "result": { + "item": "appliedenergistics2:wireless_access_point" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "a", + "b", + "c" + ], + "key": { + "a": { + "item": "appliedenergistics2:wireless_receiver" }, - "type": "forge:ore_shaped", - "pattern": [ - "a", - "b", - "c" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "material.wireless" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "cable_glass.fluix" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "material.calculation_processor" - } + "c": { + "item": "appliedenergistics2:fluix_cable_glass" + }, + "b": { + "item": "appliedenergistics2:calculation_processor" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/wireless_booster.json b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_booster.json index fe16941bc..6b61ba93b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/wireless_booster.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_booster.json @@ -1,28 +1,26 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "material.wireless_booster", - "count": 2 + "result": { + "type": "appliedenergistics2:part", + "part": "material.wireless_booster", + "count": 2 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "abc", + "ddd" + ], + "key": { + "d": { + "tag": "forge:ingots/iron" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "abc", - "ddd" - ], - "key": { - "d": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "item": "#appliedenergistics2:certusCrystal" - }, - "a": { - "type": "forge:ore_dict", - "ore": "dustFluix" - }, - "c": { - "item": "#appliedenergistics2:dustEnder" - } + "b": { + "tag": "appliedenergistics2:crystals/certus" + }, + "a": { + "tag": "appliedenergistics2:dusts/fluix" + }, + "c": { + "tag": "appliedenergistics2:dusts/ender" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/wireless_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_part.json index 091d35692..72ae791df 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/wireless_part.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_part.json @@ -1,26 +1,22 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "material.wireless" + "result": { + "item": "appliedenergistics2:wireless_receiver" + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + " a ", + "bcb", + " b " + ], + "key": { + "b": { + "tag": "forge:ingots/iron" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - " a ", - "bcb", - " b " - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "part.quartz_fiber" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "material.fluix_pearl" - } + "c": { + "item": "appliedenergistics2:quartz_fiber" + }, + "a": { + "item": "appliedenergistics2:fluix_pearl" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/wireless_terminal.json b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_terminal.json index 2fc545f74..d57cff732 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/network/wireless_terminal.json +++ b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_terminal.json @@ -1,24 +1,22 @@ { - "result": { - "item": "appliedenergistics2:wireless_terminal" + "result": { + "item": "appliedenergistics2:wireless_terminal" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "a", + "b", + "c" + ], + "key": { + "b": { + "item": "appliedenergistics2:terminal" }, - "type": "forge:ore_shaped", - "pattern": [ - "a", - "b", - "c" - ], - "key": { - "b": { - "type": "appliedenergistics2:part", - "part": "part.terminal" - }, - "c": { - "item": "appliedenergistics2:dense_energy_cell" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "material.wireless" - } + "c": { + "item": "appliedenergistics2:dense_energy_cell" + }, + "a": { + "item": "appliedenergistics2:wireless_receiver" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/smelting/bread.json b/src/main/resources/data/appliedenergistics2/recipes/smelting/bread.json index fd055c556..30f35f234 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/smelting/bread.json +++ b/src/main/resources/data/appliedenergistics2/recipes/smelting/bread.json @@ -1,11 +1,10 @@ { - "type": "appliedenergistics2:smelt", - "result": { - "item": "minecraft:bread" - }, - "input": { - "type": "appliedenergistics2:part", - "part": "material.flour" - }, - "xp" : 0.0 + "type": "appliedenergistics2:smelt", + "result": { + "item": "minecraft:bread" + }, + "input": { + "item": "appliedenergistics2:flour" + }, + "xp": 0.0 } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/smelting/gold_ingot.json b/src/main/resources/data/appliedenergistics2/recipes/smelting/gold_ingot.json index 098a02701..f9c76325b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/smelting/gold_ingot.json +++ b/src/main/resources/data/appliedenergistics2/recipes/smelting/gold_ingot.json @@ -1,11 +1,10 @@ { - "type": "appliedenergistics2:smelt", - "result": { - "item": "minecraft:gold_ingot" - }, - "input": { - "type": "forge:ore_dict", - "ore": "dustGold" - }, - "xp" : 0.0 + "type": "appliedenergistics2:smelt", + "result": { + "item": "minecraft:gold_ingot" + }, + "input": { + "tag": "forge:dusts/gold" + }, + "xp": 0.0 } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/smelting/iron_ingot.json b/src/main/resources/data/appliedenergistics2/recipes/smelting/iron_ingot.json index 61c7c7bcb..c95ed628c 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/smelting/iron_ingot.json +++ b/src/main/resources/data/appliedenergistics2/recipes/smelting/iron_ingot.json @@ -1,11 +1,10 @@ { - "type": "appliedenergistics2:smelt", - "result": { - "item": "minecraft:iron_ingot" - }, - "input": { - "type": "forge:ore_dict", - "ore": "dustIron" - }, - "xp" : 0.0 + "type": "appliedenergistics2:smelt", + "result": { + "item": "minecraft:iron_ingot" + }, + "input": { + "tag": "forge:dusts/iron" + }, + "xp": 0.0 } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/smelting/silicon.json b/src/main/resources/data/appliedenergistics2/recipes/smelting/silicon.json index b9da64a44..0a416dd43 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/smelting/silicon.json +++ b/src/main/resources/data/appliedenergistics2/recipes/smelting/silicon.json @@ -1,18 +1,15 @@ { - "type": "appliedenergistics2:smelt", - "result": { - "part": "material.silicon" - }, - "input": - [ - { - "type": "forge:ore_dict", - "ore": "dustNetherQuartz" - }, - { - "type": "forge:ore_dict", - "ore": "dustCertusQuartz" - } - ], - "xp" : 0.0 + "type": "appliedenergistics2:smelt", + "result": { + "part": "material.silicon" + }, + "input": [ + { + "tag": "appliedenergistics2:dusts/nether_quartz" + }, + { + "tag": "appliedenergistics2:dusts/certus_quartz" + } + ], + "xp": 0.0 } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/smelting/smooth_sky_stone_block.json b/src/main/resources/data/appliedenergistics2/recipes/smelting/smooth_sky_stone_block.json index f063b9547..02dcfc91f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/smelting/smooth_sky_stone_block.json +++ b/src/main/resources/data/appliedenergistics2/recipes/smelting/smooth_sky_stone_block.json @@ -1,10 +1,10 @@ { - "type": "appliedenergistics2:smelt", - "result": { - "item": "appliedenergistics2:smooth_sky_stone_block" - }, - "input": { - "item": "appliedenergistics2:sky_stone_block" - }, - "xp" : 0.0 + "type": "appliedenergistics2:smelt", + "result": { + "item": "appliedenergistics2:smooth_sky_stone_block" + }, + "input": { + "item": "appliedenergistics2:sky_stone_block" + }, + "xp": 0.0 } \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_axe.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_axe.json index 5c0c795dc..809720b00 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_axe.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_axe.json @@ -1,21 +1,19 @@ { - "result": { - "item": "appliedenergistics2:certus_quartz_axe" + "result": { + "item": "appliedenergistics2:certus_quartz_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aa", + "ab", + " b" + ], + "key": { + "a": { + "tag": "appliedenergistics2:crystals/certus_quartz" }, - "type": "forge:ore_shaped", - "pattern": [ - "aa", - "ab", - " b" - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "crystalCertusQuartz" - }, - "b": { - "type": "forge:ore_dict", - "ore": "stickWood" - } + "b": { + "tag": "forge:rods/wooden" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_cutting_knife.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_cutting_knife.json index 30ece2544..f0830a3b3 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_cutting_knife.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_cutting_knife.json @@ -1,25 +1,22 @@ { - "result": { - "item": "appliedenergistics2:certus_quartz_cutting_knife" + "result": { + "item": "appliedenergistics2:certus_quartz_cutting_knife" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " a", + "ba ", + "cc " + ], + "key": { + "b": { + "tag": "forge:ingots/iron" }, - "type": "forge:ore_shaped", - "pattern": [ - " a", - "ba ", - "cc " - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "type": "forge:ore_dict", - "ore": "crystalCertusQuartz" - }, - "a": { - "type": "forge:ore_dict", - "ore": "stickWood" - } + "c": { + "tag": "appliedenergistics2:crystals/certus_quartz" + }, + "a": { + "tag": "forge:rods/wooden" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_hoe.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_hoe.json index b8cf144a1..684fbfd9a 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_hoe.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_hoe.json @@ -1,21 +1,19 @@ { - "result": { - "item": "appliedenergistics2:certus_quartz_hoe" + "result": { + "item": "appliedenergistics2:certus_quartz_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aa", + " b", + " b" + ], + "key": { + "a": { + "tag": "appliedenergistics2:crystals/certus_quartz" }, - "type": "forge:ore_shaped", - "pattern": [ - "aa", - " b", - " b" - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "crystalCertusQuartz" - }, - "b": { - "type": "forge:ore_dict", - "ore": "stickWood" - } + "b": { + "tag": "forge:rods/wooden" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_pickaxe.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_pickaxe.json index 882c53dd8..7bf55a893 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_pickaxe.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_pickaxe.json @@ -1,21 +1,19 @@ { - "result": { - "item": "appliedenergistics2:certus_quartz_pickaxe" + "result": { + "item": "appliedenergistics2:certus_quartz_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa", + " b ", + " b " + ], + "key": { + "a": { + "tag": "appliedenergistics2:crystals/certus_quartz" }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa", - " b ", - " b " - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "crystalCertusQuartz" - }, - "b": { - "type": "forge:ore_dict", - "ore": "stickWood" - } + "b": { + "tag": "forge:rods/wooden" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_spade.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_spade.json index 8adb32c0f..1f61163fa 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_spade.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_spade.json @@ -1,21 +1,19 @@ { - "result": { - "item": "appliedenergistics2:certus_quartz_spade" + "result": { + "item": "appliedenergistics2:certus_quartz_spade" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "a", + "b", + "b" + ], + "key": { + "a": { + "tag": "appliedenergistics2:crystals/certus_quartz" }, - "type": "forge:ore_shaped", - "pattern": [ - "a", - "b", - "b" - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "crystalCertusQuartz" - }, - "b": { - "type": "forge:ore_dict", - "ore": "stickWood" - } + "b": { + "tag": "forge:rods/wooden" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_sword.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_sword.json index 8174351a1..71bc16c7c 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_sword.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_sword.json @@ -1,21 +1,19 @@ { - "result": { - "item": "appliedenergistics2:certus_quartz_sword" + "result": { + "item": "appliedenergistics2:certus_quartz_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "a", + "a", + "b" + ], + "key": { + "a": { + "tag": "appliedenergistics2:crystals/certus_quartz" }, - "type": "forge:ore_shaped", - "pattern": [ - "a", - "a", - "b" - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "crystalCertusQuartz" - }, - "b": { - "type": "forge:ore_dict", - "ore": "stickWood" - } + "b": { + "tag": "forge:rods/wooden" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_wrench.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_wrench.json index 72683ec71..37c1d456a 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_wrench.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_wrench.json @@ -1,17 +1,16 @@ { - "result": { - "item": "appliedenergistics2:certus_quartz_wrench" - }, - "type": "forge:ore_shaped", - "pattern": [ - "a a", - " a ", - "a a" - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "crystalCertusQuartz" - } + "result": { + "item": "appliedenergistics2:certus_quartz_wrench" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "a a", + " a ", + "a a" + ], + "key": { + "a": { + "tag": "appliedenergistics2:crystals/certus_quartz" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/matter_cannon.json b/src/main/resources/data/appliedenergistics2/recipes/tools/matter_cannon.json index fb6936303..db43c6e7f 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/matter_cannon.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/matter_cannon.json @@ -1,28 +1,25 @@ { - "result": { - "item": "appliedenergistics2:matter_cannon" + "result": { + "item": "appliedenergistics2:matter_cannon" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aab", + "cd ", + "a " + ], + "key": { + "b": { + "item": "appliedenergistics2:formation_core" }, - "type": "forge:ore_shaped", - "pattern": [ - "aab", - "cd ", - "a " - ], - "key": { - "b": { - "type": "appliedenergistics2:part", - "part": "material.formation_core" - }, - "a": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.cell4k_part" - }, - "d": { - "item": "appliedenergistics2:energy_cell" - } + "a": { + "tag": "forge:ingots/iron" + }, + "c": { + "item": "appliedenergistics2:cell4k_part" + }, + "d": { + "item": "appliedenergistics2:energy_cell" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_charged_staff.json b/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_charged_staff.json index 1922db084..125f6e4ae 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_charged_staff.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_charged_staff.json @@ -1,21 +1,19 @@ { - "result": { - "item": "appliedenergistics2:charged_staff" + "result": { + "item": "appliedenergistics2:charged_staff" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "a ", + " b ", + " b" + ], + "key": { + "b": { + "tag": "forge:ingots/iron" }, - "type": "forge:ore_shaped", - "pattern": [ - "a ", - " b ", - " b" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "material.certus_quartz_crystal_charged" - } + "a": { + "item": "appliedenergistics2:certus_quartz_crystal_charged" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_entropy_manipulator.json b/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_entropy_manipulator.json index ce0f61312..0a8d2ee0e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_entropy_manipulator.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_entropy_manipulator.json @@ -1,27 +1,25 @@ { - "result": { - "item": "appliedenergistics2:entropy_manipulator" + "result": { + "item": "appliedenergistics2:entropy_manipulator" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ab ", + "cd ", + " d" + ], + "key": { + "c": { + "item": "appliedenergistics2:engineering_processor" }, - "type": "forge:ore_shaped", - "pattern": [ - "ab ", - "cd ", - " d" - ], - "key": { - "c": { - "type": "appliedenergistics2:part", - "part": "material.engineering_processor" - }, - "d": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "b": { - "item": "appliedenergistics2:energy_cell" - }, - "a": { - "item": "#appliedenergistics2:fluixCrystal" - } + "d": { + "tag": "forge:ingots/iron" + }, + "b": { + "item": "appliedenergistics2:energy_cell" + }, + "a": { + "tag": "appliedenergistics2:crystals/fluix" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_axe.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_axe.json index 123919328..fd9411df6 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_axe.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_axe.json @@ -1,21 +1,19 @@ { - "result": { - "item": "appliedenergistics2:nether_quartz_axe" + "result": { + "item": "appliedenergistics2:nether_quartz_axe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aa", + "ab", + " b" + ], + "key": { + "a": { + "tag": "forge:gems/quartz" }, - "type": "forge:ore_shaped", - "pattern": [ - "aa", - "ab", - " b" - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "gemQuartz" - }, - "b": { - "type": "forge:ore_dict", - "ore": "stickWood" - } + "b": { + "tag": "forge:rods/wooden" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_cutting_knife.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_cutting_knife.json index 4205b95e9..0bfa2cf9e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_cutting_knife.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_cutting_knife.json @@ -1,25 +1,22 @@ { - "result": { - "item": "appliedenergistics2:nether_quartz_cutting_knife" + "result": { + "item": "appliedenergistics2:nether_quartz_cutting_knife" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + " a", + "ba ", + "cc " + ], + "key": { + "b": { + "tag": "forge:ingots/iron" }, - "type": "forge:ore_shaped", - "pattern": [ - " a", - "ba ", - "cc " - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "type": "forge:ore_dict", - "ore": "gemQuartz" - }, - "a": { - "type": "forge:ore_dict", - "ore": "stickWood" - } + "c": { + "tag": "forge:gems/quartz" + }, + "a": { + "tag": "forge:rods/wooden" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_hoe.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_hoe.json index 44cfbdec4..1fb24bff3 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_hoe.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_hoe.json @@ -1,21 +1,19 @@ { - "result": { - "item": "appliedenergistics2:nether_quartz_hoe" + "result": { + "item": "appliedenergistics2:nether_quartz_hoe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aa", + " b", + " b" + ], + "key": { + "a": { + "tag": "forge:gems/quartz" }, - "type": "forge:ore_shaped", - "pattern": [ - "aa", - " b", - " b" - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "gemQuartz" - }, - "b": { - "type": "forge:ore_dict", - "ore": "stickWood" - } + "b": { + "tag": "forge:rods/wooden" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_pickaxe.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_pickaxe.json index 11c136770..b18b7dfbe 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_pickaxe.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_pickaxe.json @@ -1,21 +1,19 @@ { - "result": { - "item": "appliedenergistics2:nether_quartz_pickaxe" + "result": { + "item": "appliedenergistics2:nether_quartz_pickaxe" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa", + " b ", + " b " + ], + "key": { + "a": { + "tag": "forge:gems/quartz" }, - "type": "forge:ore_shaped", - "pattern": [ - "aaa", - " b ", - " b " - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "gemQuartz" - }, - "b": { - "type": "forge:ore_dict", - "ore": "stickWood" - } + "b": { + "tag": "forge:rods/wooden" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_spade.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_spade.json index 6f0e8de7b..ae81b8d4b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_spade.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_spade.json @@ -1,21 +1,19 @@ { - "result": { - "item": "appliedenergistics2:nether_quartz_spade" + "result": { + "item": "appliedenergistics2:nether_quartz_spade" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "a", + "b", + "b" + ], + "key": { + "a": { + "tag": "forge:gems/quartz" }, - "type": "forge:ore_shaped", - "pattern": [ - "a", - "b", - "b" - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "gemQuartz" - }, - "b": { - "type": "forge:ore_dict", - "ore": "stickWood" - } + "b": { + "tag": "forge:rods/wooden" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_sword.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_sword.json index 548d64f9e..89779412d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_sword.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_sword.json @@ -1,21 +1,19 @@ { - "result": { - "item": "appliedenergistics2:nether_quartz_sword" + "result": { + "item": "appliedenergistics2:nether_quartz_sword" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "a", + "a", + "b" + ], + "key": { + "a": { + "tag": "forge:gems/quartz" }, - "type": "forge:ore_shaped", - "pattern": [ - "a", - "a", - "b" - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "gemQuartz" - }, - "b": { - "type": "forge:ore_dict", - "ore": "stickWood" - } + "b": { + "tag": "forge:rods/wooden" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_wrench.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_wrench.json index 483e3c2e7..148ca2bbf 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_wrench.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_wrench.json @@ -1,17 +1,16 @@ { - "result": { - "item": "appliedenergistics2:nether_quartz_wrench" - }, - "type": "forge:ore_shaped", - "pattern": [ - "a a", - " a ", - "a a" - ], - "key": { - "a": { - "type": "forge:ore_dict", - "ore": "gemQuartz" - } + "result": { + "item": "appliedenergistics2:nether_quartz_wrench" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "a a", + " a ", + "a a" + ], + "key": { + "a": { + "tag": "forge:gems/quartz" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/network_biometric_card.json b/src/main/resources/data/appliedenergistics2/recipes/tools/network_biometric_card.json index ce1727c83..033e49d08 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/network_biometric_card.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/network_biometric_card.json @@ -1,28 +1,24 @@ { - "result": { - "item": "appliedenergistics2:biometric_card" + "result": { + "item": "appliedenergistics2:biometric_card" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "abb", + "cdc" + ], + "key": { + "a": { + "item": "appliedenergistics2:engineering_processor" }, - "type": "forge:ore_shaped", - "pattern": [ - "abb", - "cdc" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "material.engineering_processor" - }, - "b": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "d": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "c": { - "type": "forge:ore_dict", - "ore": "ingotGold" - } + "b": { + "tag": "forge:ingots/iron" + }, + "d": { + "tag": "forge:dusts/redstone" + }, + "c": { + "tag": "forge:ingots/gold" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/network_color_applicator.json b/src/main/resources/data/appliedenergistics2/recipes/tools/network_color_applicator.json index d0edebcb7..fde1ba1f6 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/network_color_applicator.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/network_color_applicator.json @@ -1,28 +1,25 @@ { - "result": { - "item": "appliedenergistics2:color_applicator" + "result": { + "item": "appliedenergistics2:color_applicator" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "ab ", + "bc ", + " d" + ], + "key": { + "a": { + "item": "appliedenergistics2:formation_core" }, - "type": "forge:ore_shaped", - "pattern": [ - "ab ", - "bc ", - " d" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "material.formation_core" - }, - "b": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "c": { - "type": "appliedenergistics2:part", - "part": "material.cell4k_part" - }, - "d": { - "item": "appliedenergistics2:energy_cell" - } + "b": { + "tag": "forge:ingots/iron" + }, + "c": { + "item": "appliedenergistics2:cell4k_part" + }, + "d": { + "item": "appliedenergistics2:energy_cell" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/network_memory_card.json b/src/main/resources/data/appliedenergistics2/recipes/tools/network_memory_card.json index 30dee8d8e..0b43c82b5 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/network_memory_card.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/network_memory_card.json @@ -1,28 +1,24 @@ { - "result": { - "item": "appliedenergistics2:memory_card" + "result": { + "item": "appliedenergistics2:memory_card" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "abb", + "cdc" + ], + "key": { + "b": { + "tag": "forge:ingots/iron" }, - "type": "forge:ore_shaped", - "pattern": [ - "abb", - "cdc" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "d": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "c": { - "type": "forge:ore_dict", - "ore": "ingotGold" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "material.calculation_processor" - } + "d": { + "tag": "forge:dusts/redstone" + }, + "c": { + "tag": "forge:ingots/gold" + }, + "a": { + "item": "appliedenergistics2:calculation_processor" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/network_portable_cell.json b/src/main/resources/data/appliedenergistics2/recipes/tools/network_portable_cell.json index 1b984e1e7..339fed2c2 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/network_portable_cell.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/network_portable_cell.json @@ -1,21 +1,20 @@ { - "result": { - "item": "appliedenergistics2:portable_cell" + "result": { + "item": "appliedenergistics2:portable_cell" + }, + "type": "minecraft:crafting_shaped", + "pattern": [ + "abc" + ], + "key": { + "a": { + "item": "appliedenergistics2:chest" }, - "type": "forge:ore_shaped", - "pattern": [ - "abc" - ], - "key": { - "a": { - "item": "appliedenergistics2:chest" - }, - "c": { - "item": "appliedenergistics2:energy_cell" - }, - "b": { - "type": "appliedenergistics2:part", - "part": "material.cell1k_part" - } + "c": { + "item": "appliedenergistics2:energy_cell" + }, + "b": { + "item": "appliedenergistics2:cell1k_part" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/network_tool.json b/src/main/resources/data/appliedenergistics2/recipes/tools/network_tool.json index 89524f190..0c897803b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/network_tool.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/network_tool.json @@ -1,24 +1,20 @@ { - "result": { - "item": "appliedenergistics2:network_tool" + "result": { + "item": "appliedenergistics2:network_tool" + }, + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "appliedenergistics2:illuminated_panel" }, - "type": "forge:ore_shapeless", - "ingredients": [ - { - "type": "forge:ore_dict", - "ore": "itemIlluminatedPanel" - }, - { - "type": "forge:ore_dict", - "ore": "chestWood" - }, - { - "type": "forge:ore_dict", - "ore": "itemQuartzWrench" - }, - { - "type": "appliedenergistics2:part", - "part": "material.calculation_processor" - } - ] -} + { + "tag": "forge:chests/wooden" + }, + { + "tag": "appliedenergistics2:quartz_wrench" + }, + { + "item": "appliedenergistics2:calculation_processor" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_black.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_black.json index e7894d367..a4fb382f5 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_black.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_black.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "paint_ball.black", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "paint_ball.black", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/black" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeBlack" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "material.matter_ball" - } + "a": { + "item": "appliedenergistics2:matter_ball" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_blue.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_blue.json index 7a761e60d..b74f77360 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_blue.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "paint_ball.blue", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "paint_ball.blue", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:matter_ball" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "material.matter_ball" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeBlue" - } + "b": { + "tag": "forge:dyes/blue" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_brown.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_brown.json index 5c8f18842..2b78a585e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_brown.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_brown.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "paint_ball.brown", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "paint_ball.brown", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/brown" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeBrown" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "material.matter_ball" - } + "a": { + "item": "appliedenergistics2:matter_ball" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_cyan.json index 94130c8c4..7aa20a7ae 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_cyan.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_cyan.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "paint_ball.cyan", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "paint_ball.cyan", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/cyan" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeCyan" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "material.matter_ball" - } + "a": { + "item": "appliedenergistics2:matter_ball" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_gray.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_gray.json index 981a99d6f..9b57df4c2 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_gray.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "paint_ball.gray", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "paint_ball.gray", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/gray" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeGray" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "material.matter_ball" - } + "a": { + "item": "appliedenergistics2:matter_ball" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_green.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_green.json index 9011a6952..4eeacb9eb 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_green.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_green.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "paint_ball.green", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "paint_ball.green", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/green" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeGreen" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "material.matter_ball" - } + "a": { + "item": "appliedenergistics2:matter_ball" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_blue.json index cd4e10d37..44dced005 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_blue.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "paint_ball.light_blue", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "paint_ball.light_blue", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/light_blue" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeLightBlue" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "material.matter_ball" - } + "a": { + "item": "appliedenergistics2:matter_ball" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_gray.json index d9ad4b5cd..62f20d7b5 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_gray.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "paint_ball.light_gray", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "paint_ball.light_gray", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/light_gray" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeLightGray" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "material.matter_ball" - } + "a": { + "item": "appliedenergistics2:matter_ball" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lime.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lime.json index 63cbd3912..2e1701a06 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lime.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lime.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "paint_ball.lime", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "paint_ball.lime", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:matter_ball" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "material.matter_ball" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeLime" - } + "b": { + "tag": "forge:dyes/lime" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_black.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_black.json index d11b7abe7..aca406dd8 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_black.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_black.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "lumen_paint_ball.black", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "lumen_paint_ball.black", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:black_paint_ball" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "paint_ball.black" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "b": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json index 36ffcf1e3..e31d2d178 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "lumen_paint_ball.blue", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "lumen_paint_ball.blue", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:blue_paint_ball" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "paint_ball.blue" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "b": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json index 680b4d6f8..b32c0bedf 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "lumen_paint_ball.brown", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "lumen_paint_ball.brown", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:brown_paint_ball" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "paint_ball.brown" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "b": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json index 1a30e1b06..95b1b52bf 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "lumen_paint_ball.cyan", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "lumen_paint_ball.cyan", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:cyan_paint_ball" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "paint_ball.cyan" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "b": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json index 0787865f7..2aa08e4f5 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "lumen_paint_ball.gray", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "lumen_paint_ball.gray", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:gray_paint_ball" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "paint_ball.gray" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "b": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_green.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_green.json index f73862cc4..5e0e70108 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_green.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_green.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "lumen_paint_ball.green", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "lumen_paint_ball.green", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:green_paint_ball" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "paint_ball.green" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "b": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json index 3682a6763..7ed6fe261 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "lumen_paint_ball.light_blue", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "lumen_paint_ball.light_blue", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:light_blue_paint_ball" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "paint_ball.light_blue" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "b": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json index 2bf98e672..edb5e6dc5 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "lumen_paint_ball.light_gray", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "lumen_paint_ball.light_gray", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:light_gray_paint_ball" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "paint_ball.light_gray" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "b": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json index ac3eb7dfc..c8be29c45 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "lumen_paint_ball.lime", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "lumen_paint_ball.lime", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:lime_paint_ball" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "paint_ball.lime" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "b": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json index 54ecc2c90..f82d655df 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "lumen_paint_ball.magenta", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "lumen_paint_ball.magenta", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:magenta_paint_ball" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "paint_ball.magenta" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "b": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json index 679b17d4d..c1661c70e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "lumen_paint_ball.orange", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "lumen_paint_ball.orange", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dust/glowstone" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "paint_ball.orange" - } + "a": { + "item": "appliedenergistics2:orange_paint_ball" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json index db7657315..7c6d9d33e 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "lumen_paint_ball.pink", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "lumen_paint_ball.pink", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:pink_paint_ball" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "paint_ball.pink" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "b": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json index ede3b448d..85aaaeb15 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "lumen_paint_ball.purple", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "lumen_paint_ball.purple", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:purple_paint_ball" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "paint_ball.purple" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "b": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_red.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_red.json index cd55dcba4..86be8fe2c 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_red.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_red.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "lumen_paint_ball.red", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "lumen_paint_ball.red", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:red_paint_ball" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "paint_ball.red" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "b": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_white.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_white.json index faf716d7b..1d36c8c4d 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_white.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_white.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "lumen_paint_ball.white", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "lumen_paint_ball.white", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:white_paint_ball" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "paint_ball.white" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "b": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json index ab0d241c1..bacc0d3ce 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "lumen_paint_ball.yellow", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "lumen_paint_ball.yellow", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:yellow_paint_ball" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "paint_ball.yellow" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - } + "b": { + "tag": "forge:dust/glowstone" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_magenta.json index 0a0f8b7ab..baca5647b 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_magenta.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_magenta.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "paint_ball.magenta", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "paint_ball.magenta", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/magenta" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeMagenta" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "material.matter_ball" - } + "a": { + "item": "appliedenergistics2:matter_ball" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_orange.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_orange.json index 81b3e16f8..ebccdf3c8 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_orange.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_orange.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "paint_ball.orange", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "paint_ball.orange", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/orange" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeOrange" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "material.matter_ball" - } + "a": { + "item": "appliedenergistics2:matter_ball" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_pink.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_pink.json index 35a757881..6f55a3b2a 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_pink.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_pink.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "paint_ball.pink", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "paint_ball.pink", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/pink" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyePink" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "material.matter_ball" - } + "a": { + "item": "appliedenergistics2:matter_ball" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_purple.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_purple.json index dccdf672d..46bb50f06 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_purple.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_purple.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "paint_ball.purple", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "paint_ball.purple", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/purple" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyePurple" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "material.matter_ball" - } + "a": { + "item": "appliedenergistics2:matter_ball" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_red.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_red.json index b275750e5..f5dcf3934 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_red.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_red.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "paint_ball.red", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "paint_ball.red", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "appliedenergistics2:matter_ball" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "a": { - "type": "appliedenergistics2:part", - "part": "material.matter_ball" - }, - "b": { - "type": "forge:ore_dict", - "ore": "dyeRed" - } + "b": { + "tag": "forge:dyes/red" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_white.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_white.json index 34673fcd0..8a83b85f4 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_white.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_white.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "paint_ball.white", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "paint_ball.white", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/white" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeWhite" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "material.matter_ball" - } + "a": { + "item": "appliedenergistics2:matter_ball" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_yellow.json index a90d2ec40..bc5b307b2 100644 --- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_yellow.json +++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_yellow.json @@ -1,23 +1,21 @@ { - "result": { - "type": "appliedenergistics2:part", - "part": "paint_ball.yellow", - "count": 8 + "result": { + "type": "appliedenergistics2:part", + "part": "paint_ball.yellow", + "count": 8 + }, + "type": "appliedenergistics2:part_shaped", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "b": { + "tag": "forge:dyes/yellow" }, - "type": "appliedenergistics2:part_shaped", - "pattern": [ - "aaa", - "aba", - "aaa" - ], - "key": { - "b": { - "type": "forge:ore_dict", - "ore": "dyeYellow" - }, - "a": { - "type": "appliedenergistics2:part", - "part": "material.matter_ball" - } + "a": { + "item": "appliedenergistics2:matter_ball" } -} + } +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/crystals/certus.json b/src/main/resources/data/appliedenergistics2/tags/items/crystals/certus.json new file mode 100644 index 000000000..0956d772c --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/crystals/certus.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#appliedenergistics2:crystals/certus_quartz", + "appliedenergistics2:charged_certus_quartz_crystal", + "appliedenergistics2:purified_certus_quartz_crystal" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/crystals/certus_quartz.json b/src/main/resources/data/appliedenergistics2/tags/items/crystals/certus_quartz.json new file mode 100644 index 000000000..de228338f --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/crystals/certus_quartz.json @@ -0,0 +1,5 @@ +{ + "values": [ + "appliedenergistics2:certus_quartz_crystal" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/crystals/fluix.json b/src/main/resources/data/appliedenergistics2/tags/items/crystals/fluix.json new file mode 100644 index 000000000..e3305851d --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/crystals/fluix.json @@ -0,0 +1,6 @@ +{ + "values": [ + "appliedenergistics2:fluix_crystal", + "appliedenergistics2:purified_fluix_crystal" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/crystals/nether.json b/src/main/resources/data/appliedenergistics2/tags/items/crystals/nether.json new file mode 100644 index 000000000..1e70b5360 --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/crystals/nether.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#forge:gems/quartz", + "appliedenergistics2:purified_nether_quartz_crystal" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/crystals/quartz.json b/src/main/resources/data/appliedenergistics2/tags/items/crystals/quartz.json new file mode 100644 index 000000000..b914e9d4f --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/crystals/quartz.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#forge:gems/quartz", + "#appliedenergistics2:crystals/certus_quartz", + "appliedenergistics2:charged_certus_quartz_crystal" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/dusts/certus_quartz.json b/src/main/resources/data/appliedenergistics2/tags/items/dusts/certus_quartz.json new file mode 100644 index 000000000..55b0aa974 --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/dusts/certus_quartz.json @@ -0,0 +1,5 @@ +{ + "values": [ + "appliedenergistics2:certus_quartz_dust" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/dusts/ender.json b/src/main/resources/data/appliedenergistics2/tags/items/dusts/ender.json new file mode 100644 index 000000000..d6649e775 --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/dusts/ender.json @@ -0,0 +1,4 @@ +{ + "values": [ + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/dusts/fluix.json b/src/main/resources/data/appliedenergistics2/tags/items/dusts/fluix.json new file mode 100644 index 000000000..511ff0e77 --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/dusts/fluix.json @@ -0,0 +1,5 @@ +{ + "values": [ + "appliedenergistics2:fluix_dust" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/dusts/nether_quartz.json b/src/main/resources/data/appliedenergistics2/tags/items/dusts/nether_quartz.json new file mode 100644 index 000000000..a353be234 --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/dusts/nether_quartz.json @@ -0,0 +1,5 @@ +{ + "values": [ + "appliedenergistics2:nether_quartz_dust" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/dusts/quartz.json b/src/main/resources/data/appliedenergistics2/tags/items/dusts/quartz.json new file mode 100644 index 000000000..11d12c8f7 --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/dusts/quartz.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#appliedenergistics2:dusts/certus_quartz", + "#appliedenergistics2:dusts/nether_quartz" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/fluid_interface.json b/src/main/resources/data/appliedenergistics2/tags/items/fluid_interface.json new file mode 100644 index 000000000..ce7158041 --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/fluid_interface.json @@ -0,0 +1,6 @@ +{ + "values": [ + "appliedenergistics2:fluid_interface", + "appliedenergistics2:cable_fluid_interface" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/gears/wooden.json b/src/main/resources/data/appliedenergistics2/tags/items/gears/wooden.json new file mode 100644 index 000000000..d53541e6b --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/gears/wooden.json @@ -0,0 +1,5 @@ +{ + "values": [ + "appliedenergistics2:wooden_gear" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/glass.json b/src/main/resources/data/appliedenergistics2/tags/items/glass.json new file mode 100644 index 000000000..a62d59539 --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/glass.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:glass", + "#forge:glass" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/illuminated_panel.json b/src/main/resources/data/appliedenergistics2/tags/items/illuminated_panel.json new file mode 100644 index 000000000..411061cfb --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/illuminated_panel.json @@ -0,0 +1,7 @@ +{ + "values": [ + "appliedenergistics2:monitor", + "appliedenergistics2:semi_dark_monitor", + "appliedenergistics2:dark_monitor" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/interface.json b/src/main/resources/data/appliedenergistics2/tags/items/interface.json new file mode 100644 index 000000000..df9a466ff --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/interface.json @@ -0,0 +1,6 @@ +{ + "values": [ + "appliedenergistics2:interface", + "appliedenergistics2:cable_interface" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/knife.json b/src/main/resources/data/appliedenergistics2/tags/items/knife.json new file mode 100644 index 000000000..b11b036b0 --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/knife.json @@ -0,0 +1,6 @@ +{ + "values": [ + "appliedenergistics2:certus_quartz_cutting_knife", + "appliedenergistics2:nether_quartz_cutting_knife" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/metal_ingots.json b/src/main/resources/data/appliedenergistics2/tags/items/metal_ingots.json new file mode 100644 index 000000000..81f6e053a --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/metal_ingots.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#forge:ingots/gold", + "#forge:ingots/iron" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/nether_quartz_dust.json b/src/main/resources/data/appliedenergistics2/tags/items/nether_quartz_dust.json new file mode 100644 index 000000000..b366a51f9 --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/nether_quartz_dust.json @@ -0,0 +1,5 @@ +{ + "values": [ + "appliedenergistics2:nether_quartz_dust" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/quartz_wrench.json b/src/main/resources/data/appliedenergistics2/tags/items/quartz_wrench.json new file mode 100644 index 000000000..35ff272ad --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/quartz_wrench.json @@ -0,0 +1,6 @@ +{ + "values": [ + "appliedenergistics2:nether_quartz_wrench", + "appliedenergistics2:certus_quartz_wrench" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/silicon.json b/src/main/resources/data/appliedenergistics2/tags/items/silicon.json new file mode 100644 index 000000000..500504096 --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/silicon.json @@ -0,0 +1,5 @@ +{ + "values": [ + "appliedenergistics2:silicon" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/wool.json b/src/main/resources/data/appliedenergistics2/tags/items/wool.json new file mode 100644 index 000000000..495a1df46 --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/wool.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#minecraft:wool" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/appliedenergistics2/tags/items/workbench.json b/src/main/resources/data/appliedenergistics2/tags/items/workbench.json new file mode 100644 index 000000000..3be1c8e22 --- /dev/null +++ b/src/main/resources/data/appliedenergistics2/tags/items/workbench.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:crafting_table" + ] +} \ No newline at end of file