From ac173a5a75fb242ae3bfe4f90c1adb0a3ca3457b Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 8 Mar 2019 13:34:55 +0000 Subject: [PATCH] Add scrap box to matter fab, fixes https://github.com/TechReborn/TechReborn/issues/1682 --- src/main/java/techreborn/init/IC2Duplicates.java | 1 + src/main/java/techreborn/tiles/TileMatterFabricator.java | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/techreborn/init/IC2Duplicates.java b/src/main/java/techreborn/init/IC2Duplicates.java index 73a6b3e72..755ae1b91 100644 --- a/src/main/java/techreborn/init/IC2Duplicates.java +++ b/src/main/java/techreborn/init/IC2Duplicates.java @@ -69,6 +69,7 @@ public enum IC2Duplicates { THICK_NEUTRON_REFLECTOR(ItemParts.getPartByName("thick_neutron_reflector")), IRIDIUM_NEUTRON_REFLECTOR(ItemParts.getPartByName("iridium_neutron_reflector")), SCRAP(ItemParts.getPartByName("scrap")), + SCRAP_BOX(new ItemStack(ModItems.SCRAP_BOX)), FREQ_TRANSMITTER(new ItemStack(ModItems.FREQUENCY_TRANSMITTER)), //Classical dedupes diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index 957b807e2..bdcc3fce8 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -1,4 +1,4 @@ -/* + /* * This file is part of TechReborn, licensed under the MIT License (MIT). * * Copyright (c) 2018 TechReborn @@ -122,6 +122,11 @@ public class TileMatterFabricator extends TilePowerAcceptor return 200; } } + if (IC2Duplicates.SCRAP_BOX.hasIC2Stack()) { + if (ItemUtils.isInputEqual(itemStack, IC2Duplicates.SCRAP_BOX.getIc2Stack(), true, true, true)) { + return 2000; + } + } return 0; }