dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove conversion code from dev builds. First use 1.7 before updating!!

Browse Source
This commit is contained in:
raoulvdberge
2019-11-04 14:54:28 +01:00
parent 08f4b830b0
commit d397018bab
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java
View File

@@ -299,8 +299,6 @@ public final class StackUtils {
return Pair.of(ItemStack.EMPTY, FluidStack.EMPTY); return Pair.of(ItemStack.EMPTY, FluidStack.EMPTY);
} }
// TODO Remove Type
private static final String NBT_ITEM_TYPE = "Type";
private static final String NBT_ITEM_ID = "Id"; private static final String NBT_ITEM_ID = "Id";
private static final String NBT_ITEM_QUANTITY = "Quantity"; private static final String NBT_ITEM_QUANTITY = "Quantity";
private static final String NBT_ITEM_NBT = "NBT"; private static final String NBT_ITEM_NBT = "NBT";
@@ -332,20 +330,14 @@ public final class StackUtils {
@Nonnull @Nonnull
public static ItemStack deserializeStackFromNbt(CompoundNBT tag) { public static ItemStack deserializeStackFromNbt(CompoundNBT tag) {
Item item; Item item;
if (tag.contains(NBT_ITEM_TYPE)) { if (tag.contains(NBT_ITEM_ID)) {
item = Item.getItemById(tag.getInt(NBT_ITEM_TYPE));
if (item == Items.AIR) {
LOGGER.warn("Could not deserialize item from numerical ID, it no longer exists: " + tag.getInt(NBT_ITEM_TYPE));
}
} else if (tag.contains(NBT_ITEM_ID)) {
item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(tag.getString(NBT_ITEM_ID))); item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(tag.getString(NBT_ITEM_ID)));
if (item == null) { if (item == null) {
LOGGER.warn("Could not deserialize item from string ID, it no longer exists: " + tag.getString(NBT_ITEM_ID)); LOGGER.warn("Could not deserialize item from string ID, it no longer exists: " + tag.getString(NBT_ITEM_ID));
} }
} else { } else {
throw new IllegalStateException("Cannot deserialize ItemStack: no " + NBT_ITEM_TYPE + " (legacy tag) or " + NBT_ITEM_ID + " tag was found!"); throw new IllegalStateException("Cannot deserialize ItemStack: no " + NBT_ITEM_ID + " tag was found!");
} }
if (item == null) { if (item == null) {