mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-16 10:44:45 +00:00
Update buildscript & apply automatic formatting rules
This commit is contained in:
1 parent
a7683b885d
commit
f7a900e910
173 files changed
+4581
-5321
No files matched your search
@@ -1,26 +1,23 @@
|
||||
package codechicken.nei;
|
||||
|
||||
import com.google.common.base.Objects;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static codechicken.lib.inventory.InventoryUtils.actualDamage;
|
||||
import static codechicken.lib.inventory.InventoryUtils.newItemStack;
|
||||
import static net.minecraftforge.oredict.OreDictionary.WILDCARD_VALUE;
|
||||
|
||||
import com.google.common.base.Objects;
|
||||
import java.util.HashMap;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
/**
|
||||
* A maplike class for ItemStack keys with wildcard damage/NBT. Optimised for lookup
|
||||
*/
|
||||
public class ItemStackMap<T>
|
||||
{
|
||||
public static class StackMetaKey
|
||||
{
|
||||
public class ItemStackMap<T> {
|
||||
public static class StackMetaKey {
|
||||
public final int damage;
|
||||
public final NBTTagCompound tag;
|
||||
|
||||
@@ -38,15 +35,13 @@ public class ItemStackMap<T>
|
||||
}
|
||||
|
||||
public boolean equals(Object o) {
|
||||
if (!(o instanceof StackMetaKey))
|
||||
return false;
|
||||
if (!(o instanceof StackMetaKey)) return false;
|
||||
StackMetaKey t = (StackMetaKey) o;
|
||||
return damage == t.damage && Objects.equal(tag, t.tag);
|
||||
}
|
||||
}
|
||||
|
||||
public static class Entry<T>
|
||||
{
|
||||
public static class Entry<T> {
|
||||
public final ItemStack key;
|
||||
public final T value;
|
||||
|
||||
@@ -56,8 +51,7 @@ public class ItemStackMap<T>
|
||||
}
|
||||
}
|
||||
|
||||
public class DetailMap
|
||||
{
|
||||
public class DetailMap {
|
||||
private boolean hasWildcard;
|
||||
private T wildcard;
|
||||
private HashMap<Integer, T> damageMap;
|
||||
@@ -66,8 +60,7 @@ public class ItemStackMap<T>
|
||||
private int size;
|
||||
|
||||
public T get(ItemStack key) {
|
||||
if (wildcard != null)
|
||||
return wildcard;
|
||||
if (wildcard != null) return wildcard;
|
||||
|
||||
if (damageMap != null) {
|
||||
final T ret = damageMap.get(actualDamage(key));
|
||||
@@ -77,8 +70,7 @@ public class ItemStackMap<T>
|
||||
final T ret = tagMap.get(key.stackTagCompound);
|
||||
if (ret != null) return ret;
|
||||
}
|
||||
if (metaMap != null)
|
||||
return metaMap.get(new StackMetaKey(key));
|
||||
if (metaMap != null) return metaMap.get(new StackMetaKey(key));
|
||||
|
||||
return null;
|
||||
}
|
||||
@@ -129,45 +121,36 @@ public class ItemStackMap<T>
|
||||
}
|
||||
|
||||
private void updateSize() {
|
||||
int newSize = (hasWildcard ? 1 : 0) +
|
||||
(metaMap != null ? metaMap.size() : 0) +
|
||||
(tagMap != null ? tagMap.size() : 0) +
|
||||
(damageMap != null ? damageMap.size() : 0);
|
||||
int newSize = (hasWildcard ? 1 : 0)
|
||||
+ (metaMap != null ? metaMap.size() : 0)
|
||||
+ (tagMap != null ? tagMap.size() : 0)
|
||||
+ (damageMap != null ? damageMap.size() : 0);
|
||||
|
||||
if(newSize != size) {
|
||||
ItemStackMap.this.size += newSize-size;
|
||||
if (newSize != size) {
|
||||
ItemStackMap.this.size += newSize - size;
|
||||
size = newSize;
|
||||
}
|
||||
}
|
||||
|
||||
public void addKeys(Item item, List<ItemStack> list) {
|
||||
if (wildcard != null)
|
||||
list.add(wildcard(item));
|
||||
if (wildcard != null) list.add(wildcard(item));
|
||||
if (damageMap != null)
|
||||
for (int damage : damageMap.keySet())
|
||||
list.add(newItemStack(item, 1, damage, WILDCARD_TAG));
|
||||
for (int damage : damageMap.keySet()) list.add(newItemStack(item, 1, damage, WILDCARD_TAG));
|
||||
if (tagMap != null)
|
||||
for (NBTTagCompound tag : tagMap.keySet())
|
||||
list.add(newItemStack(item, 1, WILDCARD_VALUE, tag));
|
||||
for (NBTTagCompound tag : tagMap.keySet()) list.add(newItemStack(item, 1, WILDCARD_VALUE, tag));
|
||||
if (metaMap != null)
|
||||
for (StackMetaKey key : metaMap.keySet())
|
||||
list.add(newItemStack(item, 1, key.damage, key.tag));
|
||||
for (StackMetaKey key : metaMap.keySet()) list.add(newItemStack(item, 1, key.damage, key.tag));
|
||||
}
|
||||
|
||||
public void addValues(List<T> list) {
|
||||
if (wildcard != null)
|
||||
list.add(wildcard);
|
||||
if (damageMap != null)
|
||||
list.addAll(damageMap.values());
|
||||
if (tagMap != null)
|
||||
list.addAll(tagMap.values());
|
||||
if (metaMap != null)
|
||||
list.addAll(metaMap.values());
|
||||
if (wildcard != null) list.add(wildcard);
|
||||
if (damageMap != null) list.addAll(damageMap.values());
|
||||
if (tagMap != null) list.addAll(tagMap.values());
|
||||
if (metaMap != null) list.addAll(metaMap.values());
|
||||
}
|
||||
|
||||
public void addEntries(Item item, List<Entry<T>> list) {
|
||||
if (wildcard != null)
|
||||
list.add(new Entry<>(newItemStack(item, 1, WILDCARD_VALUE, WILDCARD_TAG), wildcard));
|
||||
if (wildcard != null) list.add(new Entry<>(newItemStack(item, 1, WILDCARD_VALUE, WILDCARD_TAG), wildcard));
|
||||
if (damageMap != null)
|
||||
for (Map.Entry<Integer, T> entry : damageMap.entrySet())
|
||||
list.add(new Entry<>(newItemStack(item, 1, entry.getKey(), WILDCARD_TAG), entry.getValue()));
|
||||
@@ -176,16 +159,17 @@ public class ItemStackMap<T>
|
||||
list.add(new Entry<>(newItemStack(item, 1, WILDCARD_VALUE, entry.getKey()), entry.getValue()));
|
||||
if (metaMap != null)
|
||||
for (Map.Entry<StackMetaKey, T> entry : metaMap.entrySet())
|
||||
list.add(new Entry<>(newItemStack(item, 1, entry.getKey().damage, entry.getKey().tag), entry.getValue()));
|
||||
list.add(new Entry<>(
|
||||
newItemStack(item, 1, entry.getKey().damage, entry.getKey().tag), entry.getValue()));
|
||||
}
|
||||
}
|
||||
|
||||
public static int getKeyType(int damage, NBTTagCompound tag) {
|
||||
int i = 0;
|
||||
if (isWildcard(damage)) i = 1;
|
||||
if (isWildcard(tag)) i |= 2;
|
||||
return i;
|
||||
}
|
||||
int i = 0;
|
||||
if (isWildcard(damage)) i = 1;
|
||||
if (isWildcard(tag)) i |= 2;
|
||||
return i;
|
||||
}
|
||||
|
||||
public static ItemStack wildcard(Item item) {
|
||||
return newItemStack(item, 1, WILDCARD_VALUE, WILDCARD_TAG);
|
||||
@@ -219,12 +203,10 @@ public class ItemStackMap<T>
|
||||
}
|
||||
|
||||
public void put(ItemStack key, T value) {
|
||||
if (key == null || key.getItem() == null)
|
||||
return;
|
||||
if (key == null || key.getItem() == null) return;
|
||||
|
||||
DetailMap map = itemMap.get(key.getItem());
|
||||
if (map == null)
|
||||
itemMap.put(key.getItem(), map = new DetailMap());
|
||||
if (map == null) itemMap.put(key.getItem(), map = new DetailMap());
|
||||
map.put(key, value);
|
||||
}
|
||||
|
||||
@@ -233,8 +215,7 @@ public class ItemStackMap<T>
|
||||
}
|
||||
|
||||
public T remove(ItemStack key) {
|
||||
if (key == null || key.getItem() == null)
|
||||
return null;
|
||||
if (key == null || key.getItem() == null) return null;
|
||||
|
||||
DetailMap map = itemMap.get(key.getItem());
|
||||
return map == null ? null : map.remove(key);
|
||||
@@ -249,8 +230,7 @@ public class ItemStackMap<T>
|
||||
|
||||
public List<T> values() {
|
||||
LinkedList<T> list = new LinkedList<>();
|
||||
for (DetailMap map : itemMap.values())
|
||||
map.addValues(list);
|
||||
for (DetailMap map : itemMap.values()) map.addValues(list);
|
||||
return list;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user