package-info upd- I mean 1.9.4 update
These are now "required" thanks to Mojang giving us some annotations. Yay..?
This commit is contained in:
parent
cb05e643a3
commit
de5e23e6c4
132 changed files with 1174 additions and 67 deletions
|
@ -27,11 +27,12 @@ public class TileAlchemyArray extends TileInventory implements ITickable
|
|||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tagCompound)
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||
{
|
||||
super.writeToNBT(tagCompound);
|
||||
tagCompound.setBoolean("isActive", isActive);
|
||||
tagCompound.setInteger("activeCounter", activeCounter);
|
||||
return tagCompound;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -74,7 +75,7 @@ public class TileAlchemyArray extends TileInventory implements ITickable
|
|||
}
|
||||
|
||||
@Override
|
||||
public Packet getDescriptionPacket()
|
||||
public SPacketUpdateTileEntity getUpdatePacket()
|
||||
{
|
||||
NBTTagCompound nbttagcompound = new NBTTagCompound();
|
||||
writeToNBT(nbttagcompound);
|
||||
|
|
|
@ -105,7 +105,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory,
|
|||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tag)
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound tag)
|
||||
{
|
||||
super.writeToNBT(tag);
|
||||
|
||||
|
@ -125,6 +125,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory,
|
|||
}
|
||||
|
||||
tag.setIntArray("blockedSlots", blockedSlotArray);
|
||||
return tag;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
|
|
|
@ -33,7 +33,7 @@ public class TileAltar extends TileInventory implements IBloodAltar, ITickable,
|
|||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tagCompound)
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||
{
|
||||
super.writeToNBT(tagCompound);
|
||||
|
||||
|
@ -41,6 +41,7 @@ public class TileAltar extends TileInventory implements IBloodAltar, ITickable,
|
|||
this.bloodAltar.writeToNBT(altarTag);
|
||||
|
||||
tagCompound.setTag("bloodAltar", altarTag);
|
||||
return tagCompound;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -61,11 +61,12 @@ public class TileBloodTank extends TileEntity implements IFluidHandler
|
|||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tagCompound)
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||
{
|
||||
super.writeToNBT(tagCompound);
|
||||
if (tank.getFluidAmount() != 0)
|
||||
tagCompound.setTag("tank", tank.writeToNBT(new NBTTagCompound()));
|
||||
tagCompound.setInteger("capacity", capacity);
|
||||
return tagCompound;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -128,7 +128,7 @@ public class TileDemonCrucible extends TileInventory implements ITickable, IDemo
|
|||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tag)
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound tag)
|
||||
{
|
||||
super.writeToNBT(tag);
|
||||
|
||||
|
@ -136,6 +136,7 @@ public class TileDemonCrucible extends TileInventory implements ITickable, IDemo
|
|||
{
|
||||
tag.setDouble("EnumWill" + entry.getKey().getName(), entry.getValue());
|
||||
}
|
||||
return tag;
|
||||
}
|
||||
|
||||
// IDemonWillConduit
|
||||
|
|
|
@ -186,7 +186,7 @@ public class TileDemonCrystal extends TileEntity implements ITickable
|
|||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tag)
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound tag)
|
||||
{
|
||||
super.writeToNBT(tag);
|
||||
|
||||
|
@ -194,6 +194,7 @@ public class TileDemonCrystal extends TileEntity implements ITickable
|
|||
tag.setInteger("crystalCount", crystalCount);
|
||||
tag.setInteger("placement", placement.getIndex());
|
||||
tag.setDouble("progress", progressToNextCrystal);
|
||||
return tag;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -203,7 +204,7 @@ public class TileDemonCrystal extends TileEntity implements ITickable
|
|||
}
|
||||
|
||||
@Override
|
||||
public Packet getDescriptionPacket()
|
||||
public SPacketUpdateTileEntity getUpdatePacket()
|
||||
{
|
||||
NBTTagCompound nbt = new NBTTagCompound();
|
||||
writeToNBT(nbt);
|
||||
|
|
|
@ -96,12 +96,13 @@ public class TileDemonCrystallizer extends TileEntity implements ITickable, IDem
|
|||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tag)
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound tag)
|
||||
{
|
||||
super.writeToNBT(tag);
|
||||
|
||||
holder.writeToNBT(tag, "Will");
|
||||
tag.setDouble("internalCounter", internalCounter);
|
||||
return tag;
|
||||
}
|
||||
|
||||
// IDemonWillConduit
|
||||
|
|
|
@ -56,11 +56,12 @@ public class TileDemonPylon extends TileEntity implements ITickable, IDemonWillC
|
|||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tag)
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound tag)
|
||||
{
|
||||
super.writeToNBT(tag);
|
||||
|
||||
holder.writeToNBT(tag, "Will");
|
||||
return tag;
|
||||
}
|
||||
|
||||
// IDemonWillConduit
|
||||
|
|
|
@ -29,7 +29,7 @@ public class TileDimensionalPortal extends TileEntity
|
|||
masterStoneZ = tagCompound.getInteger("masterStoneZ");
|
||||
}
|
||||
|
||||
public void writeToNBT(NBTTagCompound tagCompound)
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||
{
|
||||
super.writeToNBT(tagCompound);
|
||||
|
||||
|
@ -38,6 +38,7 @@ public class TileDimensionalPortal extends TileEntity
|
|||
tagCompound.setInteger("masterStoneX", masterStoneX);
|
||||
tagCompound.setInteger("masterStoneY", masterStoneY);
|
||||
tagCompound.setInteger("masterStoneZ", masterStoneZ);
|
||||
return tagCompound;
|
||||
}
|
||||
|
||||
public BlockPos getMasterStonePos()
|
||||
|
|
|
@ -82,11 +82,12 @@ public class TileIncenseAltar extends TileInventory implements ITickable
|
|||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tag)
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound tag)
|
||||
{
|
||||
super.writeToNBT(tag);
|
||||
tag.setDouble("tranquility", tranquility);
|
||||
tag.setDouble("incenseAddition", incenseAddition);
|
||||
return tag;
|
||||
}
|
||||
|
||||
public void recheckConstruction()
|
||||
|
|
|
@ -74,7 +74,7 @@ public class TileInventory extends TileEntity implements IInventory
|
|||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tagCompound)
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||
{
|
||||
super.writeToNBT(tagCompound);
|
||||
NBTTagList tags = new NBTTagList();
|
||||
|
@ -91,10 +91,11 @@ public class TileInventory extends TileEntity implements IInventory
|
|||
}
|
||||
|
||||
tagCompound.setTag("Items", tags);
|
||||
return tagCompound;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Packet getDescriptionPacket()
|
||||
public SPacketUpdateTileEntity getUpdatePacket()
|
||||
{
|
||||
NBTTagCompound nbt = new NBTTagCompound();
|
||||
writeToNBT(nbt);
|
||||
|
|
|
@ -103,7 +103,7 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt
|
|||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tag)
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound tag)
|
||||
{
|
||||
super.writeToNBT(tag);
|
||||
String ritualId = RitualRegistry.getIdForRitual(getCurrentRitual());
|
||||
|
@ -119,6 +119,7 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt
|
|||
tag.setInteger(Constants.NBT.RUNTIME, getActiveTime());
|
||||
tag.setInteger(Constants.NBT.DIRECTION, direction.getIndex());
|
||||
tag.setBoolean(Constants.NBT.IS_REDSTONED, redstoned);
|
||||
return tag;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -274,7 +275,7 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt
|
|||
}
|
||||
|
||||
@Override
|
||||
public Packet getDescriptionPacket()
|
||||
public SPacketUpdateTileEntity getUpdatePacket()
|
||||
{
|
||||
NBTTagCompound nbttagcompound = new NBTTagCompound();
|
||||
writeToNBT(nbttagcompound);
|
||||
|
|
|
@ -30,10 +30,11 @@ public class TilePhantomBlock extends TileEntity implements ITickable
|
|||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tagCompound)
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||
{
|
||||
super.writeToNBT(tagCompound);
|
||||
tagCompound.setInteger(Constants.NBT.TICKS_REMAINING, ticksRemaining);
|
||||
return tagCompound;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -49,7 +50,7 @@ public class TilePhantomBlock extends TileEntity implements ITickable
|
|||
}
|
||||
|
||||
@Override
|
||||
public Packet getDescriptionPacket()
|
||||
public SPacketUpdateTileEntity getUpdatePacket()
|
||||
{
|
||||
NBTTagCompound nbt = new NBTTagCompound();
|
||||
writeToNBT(nbt);
|
||||
|
|
|
@ -41,11 +41,12 @@ public class TileSoulForge extends TileInventory implements ITickable, IDemonWil
|
|||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tag)
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound tag)
|
||||
{
|
||||
super.writeToNBT(tag);
|
||||
|
||||
tag.setInteger(Constants.NBT.SOUL_FORGE_BURN, burnTime);
|
||||
return tag;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -33,12 +33,13 @@ public class TileSpectralBlock extends TileEntity implements ITickable
|
|||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tagCompound)
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||
{
|
||||
super.writeToNBT(tagCompound);
|
||||
tagCompound.setInteger(Constants.NBT.TICKS_REMAINING, ticksRemaining);
|
||||
tagCompound.setString(Constants.NBT.CONTAINED_BLOCK_NAME, Strings.isNullOrEmpty(containedBlockName) ? "" : containedBlockName);
|
||||
tagCompound.setInteger(Constants.NBT.CONTAINED_BLOCK_META, containedBlockMeta);
|
||||
return tagCompound;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -42,10 +42,11 @@ public class TileTeleposer extends TileInventory implements ITickable
|
|||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tagCompound)
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||
{
|
||||
super.writeToNBT(tagCompound);
|
||||
tagCompound.setInteger(Constants.NBT.PREVIOUS_INPUT, previousInput);
|
||||
return tagCompound;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
@ParametersAreNonnullByDefault
|
||||
@MethodsReturnNonnullByDefault
|
||||
package WayofTime.bloodmagic.tile.container;
|
||||
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
|
@ -0,0 +1,7 @@
|
|||
@ParametersAreNonnullByDefault
|
||||
@MethodsReturnNonnullByDefault
|
||||
package WayofTime.bloodmagic.tile;
|
||||
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
|
@ -48,11 +48,12 @@ public class TileFilteredRoutingNode extends TileRoutingNode implements ISidedIn
|
|||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tag)
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound tag)
|
||||
{
|
||||
super.writeToNBT(tag);
|
||||
tag.setInteger("currentSlot", currentActiveSlot);
|
||||
tag.setIntArray(Constants.NBT.ROUTING_PRIORITY, priorities);
|
||||
return tag;
|
||||
}
|
||||
|
||||
public void swapFilters(int requestedSlot)
|
||||
|
|
|
@ -30,7 +30,6 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti
|
|||
public TileMasterRoutingNode()
|
||||
{
|
||||
super(0, "masterRoutingNode");
|
||||
// TODO Auto-generated constructor stub
|
||||
}
|
||||
|
||||
// A list of connections
|
||||
|
@ -146,7 +145,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti
|
|||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tag)
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound tag)
|
||||
{
|
||||
super.writeToNBT(tag);
|
||||
|
||||
|
@ -182,6 +181,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti
|
|||
tags.appendTag(posTag);
|
||||
}
|
||||
tag.setTag(Constants.NBT.ROUTING_MASTER_OUTPUT, tags);
|
||||
return tag;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -28,7 +28,7 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte
|
|||
private List<BlockPos> connectionList = new LinkedList<BlockPos>();
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound tag)
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound tag)
|
||||
{
|
||||
super.writeToNBT(tag);
|
||||
NBTTagCompound masterTag = new NBTTagCompound();
|
||||
|
@ -47,6 +47,7 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte
|
|||
tags.appendTag(posTag);
|
||||
}
|
||||
tag.setTag(Constants.NBT.ROUTING_CONNECTION, tags);
|
||||
return tag;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -137,12 +138,7 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte
|
|||
public boolean isMaster(IMasterRoutingNode master)
|
||||
{
|
||||
BlockPos checkPos = master.getBlockPos();
|
||||
if (checkPos.equals(getMasterPos()))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
return checkPos.equals(getMasterPos());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
@ParametersAreNonnullByDefault
|
||||
@MethodsReturnNonnullByDefault
|
||||
package WayofTime.bloodmagic.tile.routing;
|
||||
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
Loading…
Add table
Add a link
Reference in a new issue