fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Flattened Paintballs, great recipe migratin.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-10 16:07:20 +02:00
parent 8c45807ecd
commit 1393b4c9dd
382 changed files with 6453 additions and 7261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/bootstrap/FeatureFactory.java
-17
View File
@@ -114,23 +114,6 @@ public class FeatureFactory
return new TileEntityBuilder<>( this, id, teClass, factory ).features( this.defaultFeatures ); 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 ) public FeatureFactory features( AEFeature... features )
{ {
return new FeatureFactory( this, features ); return new FeatureFactory( this, features );
src/main/java/appeng/core/Registration.java
-1
View File
@@ -96,7 +96,6 @@ import appeng.fluids.registries.BasicFluidCellGuiHandler;
import appeng.me.cache.*; import appeng.me.cache.*;
import appeng.recipes.conditions.FeaturesEnabled; import appeng.recipes.conditions.FeaturesEnabled;
import appeng.recipes.game.DisassembleRecipe; import appeng.recipes.game.DisassembleRecipe;
import appeng.recipes.ingredients.PartIngredientSerializer;
import appeng.server.AECommand; import appeng.server.AECommand;
import appeng.tile.AEBaseTile; import appeng.tile.AEBaseTile;
import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.advancements.CriteriaTriggers;
src/main/java/appeng/core/api/definitions/ApiItems.java
+19 -11
View File
@@ -21,12 +21,16 @@ package appeng.core.api.definitions;
import appeng.api.definitions.IItemDefinition; import appeng.api.definitions.IItemDefinition;
import appeng.api.definitions.IItems; import appeng.api.definitions.IItems;
import appeng.api.util.AEColor;
import appeng.api.util.AEColoredItemDefinition; import appeng.api.util.AEColoredItemDefinition;
import appeng.bootstrap.FeatureFactory; import appeng.bootstrap.FeatureFactory;
import appeng.api.features.AEFeature; import appeng.api.features.AEFeature;
import appeng.client.render.crafting.EncodedPatternRenderer; import appeng.client.render.crafting.EncodedPatternRenderer;
import appeng.client.render.crafting.ItemEncodedPatternRendering; import appeng.client.render.crafting.ItemEncodedPatternRendering;
import appeng.core.CreativeTabFacade; import appeng.core.CreativeTabFacade;
import appeng.core.features.ActivityState;
import appeng.core.features.ColoredItemDefinition;
import appeng.core.features.ItemStackSrc;
import appeng.debug.*; import appeng.debug.*;
import appeng.entity.EntityGrowingCrystal; import appeng.entity.EntityGrowingCrystal;
import appeng.fluids.items.BasicFluidStorageCell; import appeng.fluids.items.BasicFluidStorageCell;
@@ -290,17 +294,8 @@ public final class ApiItems implements IItems
.rendering( new ItemEncodedPatternRendering() ) .rendering( new ItemEncodedPatternRendering() )
.build(); .build();
IItemDefinition paintBall = registry.item( "paint_ball", props -> new ItemPaintBall(props, false) ) this.coloredPaintBall = createPaintBalls(registry, "_paint_ball", false);
.features( AEFeature.PAINT_BALLS ) this.coloredLumenPaintBall = createPaintBalls(registry, "_lumen_paint_ball", true);
.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 );
FeatureFactory debugTools = registry.features( AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE ); FeatureFactory debugTools = registry.features( AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE );
this.toolEraser = debugTools.item( "debug_eraser", ToolEraser::new ).build(); 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(); 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 @Override
public IItemDefinition certusQuartzAxe() public IItemDefinition certusQuartzAxe()
{ {
src/main/java/appeng/items/misc/ItemPaintBall.java
+8 -32
View File
@@ -21,6 +21,7 @@ package appeng.items.misc;
import appeng.api.util.AEColor; import appeng.api.util.AEColor;
import appeng.items.AEBaseItem; import appeng.items.AEBaseItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
@@ -32,12 +33,13 @@ import net.minecraft.util.text.TranslationTextComponent;
public class ItemPaintBall extends AEBaseItem public class ItemPaintBall extends AEBaseItem
{ {
private static final String TAG_COLOR = "c"; private final AEColor color;
private final boolean lumen; private final boolean lumen;
public ItemPaintBall(Properties properties, boolean lumen) { public ItemPaintBall(Properties properties, AEColor color, boolean lumen) {
super(properties); super(properties);
this.color = color;
this.lumen = lumen; this.lumen = lumen;
} }
@@ -56,42 +58,16 @@ public class ItemPaintBall extends AEBaseItem
public AEColor getColor( final ItemStack is ) public AEColor getColor( final ItemStack is )
{ {
CompoundNBT tag = is.getTag(); Item item = is.getItem();
if (tag == null || !tag.contains(TAG_COLOR)) { if (item instanceof ItemPaintBall) {
return ((ItemPaintBall) item).color;
}
return AEColor.TRANSPARENT; return AEColor.TRANSPARENT;
} }
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;
}
public boolean isLumen() public boolean isLumen()
{ {
return lumen; return lumen;
} }
@Override
public void fillItemGroup(ItemGroup group, NonNullList<ItemStack> itemStacks) {
if (!isInGroup(group)) {
return;
}
for( final AEColor c : AEColor.values() )
{
if( c != AEColor.TRANSPARENT )
{
itemStacks.add( setColor(new ItemStack( this ), c) );
}
}
}
} }
src/main/java/appeng/items/misc/ItemPaintBallRendering.java
+16 -16
View File
@@ -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.api.util.AEColor;
import appeng.bootstrap.IItemRendering; import appeng.bootstrap.IItemRendering;
import appeng.bootstrap.ItemRenderingCustomizer; import appeng.bootstrap.ItemRenderingCustomizer;
@@ -31,33 +28,36 @@ import appeng.bootstrap.ItemRenderingCustomizer;
public class ItemPaintBallRendering extends 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 @Override
public void customize( IItemRendering rendering ) public void customize( IItemRendering rendering )
{ {
rendering.color( ItemPaintBallRendering::getColorFromItemstack ); final int colorValue = lumen ? color.mediumVariant : color.mediumVariant;
// 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 r = ( colorValue >> 16 ) & 0xff; final int r = ( colorValue >> 16 ) & 0xff;
final int g = ( colorValue >> 8 ) & 0xff; final int g = ( colorValue >> 8 ) & 0xff;
final int b = ( colorValue ) & 0xff; final int b = ( colorValue ) & 0xff;
int renderColor;
if( lumen ) if( lumen )
{ {
final float fail = 0.7f; final float fail = 0.7f;
final int full = (int) ( 255 * 0.3 ); 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 else
{ {
return r << 16 | g << 8 | b | 0xff << 24; renderColor = r << 16 | g << 8 | b | 0xff << 24;
} }
rendering.color( (is, tintIndex) -> renderColor );
} }
} }
src/main/resources/data/appliedenergistics2/advancements/main/cable_glass.json
+1 -2
View File
@@ -18,8 +18,7 @@
"conditions": { "conditions": {
"items": [ "items": [
{ {
"type": "appliedenergistics2:part", "tag": "appliedenergistics2:glass_cable"
"part": "CABLE_GLASS"
} }
] ]
} }
src/main/resources/data/appliedenergistics2/advancements/main/crafting_terminal.json
+1 -2
View File
@@ -18,8 +18,7 @@
"conditions": { "conditions": {
"items": [ "items": [
{ {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:crafting_terminal"
"part": "CRAFTING_TERMINAL"
} }
] ]
} }
src/main/resources/data/appliedenergistics2/advancements/main/p2p.json
+1 -2
View File
@@ -18,8 +18,7 @@
"conditions": { "conditions": {
"items": [ "items": [
{ {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:me_p2p_tunnel"
"part": "P2P_TUNNEL_ME"
} }
] ]
} }
src/main/resources/data/appliedenergistics2/advancements/main/pattern_terminal.json
+1 -2
View File
@@ -18,8 +18,7 @@
"conditions": { "conditions": {
"items": [ "items": [
{ {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:pattern_terminal"
"part": "PATTERN_TERMINAL"
} }
] ]
} }
src/main/resources/data/appliedenergistics2/advancements/main/storage_bus.json
+1 -2
View File
@@ -18,8 +18,7 @@
"conditions": { "conditions": {
"items": [ "items": [
{ {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:storage_bus"
"part": "STORAGE_BUS"
} }
] ]
} }
src/main/resources/data/appliedenergistics2/recipes/_constants.json
-241
View File
@@ -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"
}
]
}
]
src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_block.json
+2 -3
View File
@@ -2,15 +2,14 @@
"result": { "result": {
"item": "appliedenergistics2:quartz_block" "item": "appliedenergistics2:quartz_block"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aa", "aa",
"aa" "aa"
], ],
"key": { "key": {
"a": { "a": {
"type": "forge:ore_dict", "tag": "appliedenergistics2:crystals/certus_quartz"
"ore": "crystalCertusQuartz"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json
+2 -3
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:quartz_block" "item": "appliedenergistics2:quartz_block"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aaa", "aaa",
"a a", "a a",
@@ -10,8 +10,7 @@
], ],
"key": { "key": {
"a": { "a": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:purified_certus_quartz_crystal"
"part": "material.purified_certus_quartz_crystal"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_pillar.json
+1 -1
View File
@@ -3,7 +3,7 @@
"item": "appliedenergistics2:quartz_pillar", "item": "appliedenergistics2:quartz_pillar",
"count": 2 "count": 2
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"a", "a",
"a" "a"
src/main/resources/data/appliedenergistics2/recipes/decorative/chiseled_quartz_block.json
+1 -1
View File
@@ -3,7 +3,7 @@
"item": "appliedenergistics2:chiseled_quartz_block", "item": "appliedenergistics2:chiseled_quartz_block",
"count": 2 "count": 2
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aa" "aa"
], ],
src/main/resources/data/appliedenergistics2/recipes/decorative/fluix_block.json
+2 -3
View File
@@ -2,15 +2,14 @@
"result": { "result": {
"item": "appliedenergistics2:fluix_block" "item": "appliedenergistics2:fluix_block"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aa", "aa",
"aa" "aa"
], ],
"key": { "key": {
"a": { "a": {
"type": "forge:ore_dict", "tag": "appliedenergistics2:crystals/fluix"
"ore": "crystalFluix"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/decorative/fluix_block_pure.json
+2 -3
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:fluix_block" "item": "appliedenergistics2:fluix_block"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aaa", "aaa",
"a a", "a a",
@@ -10,8 +10,7 @@
], ],
"key": { "key": {
"a": { "a": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:purified_fluix_crystal"
"part": "material.purified_fluix_crystal"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/decorative/light_detector.json
+2 -2
View File
@@ -2,13 +2,13 @@
"result": { "result": {
"item": "appliedenergistics2:light_detector" "item": "appliedenergistics2:light_detector"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"ab" "ab"
], ],
"key": { "key": {
"a": { "a": {
"item": "#appliedenergistics2:netherCrystal" "tag": "appliedenergistics2:crystals/nether"
}, },
"b": { "b": {
"item": "minecraft:iron_ingot" "item": "minecraft:iron_ingot"
src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_block_pure.json
+2 -3
View File
@@ -3,7 +3,7 @@
"item": "minecraft:quartz_block", "item": "minecraft:quartz_block",
"data": 0 "data": 0
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aaa", "aaa",
"a a", "a a",
@@ -11,8 +11,7 @@
], ],
"key": { "key": {
"a": { "a": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:purified_nether_quartz_crystal"
"part": "material.purified_nether_quartz_crystal"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_fixture.json
+2 -3
View File
@@ -3,7 +3,7 @@
"item": "appliedenergistics2:quartz_fixture", "item": "appliedenergistics2:quartz_fixture",
"count": 2 "count": 2
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"ab" "ab"
], ],
@@ -12,8 +12,7 @@
"item": "minecraft:iron_ingot" "item": "minecraft:iron_ingot"
}, },
"a": { "a": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:certus_quartz_crystal_charged"
"part": "material.certus_quartz_crystal_charged"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_glass.json
+3 -3
View File
@@ -3,7 +3,7 @@
"item": "appliedenergistics2:quartz_glass", "item": "appliedenergistics2:quartz_glass",
"count": 4 "count": 4
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aba", "aba",
"bab", "bab",
@@ -11,10 +11,10 @@
], ],
"key": { "key": {
"b": { "b": {
"item": "#appliedenergistics2:glass" "tag": "appliedenergistics2:glass"
}, },
"a": { "a": {
"item": "#appliedenergistics2:dustQuartz" "tag": "appliedenergistics2:dusts/quartz"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_vibrant_glass.json
+1 -1
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:quartz_vibrant_glass" "item": "appliedenergistics2:quartz_vibrant_glass"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aba" "aba"
], ],
src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_brick.json
+1 -1
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:sky_stone_brick" "item": "appliedenergistics2:sky_stone_brick"
}, },
"type": "forge:ore_shapeless", "type": "minecraft:crafting_shapeless",
"ingredients": [ "ingredients": [
{ {
"item": "appliedenergistics2:smooth_sky_stone_block" "item": "appliedenergistics2:smooth_sky_stone_block"
src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_small_brick.json
+1 -1
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:sky_stone_small_brick" "item": "appliedenergistics2:sky_stone_small_brick"
}, },
"type": "forge:ore_shapeless", "type": "minecraft:crafting_shapeless",
"ingredients": [ "ingredients": [
{ {
"item": "appliedenergistics2:sky_stone_brick" "item": "appliedenergistics2:sky_stone_brick"
src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_smooth.json
+1 -1
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:smooth_sky_stone_block" "item": "appliedenergistics2:smooth_sky_stone_block"
}, },
"type": "forge:ore_shapeless", "type": "minecraft:crafting_shapeless",
"ingredients": [ "ingredients": [
{ {
"item": "appliedenergistics2:sky_stone_small_brick" "item": "appliedenergistics2:sky_stone_small_brick"
src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_chiseled_quartz.json
+1 -1
View File
@@ -4,7 +4,7 @@
"data": 0, "data": 0,
"count": 6 "count": 6
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aaa" "aaa"
], ],
src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_fluix.json
+1 -1
View File
@@ -4,7 +4,7 @@
"data": 0, "data": 0,
"count": 6 "count": 6
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aaa" "aaa"
], ],
src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_quartz.json
+1 -1
View File
@@ -4,7 +4,7 @@
"data": 0, "data": 0,
"count": 6 "count": 6
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aaa" "aaa"
], ],
src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_quartz_pillar.json
+1 -1
View File
@@ -4,7 +4,7 @@
"data": 0, "data": 0,
"count": 6 "count": 6
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aaa" "aaa"
], ],
src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone.json
+1 -1
View File
@@ -4,7 +4,7 @@
"data": 0, "data": 0,
"count": 6 "count": 6
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aaa" "aaa"
], ],
src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone_brick.json
+1 -1
View File
@@ -4,7 +4,7 @@
"data": 0, "data": 0,
"count": 6 "count": 6
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aaa" "aaa"
], ],
src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone_small_brick.json
+1 -1
View File
@@ -4,7 +4,7 @@
"data": 0, "data": 0,
"count": 6 "count": 6
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aaa" "aaa"
], ],
src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_smooth_sky_stone.json
+1 -1
View File
@@ -4,7 +4,7 @@
"data": 0, "data": 0,
"count": 6 "count": 6
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aaa" "aaa"
], ],
src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_chiseled_quartz.json
+1 -1
View File
@@ -3,7 +3,7 @@
"item": "appliedenergistics2:chiseled_quartz_stairs", "item": "appliedenergistics2:chiseled_quartz_stairs",
"count": 4 "count": 4
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"a ", "a ",
"aa ", "aa ",
src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_fluix.json
+1 -1
View File
@@ -3,7 +3,7 @@
"item": "appliedenergistics2:fluix_stairs", "item": "appliedenergistics2:fluix_stairs",
"count": 4 "count": 4
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"a ", "a ",
"aa ", "aa ",
src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_quartz.json
+1 -1
View File
@@ -3,7 +3,7 @@
"item": "appliedenergistics2:quartz_stairs", "item": "appliedenergistics2:quartz_stairs",
"count": 4 "count": 4
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"a ", "a ",
"aa ", "aa ",
src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_quartz_pillar.json
+1 -1
View File
@@ -3,7 +3,7 @@
"item": "appliedenergistics2:quartz_pillar_stairs", "item": "appliedenergistics2:quartz_pillar_stairs",
"count": 4 "count": 4
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"a ", "a ",
"aa ", "aa ",
src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone.json
+1 -1
View File
@@ -3,7 +3,7 @@
"item": "appliedenergistics2:sky_stone_stairs", "item": "appliedenergistics2:sky_stone_stairs",
"count": 4 "count": 4
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"a ", "a ",
"aa ", "aa ",
src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone_brick.json
+1 -1
View File
@@ -3,7 +3,7 @@
"item": "appliedenergistics2:sky_stone_brick_stairs", "item": "appliedenergistics2:sky_stone_brick_stairs",
"count": 4 "count": 4
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"a ", "a ",
"aa ", "aa ",
src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone_small_brick.json
+1 -1
View File
@@ -3,7 +3,7 @@
"item": "appliedenergistics2:sky_stone_small_brick_stairs", "item": "appliedenergistics2:sky_stone_small_brick_stairs",
"count": 4 "count": 4
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"a ", "a ",
"aa ", "aa ",
src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_smooth_sky_stone.json
+1 -1
View File
@@ -3,7 +3,7 @@
"item": "appliedenergistics2:smooth_sky_stone_stairs", "item": "appliedenergistics2:smooth_sky_stone_stairs",
"count": 4 "count": 4
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"a ", "a ",
"aa ", "aa ",
src/main/resources/data/appliedenergistics2/recipes/grinder/fluix_dust.json
+1 -2
View File
@@ -1,8 +1,7 @@
{ {
"type": "appliedenergistics2:grinder", "type": "appliedenergistics2:grinder",
"input": { "input": {
"type": "forge:ore_dict", "tag": "appliedenergistics2:crystals/fluix"
"ore": "crystalFluix"
}, },
"result": { "result": {
"primary": { "primary": {
src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json
+3 -6
View File
@@ -6,16 +6,13 @@
}, },
"ingredients": { "ingredients": {
"top": { "top": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:engineering_processor_print"
"part": "material.engineering_processor_print"
}, },
"middle": { "middle": {
"type": "forge:ore_dict", "tag": "forge:dusts/redstone"
"ore": "dustRedstone"
}, },
"bottom": { "bottom": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:silicon_print"
"part": "material.silicon_print"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_press.json
+2 -4
View File
@@ -6,12 +6,10 @@
}, },
"ingredients": { "ingredients": {
"top": { "top": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:calculation_processor_press"
"part": "material.calculation_processor_press"
}, },
"middle": { "middle": {
"type": "forge:ore_dict", "tag": "forge:storage_blocks/iron"
"ore": "blockIron"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_print.json
+2 -4
View File
@@ -6,12 +6,10 @@
}, },
"ingredients": { "ingredients": {
"top": { "top": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:calculation_processor_press"
"part": "material.calculation_processor_press"
}, },
"middle": { "middle": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:purified_certus_quartz_crystal"
"part": "material.purified_certus_quartz_crystal"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json
+3 -6
View File
@@ -6,16 +6,13 @@
}, },
"ingredients": { "ingredients": {
"top": { "top": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:calculation_processor_print"
"part": "material.calculation_processor_print"
}, },
"middle": { "middle": {
"type": "forge:ore_dict", "tag": "forge:dusts/redstone"
"ore": "dustRedstone"
}, },
"bottom": { "bottom": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:silicon_print"
"part": "material.silicon_print"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_press.json
+2 -4
View File
@@ -6,12 +6,10 @@
}, },
"ingredients": { "ingredients": {
"top": { "top": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:engineering_processor_press"
"part": "material.engineering_processor_press"
}, },
"middle": { "middle": {
"type": "forge:ore_dict", "tag": "forge:storage_blocks/iron"
"ore": "blockIron"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json
+2 -4
View File
@@ -6,12 +6,10 @@
}, },
"ingredients": { "ingredients": {
"top": { "top": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:engineering_processor_press"
"part": "material.engineering_processor_press"
}, },
"middle": { "middle": {
"type": "forge:ore_dict", "tag": "forge:gems/diamond"
"ore": "gemDiamond"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json
+3 -6
View File
@@ -6,16 +6,13 @@
}, },
"ingredients": { "ingredients": {
"top": { "top": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:logic_processor_print"
"part": "material.logic_processor_print"
}, },
"middle": { "middle": {
"type": "forge:ore_dict", "tag": "forge:dusts/redstone"
"ore": "dustRedstone"
}, },
"bottom": { "bottom": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:silicon_print"
"part": "material.silicon_print"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_press.json
+2 -4
View File
@@ -6,12 +6,10 @@
}, },
"ingredients": { "ingredients": {
"top": { "top": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:logic_processor_press"
"part": "material.logic_processor_press"
}, },
"middle": { "middle": {
"type": "forge:ore_dict", "tag": "forge:storage_blocks/iron"
"ore": "blockIron"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json
+2 -4
View File
@@ -6,12 +6,10 @@
}, },
"ingredients": { "ingredients": {
"top": { "top": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:logic_processor_press"
"part": "material.logic_processor_press"
}, },
"middle": { "middle": {
"type": "forge:ore_dict", "tag": "forge:ingots/gold"
"ore": "ingotGold"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_press.json
+2 -4
View File
@@ -6,12 +6,10 @@
}, },
"ingredients": { "ingredients": {
"top": { "top": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:silicon_press"
"part": "material.silicon_press"
}, },
"middle": { "middle": {
"type": "forge:ore_dict", "tag": "forge:storage_blocks/iron"
"ore": "blockIron"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_print.json
+2 -4
View File
@@ -6,12 +6,10 @@
}, },
"ingredients": { "ingredients": {
"top": { "top": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:silicon_press"
"part": "material.silicon_press"
}, },
"middle": { "middle": {
"type": "forge:ore_dict", "tag": "appliedenergistics2:silicon"
"ore": "itemSilicon"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/materials/advancedcard.json
+4 -8
View File
@@ -18,20 +18,16 @@
], ],
"key": { "key": {
"b": { "b": {
"type": "forge:ore_dict", "tag": "forge:ingots/iron"
"ore": "ingotIron"
}, },
"c": { "c": {
"type": "forge:ore_dict", "tag": "forge:dusts/redstone"
"ore": "dustRedstone"
}, },
"a": { "a": {
"type": "forge:ore_dict", "tag": "forge:gems/diamond"
"ore": "gemDiamond"
}, },
"d": { "d": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:calculation_processor"
"part": "material.calculation_processor"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/materials/annihilationcore.json
+3 -5
View File
@@ -16,15 +16,13 @@
], ],
"key": { "key": {
"b": { "b": {
"type": "forge:ore_dict", "tag": "appliedenergistics2:dusts/fluix"
"ore": "dustFluix"
}, },
"a": { "a": {
"item": "#appliedenergistics2:netherCrystal" "tag": "appliedenergistics2:crystals/nether"
}, },
"c": { "c": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:logic_processor"
"part": "material.logic_processor"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/materials/basiccard.json
+4 -8
View File
@@ -18,20 +18,16 @@
], ],
"key": { "key": {
"b": { "b": {
"type": "forge:ore_dict", "tag": "forge:ingots/iron"
"ore": "ingotIron"
}, },
"c": { "c": {
"type": "forge:ore_dict", "tag": "forge:dusts/redstone"
"ore": "dustRedstone"
}, },
"a": { "a": {
"type": "forge:ore_dict", "tag": "forge:ingots/gold"
"ore": "ingotGold"
}, },
"d": { "d": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:calculation_processor"
"part": "material.calculation_processor"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/materials/cardcapacity.json
+3 -5
View File
@@ -6,17 +6,15 @@
} }
], ],
"result": { "result": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:card_capacity"
"part": "material.card_capacity"
}, },
"type": "appliedenergistics2:part_shapeless", "type": "appliedenergistics2:part_shapeless",
"ingredients": [ "ingredients": [
{ {
"item": "#appliedenergistics2:certusCrystal" "tag": "appliedenergistics2:crystals/certus"
}, },
{ {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:basic_card"
"part": "material.basic_card"
} }
] ]
} }
src/main/resources/data/appliedenergistics2/recipes/materials/cardcrafting.json
+3 -6
View File
@@ -6,18 +6,15 @@
} }
], ],
"result": { "result": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:card_crafting"
"part": "material.card_crafting"
}, },
"type": "appliedenergistics2:part_shapeless", "type": "appliedenergistics2:part_shapeless",
"ingredients": [ "ingredients": [
{ {
"type": "forge:ore_dict", "tag": "appliedenergistics2:workbench"
"ore": "workbench"
}, },
{ {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:basic_card"
"part": "material.basic_card"
} }
] ]
} }
src/main/resources/data/appliedenergistics2/recipes/materials/cardfuzzy.json
+3 -5
View File
@@ -6,17 +6,15 @@
} }
], ],
"result": { "result": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:card_fuzzy"
"part": "material.card_fuzzy"
}, },
"type": "appliedenergistics2:part_shapeless", "type": "appliedenergistics2:part_shapeless",
"ingredients": [ "ingredients": [
{ {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:advanced_card"
"part": "material.advanced_card"
}, },
{ {
"item": "#appliedenergistics2:wool" "tag": "appliedenergistics2:wool"
} }
] ]
} }
src/main/resources/data/appliedenergistics2/recipes/materials/cardinverter.json
+2 -4
View File
@@ -6,8 +6,7 @@
} }
], ],
"result": { "result": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:card_inverter"
"part": "material.card_inverter"
}, },
"type": "appliedenergistics2:part_shapeless", "type": "appliedenergistics2:part_shapeless",
"ingredients": [ "ingredients": [
@@ -15,8 +14,7 @@
"item": "minecraft:redstone_torch" "item": "minecraft:redstone_torch"
}, },
{ {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:advanced_card"
"part": "material.advanced_card"
} }
] ]
} }
src/main/resources/data/appliedenergistics2/recipes/materials/cardredstone.json
+2 -4
View File
@@ -6,8 +6,7 @@
} }
], ],
"result": { "result": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:card_redstone"
"part": "material.card_redstone"
}, },
"type": "appliedenergistics2:part_shapeless", "type": "appliedenergistics2:part_shapeless",
"ingredients": [ "ingredients": [
@@ -15,8 +14,7 @@
"item": "minecraft:redstone_torch" "item": "minecraft:redstone_torch"
}, },
{ {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:basic_card"
"part": "material.basic_card"
} }
] ]
} }
src/main/resources/data/appliedenergistics2/recipes/materials/cardspeed.json
+3 -5
View File
@@ -6,17 +6,15 @@
} }
], ],
"result": { "result": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:card_speed"
"part": "material.card_speed"
}, },
"type": "appliedenergistics2:part_shapeless", "type": "appliedenergistics2:part_shapeless",
"ingredients": [ "ingredients": [
{ {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:advanced_card"
"part": "material.advanced_card"
}, },
{ {
"item": "#appliedenergistics2:fluixCrystal" "tag": "appliedenergistics2:crystals/fluix"
} }
] ]
} }
src/main/resources/data/appliedenergistics2/recipes/materials/formationcore.json
+3 -5
View File
@@ -16,15 +16,13 @@
], ],
"key": { "key": {
"b": { "b": {
"type": "forge:ore_dict", "tag": "appliedenergistics2:dusts/fluix"
"ore": "dustFluix"
}, },
"a": { "a": {
"item": "#appliedenergistics2:certusCrystal" "tag": "appliedenergistics2:crystals/certus"
}, },
"c": { "c": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:logic_processor"
"part": "material.logic_processor"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/misc/chests_sky_stone.json
+1 -1
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:sky_stone_chest" "item": "appliedenergistics2:sky_stone_chest"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aaa", "aaa",
"a a", "a a",
src/main/resources/data/appliedenergistics2/recipes/misc/chests_smooth_sky_stone.json
+1 -1
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:smooth_sky_stone_chest" "item": "appliedenergistics2:smooth_sky_stone_chest"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aaa", "aaa",
"a a", "a a",
src/main/resources/data/appliedenergistics2/recipes/misc/fluixpearl.json
+3 -5
View File
@@ -6,8 +6,7 @@
} }
], ],
"result": { "result": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:fluix_pearl"
"part": "material.fluix_pearl"
}, },
"type": "appliedenergistics2:part_shaped", "type": "appliedenergistics2:part_shaped",
"pattern": [ "pattern": [
@@ -20,11 +19,10 @@
"item": "minecraft:ender_pearl" "item": "minecraft:ender_pearl"
}, },
"a": { "a": {
"type": "forge:ore_dict", "tag": "appliedenergistics2:dusts/fluix"
"ore": "dustFluix"
}, },
"b": { "b": {
"item": "#appliedenergistics2:fluixCrystal" "tag": "appliedenergistics2:crystals/fluix"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/misc/grindstone.json
+5 -8
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:grindstone" "item": "appliedenergistics2:grindstone"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aba", "aba",
"cac", "cac",
@@ -10,19 +10,16 @@
], ],
"key": { "key": {
"c": { "c": {
"item": "#appliedenergistics2:crystalQuartz" "tag": "appliedenergistics2:crystals/quartz"
}, },
"a": { "a": {
"type": "forge:ore_dict", "tag": "forge:stone"
"ore": "stone"
}, },
"d": { "d": {
"type": "forge:ore_dict", "tag": "forge:cobblestone"
"ore": "cobblestone"
}, },
"b": { "b": {
"type": "forge:ore_dict", "tag": "appliedenergistics2:gears/wooden"
"ore": "gearWood"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_crank.json
+2 -3
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:crank" "item": "appliedenergistics2:crank"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aaa", "aaa",
" a", " a",
@@ -10,8 +10,7 @@
], ],
"key": { "key": {
"a": { "a": {
"type": "forge:ore_dict", "tag": "forge:rods/wooden"
"ore": "stickWood"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_woodengear.json
+2 -4
View File
@@ -6,8 +6,7 @@
} }
], ],
"result": { "result": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:wooden_gear"
"part": "material.wooden_gear"
}, },
"type": "appliedenergistics2:part_shaped", "type": "appliedenergistics2:part_shaped",
"pattern": [ "pattern": [
@@ -17,8 +16,7 @@
], ],
"key": { "key": {
"a": { "a": {
"type": "forge:ore_dict", "tag": "forge:rods/wooden"
"ore": "stickWood"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/misc/meteors_sky_compass.json
+3 -5
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:sky_compass" "item": "appliedenergistics2:sky_compass"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
" a ", " a ",
"aba", "aba",
@@ -10,12 +10,10 @@
], ],
"key": { "key": {
"a": { "a": {
"type": "forge:ore_dict", "tag": "forge:ingots/iron"
"ore": "ingotIron"
}, },
"b": { "b": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:certus_quartz_crystal_charged"
"part": "material.certus_quartz_crystal_charged"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/misc/seeds_certus.json
+2 -4
View File
@@ -7,12 +7,10 @@
"type": "appliedenergistics2:part_shapeless", "type": "appliedenergistics2:part_shapeless",
"ingredients": [ "ingredients": [
{ {
"type": "forge:ore_dict", "tag": "forge:sand"
"ore": "sand"
}, },
{ {
"type": "forge:ore_dict", "tag": "appliedenergistics2:dusts/certus_quartz"
"ore": "dustCertusQuartz"
} }
] ]
} }
src/main/resources/data/appliedenergistics2/recipes/misc/seeds_fluix.json
+2 -4
View File
@@ -7,12 +7,10 @@
"type": "appliedenergistics2:part_shapeless", "type": "appliedenergistics2:part_shapeless",
"ingredients": [ "ingredients": [
{ {
"type": "forge:ore_dict", "tag": "forge:sand"
"ore": "sand"
}, },
{ {
"type": "forge:ore_dict", "tag": "appliedenergistics2:dusts/fluix"
"ore": "dustFluix"
} }
] ]
} }
src/main/resources/data/appliedenergistics2/recipes/misc/seeds_nether.json
+2 -4
View File
@@ -7,12 +7,10 @@
"type": "appliedenergistics2:part_shapeless", "type": "appliedenergistics2:part_shapeless",
"ingredients": [ "ingredients": [
{ {
"type": "forge:ore_dict", "tag": "forge:sand"
"ore": "sand"
}, },
{ {
"type": "forge:ore_dict", "tag": "appliedenergistics2:dusts/nether_quartz"
"ore": "dustNetherQuartz"
} }
] ]
} }
src/main/resources/data/appliedenergistics2/recipes/misc/tiny_tnt.json
+2 -2
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:tiny_tnt" "item": "appliedenergistics2:tiny_tnt"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"ab", "ab",
"ba" "ba"
@@ -12,7 +12,7 @@
"item": "minecraft:gunpowder" "item": "minecraft:gunpowder"
}, },
"a": { "a": {
"item": "#appliedenergistics2:dustQuartz" "tag": "appliedenergistics2:dusts/quartz"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_comparator.json
+3 -4
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "minecraft:comparator" "item": "minecraft:comparator"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
" a ", " a ",
"aba", "aba",
@@ -10,14 +10,13 @@
], ],
"key": { "key": {
"b": { "b": {
"item": "#appliedenergistics2:netherCrystal" "tag": "appliedenergistics2:crystals/nether"
}, },
"a": { "a": {
"item": "minecraft:redstone_torch" "item": "minecraft:redstone_torch"
}, },
"c": { "c": {
"type": "forge:ore_dict", "tag": "forge:stone"
"ore": "stone"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json
+4 -5
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "minecraft:daylight_detector" "item": "minecraft:daylight_detector"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aaa", "aaa",
"bbb", "bbb",
@@ -10,14 +10,13 @@
], ],
"key": { "key": {
"a": { "a": {
"item": "#appliedenergistics2:glass" "tag": "appliedenergistics2:glass"
}, },
"b": { "b": {
"item": "#appliedenergistics2:netherCrystal" "tag": "appliedenergistics2:crystals/nether"
}, },
"c": { "c": {
"type": "forge:ore_dict", "tag": "minecraft:wooden_slabs"
"ore": "slabWood"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/network/blocks/cell_workbench.json
+5 -8
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:cell_workbench" "item": "appliedenergistics2:cell_workbench"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aba", "aba",
"cdc", "cdc",
@@ -10,19 +10,16 @@
], ],
"key": { "key": {
"c": { "c": {
"type": "forge:ore_dict", "tag": "forge:ingots/iron"
"ore": "ingotIron"
}, },
"a": { "a": {
"item": "#appliedenergistics2:wool" "tag": "appliedenergistics2:wool"
}, },
"d": { "d": {
"type": "forge:ore_dict", "tag": "forge:chests/wooden"
"ore": "chestWood"
}, },
"b": { "b": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:calculation_processor"
"part": "material.calculation_processor"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/network/blocks/controller.json
+3 -5
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:controller" "item": "appliedenergistics2:controller"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aba", "aba",
"bcb", "bcb",
@@ -10,12 +10,10 @@
], ],
"key": { "key": {
"c": { "c": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:engineering_processor"
"part": "material.engineering_processor"
}, },
"b": { "b": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:purified_fluix_crystal"
"part": "material.purified_fluix_crystal"
}, },
"a": { "a": {
"item": "appliedenergistics2:smooth_sky_stone_block" "item": "appliedenergistics2:smooth_sky_stone_block"
src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json
+3 -4
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:charger" "item": "appliedenergistics2:charger"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aba", "aba",
"a ", "a ",
@@ -10,11 +10,10 @@
], ],
"key": { "key": {
"a": { "a": {
"type": "forge:ore_dict", "tag": "forge:ingots/iron"
"ore": "ingotIron"
}, },
"b": { "b": {
"item": "#appliedenergistics2:fluixCrystal" "tag": "appliedenergistics2:crystals/fluix"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json
+3 -5
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:quartz_growth_accelerator" "item": "appliedenergistics2:quartz_growth_accelerator"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aba", "aba",
"cdc", "cdc",
@@ -13,12 +13,10 @@
"item": "appliedenergistics2:quartz_glass" "item": "appliedenergistics2:quartz_glass"
}, },
"a": { "a": {
"type": "forge:ore_dict", "tag": "forge:ingots/iron"
"ore": "ingotIron"
}, },
"b": { "b": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:fluix_cable_glass"
"part": "cable_glass.fluix"
}, },
"d": { "d": {
"item": "appliedenergistics2:fluix_block" "item": "appliedenergistics2:fluix_block"
src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_dense_energy_cell.json
+2 -3
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:dense_energy_cell" "item": "appliedenergistics2:dense_energy_cell"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aaa", "aaa",
"aba", "aba",
@@ -13,8 +13,7 @@
"item": "appliedenergistics2:energy_cell" "item": "appliedenergistics2:energy_cell"
}, },
"b": { "b": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:calculation_processor"
"part": "material.calculation_processor"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json
+3 -4
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:energy_acceptor" "item": "appliedenergistics2:energy_acceptor"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aba", "aba",
"bcb", "bcb",
@@ -13,11 +13,10 @@
"item": "appliedenergistics2:quartz_glass" "item": "appliedenergistics2:quartz_glass"
}, },
"a": { "a": {
"type": "forge:ore_dict", "tag": "forge:ingots/iron"
"ore": "ingotIron"
}, },
"c": { "c": {
"item": "#appliedenergistics2:fluixCrystal" "tag": "appliedenergistics2:crystals/fluix"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_cell.json
+3 -4
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:energy_cell" "item": "appliedenergistics2:energy_cell"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aba", "aba",
"bcb", "bcb",
@@ -13,11 +13,10 @@
"item": "appliedenergistics2:quartz_glass" "item": "appliedenergistics2:quartz_glass"
}, },
"a": { "a": {
"item": "#appliedenergistics2:certusCrystal" "tag": "appliedenergistics2:crystals/certus"
}, },
"b": { "b": {
"type": "forge:ore_dict", "tag": "appliedenergistics2:dusts/fluix"
"ore": "dustFluix"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_vibration_chamber.json
+2 -3
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:vibration_chamber" "item": "appliedenergistics2:vibration_chamber"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aaa", "aaa",
"aba", "aba",
@@ -10,8 +10,7 @@
], ],
"key": { "key": {
"a": { "a": {
"type": "forge:ore_dict", "tag": "forge:ingots/iron"
"ore": "ingotIron"
}, },
"c": { "c": {
"item": "appliedenergistics2:energy_acceptor" "item": "appliedenergistics2:energy_acceptor"
src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface.json
+5 -9
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:fluid_interface" "item": "appliedenergistics2:fluid_interface"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aba", "aba",
"c d", "c d",
@@ -10,20 +10,16 @@
], ],
"key": { "key": {
"d": { "d": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:formation_core"
"part": "material.formation_core"
}, },
"b": { "b": {
"type": "forge:ore_dict", "tag": "forge:dyes/blue"
"ore": "dyeBlue"
}, },
"a": { "a": {
"type": "forge:ore_dict", "tag": "forge:ingots/iron"
"ore": "ingotIron"
}, },
"c": { "c": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:annihilation_core"
"part": "material.annihilation_core"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_alt.json
+2 -3
View File
@@ -2,11 +2,10 @@
"result": { "result": {
"item": "appliedenergistics2:fluid_interface" "item": "appliedenergistics2:fluid_interface"
}, },
"type": "forge:ore_shapeless", "type": "minecraft:crafting_shapeless",
"ingredients": [ "ingredients": [
{ {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:cable_fluid_interface"
"part": "part.fluid_interface"
} }
] ]
} }
src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_part.json
+1 -2
View File
@@ -1,7 +1,6 @@
{ {
"result": { "result": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:cable_fluid_interface"
"part": "part.fluid_interface"
}, },
"type": "appliedenergistics2:part_shapeless", "type": "appliedenergistics2:part_shapeless",
"ingredients": [ "ingredients": [
src/main/resources/data/appliedenergistics2/recipes/network/blocks/inscribers.json
+3 -4
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:inscriber" "item": "appliedenergistics2:inscriber"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aba", "aba",
"c a", "c a",
@@ -13,11 +13,10 @@
"item": "minecraft:sticky_piston" "item": "minecraft:sticky_piston"
}, },
"a": { "a": {
"type": "forge:ore_dict", "tag": "forge:ingots/iron"
"ore": "ingotIron"
}, },
"c": { "c": {
"item": "#appliedenergistics2:fluixCrystal" "tag": "appliedenergistics2:crystals/fluix"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface.json
+5 -8
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:interface" "item": "appliedenergistics2:interface"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aba", "aba",
"c d", "c d",
@@ -10,19 +10,16 @@
], ],
"key": { "key": {
"d": { "d": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:formation_core"
"part": "material.formation_core"
}, },
"b": { "b": {
"item": "#appliedenergistics2:glass" "tag": "appliedenergistics2:glass"
}, },
"a": { "a": {
"type": "forge:ore_dict", "tag": "forge:ingots/iron"
"ore": "ingotIron"
}, },
"c": { "c": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:annihilation_core"
"part": "material.annihilation_core"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_alt.json
+2 -3
View File
@@ -2,11 +2,10 @@
"result": { "result": {
"item": "appliedenergistics2:interface" "item": "appliedenergistics2:interface"
}, },
"type": "forge:ore_shapeless", "type": "minecraft:crafting_shapeless",
"ingredients": [ "ingredients": [
{ {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:cable_interface"
"part": "part.interface"
} }
] ]
} }
src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json
+1 -2
View File
@@ -1,7 +1,6 @@
{ {
"result": { "result": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:cable_interface"
"part": "part.interface"
}, },
"type": "appliedenergistics2:part_shapeless", "type": "appliedenergistics2:part_shapeless",
"ingredients": [ "ingredients": [
src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_condenser.json
+4 -6
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:condenser" "item": "appliedenergistics2:condenser"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aba", "aba",
"bcb", "bcb",
@@ -10,15 +10,13 @@
], ],
"key": { "key": {
"b": { "b": {
"item": "#appliedenergistics2:glass" "tag": "appliedenergistics2:glass"
}, },
"a": { "a": {
"type": "forge:ore_dict", "tag": "forge:ingots/iron"
"ore": "ingotIron"
}, },
"c": { "c": {
"type": "forge:ore_dict", "tag": "appliedenergistics2:dusts/fluix"
"ore": "dustFluix"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_port.json
+5 -8
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:io_port" "item": "appliedenergistics2:io_port"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aaa", "aaa",
"bcb", "bcb",
@@ -10,22 +10,19 @@
], ],
"key": { "key": {
"a": { "a": {
"item": "#appliedenergistics2:glass" "tag": "appliedenergistics2:glass"
}, },
"d": { "d": {
"type": "forge:ore_dict", "tag": "forge:ingots/iron"
"ore": "ingotIron"
}, },
"b": { "b": {
"item": "appliedenergistics2:drive" "item": "appliedenergistics2:drive"
}, },
"e": { "e": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:logic_processor"
"part": "material.logic_processor"
}, },
"c": { "c": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:fluix_cable_glass"
"part": "cable_glass.fluix"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_link.json
+2 -3
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:quantum_link" "item": "appliedenergistics2:quantum_link"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aba", "aba",
"b b", "b b",
@@ -13,8 +13,7 @@
"item": "appliedenergistics2:quartz_glass" "item": "appliedenergistics2:quartz_glass"
}, },
"b": { "b": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:fluix_pearl"
"part": "material.fluix_pearl"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_ring.json
+5 -9
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:quantum_ring" "item": "appliedenergistics2:quantum_ring"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aba", "aba",
"cde", "cde",
@@ -10,23 +10,19 @@
], ],
"key": { "key": {
"c": { "c": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:engineering_processor"
"part": "material.engineering_processor"
}, },
"e": { "e": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:fluix_cable_dense_smart"
"part": "cable_dense_smart.fluix"
}, },
"a": { "a": {
"type": "forge:ore_dict", "tag": "forge:ingots/iron"
"ore": "ingotIron"
}, },
"d": { "d": {
"item": "appliedenergistics2:energy_cell" "item": "appliedenergistics2:energy_cell"
}, },
"b": { "b": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:logic_processor"
"part": "material.logic_processor"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json
+5 -9
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:security_station" "item": "appliedenergistics2:security_station"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aba", "aba",
"cdc", "cdc",
@@ -10,23 +10,19 @@
], ],
"key": { "key": {
"d": { "d": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:cell16k_part"
"part": "material.cell16k_part"
}, },
"e": { "e": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:engineering_processor"
"part": "material.engineering_processor"
}, },
"b": { "b": {
"item": "appliedenergistics2:chest" "item": "appliedenergistics2:chest"
}, },
"a": { "a": {
"type": "forge:ore_dict", "tag": "forge:ingots/iron"
"ore": "ingotIron"
}, },
"c": { "c": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:fluix_cable_glass"
"part": "cable_glass.fluix"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_port.json
+5 -8
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:spatial_io_port" "item": "appliedenergistics2:spatial_io_port"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aaa", "aaa",
"bcb", "bcb",
@@ -10,22 +10,19 @@
], ],
"key": { "key": {
"a": { "a": {
"item": "#appliedenergistics2:glass" "tag": "appliedenergistics2:glass"
}, },
"e": { "e": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:engineering_processor"
"part": "material.engineering_processor"
}, },
"d": { "d": {
"type": "forge:ore_dict", "tag": "forge:ingots/iron"
"ore": "ingotIron"
}, },
"c": { "c": {
"item": "appliedenergistics2:io_port" "item": "appliedenergistics2:io_port"
}, },
"b": { "b": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:fluix_cable_glass"
"part": "cable_glass.fluix"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json
+4 -6
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:spatial_pylon" "item": "appliedenergistics2:spatial_pylon"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aba", "aba",
"cdc", "cdc",
@@ -13,15 +13,13 @@
"item": "appliedenergistics2:quartz_glass" "item": "appliedenergistics2:quartz_glass"
}, },
"c": { "c": {
"type": "forge:ore_dict", "tag": "appliedenergistics2:dusts/fluix"
"ore": "dustFluix"
}, },
"b": { "b": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:fluix_cable_glass"
"part": "cable_glass.fluix"
}, },
"d": { "d": {
"item": "#appliedenergistics2:fluixCrystal" "tag": "appliedenergistics2:crystals/fluix"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_chest.json
+6 -9
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:chest" "item": "appliedenergistics2:chest"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aba", "aba",
"c c", "c c",
@@ -10,22 +10,19 @@
], ],
"key": { "key": {
"a": { "a": {
"item": "#appliedenergistics2:glass" "tag": "appliedenergistics2:glass"
}, },
"b": { "b": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:terminal"
"part": "part.terminal"
}, },
"d": { "d": {
"type": "forge:ore_dict", "tag": "forge:ingots/iron"
"ore": "ingotIron"
}, },
"c": { "c": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:fluix_cable_glass"
"part": "cable_glass.fluix"
}, },
"e": { "e": {
"item": "#appliedenergistics2:fluixCrystal" "tag": "appliedenergistics2:crystals/fluix"
} }
} }
} }
src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_drive.json
+4 -7
View File
@@ -2,7 +2,7 @@
"result": { "result": {
"item": "appliedenergistics2:drive" "item": "appliedenergistics2:drive"
}, },
"type": "forge:ore_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"aba", "aba",
"c c", "c c",
@@ -10,16 +10,13 @@
], ],
"key": { "key": {
"b": { "b": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:engineering_processor"
"part": "material.engineering_processor"
}, },
"a": { "a": {
"type": "forge:ore_dict", "tag": "forge:ingots/iron"
"ore": "ingotIron"
}, },
"c": { "c": {
"type": "appliedenergistics2:part", "item": "appliedenergistics2:fluix_cable_glass"
"part": "cable_glass.fluix"
} }
} }
} }

Some files were not shown because too many files have changed in this diff Show More