Merge branch 'dev' into 3.6.0

This commit is contained in:
mezz committed 2015-06-19 00:34:41 -07:00
commit be16bf4491
221 files changed
+4876 -4644

No files matched your search

@@ -15,13 +15,15 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.StatCollector;
import net.minecraftforge.oredict.OreDictionary;
import forestry.api.storage.IBackpackDefinition;
import forestry.core.utils.StackUtils;
public class BackpackDefinition implements IBackpackDefinition {
@@ -30,7 +32,10 @@ public class BackpackDefinition implements IBackpackDefinition {
private final int primaryColor; // - c03384
private final int secondaryColor;
private final ArrayList<ItemStack> validItems = new ArrayList<ItemStack>();
private final List<String> validItemStacks = new ArrayList<String>();
private final List<Integer> validOreIds = new ArrayList<Integer>();
private final List<Class> validItemClasses = new ArrayList<Class>();
private final List<Class> validBlockClasses = new ArrayList<Class>();
public BackpackDefinition(String name, int primaryColor) {
this(name, primaryColor, 0xffffff);
@@ -75,19 +80,88 @@ public class BackpackDefinition implements IBackpackDefinition {
@Override
public void addValidItem(ItemStack validItem) {
if (validItem.getItem() != null) {
this.validItems.add(validItem);
if (validItem == null) {
return;
}
Item item = validItem.getItem();
if (item == null) {
return;
}
String itemStackString = item.delegate.name();
int meta = validItem.getItemDamage();
if (meta != OreDictionary.WILDCARD_VALUE) {
itemStackString = itemStackString + ':' + meta;
}
this.validItemStacks.add(itemStackString);
}
public void clearAllValid() {
validItemStacks.clear();
validOreIds.clear();
}
@Override
public void addValidItems(List<ItemStack> validItems) {
for (ItemStack validItem : validItems) {
addValidItem(validItem);
}
}
public ArrayList<ItemStack> getValidItems() {
return validItems;
public void addValidOreDictName(String oreDictName) {
// if (OreDictionary.doesOreNameExist(oreDictName)) { //TODO: add this back when using a forge version that supports it
int oreId = OreDictionary.getOreID(oreDictName);
validOreIds.add(oreId);
// }
}
public void addValidOreDictNames(List<String> oreDictNames) {
for (String oreDictName : oreDictNames) {
addValidOreDictName(oreDictName);
}
}
public void addValidItemClass(Class itemClass) {
if (itemClass != null) {
validItemClasses.add(itemClass);
}
}
public void addValidItemClasses(List<Class> itemClasses) {
for (Class itemClass : itemClasses) {
addValidItemClass(itemClass);
}
}
public void addValidBlockClass(Class blockClass) {
if (blockClass != null) {
validBlockClasses.add(blockClass);
}
}
public void addValidBlockClasses(List<Class> blockClasses) {
for (Class blockClass : blockClasses) {
addValidBlockClass(blockClass);
}
}
public List<String> getValidItemStacks() {
return validItemStacks;
}
public List<Integer> getValidOreIds() {
return validOreIds;
}
public List<Class> getValidBlockClasses() {
return validBlockClasses;
}
public List<Class> getValidItemClasses() {
return validItemClasses;
}
// isValidItem can get called multiple times per tick if the player's inventory is full
@@ -96,20 +170,65 @@ public class BackpackDefinition implements IBackpackDefinition {
private final Map<ItemStack, Boolean> isValidItemCache = new ValidItemCache();
@Override
public boolean isValidItem(ItemStack itemstack) {
Boolean cached = isValidItemCache.get(itemstack);
if (cached != null) {
return cached;
public boolean isValidItem(ItemStack itemStack) {
if (itemStack == null) {
return false;
}
for (ItemStack stack : getValidItems()) {
if (StackUtils.isCraftingEquivalent(stack, itemstack, true, false)) {
isValidItemCache.put(itemstack, true);
Boolean isValid = isValidItemCache.get(itemStack);
if (isValid != null) {
return isValid;
}
isValid = isValidItemUncached(itemStack);
isValidItemCache.put(itemStack, isValid);
return isValid;
}
private boolean isValidItemUncached(ItemStack itemStack) {
Item item = itemStack.getItem();
if (item == null) {
return false;
}
String itemStackStringWild = item.delegate.name();
if (validItemStacks.contains(itemStackStringWild)) {
return true;
}
int meta = itemStack.getItemDamage();
if (meta != OreDictionary.WILDCARD_VALUE) {
String itemStackString = itemStackStringWild + ':' + meta;
if (validItemStacks.contains(itemStackString)) {
return true;
}
}
isValidItemCache.put(itemstack, false);
int[] oreIds = OreDictionary.getOreIDs(itemStack);
for (int oreId : oreIds) {
if (validOreIds.contains(oreId)) {
validItemStacks.add(itemStackStringWild);
return true;
}
}
for (Class itemClass : validItemClasses) {
if (itemClass.isInstance(item)) {
validItemStacks.add(itemStackStringWild);
return true;
}
}
Block block = Block.getBlockFromItem(item);
if (block != null) {
for (Class blockClass : validBlockClasses) {
if (blockClass.isInstance(block)) {
validItemStacks.add(itemStackStringWild);
return true;
}
}
}
return false;
}
@@ -15,7 +15,7 @@ import net.minecraft.entity.player.EntityPlayer;
import forestry.core.gui.ContainerItemInventory;
import forestry.core.gui.IGuiSelectable;
import forestry.core.gui.slots.SlotFiltered;
import forestry.core.network.PacketUpdate;
import forestry.core.network.PacketGuiSelect;
import forestry.storage.GuiHandlerStorage.PagedBackpackInventory;
public class ContainerNaturalistBackpack extends ContainerItemInventory<PagedBackpackInventory> implements IGuiSelectable {
@@ -32,11 +32,11 @@ public class ContainerNaturalistBackpack extends ContainerItemInventory<PagedBac
}
@Override
public void handleSelectionChange(EntityPlayer player, PacketUpdate packet) {
inventory.flipPage(player, packet.payload.intPayload[0]);
public void handleSelectionChange(EntityPlayer player, PacketGuiSelect packet) {
inventory.flipPage(player, packet.getPrimaryIndex());
}
@Override
public void setSelection(PacketUpdate packet) {
public void setSelection(PacketGuiSelect packet) {
}
}
@@ -29,8 +29,8 @@ public class ItemNaturalistBackpack extends ItemBackpack {
}
@Override
public boolean isValidItem(ItemStack stack) {
return BeeManager.beeRoot.isMember(stack);
public boolean isValidItem(ItemStack itemStack) {
return BeeManager.beeRoot.isMember(itemStack);
}
}
@@ -41,8 +41,8 @@ public class ItemNaturalistBackpack extends ItemBackpack {
}
@Override
public boolean isValidItem(ItemStack stack) {
return PluginLepidopterology.butterflyInterface.isMember(stack);
public boolean isValidItem(ItemStack itemStack) {
return PluginLepidopterology.butterflyInterface.isMember(itemStack);
}
}