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

24
src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java
View file

@ -49,7 +49,7 @@ public class ContainerAlchemyTable extends Container
if (slotId < 6 && slotId >= 0)
{
Slot slot = this.getSlot(slotId);
if (!slot.getHasStack() && inventoryPlayer.getItemStack() == null)
if (!slot.getHasStack() && inventoryPlayer.getItemStack().isEmpty())
{
((TileAlchemyTable) tileTable).toggleInputSlotAccessible(slotId);
}
@ -61,7 +61,7 @@ public class ContainerAlchemyTable extends Container
@Override
public ItemStack transferStackInSlot(EntityPlayer playerIn, int index)
{
ItemStack itemstack = null;
ItemStack itemstack = ItemStack.EMPTY;
Slot slot = this.inventorySlots.get(index);
if (slot != null && slot.getHasStack())
@ -73,7 +73,7 @@ public class ContainerAlchemyTable extends Container
{
if (!this.mergeItemStack(itemstack1, 9, 9 + 36, true))
{
return null;
return ItemStack.EMPTY;
}
slot.onSlotChange(itemstack1, itemstack);
@ -83,31 +83,31 @@ public class ContainerAlchemyTable extends Container
{
if (!this.mergeItemStack(itemstack1, 7, 8, false)) //TODO: Add alchemy tools to list
{
return null;
return ItemStack.EMPTY;
}
} else if (!this.mergeItemStack(itemstack1, 0, 6, false))
{
return null;
return ItemStack.EMPTY;
}
} else if (!this.mergeItemStack(itemstack1, 9, 9 + 36, false))
{
return null;
return ItemStack.EMPTY;
}
if (itemstack1.stackSize == 0)
if (itemstack1.getCount() == 0)
{
slot.putStack(null);
slot.putStack(ItemStack.EMPTY);
} else
{
slot.onSlotChanged();
}
if (itemstack1.stackSize == itemstack.stackSize)
if (itemstack1.getCount() == itemstack.getCount())
{
return null;
return ItemStack.EMPTY;
}
slot.onPickupFromSlot(playerIn, itemstack1);
slot.onTake(playerIn, itemstack1);
}
return itemstack;
@ -116,7 +116,7 @@ public class ContainerAlchemyTable extends Container
@Override
public boolean canInteractWith(EntityPlayer playerIn)
{
return this.tileTable.isUseableByPlayer(playerIn);
return this.tileTable.isUsableByPlayer(playerIn);
}
private class SlotOrb extends Slot

24
src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java
View file

@ -98,7 +98,7 @@ public class ContainerItemRoutingNode extends Container
ItemStack copyStack = heldStack.copy();
GhostItemHelper.setItemGhostAmount(copyStack, 0);
copyStack.stackSize = 1;
copyStack.setCount(1);
slot.putStack(copyStack);
}
}
@ -124,7 +124,7 @@ public class ContainerItemRoutingNode extends Container
@Override
public ItemStack transferStackInSlot(EntityPlayer playerIn, int index)
{
ItemStack itemstack = null;
ItemStack itemstack = ItemStack.EMPTY;
Slot slot = this.inventorySlots.get(index);
if (slot != null && slot.getHasStack())
@ -136,7 +136,7 @@ public class ContainerItemRoutingNode extends Container
{
if (!this.mergeItemStack(itemstack1, slotsOccupied, slotsOccupied + 36, true))
{
return null;
return ItemStack.EMPTY;
}
slot.onSlotChange(itemstack1, itemstack);
@ -147,28 +147,28 @@ public class ContainerItemRoutingNode extends Container
{
if (!this.mergeItemStack(itemstack1, 0, 1, false))
{
return null;
return ItemStack.EMPTY;
}
}
} else if (!this.mergeItemStack(itemstack1, 0 + slotsOccupied, 36 + slotsOccupied, false))
} else if (!this.mergeItemStack(itemstack1, slotsOccupied, 36 + slotsOccupied, false))
{
return null;
return ItemStack.EMPTY;
}
if (itemstack1.stackSize == 0)
if (itemstack1.getCount() == 0)
{
slot.putStack(null);
slot.putStack(ItemStack.EMPTY);
} else
{
slot.onSlotChanged();
}
if (itemstack1.stackSize == itemstack.stackSize)
if (itemstack1.getCount() == itemstack.getCount())
{
return null;
return ItemStack.EMPTY;
}
slot.onPickupFromSlot(playerIn, itemstack1);
slot.onTake(playerIn, itemstack1);
}
return itemstack;
@ -177,7 +177,7 @@ public class ContainerItemRoutingNode extends Container
@Override
public boolean canInteractWith(EntityPlayer playerIn)
{
return this.tileItemRoutingNode.isUseableByPlayer(playerIn);
return this.tileItemRoutingNode.isUsableByPlayer(playerIn);
}
private class SlotItemFilter extends Slot

2
src/main/java/WayofTime/bloodmagic/tile/container/ContainerMasterRoutingNode.java
View file

@ -18,6 +18,6 @@ public class ContainerMasterRoutingNode extends Container
@Override
public boolean canInteractWith(EntityPlayer playerIn)
{
return this.tileMasterRoutingNode.isUseableByPlayer(playerIn);
return this.tileMasterRoutingNode.isUsableByPlayer(playerIn);
}
}

22
src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java
View file

@ -41,7 +41,7 @@ public class ContainerSoulForge extends Container
@Override
public ItemStack transferStackInSlot(EntityPlayer playerIn, int index)
{
ItemStack itemstack = null;
ItemStack itemstack = ItemStack.EMPTY;
Slot slot = this.inventorySlots.get(index);
if (slot != null && slot.getHasStack())
@ -53,7 +53,7 @@ public class ContainerSoulForge extends Container
{
if (!this.mergeItemStack(itemstack1, 6, 6 + 36, true))
{
return null;
return ItemStack.EMPTY;
}
slot.onSlotChange(itemstack1, itemstack);
@ -63,31 +63,31 @@ public class ContainerSoulForge extends Container
{
if (!this.mergeItemStack(itemstack1, 4, 5, false))
{
return null;
return ItemStack.EMPTY;
}
} else if (!this.mergeItemStack(itemstack1, 0, 4, false))
{
return null;
return ItemStack.EMPTY;
}
} else if (!this.mergeItemStack(itemstack1, 6, 42, false))
{
return null;
return ItemStack.EMPTY;
}
if (itemstack1.stackSize == 0)
if (itemstack1.getCount() == 0)
{
slot.putStack(null);
slot.putStack(ItemStack.EMPTY);
} else
{
slot.onSlotChanged();
}
if (itemstack1.stackSize == itemstack.stackSize)
if (itemstack1.getCount() == itemstack.getCount())
{
return null;
return ItemStack.EMPTY;
}
slot.onPickupFromSlot(playerIn, itemstack1);
slot.onTake(playerIn, itemstack1);
}
return itemstack;
@ -96,7 +96,7 @@ public class ContainerSoulForge extends Container
@Override
public boolean canInteractWith(EntityPlayer playerIn)
{
return this.tileForge.isUseableByPlayer(playerIn);
return this.tileForge.isUsableByPlayer(playerIn);
}
private class SlotSoul extends Slot

18
src/main/java/WayofTime/bloodmagic/tile/container/ContainerTeleposer.java
View file

@ -34,7 +34,7 @@ public class ContainerTeleposer extends Container
@Override
public ItemStack transferStackInSlot(EntityPlayer player, int slot)
{
ItemStack stack = null;
ItemStack stack = ItemStack.EMPTY;
Slot slotObject = inventorySlots.get(slot);
int slots = inventorySlots.size();
@ -49,28 +49,28 @@ public class ContainerTeleposer extends Container
{
if (!this.mergeItemStack(stackInSlot, 0, slots, false))
{
return null;
return ItemStack.EMPTY;
}
} else if (!this.mergeItemStack(stackInSlot, slots, 36 + slots, false))
{
return null;
return ItemStack.EMPTY;
}
}
if (stackInSlot.stackSize == 0)
if (stackInSlot.getCount() == 0)
{
slotObject.putStack(null);
slotObject.putStack(ItemStack.EMPTY);
} else
{
slotObject.onSlotChanged();
}
if (stackInSlot.stackSize == stack.stackSize)
if (stackInSlot.getCount() == stack.getCount())
{
return null;
return ItemStack.EMPTY;
}
slotObject.onPickupFromSlot(player, stackInSlot);
slotObject.onTake(player, stackInSlot);
}
return stack;
@ -79,7 +79,7 @@ public class ContainerTeleposer extends Container
@Override
public boolean canInteractWith(EntityPlayer playerIn)
{
return this.tileTeleposer.isUseableByPlayer(playerIn);
return this.tileTeleposer.isUsableByPlayer(playerIn);
}
private class SlotTeleposer extends Slot