From d12078d9217e3a8345cad1a43b463395e2ae4462 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 15 Jun 2017 23:54:15 +0200 Subject: [PATCH] Update Forge, re-add MCMP support, fixed recipes --- CHANGELOG.md | 5 +++ build.gradle | 4 +- .../com/raoulvdberge/refinedstorage/RS.java | 3 +- .../integration/mcmp/PartCable.java | 4 +- .../integration/mcmp/PartCableTile.java | 5 +-- .../integration/mcmp/RSMCMPAddon.java | 45 ++++++++++++++----- .../recipes/construction_core.json | 5 ++- .../refinedstorage/recipes/constructor.json | 4 +- .../refinedstorage/recipes/controller.json | 3 +- .../refinedstorage/recipes/crafter.json | 6 +-- .../recipes/crafting_monitor.json | 2 +- .../recipes/destruction_core.json | 5 ++- .../refinedstorage/recipes/destructor.json | 4 +- .../refinedstorage/recipes/detector.json | 2 +- .../refinedstorage/recipes/disk_drive.json | 2 +- .../recipes/disk_manipulator.json | 4 +- .../refinedstorage/recipes/exporter.json | 4 +- .../recipes/external_storage.json | 7 ++- .../recipes/{grid_filter.json => filter.json} | 2 +- .../assets/refinedstorage/recipes/grid.json | 9 ++-- .../refinedstorage/recipes/importer.json | 4 +- .../refinedstorage/recipes/network_card.json | 2 +- .../recipes/network_receiver.json | 6 +-- .../recipes/network_transmitter.json | 6 +-- .../refinedstorage/recipes/portable_grid.json | 9 ++-- .../assets/refinedstorage/recipes/reader.json | 4 +- .../refinedstorage/recipes/security_card.json | 2 +- .../refinedstorage/recipes/stack_upgrade.json | 2 +- .../recipes/storage_monitor.json | 6 +-- .../refinedstorage/recipes/upgrade.json | 5 ++- .../recipes/wireless_crafting_monitor.json | 5 ++- .../recipes/wireless_fluid_grid.json | 5 ++- .../refinedstorage/recipes/wireless_grid.json | 8 ++-- .../recipes/wireless_transmitter.json | 2 +- .../assets/refinedstorage/recipes/wrench.json | 2 +- .../assets/refinedstorage/recipes/writer.json | 4 +- 36 files changed, 119 insertions(+), 78 deletions(-) rename src/main/resources/assets/refinedstorage/recipes/{grid_filter.json => filter.json} (87%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3710b7d56..f13e248ae 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Refined Storage Changelog +### 1.5.1 +- Updated Forge to 2329 (raoulvdberge) +- Re-added MCMultiPart support (raoulvdberge) +- Added back crafting recipes (raoulvdberge) + ### 1.5 - Port to Minecraft 1.12 (raoulvdberge) - Removed MCMultiPart support (will be re-added as soon as MCMultiPart for MC 1.12 is available) (raoulvdberge) diff --git a/build.gradle b/build.gradle index a3fd55b17..6eb8ac961 100755 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 minecraft { - version = "1.12-14.21.0.2327" + version = "1.12-14.21.0.2329" runDir = "run" useDepAts = true mappings = "snapshot_20170615" @@ -53,7 +53,7 @@ dependencies { deobfCompile "mezz.jei:jei_1.12:4.6.0.61:api" runtime "mezz.jei:jei_1.12:4.6.0.61" deobfCompile "net.darkhax.tesla:Tesla-1.12:1.0.58" - // deobfCompile "MCMultiPart2:MCMultiPart-exp:2.0.0_19" + deobfCompile "MCMultiPart2:MCMultiPart-exp:2.0.0_26" // deobfCompile "li.cil.oc:OpenComputers:MC1.11.2-1.7.0.28:api" } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RS.java b/src/main/java/com/raoulvdberge/refinedstorage/RS.java index 78e42a939..e489678a6 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/RS.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RS.java @@ -15,7 +15,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -@Mod(modid = RS.ID, version = RS.VERSION, guiFactory = RS.GUI_FACTORY, updateJSON = RS.UPDATE_JSON) +@Mod(modid = RS.ID, version = RS.VERSION, dependencies = RS.DEPENDENCIES, guiFactory = RS.GUI_FACTORY, updateJSON = RS.UPDATE_JSON) public final class RS { static { FluidRegistry.enableUniversalBucket(); @@ -23,6 +23,7 @@ public final class RS { public static final String ID = "refinedstorage"; public static final String VERSION = "1.5.1"; + public static final String DEPENDENCIES = "required-after:forge@[14.21.0.2329,);"; public static final String GUI_FACTORY = "com.raoulvdberge.refinedstorage.gui.config.ModGuiFactory"; public static final String UPDATE_JSON = "https://refinedstorage.raoulvdberge.com/update"; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/PartCable.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/PartCable.java index d5b9b7a50..aaffae8f1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/PartCable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/PartCable.java @@ -1,4 +1,4 @@ -/*package com.raoulvdberge.refinedstorage.integration.mcmp; +package com.raoulvdberge.refinedstorage.integration.mcmp; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.block.BlockCable; @@ -54,4 +54,4 @@ public class PartCable implements IMultipart { public void onPartChanged(IPartInfo part, IPartInfo otherPart) { API.instance().discoverNode(part.getActualWorld(), part.getContainer().getPartPos()); } -}*/ +} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/PartCableTile.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/PartCableTile.java index 446afcb92..601979f71 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/PartCableTile.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/PartCableTile.java @@ -1,4 +1,4 @@ -/*package com.raoulvdberge.refinedstorage.integration.mcmp; +package com.raoulvdberge.refinedstorage.integration.mcmp; import mcmultipart.api.container.IPartInfo; import mcmultipart.api.multipart.IMultipartTile; @@ -25,5 +25,4 @@ public class PartCableTile implements IMultipartTile { public IPartInfo getInfo() { return info; } -}*/ - +} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/RSMCMPAddon.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/RSMCMPAddon.java index 068d5b483..226b56258 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/RSMCMPAddon.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/RSMCMPAddon.java @@ -1,21 +1,42 @@ package com.raoulvdberge.refinedstorage.integration.mcmp; +import com.raoulvdberge.refinedstorage.RSBlocks; +import com.raoulvdberge.refinedstorage.block.BlockCable; import com.raoulvdberge.refinedstorage.tile.*; +import mcmultipart.api.addon.IMCMPAddon; +import mcmultipart.api.addon.MCMPAddon; +import mcmultipart.api.container.IPartInfo; +import mcmultipart.api.multipart.IMultipart; +import mcmultipart.api.multipart.IMultipartRegistry; +import mcmultipart.api.multipart.IMultipartTile; +import mcmultipart.api.multipart.MultipartOcclusionHelper; +import mcmultipart.api.ref.MCMPCapabilities; +import mcmultipart.api.slot.EnumCenterSlot; +import mcmultipart.block.BlockMultipartContainer; +import mcmultipart.block.TileMultipartContainer; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; +import java.util.Optional; -//@MCMPAddon -public class RSMCMPAddon /*implements IMCMPAddon*/ { - /*@Override +@MCMPAddon +public class RSMCMPAddon implements IMCMPAddon { + @Override public void registerParts(IMultipartRegistry registry) { MinecraftForge.EVENT_BUS.register(this); @@ -32,7 +53,7 @@ public class RSMCMPAddon /*implements IMCMPAddon*/ { private void register(IMultipartRegistry registry, BlockCable block) { registry.registerPartWrapper(block, new PartCable(block)); registry.registerStackWrapper(Item.getItemFromBlock(block), s -> true, block); - }*/ + } @SubscribeEvent public void onAttachCapability(AttachCapabilitiesEvent e) { @@ -58,7 +79,7 @@ public class RSMCMPAddon /*implements IMCMPAddon*/ { } private void register(AttachCapabilitiesEvent e, String id) { - /*e.addCapability(new ResourceLocation("refinedstorage:" + id), new ICapabilityProvider() { + e.addCapability(new ResourceLocation("refinedstorage:" + id), new ICapabilityProvider() { private PartCableTile tile; @Override @@ -79,11 +100,11 @@ public class RSMCMPAddon /*implements IMCMPAddon*/ { return null; } - });*/ + }); } public static boolean hasConnectionWith(TileEntity tile, List boxes) { - /*if (tile != null && tile.hasCapability(MCMPCapabilities.MULTIPART_TILE, null)) { + if (tile != null && tile.hasCapability(MCMPCapabilities.MULTIPART_TILE, null)) { IMultipartTile multipartTile = tile.getCapability(MCMPCapabilities.MULTIPART_TILE, null); if (multipartTile instanceof PartCableTile && ((PartCableTile) multipartTile).getInfo() != null) { @@ -95,7 +116,7 @@ public class RSMCMPAddon /*implements IMCMPAddon*/ { } } } - }*/ + } return true; } @@ -104,13 +125,13 @@ public class RSMCMPAddon /*implements IMCMPAddon*/ { public static TileEntity unwrapTile(IBlockAccess world, BlockPos pos) { TileEntity tile = world.getTileEntity(pos); - /*if (tile instanceof TileMultipartContainer.Ticking) { + if (tile instanceof TileMultipartContainer.Ticking) { Optional multipartTile = ((TileMultipartContainer.Ticking) tile).getPartTile(EnumCenterSlot.CENTER); if (multipartTile.isPresent()) { return multipartTile.get().getTileEntity(); } - }*/ + } return tile; } @@ -118,7 +139,7 @@ public class RSMCMPAddon /*implements IMCMPAddon*/ { public static Block unwrapBlock(IBlockAccess world, BlockPos pos) { IBlockState state = world.getBlockState(pos); - /*if (state.getBlock() instanceof BlockMultipartContainer) { + if (state.getBlock() instanceof BlockMultipartContainer) { Optional multipartContainer = BlockMultipartContainer.getTile(world, pos); if (multipartContainer.isPresent()) { @@ -128,7 +149,7 @@ public class RSMCMPAddon /*implements IMCMPAddon*/ { return info.get().getPart().getBlock(); } } - }*/ + } return state.getBlock(); } diff --git a/src/main/resources/assets/refinedstorage/recipes/construction_core.json b/src/main/resources/assets/refinedstorage/recipes/construction_core.json index 4b590acec..b6d1b1b66 100644 --- a/src/main/resources/assets/refinedstorage/recipes/construction_core.json +++ b/src/main/resources/assets/refinedstorage/recipes/construction_core.json @@ -2,13 +2,14 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "refinedstorage:basic_processor" + "item": "#basic_processor" }, { "item": "minecraft:glowstone_dust" } ], "result": { - "item": "refinedstorage:construction_core" + "item": "refinedstorage:core", + "data": 0 } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/constructor.json b/src/main/resources/assets/refinedstorage/recipes/constructor.json index a9f089724..a0bd58bea 100644 --- a/src/main/resources/assets/refinedstorage/recipes/constructor.json +++ b/src/main/resources/assets/refinedstorage/recipes/constructor.json @@ -10,7 +10,7 @@ "item": "refinedstorage:quartz_enriched_iron" }, "C": { - "item": "refinedstorage:construction_core" + "item": "#construction_core" }, "R": { "item": "minecraft:redstone" @@ -19,7 +19,7 @@ "item": "refinedstorage:cable" }, "I": { - "item": "refinedstorage:improved_processor" + "item": "#improved_processor" } }, "result": { diff --git a/src/main/resources/assets/refinedstorage/recipes/controller.json b/src/main/resources/assets/refinedstorage/recipes/controller.json index 588a493bc..0f65af52d 100644 --- a/src/main/resources/assets/refinedstorage/recipes/controller.json +++ b/src/main/resources/assets/refinedstorage/recipes/controller.json @@ -21,6 +21,7 @@ } }, "result": { - "item": "refinedstorage:controller" + "item": "refinedstorage:controller", + "data": 0 } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/crafter.json b/src/main/resources/assets/refinedstorage/recipes/crafter.json index 760358ed1..28c00f45d 100644 --- a/src/main/resources/assets/refinedstorage/recipes/crafter.json +++ b/src/main/resources/assets/refinedstorage/recipes/crafter.json @@ -10,16 +10,16 @@ "item": "refinedstorage:quartz_enriched_iron" }, "C": { - "item": "refinedstorage:construction_core" + "item": "#construction_core" }, "A": { - "item": "refinedstorage:advanced_processor" + "item": "#advanced_processor" }, "M": { "item": "refinedstorage:machine_casing" }, "D": { - "item": "refinedstorage:destruction_core" + "item": "#destruction_core" } }, "result": { diff --git a/src/main/resources/assets/refinedstorage/recipes/crafting_monitor.json b/src/main/resources/assets/refinedstorage/recipes/crafting_monitor.json index b896fd028..fa206e4ac 100644 --- a/src/main/resources/assets/refinedstorage/recipes/crafting_monitor.json +++ b/src/main/resources/assets/refinedstorage/recipes/crafting_monitor.json @@ -17,7 +17,7 @@ "item": "refinedstorage:machine_casing" }, "P": { - "item": "refinedstorage:improved_processor" + "item": "#improved_processor" } }, "result": { diff --git a/src/main/resources/assets/refinedstorage/recipes/destruction_core.json b/src/main/resources/assets/refinedstorage/recipes/destruction_core.json index 49e96fbd7..55fff054a 100644 --- a/src/main/resources/assets/refinedstorage/recipes/destruction_core.json +++ b/src/main/resources/assets/refinedstorage/recipes/destruction_core.json @@ -2,13 +2,14 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "refinedstorage:basic_processor" + "item": "#basic_processor" }, { "item": "minecraft:quartz" } ], "result": { - "item": "refinedstorage:destruction_core" + "item": "refinedstorage:core", + "data": 1 } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/destructor.json b/src/main/resources/assets/refinedstorage/recipes/destructor.json index ce5113980..ee4f08ad3 100644 --- a/src/main/resources/assets/refinedstorage/recipes/destructor.json +++ b/src/main/resources/assets/refinedstorage/recipes/destructor.json @@ -10,7 +10,7 @@ "item": "refinedstorage:quartz_enriched_iron" }, "D": { - "item": "refinedstorage:destruction_core" + "item": "#destruction_core" }, "R": { "item": "minecraft:redstone" @@ -19,7 +19,7 @@ "item": "refinedstorage:cable" }, "I": { - "item": "refinedstorage:improved_processor" + "item": "#improved_processor" } }, "result": { diff --git a/src/main/resources/assets/refinedstorage/recipes/detector.json b/src/main/resources/assets/refinedstorage/recipes/detector.json index ee5ebd932..79a87275e 100644 --- a/src/main/resources/assets/refinedstorage/recipes/detector.json +++ b/src/main/resources/assets/refinedstorage/recipes/detector.json @@ -19,7 +19,7 @@ "item": "refinedstorage:machine_casing" }, "P": { - "item": "refinedstorage:improved_processor" + "item": "#improved_processor" } }, "result": { diff --git a/src/main/resources/assets/refinedstorage/recipes/disk_drive.json b/src/main/resources/assets/refinedstorage/recipes/disk_drive.json index 957932e0b..c70b1196d 100644 --- a/src/main/resources/assets/refinedstorage/recipes/disk_drive.json +++ b/src/main/resources/assets/refinedstorage/recipes/disk_drive.json @@ -17,7 +17,7 @@ "item": "refinedstorage:machine_casing" }, "P": { - "item": "refinedstorage:advanced_processor" + "item": "#advanced_processor" } }, "result": { diff --git a/src/main/resources/assets/refinedstorage/recipes/disk_manipulator.json b/src/main/resources/assets/refinedstorage/recipes/disk_manipulator.json index e6c2ea727..c7789e875 100644 --- a/src/main/resources/assets/refinedstorage/recipes/disk_manipulator.json +++ b/src/main/resources/assets/refinedstorage/recipes/disk_manipulator.json @@ -13,13 +13,13 @@ "item": "refinedstorage:storage_housing" }, "C": { - "item": "refinedstorage:construction_core" + "item": "#construction_core" }, "M": { "item": "refinedstorage:machine_casing" }, "D": { - "item": "refinedstorage:destruction_core" + "item": "#destruction_core" } }, "result": { diff --git a/src/main/resources/assets/refinedstorage/recipes/exporter.json b/src/main/resources/assets/refinedstorage/recipes/exporter.json index 240ae82db..ade5c2f44 100644 --- a/src/main/resources/assets/refinedstorage/recipes/exporter.json +++ b/src/main/resources/assets/refinedstorage/recipes/exporter.json @@ -5,10 +5,10 @@ "item": "refinedstorage:cable" }, { - "item": "refinedstorage:construction_core" + "item": "#construction_core" }, { - "item": "refinedstorage:improved_processor" + "item": "#improved_processor" } ], "result": { diff --git a/src/main/resources/assets/refinedstorage/recipes/external_storage.json b/src/main/resources/assets/refinedstorage/recipes/external_storage.json index 17fa78fc5..f0f497076 100644 --- a/src/main/resources/assets/refinedstorage/recipes/external_storage.json +++ b/src/main/resources/assets/refinedstorage/recipes/external_storage.json @@ -7,11 +7,14 @@ ], "key": { "C": { - "item": "refinedstorage:construction_core" + "item": "#construction_core" }, "E": { "item": "refinedstorage:quartz_enriched_iron" }, + "D": { + "item": "#destruction_core" + }, "H": { "type": "forge:ore_dict", "ore": "chest" @@ -20,7 +23,7 @@ "item": "refinedstorage:cable" }, "P": { - "item": "refinedstorage:improved_processor" + "item": "#improved_processor" } }, "result": { diff --git a/src/main/resources/assets/refinedstorage/recipes/grid_filter.json b/src/main/resources/assets/refinedstorage/recipes/filter.json similarity index 87% rename from src/main/resources/assets/refinedstorage/recipes/grid_filter.json rename to src/main/resources/assets/refinedstorage/recipes/filter.json index 34d289424..1b15c6ab7 100644 --- a/src/main/resources/assets/refinedstorage/recipes/grid_filter.json +++ b/src/main/resources/assets/refinedstorage/recipes/filter.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "refinedstorage:grid_filter" + "item": "refinedstorage:filter" } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/grid.json b/src/main/resources/assets/refinedstorage/recipes/grid.json index 8d28801ff..bb2af0ddd 100644 --- a/src/main/resources/assets/refinedstorage/recipes/grid.json +++ b/src/main/resources/assets/refinedstorage/recipes/grid.json @@ -10,19 +10,20 @@ "item": "refinedstorage:quartz_enriched_iron" }, "P": { - "item": "refinedstorage:improved_processor" + "item": "#improved_processor" }, "C": { - "item": "refinedstorage:construction_core" + "item": "#construction_core" }, "D": { - "item": "refinedstorage:destruction_core" + "item": "#destruction_core" }, "M": { "item": "refinedstorage:machine_casing" } }, "result": { - "item": "refinedstorage:grid" + "item": "refinedstorage:grid", + "data": 0 } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/importer.json b/src/main/resources/assets/refinedstorage/recipes/importer.json index d87249700..15c052499 100644 --- a/src/main/resources/assets/refinedstorage/recipes/importer.json +++ b/src/main/resources/assets/refinedstorage/recipes/importer.json @@ -5,10 +5,10 @@ "item": "refinedstorage:cable" }, { - "item": "refinedstorage:destruction_core" + "item": "#destruction_core" }, { - "item": "refinedstorage:improved_processor" + "item": "#improved_processor" } ], "result": { diff --git a/src/main/resources/assets/refinedstorage/recipes/network_card.json b/src/main/resources/assets/refinedstorage/recipes/network_card.json index cd26ca3a0..4b81a6290 100644 --- a/src/main/resources/assets/refinedstorage/recipes/network_card.json +++ b/src/main/resources/assets/refinedstorage/recipes/network_card.json @@ -13,7 +13,7 @@ "item": "minecraft:paper" }, "A": { - "item": "refinedstorage:advanced_processor" + "item": "#advanced_processor" } }, "result": { diff --git a/src/main/resources/assets/refinedstorage/recipes/network_receiver.json b/src/main/resources/assets/refinedstorage/recipes/network_receiver.json index a539d6c78..64ec78032 100644 --- a/src/main/resources/assets/refinedstorage/recipes/network_receiver.json +++ b/src/main/resources/assets/refinedstorage/recipes/network_receiver.json @@ -10,16 +10,16 @@ "item": "minecraft:ender_pearl" }, "C": { - "item": "refinedstorage:construction_core" + "item": "#construction_core" }, "M": { "item": "refinedstorage:machine_casing" }, "D": { - "item": "refinedstorage:destruction_core" + "item": "#destruction_core" }, "A": { - "item": "refinedstorage:advanced_processor" + "item": "#advanced_processor" } }, "result": { diff --git a/src/main/resources/assets/refinedstorage/recipes/network_transmitter.json b/src/main/resources/assets/refinedstorage/recipes/network_transmitter.json index 4af99fab7..08b681876 100644 --- a/src/main/resources/assets/refinedstorage/recipes/network_transmitter.json +++ b/src/main/resources/assets/refinedstorage/recipes/network_transmitter.json @@ -10,16 +10,16 @@ "item": "minecraft:ender_pearl" }, "C": { - "item": "refinedstorage:construction_core" + "item": "#construction_core" }, "M": { "item": "refinedstorage:machine_casing" }, "D": { - "item": "refinedstorage:destruction_core" + "item": "#destruction_core" }, "A": { - "item": "refinedstorage:advanced_processor" + "item": "#advanced_processor" } }, "result": { diff --git a/src/main/resources/assets/refinedstorage/recipes/portable_grid.json b/src/main/resources/assets/refinedstorage/recipes/portable_grid.json index 3eba1b0d2..85802bd3b 100644 --- a/src/main/resources/assets/refinedstorage/recipes/portable_grid.json +++ b/src/main/resources/assets/refinedstorage/recipes/portable_grid.json @@ -10,13 +10,16 @@ "item": "refinedstorage:quartz_enriched_iron" }, "G": { - "item": "refinedstorage:grid" + "item": "refinedstorage:grid", + "data": 0 }, "C": { - "item": "refinedstorage:controller" + "item": "refinedstorage:controller", + "data": 0 } }, "result": { - "item": "refinedstorage:portable_grid" + "item": "refinedstorage:portable_grid", + "data": 0 } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/reader.json b/src/main/resources/assets/refinedstorage/recipes/reader.json index 0ea91082d..4b5ec8edc 100644 --- a/src/main/resources/assets/refinedstorage/recipes/reader.json +++ b/src/main/resources/assets/refinedstorage/recipes/reader.json @@ -10,7 +10,7 @@ "item": "refinedstorage:quartz_enriched_iron" }, "D": { - "item": "refinedstorage:destruction_core" + "item": "#destruction_core" }, "R": { "item": "minecraft:redstone" @@ -19,7 +19,7 @@ "item": "refinedstorage:cable" }, "I": { - "item": "refinedstorage:advanced_processor" + "item": "#advanced_processor" } }, "result": { diff --git a/src/main/resources/assets/refinedstorage/recipes/security_card.json b/src/main/resources/assets/refinedstorage/recipes/security_card.json index b8d01d3b8..527e64768 100644 --- a/src/main/resources/assets/refinedstorage/recipes/security_card.json +++ b/src/main/resources/assets/refinedstorage/recipes/security_card.json @@ -13,7 +13,7 @@ "item": "refinedstorage:network_card" }, "A": { - "item": "refinedstorage:advanced_processor" + "item": "#advanced_processor" } }, "result": { diff --git a/src/main/resources/assets/refinedstorage/recipes/stack_upgrade.json b/src/main/resources/assets/refinedstorage/recipes/stack_upgrade.json index 93f6a51c7..eda50bbf2 100644 --- a/src/main/resources/assets/refinedstorage/recipes/stack_upgrade.json +++ b/src/main/resources/assets/refinedstorage/recipes/stack_upgrade.json @@ -10,7 +10,7 @@ "item": "minecraft:sugar" }, "S": { - "item": "minecraft:upgrade", + "item": "refinedstorage:upgrade", "data": 2 } }, diff --git a/src/main/resources/assets/refinedstorage/recipes/storage_monitor.json b/src/main/resources/assets/refinedstorage/recipes/storage_monitor.json index 68d7abb98..ea36d977b 100644 --- a/src/main/resources/assets/refinedstorage/recipes/storage_monitor.json +++ b/src/main/resources/assets/refinedstorage/recipes/storage_monitor.json @@ -7,10 +7,10 @@ ], "key": { "P": { - "item": "refinedstorage:basic_processor" + "item": "#basic_processor" }, "C": { - "item": "refinedstorage:construction_core" + "item": "#construction_core" }, "G": { "type": "forge:ore_dict", @@ -23,7 +23,7 @@ "item": "refinedstorage:machine_casing" }, "D": { - "item": "refinedstorage:destruction_core" + "item": "#destruction_core" } }, "result": { diff --git a/src/main/resources/assets/refinedstorage/recipes/upgrade.json b/src/main/resources/assets/refinedstorage/recipes/upgrade.json index 156ee3483..97fba6a3d 100644 --- a/src/main/resources/assets/refinedstorage/recipes/upgrade.json +++ b/src/main/resources/assets/refinedstorage/recipes/upgrade.json @@ -14,10 +14,11 @@ "ore": "blockGlass" }, "P": { - "item": "refinedstorage:improved_processor" + "item": "#improved_processor" } }, "result": { - "item": "refinedstorage:upgrade" + "item": "refinedstorage:upgrade", + "data": 0 } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/wireless_crafting_monitor.json b/src/main/resources/assets/refinedstorage/recipes/wireless_crafting_monitor.json index 7d584d928..6d16c435a 100644 --- a/src/main/resources/assets/refinedstorage/recipes/wireless_crafting_monitor.json +++ b/src/main/resources/assets/refinedstorage/recipes/wireless_crafting_monitor.json @@ -16,10 +16,11 @@ "item": "refinedstorage:crafting_monitor" }, "A": { - "item": "refinedstorage:advanced_processor" + "item": "#advanced_processor" } }, "result": { - "item": "refinedstorage:wireless_crafting_monitor" + "item": "refinedstorage:wireless_crafting_monitor", + "data": 0 } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/wireless_fluid_grid.json b/src/main/resources/assets/refinedstorage/recipes/wireless_fluid_grid.json index be3221ae9..d85aae2a9 100644 --- a/src/main/resources/assets/refinedstorage/recipes/wireless_fluid_grid.json +++ b/src/main/resources/assets/refinedstorage/recipes/wireless_fluid_grid.json @@ -17,10 +17,11 @@ "data": 3 }, "A": { - "item": "refinedstorage:advanced_processor" + "item": "#advanced_processor" } }, "result": { - "item": "refinedstorage:wireless_fluid_grid" + "item": "refinedstorage:wireless_fluid_grid", + "data": 0 } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/wireless_grid.json b/src/main/resources/assets/refinedstorage/recipes/wireless_grid.json index 4b9637fe2..18622b886 100644 --- a/src/main/resources/assets/refinedstorage/recipes/wireless_grid.json +++ b/src/main/resources/assets/refinedstorage/recipes/wireless_grid.json @@ -13,13 +13,15 @@ "item": "minecraft:ender_pearl" }, "G": { - "item": "refinedstorage:grid" + "item": "refinedstorage:grid", + "data": 0 }, "A": { - "item": "refinedstorage:advanced_processor" + "item": "#advanced_processor" } }, "result": { - "item": "refinedstorage:wireless_grid" + "item": "refinedstorage:wireless_grid", + "data": 0 } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/wireless_transmitter.json b/src/main/resources/assets/refinedstorage/recipes/wireless_transmitter.json index 8b8a76f87..0d4dc59fb 100644 --- a/src/main/resources/assets/refinedstorage/recipes/wireless_transmitter.json +++ b/src/main/resources/assets/refinedstorage/recipes/wireless_transmitter.json @@ -10,7 +10,7 @@ "item": "refinedstorage:quartz_enriched_iron" }, "A": { - "item": "refinedstorage:advanced_processor" + "item": "#advanced_processor" }, "M": { "item": "refinedstorage:machine_casing" diff --git a/src/main/resources/assets/refinedstorage/recipes/wrench.json b/src/main/resources/assets/refinedstorage/recipes/wrench.json index 2dfb0946a..cb0722742 100644 --- a/src/main/resources/assets/refinedstorage/recipes/wrench.json +++ b/src/main/resources/assets/refinedstorage/recipes/wrench.json @@ -10,7 +10,7 @@ "item": "refinedstorage:quartz_enriched_iron" }, "P": { - "item": "refinedstorage:basic_processor" + "item": "#basic_processor" } }, "result": { diff --git a/src/main/resources/assets/refinedstorage/recipes/writer.json b/src/main/resources/assets/refinedstorage/recipes/writer.json index 38e885e7c..547fb93d7 100644 --- a/src/main/resources/assets/refinedstorage/recipes/writer.json +++ b/src/main/resources/assets/refinedstorage/recipes/writer.json @@ -10,7 +10,7 @@ "item": "refinedstorage:quartz_enriched_iron" }, "C": { - "item": "refinedstorage:construction_core" + "item": "#construction_core" }, "R": { "item": "minecraft:redstone" @@ -19,7 +19,7 @@ "item": "refinedstorage:cable" }, "I": { - "item": "refinedstorage:advanced_processor" + "item": "#advanced_processor" } }, "result": {