Skip to content
Permalink
Browse files

Fixed merge.

Signed-off-by: Dries007 <admin@dries007.net>
  • Loading branch information...
dries007 committed Sep 30, 2018
1 parent 69e5862 commit 721bb484ee5cc38f3e522d15cab51715e43a2638
@@ -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)));
}

{
@@ -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 @@

private static boolean isStackFuel(ItemStack stack)
{
return Helpers.doesStackMatchOre(stack, "logWood");
return OreDictionaryHelper.doesStackMatchOre(stack, "logWood");
}

private static boolean isStackCookable(ItemStack stack)
@@ -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();

0 comments on commit 721bb48

Please sign in to comment.
You can’t perform that action at this time.