Rename files to be more consistent. Add missing headers, tidy up Utils

This commit is contained in:
mezz committed 2015-09-25 15:09:54 -07:00
1 parent 37dd0efee2
commit 1e89bab556
576 files changed
+3811 -3923

No files matched your search

+8 -8
View File
@@ -13,7 +13,7 @@ import net.minecraft.item.ItemFirework;
import net.minecraft.item.ItemStack;
import forestry.apiculture.items.ItemHoneycomb;
import forestry.core.utils.StackUtils;
import forestry.core.utils.ItemStackUtil;
import org.junit.Assert;
import org.junit.Before;
@@ -34,15 +34,15 @@ public class ItemStackTest {
@Test
public void testEquality() {
Assert.assertTrue("Equal ItemStacks are identical.", StackUtils.isIdenticalItem(comb1, comb1));
Assert.assertTrue("Equal ItemStacks are identical.", StackUtils.isIdenticalItem(comb2, comb2));
Assert.assertFalse("Unequal ItemStacks are not identical.", StackUtils.isIdenticalItem(comb1, comb2));
Assert.assertTrue("Equal ItemStacks are identical.", ItemStackUtil.isIdenticalItem(comb1, comb1));
Assert.assertTrue("Equal ItemStacks are identical.", ItemStackUtil.isIdenticalItem(comb2, comb2));
Assert.assertFalse("Unequal ItemStacks are not identical.", ItemStackUtil.isIdenticalItem(comb1, comb2));
// OreDict crashes when minecraft hasn't loaded
// Assert.assertTrue("Different combs are crafting equivalent with Ore Dictionary.", StackUtils.isCraftingEquivalent(comb1, comb2, true, false));
// Assert.assertFalse("Different combs are not crafting equivalent without Ore Dictionary.", StackUtils.isCraftingEquivalent(comb1, comb2, false, false));
// Assert.assertTrue("Different combs are crafting equivalent with Ore Dictionary.", ItemStackUtil.isCraftingEquivalent(comb1, comb2, true, false));
// Assert.assertFalse("Different combs are not crafting equivalent without Ore Dictionary.", ItemStackUtil.isCraftingEquivalent(comb1, comb2, false, false));
//
// Assert.assertFalse("Different items are not crafting equivalent with Ore Dictionary.", StackUtils.isCraftingEquivalent(firework, comb1, true, false));
// Assert.assertFalse("Different items are not crafting equivalent without Ore Dictionary.", StackUtils.isCraftingEquivalent(firework, comb1, false, false));
// Assert.assertFalse("Different items are not crafting equivalent with Ore Dictionary.", ItemStackUtil.isCraftingEquivalent(firework, comb1, true, false));
// Assert.assertFalse("Different items are not crafting equivalent without Ore Dictionary.", ItemStackUtil.isCraftingEquivalent(firework, comb1, false, false));
}
}