Use cap's native serialization

This commit is contained in:
Vincent Lee committed 2016-03-05 12:12:29 -06:00
1 parent 274b4ab05a
commit 036fc4b0cc
14 files changed
+18 -87

No files matched your search

@@ -22,13 +22,10 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.StatCollector;
@@ -45,7 +42,6 @@ import vazkii.botania.api.state.enums.AltarVariant;
import vazkii.botania.client.core.handler.HUDHandler;
import vazkii.botania.client.core.helper.RenderHelper;
import vazkii.botania.common.Botania;
import vazkii.botania.common.lib.LibBlockNames;
public class TileAltar extends TileSimpleInventory implements IPetalApothecary {
@@ -288,7 +284,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary {
}
@Override
protected IItemHandlerModifiable createItemHandler() {
protected SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, false) {
@Override
protected int getStackLimit(int slot, ItemStack stack) {
@@ -14,7 +14,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.IItemHandlerModifiable;
import vazkii.botania.api.item.IAvatarTile;
import vazkii.botania.api.item.IAvatarWieldable;
@@ -73,7 +72,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile {
}
@Override
protected IItemHandlerModifiable createItemHandler() {
protected SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, false) {
@Override
protected int getStackLimit(int slot, ItemStack stack) {
@@ -17,12 +17,9 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.items.IItemHandlerModifiable;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.brew.IBrewContainer;
import vazkii.botania.api.brew.IBrewItem;
@@ -33,7 +30,6 @@ import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.client.core.helper.RenderHelper;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.lib.LibBlockNames;
// This is mostly copypasta from TileRuneAltar
public class TileBrewery extends TileSimpleInventory implements IManaReceiver {
@@ -209,7 +205,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver {
}*/
@Override
protected IItemHandlerModifiable createItemHandler() {
protected SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, false) {
@Override
protected int getStackLimit(int slot, ItemStack stack) {
@@ -21,7 +21,6 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraftforge.items.IItemHandlerModifiable;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.common.item.ModItems;
@@ -78,7 +77,7 @@ public class TileCraftCrate extends TileOpenCrate {
}
@Override
protected IItemHandlerModifiable createItemHandler() {
protected SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, true) {
@Override
protected int getStackLimit(int slot, ItemStack stack) {
@@ -21,10 +21,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.StatCollector;
import net.minecraft.util.StringUtils;
import net.minecraftforge.items.IItemHandlerModifiable;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.lib.LibBlockNames;
public class TileHourglass extends TileSimpleInventory {
@@ -97,7 +95,7 @@ public class TileHourglass extends TileSimpleInventory {
}
@Override
protected IItemHandlerModifiable createItemHandler() {
protected SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, true) {
@Override
public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) {
@@ -14,23 +14,18 @@ import java.awt.Color;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.common.registry.GameData;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.IItemHandlerModifiable;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.brew.Brew;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.common.Botania;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.brew.ItemIncenseStick;
import vazkii.botania.common.lib.LibBlockNames;
public class TileIncensePlate extends TileSimpleInventory {
@@ -127,7 +122,7 @@ public class TileIncensePlate extends TileSimpleInventory {
}
@Override
protected IItemHandlerModifiable createItemHandler() {
protected SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, true) {
@Override
public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) {
@@ -17,16 +17,12 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.StatCollector;
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
import net.minecraftforge.items.IItemHandlerModifiable;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
@@ -40,8 +36,6 @@ import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibObfuscation;
public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver {
@@ -313,7 +307,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver
}*/
@Override
protected IItemHandlerModifiable createItemHandler() {
protected SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, false) {
@Override
protected int getStackLimit(int slot, ItemStack stack) {
@@ -12,7 +12,6 @@ package vazkii.botania.common.block.tile;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.items.CapabilityItemHandler;
@@ -21,39 +20,22 @@ import net.minecraftforge.items.ItemStackHandler;
public abstract class TileSimpleInventory extends TileMod {
ItemStack[] inventorySlots = new ItemStack[getSizeInventory()];
protected IItemHandlerModifiable itemHandler = createItemHandler();
protected SimpleItemStackHandler itemHandler = createItemHandler();
@Override
public void readCustomNBT(NBTTagCompound par1NBTTagCompound) {
NBTTagList var2 = par1NBTTagCompound.getTagList("Items", 10);
inventorySlots = new ItemStack[getSizeInventory()];
for (int var3 = 0; var3 < var2.tagCount(); ++var3) {
NBTTagCompound var4 = var2.getCompoundTagAt(var3);
byte var5 = var4.getByte("Slot");
if (var5 >= 0 && var5 < inventorySlots.length)
inventorySlots[var5] = ItemStack.loadItemStackFromNBT(var4);
}
itemHandler = createItemHandler();
itemHandler.deserializeNBT(par1NBTTagCompound);
}
@Override
public void writeCustomNBT(NBTTagCompound par1NBTTagCompound) {
NBTTagList var2 = new NBTTagList();
for (int var3 = 0; var3 < inventorySlots.length; ++var3) {
if (inventorySlots[var3] != null) {
NBTTagCompound var4 = new NBTTagCompound();
var4.setByte("Slot", (byte)var3);
inventorySlots[var3].writeToNBT(var4);
var2.appendTag(var4);
}
}
par1NBTTagCompound.setTag("Items", var2);
par1NBTTagCompound.merge(itemHandler.serializeNBT());
}
public abstract int getSizeInventory();
protected IItemHandlerModifiable createItemHandler() {
protected SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, true);
}
@@ -82,9 +64,7 @@ public abstract class TileSimpleInventory extends TileMod {
private final TileSimpleInventory tile;
public SimpleItemStackHandler(TileSimpleInventory inv, boolean allowWrite) {
super(0);
// Overwrite with our array
this.stacks = inv.inventorySlots;
super(inv.getSizeInventory());
this.allowWrite = allowWrite;
this.tile = inv;
}
@@ -107,15 +87,5 @@ public abstract class TileSimpleInventory extends TileMod {
public void onContentsChanged(int slot) {
tile.markDirty();
}
// Override since our tile handles serialization itself
@Override
public NBTTagCompound serializeNBT() { return new NBTTagCompound(); }
@Override
public void deserializeNBT(NBTTagCompound nbt) {
onLoad();
}
}
}
@@ -17,12 +17,10 @@ import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.items.IItemHandlerModifiable;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.mana.spark.ISparkAttachable;
import vazkii.botania.api.mana.spark.ISparkEntity;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
public class TileSparkChanger extends TileSimpleInventory {
@@ -69,7 +67,7 @@ public class TileSparkChanger extends TileSimpleInventory {
}
@Override
protected IItemHandlerModifiable createItemHandler() {
protected SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, true) {
@Override
protected int getStackLimit(int slot, ItemStack stack) {
@@ -19,16 +19,13 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.animation.Animation;
import net.minecraftforge.client.model.animation.IAnimationProvider;
import net.minecraftforge.client.model.animation.TimeValues;
import net.minecraftforge.common.model.animation.IAnimationStateMachine;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.items.IItemHandlerModifiable;
import vazkii.botania.api.corporea.CorporeaHelper;
import vazkii.botania.api.corporea.ICorporeaRequestor;
import vazkii.botania.api.corporea.ICorporeaSpark;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.common.lib.LibBlockNames;
public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor, IAnimationProvider {
@@ -144,7 +141,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor
}
@Override
protected IItemHandlerModifiable createItemHandler() {
protected SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, false);
}
@@ -19,12 +19,10 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.items.IItemHandlerModifiable;
import vazkii.botania.api.corporea.CorporeaHelper;
import vazkii.botania.api.corporea.ICorporeaRequestor;
import vazkii.botania.api.corporea.ICorporeaSpark;
import vazkii.botania.common.core.helper.InventoryHelper;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaRequestor {
@@ -73,7 +71,7 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq
}
@Override
protected IItemHandlerModifiable createItemHandler() {
protected SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, false);
}
@@ -19,18 +19,16 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.items.IItemHandlerModifiable;
import vazkii.botania.api.corporea.CorporeaHelper;
import vazkii.botania.api.corporea.ICorporeaInterceptor;
import vazkii.botania.api.corporea.ICorporeaSpark;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorporeaInterceptor {
@Override
protected IItemHandlerModifiable createItemHandler() {
protected SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, false);
}
@@ -11,10 +11,7 @@
package vazkii.botania.common.block.tile.mana;
import net.minecraft.entity.Entity;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.items.IItemHandlerModifiable;
import vazkii.botania.api.internal.IManaBurst;
import vazkii.botania.api.mana.BurstProperties;
import vazkii.botania.api.mana.ILens;
@@ -22,7 +19,6 @@ import vazkii.botania.api.mana.IManaCollisionGhost;
import vazkii.botania.api.mana.ITinyPlanetExcempt;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.block.tile.TileSimpleInventory;
import vazkii.botania.common.lib.LibBlockNames;
public class TilePrism extends TileSimpleInventory implements IManaCollisionGhost {
@@ -63,7 +59,7 @@ public class TilePrism extends TileSimpleInventory implements IManaCollisionGhos
}
@Override
protected IItemHandlerModifiable createItemHandler() {
protected SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, true) {
@Override
public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) {
@@ -29,7 +29,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.*;
import net.minecraft.world.World;
import net.minecraftforge.items.IItemHandlerModifiable;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.internal.IManaBurst;
@@ -58,8 +57,6 @@ import vazkii.botania.common.core.handler.ManaNetworkHandler;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.entity.EntityManaBurst;
import vazkii.botania.common.entity.EntityManaBurst.PositionProperties;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibBlockNames;
public class TileSpreader extends TileSimpleInventory implements IManaCollector, IWandBindable, IKeyLocked, IThrottledPacket, IManaSpreader, IRedirectable, ITickable {
@@ -609,7 +606,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
}
@Override
protected IItemHandlerModifiable createItemHandler() {
protected SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, true) {
@Override
protected int getStackLimit(int slot, ItemStack stack) {