Under 1300 errors left now, started on packet/network stuffs.

This commit is contained in:
Ben Spiers committed 2014-04-20 21:15:44 +01:00
1 parent 86777694e5
commit 31938e8b68
151 files changed
+1796 -1510

No files matched your search

+8 -6
View File
@@ -3,6 +3,8 @@ package mekanism.api;
import java.util.HashSet;
import java.util.Set;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import cpw.mods.fml.common.eventhandler.Event;
import net.minecraftforge.oredict.OreDictionary;
@@ -11,11 +13,11 @@ public class MekanismAPI
//Add a BlockInfo value here if you don't want a certain block to be picked up by cardboard boxes
private static Set<ItemInfo> cardboardBoxIgnore = new HashSet<ItemInfo>();
public static boolean isBlockCompatible(int id, int meta)
public static boolean isBlockCompatible(Item item, int meta)
{
for(ItemInfo i : cardboardBoxIgnore)
{
if(i.id == id && (i.meta == OreDictionary.WILDCARD_VALUE || i.meta == meta))
if(i.block == item && (i.meta == OreDictionary.WILDCARD_VALUE || i.meta == meta))
{
return false;
}
@@ -24,14 +26,14 @@ public class MekanismAPI
return true;
}
public static void addBoxBlacklist(int id, int meta)
public static void addBoxBlacklist(Block block, int meta)
{
cardboardBoxIgnore.add(new ItemInfo(id, meta));
cardboardBoxIgnore.add(new ItemInfo(block, meta));
}
public static void removeBoxBlacklist(int id, int meta)
public static void removeBoxBlacklist(Block block, int meta)
{
cardboardBoxIgnore.remove(new ItemInfo(id, meta));
cardboardBoxIgnore.remove(new ItemInfo(block, meta));
}
public static Set<ItemInfo> getBoxIgnore()