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

Initial stab at 1.11

Browse source 
About halfway.
This commit is contained in:
Nicholas Ignoffo 2016-12-12 19:56:36 -08:00
parent ce52aea512
commit 00d6f8eb46
157 changed files with 1036 additions and 1554 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@ public class TileFilteredRoutingNode extends TileRoutingNode implements ISidedIn
public void setGhostItemAmount(int ghostItemSlot, int amount)
{
ItemStack stack = itemInventory.getStackInSlot(ghostItemSlot);
if (stack != null)
if (!stack.isEmpty())
{
GhostItemHelper.setItemGhostAmount(stack, amount);
}
@ -70,10 +70,10 @@ public class TileFilteredRoutingNode extends TileRoutingNode implements ISidedIn
if (j == 0)
{
inventory[currentActiveSlot] = ItemStack.loadItemStackFromNBT(data);
inventory[currentActiveSlot] = new ItemStack(data);
} else if (j >= 1 && j < inventory.length + 1)
{
inventory[j - 1] = ItemStack.loadItemStackFromNBT(data);
inventory[j - 1] = new ItemStack(data);
}
}
}
@ -126,14 +126,14 @@ public class TileFilteredRoutingNode extends TileRoutingNode implements ISidedIn
public void incrementCurrentPriotiryToMaximum(int max)
{
priorities[currentActiveSlot] = Math.min(priorities[currentActiveSlot] + 1, max);
IBlockState state = worldObj.getBlockState(pos);
worldObj.notifyBlockUpdate(pos, state, state, 3);
IBlockState state = getWorld().getBlockState(pos);
getWorld().notifyBlockUpdate(pos, state, state, 3);
}
public void decrementCurrentPriority()
{
priorities[currentActiveSlot] = Math.max(priorities[currentActiveSlot] - 1, 0);
IBlockState state = worldObj.getBlockState(pos);
worldObj.notifyBlockUpdate(pos, state, state, 3);
IBlockState state = getWorld().getBlockState(pos);
getWorld().notifyBlockUpdate(pos, state, state, 3);
}
}

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

