From 721bb484ee5cc38f3e522d15cab51715e43a2638 Mon Sep 17 00:00:00 2001
From: Dries007 <admin@dries007.net>
Date: Sun, 30 Sep 2018 13:45:00 +0200
Subject: [PATCH] Fixed merge.

Signed-off-by: Dries007 <admin@dries007.net>
---
 src/main/java/net/dries007/tfc/objects/blocks/BlocksTFC.java | 2 +-
 src/main/java/net/dries007/tfc/objects/te/TEFirePit.java     | 5 ++---
 src/main/java/net/dries007/tfc/objects/te/TEPitKiln.java     | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/dries007/tfc/objects/blocks/BlocksTFC.java b/src/main/java/net/dries007/tfc/objects/blocks/BlocksTFC.java
index 50ce5ce1a0..a1f477707a 100644
--- a/src/main/java/net/dries007/tfc/objects/blocks/BlocksTFC.java
+++ b/src/main/java/net/dries007/tfc/objects/blocks/BlocksTFC.java
@@ -313,7 +313,7 @@ public static void registerBlocks(RegistryEvent.Register<Block> event)
             // doors are special
             allTrapDoorWoodBlocks.forEach(x -> inventoryItemBlocks.add(new ItemBlockTFC(x)));
             allChestBlocks.forEach(x -> normalItemBlocks.add(new ItemBlockTFC(x)));
-            allToolRackBlocks.forEach(x -> normalItemBlocks.put(x, ItemBlockTFC.class));
+            allToolRackBlocks.forEach(x -> normalItemBlocks.add(new ItemBlockTFC(x)));
         }
 
         {
diff --git a/src/main/java/net/dries007/tfc/objects/te/TEFirePit.java b/src/main/java/net/dries007/tfc/objects/te/TEFirePit.java
index c5893775e9..1e4c6de5f3 100644
--- a/src/main/java/net/dries007/tfc/objects/te/TEFirePit.java
+++ b/src/main/java/net/dries007/tfc/objects/te/TEFirePit.java
@@ -1,7 +1,6 @@
 /*
  * Work under Copyright. Licensed under the EUPL.
  * See the project README.md and LICENSE.txt for more information.
- *
  */
 
 package net.dries007.tfc.objects.te;
@@ -15,7 +14,7 @@
 import net.minecraft.util.ITickable;
 
 import net.dries007.tfc.api.capability.heat.CapabilityItemHeat;
-import net.dries007.tfc.util.Helpers;
+import net.dries007.tfc.util.OreDictionaryHelper;
 
 import static net.dries007.tfc.objects.blocks.BlockFirePit.LIT;
 
@@ -28,7 +27,7 @@ public class TEFirePit extends TESidedInventory implements ITickable
 
     private static boolean isStackFuel(ItemStack stack)
     {
-        return Helpers.doesStackMatchOre(stack, "logWood");
+        return OreDictionaryHelper.doesStackMatchOre(stack, "logWood");
     }
 
     private static boolean isStackCookable(ItemStack stack)
diff --git a/src/main/java/net/dries007/tfc/objects/te/TEPitKiln.java b/src/main/java/net/dries007/tfc/objects/te/TEPitKiln.java
index be3b8415f2..adfd581438 100644
--- a/src/main/java/net/dries007/tfc/objects/te/TEPitKiln.java
+++ b/src/main/java/net/dries007/tfc/objects/te/TEPitKiln.java
@@ -33,8 +33,8 @@
 import net.dries007.tfc.api.types.Metal;
 import net.dries007.tfc.objects.blocks.BlocksTFC;
 import net.dries007.tfc.objects.items.ItemsTFC;
-import net.dries007.tfc.util.Helpers;
 import net.dries007.tfc.util.IFireable;
+import net.dries007.tfc.util.OreDictionaryHelper;
 
 @MethodsReturnNonnullByDefault
 public class TEPitKiln extends TileEntity implements ITickable
@@ -205,7 +205,7 @@ public void onRightClick(EntityPlayer player, ItemStack item, boolean x, boolean
         }
         if (count < STRAW_NEEDED) return;
         count = getLogCount();
-        if (Helpers.doesStackMatchOre(item, "logWood") && count < WOOD_NEEDED)
+        if (OreDictionaryHelper.doesStackMatchOre(item, "logWood") && count < WOOD_NEEDED)
         {
             addLog(item.splitStack(1));
             updateBlock();