Added Sacrificial Knife event
This commit is contained in:
WayofTime
parent
df776f0323
commit
086027faf5
8 changed files with 169 additions and 329 deletions
|
|
@ -74,157 +74,110 @@ public class RitualEffectItemRouting extends RitualEffect
|
|||
return;
|
||||
}
|
||||
|
||||
for(int i=0; i<4; i++)
|
||||
{
|
||||
Int3 inputFocusChest = this.getInputBufferChestLocation(i);
|
||||
TileEntity inputFocusInv = world.getTileEntity(x + inputFocusChest.xCoord, y + inputFocusChest.yCoord, z + inputFocusChest.zCoord);
|
||||
if(inputFocusInv instanceof IInventory)
|
||||
{
|
||||
for(int ji=0; ji<((IInventory) inputFocusInv).getSizeInventory(); ji++) //Iterate through foci inventory
|
||||
{
|
||||
ItemStack inputFocusStack = ((IInventory) inputFocusInv).getStackInSlot(ji);
|
||||
if(inputFocusStack != null && inputFocusStack.getItem() instanceof InputRoutingFocus)
|
||||
{
|
||||
InputRoutingFocus inputFocus = (InputRoutingFocus)inputFocusStack.getItem();
|
||||
TileEntity inputChest = world.getTileEntity(inputFocus.xCoord(inputFocusStack), inputFocus.yCoord(inputFocusStack), inputFocus.zCoord(inputFocusStack));
|
||||
if(inputChest instanceof IInventory)
|
||||
{
|
||||
IInventory inputChestInventory = (IInventory)inputChest;
|
||||
ForgeDirection syphonDirection = inputFocus.getSetDirection(inputFocusStack);
|
||||
boolean[] canSyphonList = new boolean[inputChestInventory.getSizeInventory()];
|
||||
if(inputChest instanceof ISidedInventory)
|
||||
{
|
||||
int[] validSlots = ((ISidedInventory) inputChest).getAccessibleSlotsFromSide(syphonDirection.ordinal());
|
||||
for(int in : validSlots)
|
||||
{
|
||||
canSyphonList[in] = true;
|
||||
}
|
||||
}else
|
||||
{
|
||||
for(int ni=0; ni<inputChestInventory.getSizeInventory(); ni++)
|
||||
{
|
||||
canSyphonList[ni] = true;
|
||||
}
|
||||
}
|
||||
|
||||
for(int ni=0; ni<inputChestInventory.getSizeInventory(); ni++)
|
||||
{
|
||||
if(canSyphonList[ni])
|
||||
{
|
||||
ItemStack syphonedStack = inputChestInventory.getStackInSlot(ni); //Has a syphoned item linked, next need to find a destination
|
||||
if(syphonedStack == null || (inputChestInventory instanceof ISidedInventory && !((ISidedInventory)inputChestInventory).canExtractItem(ni, syphonedStack, syphonDirection.ordinal())))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
int size = syphonedStack.stackSize;
|
||||
|
||||
for(IInventory outputFocusInventory : outputList)
|
||||
{
|
||||
//ItemStack stack = outputFocusInventory.getStackInSlot(0);
|
||||
//if(stack != null && stack.getItem() instanceof OutputRoutingFocus) //TODO change to output routing focus
|
||||
{
|
||||
// boolean transferEverything = true;
|
||||
// for(int j=1; j<outputFocusInventory.getSizeInventory(); j++)
|
||||
// {
|
||||
// if(outputFocusInventory.getStackInSlot(j) != null)
|
||||
// {
|
||||
// transferEverything = false;
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
|
||||
OutputRoutingFocus outputFocus;;
|
||||
|
||||
RoutingFocusParadigm parad = new RoutingFocusParadigm();
|
||||
// parad.addRoutingFocusPosAndFacing(outputFocus.getPosAndFacing(stack));
|
||||
// parad.addLogic(outputFocus.getLogic(stack.getItemDamage()));
|
||||
|
||||
TileEntity outputChest = null; //Destination
|
||||
ForgeDirection inputDirection;;
|
||||
|
||||
// if(transferEverything)
|
||||
// {
|
||||
// if(outputChest instanceof IInventory)
|
||||
// {
|
||||
// IInventory outputChestInventory = (IInventory)outputChest;
|
||||
//
|
||||
// for(int n=0; n<bufferInventory.getSizeInventory(); n++)
|
||||
// {
|
||||
// ItemStack syphonedStack = bufferInventory.getStackInSlot(n);
|
||||
// if(syphonedStack == null)
|
||||
// {
|
||||
// continue;
|
||||
// }
|
||||
// int size = syphonedStack.stackSize;
|
||||
// ItemStack newStack = SpellHelper.insertStackIntoInventory(syphonedStack, outputChestInventory, inputDirection);
|
||||
// if(size == newStack.stackSize)
|
||||
// {
|
||||
// continue;
|
||||
// }
|
||||
// if(newStack != null && newStack.stackSize <= 0)
|
||||
// {
|
||||
// newStack = null;
|
||||
// }
|
||||
// bufferInventory.setInventorySlotContents(n, newStack);
|
||||
//// break;
|
||||
// }
|
||||
// }
|
||||
// }else
|
||||
{
|
||||
// if(!(outputChest instanceof IInventory))
|
||||
// {
|
||||
// continue;
|
||||
// }
|
||||
|
||||
IInventory outputChestInventory = null;
|
||||
|
||||
boolean lastItemWasFocus = true;
|
||||
|
||||
for(int j=0; j<outputFocusInventory.getSizeInventory(); j++)
|
||||
{
|
||||
ItemStack keyStack = outputFocusInventory.getStackInSlot(j);
|
||||
if(keyStack == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(keyStack.getItem() instanceof OutputRoutingFocus)
|
||||
{
|
||||
if(!lastItemWasFocus)
|
||||
{
|
||||
parad.clear();
|
||||
}
|
||||
|
||||
outputFocus = (OutputRoutingFocus)keyStack.getItem();
|
||||
|
||||
parad.addRoutingFocusPosAndFacing(outputFocus.getPosAndFacing(keyStack));
|
||||
parad.addLogic(outputFocus.getLogic(keyStack));
|
||||
lastItemWasFocus = true;
|
||||
continue;
|
||||
}else
|
||||
{
|
||||
lastItemWasFocus = false;
|
||||
}
|
||||
|
||||
for(RoutingFocusPosAndFacing posAndFacing : parad.locationList)
|
||||
{
|
||||
if(posAndFacing == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
inputDirection = posAndFacing.facing;
|
||||
if(outputChest == null || !posAndFacing.location.equals(new Int3(outputChest.xCoord, outputChest.yCoord, outputChest.zCoord)))
|
||||
{
|
||||
outputChest = world.getTileEntity(posAndFacing.location.xCoord, posAndFacing.location.yCoord, posAndFacing.location.zCoord);
|
||||
if(outputChest instanceof IInventory)
|
||||
{
|
||||
outputChestInventory = (IInventory)outputChest;
|
||||
}else
|
||||
{
|
||||
continue;
|
||||
}
|
||||
}
|
||||
for(IInventory outputFocusInventory : outputList)
|
||||
{
|
||||
{
|
||||
OutputRoutingFocus outputFocus;;
|
||||
|
||||
RoutingFocusParadigm parad = new RoutingFocusParadigm();
|
||||
|
||||
TileEntity outputChest = null; //Destination
|
||||
ForgeDirection inputDirection;;
|
||||
|
||||
{
|
||||
IInventory outputChestInventory = null;
|
||||
|
||||
boolean lastItemWasFocus = true;
|
||||
|
||||
for(int j=0; j<outputFocusInventory.getSizeInventory(); j++)
|
||||
{
|
||||
ItemStack keyStack = outputFocusInventory.getStackInSlot(j);
|
||||
if(keyStack == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(keyStack.getItem() instanceof OutputRoutingFocus)
|
||||
{
|
||||
if(!lastItemWasFocus)
|
||||
{
|
||||
parad.clear();
|
||||
}
|
||||
|
||||
outputFocus = (OutputRoutingFocus)keyStack.getItem();
|
||||
|
||||
parad.addRoutingFocusPosAndFacing(outputFocus.getPosAndFacing(keyStack));
|
||||
parad.addLogic(outputFocus.getLogic(keyStack));
|
||||
lastItemWasFocus = true;
|
||||
continue;
|
||||
}else
|
||||
{
|
||||
lastItemWasFocus = false;
|
||||
}
|
||||
|
||||
for(RoutingFocusPosAndFacing posAndFacing : parad.locationList)
|
||||
{
|
||||
if(posAndFacing == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
inputDirection = posAndFacing.facing;
|
||||
if(outputChest == null || !posAndFacing.location.equals(new Int3(outputChest.xCoord, outputChest.yCoord, outputChest.zCoord)))
|
||||
{
|
||||
outputChest = world.getTileEntity(posAndFacing.location.xCoord, posAndFacing.location.yCoord, posAndFacing.location.zCoord);
|
||||
if(outputChest instanceof IInventory)
|
||||
{
|
||||
outputChestInventory = (IInventory)outputChest;
|
||||
}else
|
||||
{
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
for(int i=0; i<4; i++)
|
||||
{
|
||||
Int3 inputFocusChest = this.getInputBufferChestLocation(i);
|
||||
TileEntity inputFocusInv = world.getTileEntity(x + inputFocusChest.xCoord, y + inputFocusChest.yCoord, z + inputFocusChest.zCoord);
|
||||
if(inputFocusInv instanceof IInventory)
|
||||
{
|
||||
for(int ji=0; ji<((IInventory) inputFocusInv).getSizeInventory(); ji++) //Iterate through foci inventory
|
||||
{
|
||||
ItemStack inputFocusStack = ((IInventory) inputFocusInv).getStackInSlot(ji);
|
||||
if(inputFocusStack != null && inputFocusStack.getItem() instanceof InputRoutingFocus)
|
||||
{
|
||||
InputRoutingFocus inputFocus = (InputRoutingFocus)inputFocusStack.getItem();
|
||||
TileEntity inputChest = world.getTileEntity(inputFocus.xCoord(inputFocusStack), inputFocus.yCoord(inputFocusStack), inputFocus.zCoord(inputFocusStack));
|
||||
if(inputChest instanceof IInventory)
|
||||
{
|
||||
IInventory inputChestInventory = (IInventory)inputChest;
|
||||
ForgeDirection syphonDirection = inputFocus.getSetDirection(inputFocusStack);
|
||||
boolean[] canSyphonList = new boolean[inputChestInventory.getSizeInventory()];
|
||||
if(inputChest instanceof ISidedInventory)
|
||||
{
|
||||
int[] validSlots = ((ISidedInventory) inputChest).getAccessibleSlotsFromSide(syphonDirection.ordinal());
|
||||
for(int in : validSlots)
|
||||
{
|
||||
canSyphonList[in] = true;
|
||||
}
|
||||
}else
|
||||
{
|
||||
for(int ni=0; ni<inputChestInventory.getSizeInventory(); ni++)
|
||||
{
|
||||
canSyphonList[ni] = true;
|
||||
}
|
||||
}
|
||||
|
||||
for(int ni=0; ni<inputChestInventory.getSizeInventory(); ni++)
|
||||
{
|
||||
if(canSyphonList[ni])
|
||||
{
|
||||
ItemStack syphonedStack = inputChestInventory.getStackInSlot(ni); //Has a syphoned item linked, next need to find a destination
|
||||
if(syphonedStack == null || (inputChestInventory instanceof ISidedInventory && !((ISidedInventory)inputChestInventory).canExtractItem(ni, syphonedStack, syphonDirection.ordinal())))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
int size = syphonedStack.stackSize;
|
||||
|
||||
if(parad.doesItemMatch(keyStack, syphonedStack))
|
||||
{
|
||||
|
|
@ -241,6 +194,8 @@ public class RitualEffectItemRouting extends RitualEffect
|
|||
continue;
|
||||
}
|
||||
|
||||
int numberSyphoned = size - newStack.stackSize;
|
||||
|
||||
if(newStack != null && newStack.stackSize <= 0)
|
||||
{
|
||||
size = newStack.stackSize;
|
||||
|
|
@ -253,20 +208,7 @@ public class RitualEffectItemRouting extends RitualEffect
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// ItemStack newStack = SpellHelper.insertStackIntoInventory(syphonedStack, bufferInventory, ForgeDirection.DOWN);
|
||||
// if(size == newStack.stackSize)
|
||||
// {
|
||||
// continue;
|
||||
// }
|
||||
// if(newStack != null && newStack.stackSize <= 0)
|
||||
// {
|
||||
// newStack = null;
|
||||
// }
|
||||
// inputChestInventory.setInventorySlotContents(n, newStack);
|
||||
// break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -274,149 +216,6 @@ public class RitualEffectItemRouting extends RitualEffect
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
// for(int i=0; i<4; i++)
|
||||
// {
|
||||
// Int3 outputFocusChest = this.getOutputBufferChestLocation(i);
|
||||
// TileEntity outputFocusInv = world.getTileEntity(x + outputFocusChest.xCoord, y + outputFocusChest.yCoord, z + outputFocusChest.zCoord);
|
||||
// if(outputFocusInv instanceof IInventory)
|
||||
// {
|
||||
// IInventory outputFocusInventory = (IInventory)outputFocusInv;
|
||||
// ItemStack stack = outputFocusInventory.getStackInSlot(0);
|
||||
// if(stack != null && stack.getItem() instanceof OutputRoutingFocus) //TODO change to output routing focus
|
||||
// {
|
||||
// boolean transferEverything = true;
|
||||
// for(int j=1; j<outputFocusInventory.getSizeInventory(); j++)
|
||||
// {
|
||||
// if(outputFocusInventory.getStackInSlot(j) != null)
|
||||
// {
|
||||
// transferEverything = false;
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// OutputRoutingFocus outputFocus = (OutputRoutingFocus)stack.getItem();
|
||||
//
|
||||
// RoutingFocusParadigm parad = new RoutingFocusParadigm();
|
||||
// parad.addRoutingFocusPosAndFacing(outputFocus.getPosAndFacing(stack));
|
||||
// parad.addLogic(outputFocus.getLogic(stack.getItemDamage()));
|
||||
//
|
||||
// TileEntity outputChest = world.getTileEntity(outputFocus.xCoord(stack), outputFocus.yCoord(stack), outputFocus.zCoord(stack)); //Destination
|
||||
// ForgeDirection inputDirection = outputFocus.getSetDirection(stack);
|
||||
//
|
||||
// if(transferEverything)
|
||||
// {
|
||||
// if(outputChest instanceof IInventory)
|
||||
// {
|
||||
// IInventory outputChestInventory = (IInventory)outputChest;
|
||||
//
|
||||
// for(int n=0; n<bufferInventory.getSizeInventory(); n++)
|
||||
// {
|
||||
// ItemStack syphonedStack = bufferInventory.getStackInSlot(n);
|
||||
// if(syphonedStack == null)
|
||||
// {
|
||||
// continue;
|
||||
// }
|
||||
// int size = syphonedStack.stackSize;
|
||||
// ItemStack newStack = SpellHelper.insertStackIntoInventory(syphonedStack, outputChestInventory, inputDirection);
|
||||
// if(size == newStack.stackSize)
|
||||
// {
|
||||
// continue;
|
||||
// }
|
||||
// if(newStack != null && newStack.stackSize <= 0)
|
||||
// {
|
||||
// newStack = null;
|
||||
// }
|
||||
// bufferInventory.setInventorySlotContents(n, newStack);
|
||||
//// break;
|
||||
// }
|
||||
// }
|
||||
// }else
|
||||
// {
|
||||
// if(!(outputChest instanceof IInventory))
|
||||
// {
|
||||
// continue;
|
||||
// }
|
||||
//
|
||||
// IInventory outputChestInventory = (IInventory)outputChest;
|
||||
//
|
||||
// boolean lastItemWasFocus = true;
|
||||
//
|
||||
// for(int j=1; j<outputFocusInventory.getSizeInventory(); j++)
|
||||
// {
|
||||
// ItemStack keyStack = outputFocusInventory.getStackInSlot(j);
|
||||
// if(keyStack == null)
|
||||
// {
|
||||
// continue;
|
||||
// }
|
||||
//
|
||||
// if(keyStack.getItem() instanceof OutputRoutingFocus)
|
||||
// {
|
||||
// if(!lastItemWasFocus)
|
||||
// {
|
||||
// parad.clear();
|
||||
// }
|
||||
//
|
||||
// outputFocus = (OutputRoutingFocus)keyStack.getItem();
|
||||
//
|
||||
// parad.addRoutingFocusPosAndFacing(outputFocus.getPosAndFacing(keyStack));
|
||||
// parad.addLogic(outputFocus.getLogic(keyStack.getItemDamage()));
|
||||
// lastItemWasFocus = true;
|
||||
// continue;
|
||||
// }else
|
||||
// {
|
||||
// lastItemWasFocus = false;
|
||||
// }
|
||||
//
|
||||
// for(RoutingFocusPosAndFacing posAndFacing : parad.locationList)
|
||||
// {
|
||||
// if(posAndFacing == null)
|
||||
// {
|
||||
// continue;
|
||||
// }
|
||||
// inputDirection = posAndFacing.facing;
|
||||
// if(outputChest == null || !posAndFacing.location.equals(new Int3(outputChest.xCoord, outputChest.yCoord, outputChest.zCoord)))
|
||||
// {
|
||||
// outputChest = world.getTileEntity(posAndFacing.location.xCoord, posAndFacing.location.yCoord, posAndFacing.location.zCoord);
|
||||
// if(outputChest instanceof IInventory)
|
||||
// {
|
||||
// outputChestInventory = (IInventory)outputChest;
|
||||
// }else
|
||||
// {
|
||||
// continue;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// for(int n=0; n<bufferInventory.getSizeInventory(); n++)
|
||||
// {
|
||||
// ItemStack checkStack = bufferInventory.getStackInSlot(n);
|
||||
// if(checkStack == null)
|
||||
// {
|
||||
// continue;
|
||||
// }
|
||||
//
|
||||
// if(parad.doesItemMatch(keyStack, checkStack))
|
||||
// {
|
||||
// int size = checkStack.stackSize;
|
||||
// ItemStack newStack = SpellHelper.insertStackIntoInventory(checkStack, outputChestInventory, inputDirection);
|
||||
// if(size == newStack.stackSize)
|
||||
// {
|
||||
// continue;
|
||||
// }
|
||||
// if(newStack != null && newStack.stackSize <= 0)
|
||||
// {
|
||||
// newStack = null;
|
||||
// }
|
||||
// bufferInventory.setInventorySlotContents(n, newStack);
|
||||
//// break;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
public Int3 getInputBufferChestLocation(int number)
|
||||
|
|
@ -440,13 +239,13 @@ public class RitualEffectItemRouting extends RitualEffect
|
|||
switch(number)
|
||||
{
|
||||
case 0:
|
||||
return new Int3(2, 0, 0);
|
||||
return new Int3(2, 0, 2);
|
||||
case 1:
|
||||
return new Int3(-2, 0, 0);
|
||||
return new Int3(-2, 0, 2);
|
||||
case 2:
|
||||
return new Int3(0, 0, 2);
|
||||
return new Int3(2, 0, -2);
|
||||
case 3:
|
||||
return new Int3(0, 0, -2);
|
||||
return new Int3(-2, 0, -2);
|
||||
}
|
||||
return new Int3(0, 0, 0);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue