mirror of
https://github.com/GTNewHorizons/Baubles-Expanded.git
synced 2026-11-20 20:12:26 +00:00
Backported some slots and added a new one for gauntlets
This commit is contained in:
1 parent
253625dfd4
commit
36a332e597
8 files changed
+63
-11
No files matched your search
@@ -39,7 +39,7 @@ public class ContainerPlayerExpanded extends Container
|
||||
baubles.stackList = PlayerHandler.getPlayerBaubles(player).stackList;
|
||||
}
|
||||
|
||||
this.addSlotToContainer(new SlotCrafting(playerInv.player, this.craftMatrix, this.craftResult, 0, 144, 36));
|
||||
this.addSlotToContainer(new SlotCrafting(playerInv.player, this.craftMatrix, this.craftResult, 0, 144, 27));//36 -> 27
|
||||
int i;
|
||||
int j;
|
||||
|
||||
@@ -47,7 +47,7 @@ public class ContainerPlayerExpanded extends Container
|
||||
{
|
||||
for (j = 0; j < 2; ++j)
|
||||
{
|
||||
this.addSlotToContainer(new Slot(this.craftMatrix, j + i * 2, 106 + j * 18, 26 + i * 18));
|
||||
this.addSlotToContainer(new Slot(this.craftMatrix, j + i * 2, 106 + j * 18, 17 + i * 18));//26 -> 17
|
||||
}
|
||||
}
|
||||
|
||||
@@ -67,10 +67,14 @@ public class ContainerPlayerExpanded extends Container
|
||||
});
|
||||
}
|
||||
|
||||
this.addSlotToContainer(new SlotBauble(baubles,BaubleType.AMULET,0,80,8 + 0 * 18));
|
||||
this.addSlotToContainer(new SlotBauble(baubles,BaubleType.RING,1,80,8 + 1 * 18));
|
||||
this.addSlotToContainer(new SlotBauble(baubles,BaubleType.RING,2,80,8 + 2 * 18));
|
||||
this.addSlotToContainer(new SlotBauble(baubles,BaubleType.BELT,3,80,8 + 3 * 18));
|
||||
this.addSlotToContainer(new SlotBauble(baubles,BaubleType.AMULET, 0, 80, 8));
|
||||
this.addSlotToContainer(new SlotBauble(baubles,BaubleType.RING,1, 80, 8 + 18));
|
||||
this.addSlotToContainer(new SlotBauble(baubles,BaubleType.RING,2, 80, 8 + 2 * 18));
|
||||
this.addSlotToContainer(new SlotBauble(baubles,BaubleType.BELT,3, 80, 8 + 3 * 18));
|
||||
this.addSlotToContainer(new SlotBauble(baubles,BaubleType.HEAD,4, 80 + 18, 8 + 3 * 18));
|
||||
this.addSlotToContainer(new SlotBauble(baubles,BaubleType.BODY,5, 80 + 18 * 2, 8 + 3 * 18));
|
||||
this.addSlotToContainer(new SlotBauble(baubles,BaubleType.CHARM,6, 80 + 18 * 3, 8 + 3 * 18));
|
||||
this.addSlotToContainer(new SlotBauble(baubles,BaubleType.GAUNTLET,7, 80 + 18 * 4, 8 + 3 * 18));
|
||||
|
||||
for (i = 0; i < 3; ++i)
|
||||
{
|
||||
@@ -218,6 +222,50 @@ public class ContainerPlayerExpanded extends Container
|
||||
return null;
|
||||
}
|
||||
}
|
||||
else if (itemstack.getItem() instanceof IBauble &&
|
||||
((IBauble)itemstack.getItem()).getBaubleType(itemstack)==BaubleType.HEAD &&
|
||||
((IBauble)itemstack.getItem()).canEquip(itemstack, thePlayer) &&
|
||||
!((Slot)this.inventorySlots.get(13)).getHasStack())
|
||||
{
|
||||
int j = 13;
|
||||
if (!this.mergeItemStack(itemstack1, j, j + 1, false))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
else if (itemstack.getItem() instanceof IBauble &&
|
||||
((IBauble)itemstack.getItem()).getBaubleType(itemstack)==BaubleType.BODY &&
|
||||
((IBauble)itemstack.getItem()).canEquip(itemstack, thePlayer) &&
|
||||
!((Slot)this.inventorySlots.get(14)).getHasStack())
|
||||
{
|
||||
int j = 14;
|
||||
if (!this.mergeItemStack(itemstack1, j, j + 1, false))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
else if (itemstack.getItem() instanceof IBauble &&
|
||||
((IBauble)itemstack.getItem()).getBaubleType(itemstack)==BaubleType.CHARM &&
|
||||
((IBauble)itemstack.getItem()).canEquip(itemstack, thePlayer) &&
|
||||
!((Slot)this.inventorySlots.get(15)).getHasStack())
|
||||
{
|
||||
int j = 15;
|
||||
if (!this.mergeItemStack(itemstack1, j, j + 1, false))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
else if (itemstack.getItem() instanceof IBauble &&
|
||||
((IBauble)itemstack.getItem()).getBaubleType(itemstack)==BaubleType.GAUNTLET &&
|
||||
((IBauble)itemstack.getItem()).canEquip(itemstack, thePlayer) &&
|
||||
!((Slot)this.inventorySlots.get(16)).getHasStack())
|
||||
{
|
||||
int j = 16;
|
||||
if (!this.mergeItemStack(itemstack1, j, j + 1, false))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
else if (par2 >= 9+4 && par2 < 36+4)
|
||||
{
|
||||
if (!this.mergeItemStack(itemstack1, 36+4, 45+4, false))
|
||||
|
||||
Reference in new issue
Block a user