@ -26,7 +26,7 @@ public class TileInputRoutingNode extends TileFilteredRoutingNode implements IIn
@Override
public IItemFilter getInputFilterForSide(EnumFacing side)
{
TileEntity tile = worldObj.getTileEntity(pos.offset(side));
TileEntity tile = getWorld().getTileEntity(pos.offset(side));
if (tile != null)
{
IItemHandler handler = Utils.getInventory(tile, side.getOpposite());
@ -34,7 +34,7 @@ public class TileInputRoutingNode extends TileFilteredRoutingNode implements IIn
{
ItemStack filterStack = this.getFilterStack(side);
if (filterStack == null || !(filterStack.getItem() instanceof IItemFilterProvider))
if (filterStack.isEmpty() || !(filterStack.getItem() instanceof IItemFilterProvider))
{
IItemFilter filter = new DefaultItemFilter();
filter.initializeFilter(null, tile, handler, false);

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

@ -45,15 +45,15 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti
@Override
public void update()
{
if (!worldObj.isRemote)
if (!getWorld().isRemote)
{
// currentInput = worldObj.isBlockIndirectlyGettingPowered(pos);
currentInput = worldObj.getStrongPower(pos);
// currentInput = getWorld().isBlockIndirectlyGettingPowered(pos);
currentInput = getWorld().getStrongPower(pos);
// System.out.println(currentInput);
}
if (worldObj.isRemote || worldObj.getTotalWorldTime() % tickRate != 0) //Temporary tick rate solver
if (getWorld().isRemote || getWorld().getTotalWorldTime() % tickRate != 0) //Temporary tick rate solver
{
return;
}
@ -62,7 +62,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti
for (BlockPos outputPos : outputNodeList)
{
TileEntity outputTile = worldObj.getTileEntity(outputPos);
TileEntity outputTile = getWorld().getTileEntity(outputPos);
if (outputTile instanceof IOutputItemRoutingNode && this.isConnected(new LinkedList<BlockPos>(), outputPos))
{
IOutputItemRoutingNode outputNode = (IOutputItemRoutingNode) outputTile;
@ -96,7 +96,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti
for (BlockPos inputPos : inputNodeList)
{
TileEntity inputTile = worldObj.getTileEntity(inputPos);
TileEntity inputTile = getWorld().getTileEntity(inputPos);
if (inputTile instanceof IInputItemRoutingNode && this.isConnected(new LinkedList<BlockPos>(), inputPos))
{
IInputItemRoutingNode inputNode = (IInputItemRoutingNode) inputTile;
@ -126,7 +126,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti
}
}
int maxTransfer = this.getMaxTransferForDemonWill(WorldDemonWillHandler.getCurrentWill(worldObj, pos, EnumDemonWillType.DEFAULT));
int maxTransfer = this.getMaxTransferForDemonWill(WorldDemonWillHandler.getCurrentWill(getWorld(), pos, EnumDemonWillType.DEFAULT));
for (Entry<Integer, List<IItemFilter>> outputEntry : outputMap.entrySet())
{
@ -231,7 +231,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti
// {
// return false;
// }
TileEntity tile = worldObj.getTileEntity(nodePos);
TileEntity tile = getWorld().getTileEntity(nodePos);
if (!(tile instanceof IRoutingNode))
{
// connectionMap.remove(nodePos);
@ -254,7 +254,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti
// path.clear();
// path.addAll(testPath);
return true;
} else if (NodeHelper.isNodeConnectionEnabled(worldObj, node, testPos))
} else if (NodeHelper.isNodeConnectionEnabled(getWorld(), node, testPos))
{
if (isConnected(path, testPos))
{
@ -401,7 +401,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti
while (itr.hasNext())
{
BlockPos testPos = itr.next();
TileEntity tile = worldObj.getTileEntity(testPos);
TileEntity tile = getWorld().getTileEntity(testPos);
if (tile instanceof IRoutingNode)
{
((IRoutingNode) tile).removeConnection(pos);

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

@ -26,7 +26,7 @@ public class TileOutputRoutingNode extends TileFilteredRoutingNode implements IO
@Override
public IItemFilter getOutputFilterForSide(EnumFacing side)
{
TileEntity tile = worldObj.getTileEntity(pos.offset(side));
TileEntity tile = getWorld().getTileEntity(pos.offset(side));
if (tile != null)
{
IItemHandler handler = Utils.getInventory(tile, side.getOpposite());
@ -34,7 +34,7 @@ public class TileOutputRoutingNode extends TileFilteredRoutingNode implements IO
{
ItemStack filterStack = this.getFilterStack(side);
if (filterStack == null || !(filterStack.getItem() instanceof IItemFilterProvider))
if (filterStack.isEmpty() || !(filterStack.getItem() instanceof IItemFilterProvider))
{
IItemFilter filter = new DefaultItemFilter();
filter.initializeFilter(null, tile, handler, true);

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

@ -30,10 +30,10 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte
@Override
public void update()
{
if (!worldObj.isRemote)
if (!getWorld().isRemote)
{
currentInput = worldObj.isBlockIndirectlyGettingPowered(pos);
// currentInput = worldObj.getStrongPower(pos);
currentInput = getWorld().isBlockIndirectlyGettingPowered(pos);
// currentInput = getWorld().getStrongPower(pos);
}
}
@ -83,14 +83,14 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte
@Override
public void removeAllConnections()
{
TileEntity testTile = worldObj.getTileEntity(getMasterPos());
TileEntity testTile = getWorld().getTileEntity(getMasterPos());
if (testTile instanceof IMasterRoutingNode)
{
((IMasterRoutingNode) testTile).removeConnection(pos); // Remove this node from the master
}
for (BlockPos testPos : connectionList)
{
TileEntity tile = worldObj.getTileEntity(testPos);
TileEntity tile = getWorld().getTileEntity(testPos);
if (tile instanceof IRoutingNode)
{
((IRoutingNode) tile).removeConnection(pos);