lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

package-info upd- I mean 1.9.4 update

Browse source 
These are now "required" thanks to Mojang giving us some annotations. Yay..?
This commit is contained in:
Nicholas Ignoffo 2016-05-19 17:43:33 -07:00
parent cb05e643a3
commit de5e23e6c4
132 changed files with 1174 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java
View file

@ -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)

4
src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java
View file

@ -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

10
src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java
View file

@ -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

7
src/main/java/WayofTime/bloodmagic/tile/routing/package-info.java Normal file
View file

@ -0,0 +1,7 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
package WayofTime.bloodmagic.tile.routing;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;