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 );
}
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 );
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.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;
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.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()
{
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.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<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.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 );
}
}
src/main/resources/data/appliedenergistics2/advancements/main/cable_glass.json
+24 -25
View File
@@ -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"
}
]
}
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/charged_quartz.json
+24 -24
View File
@@ -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
}
]
}
}
}
]
}
}
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/charger.json
+23 -23
View File
@@ -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"
}
]
}
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/compass.json
+23 -23
View File
@@ -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"
}
]
}
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/controller.json
+23 -23
View File
@@ -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"
}
]
}
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/crafting_cpu.json
+59 -59
View File
@@ -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"
]
}
]
}
src/main/resources/data/appliedenergistics2/advancements/main/crafting_terminal.json
+24 -25
View File
@@ -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"
}
]
}
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/facade.json
+23 -23
View File
@@ -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"
}
]
}
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/fluix.json
+24 -24
View File
@@ -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
}
]
}
}
}
]
}
}
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/growth_accelerator.json
+23 -23
View File
@@ -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"
}
]
}
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/interface.json
+23 -23
View File
@@ -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"
}
]
}
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/ioport.json
+23 -23
View File
@@ -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"
}
]
}
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/network1.json
+17 -17
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/network2.json
+17 -17
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/network3.json
+17 -17
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/network_tool.json
+23 -23
View File
@@ -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"
}
]
}
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/p2p.json
+24 -25
View File
@@ -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"
}
]
}
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/pattern_terminal.json
+24 -25
View File
@@ -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"
}
]
}
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/portable_cell.json
+23 -23
View File
@@ -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"
}
]
}
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/presses.json
+64 -64
View File
@@ -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"
]
}
]
}
src/main/resources/data/appliedenergistics2/advancements/main/qnb.json
+23 -23
View File
@@ -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"
}
]
}
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/root.json
+26 -26
View File
@@ -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
}
]
}
}
}
]
}
}
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/spatial_explorer.json
+16 -16
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/spatial_ioport.json
+23 -23
View File
@@ -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"
}
]
}
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/storage_bus.json
+24 -25
View File
@@ -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"
}
]
}
}
}
}
src/main/resources/data/appliedenergistics2/advancements/main/storage_cell.json
+59 -59
View File
@@ -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"
]
}
]
}
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
+13 -14
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json
+14 -15
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_pillar.json
+14 -14
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/chiseled_quartz_block.json
+13 -13
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/fluix_block.json
+13 -14
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/fluix_block_pure.json
+14 -15
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/light_detector.json
+14 -14
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_block_pure.json
+15 -16
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_fixture.json
+15 -16
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_glass.json
+17 -17
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_vibrant_glass.json
+14 -14
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_brick.json
+10 -10
View File
@@ -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"
}
]
}
src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_small_brick.json
+10 -10
View File
@@ -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"
}
]
}
src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_smooth.json
+10 -10
View File
@@ -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"
}
]
}
src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_chiseled_quartz.json
+14 -14
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_fluix.json
+14 -14
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_quartz.json
+14 -14
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_quartz_pillar.json
+14 -14
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone.json
+14 -14
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone_brick.json
+14 -14
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone_small_brick.json
+14 -14
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_smooth_sky_stone.json
+14 -14
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_chiseled_quartz.json
+15 -15
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_fluix.json
+15 -15
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_quartz.json
+15 -15
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_quartz_pillar.json
+15 -15
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone.json
+15 -15
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone_brick.json
+15 -15
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone_small_brick.json
+15 -15
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_smooth_sky_stone.json
+15 -15
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/grinder/bonemeal.json
+12 -12
View File
@@ -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
}
src/main/resources/data/appliedenergistics2/recipes/grinder/flint.json
+10 -10
View File
@@ -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
}
src/main/resources/data/appliedenergistics2/recipes/grinder/fluix_dust.json
+10 -11
View File
@@ -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
}
src/main/resources/data/appliedenergistics2/recipes/grinder/sky_dust.json
+10 -10
View File
@@ -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
}
src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json
+16 -19
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_press.json
+13 -15
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_print.json
+13 -15
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json
+16 -19
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_press.json
+13 -15
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json
+13 -15
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json
+16 -19
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_press.json
+13 -15
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json
+13 -15
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_press.json
+13 -15
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_print.json
+13 -15
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/recipes/materials/advancedcard.json
+31 -35
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/recipes/materials/annihilationcore.json
+26 -28
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/recipes/materials/basiccard.json
+31 -35
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/recipes/materials/cardcapacity.json
+18 -20
View File
@@ -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"
}
]
}
src/main/resources/data/appliedenergistics2/recipes/materials/cardcrafting.json
+18 -21
View File
@@ -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"
}
]
}
src/main/resources/data/appliedenergistics2/recipes/materials/cardfuzzy.json
+18 -20
View File
@@ -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"
}
]
}
src/main/resources/data/appliedenergistics2/recipes/materials/cardinverter.json
+2 -4
View File
@@ -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"
}
]
}
src/main/resources/data/appliedenergistics2/recipes/materials/cardredstone.json
+18 -20
View File
@@ -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"
}
]
}
src/main/resources/data/appliedenergistics2/recipes/materials/cardspeed.json
+18 -20
View File
@@ -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"
}
]
}
src/main/resources/data/appliedenergistics2/recipes/materials/formationcore.json
+26 -28
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/recipes/misc/chests_sky_stone.json
+14 -14
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/misc/chests_smooth_sky_stone.json
+14 -14
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json
+18 -18
View File
@@ -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"
}
]
}
src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json
+18 -18
View File
@@ -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"
}
]
}
src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json
+18 -18
View File
@@ -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"
}
]
}
src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json
+18 -18
View File
@@ -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"
}
]
}
src/main/resources/data/appliedenergistics2/recipes/misc/fluixpearl.json
+26 -28
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/recipes/misc/grindstone.json
+22 -25
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_crank.json
+14 -15
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_woodengear.json
+20 -22
View File
@@ -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"
}
}
}
src/main/resources/data/appliedenergistics2/recipes/misc/meteors_sky_compass.json
+16 -18
View File
@@ -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"
}
}
}
}
src/main/resources/data/appliedenergistics2/recipes/misc/seeds_certus.json
+14 -16
View File
@@ -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"
}
]
}
src/main/resources/data/appliedenergistics2/recipes/misc/seeds_fluix.json
+14 -16
View File
@@ -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"
}
]
}

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