upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-11-13 17:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct

Browse Source
This commit is contained in:
Bernhard Bonigl committed 2014-09-26 13:35:30 +02:00
2 parents 5283333ad3 8d45b4411f
commit aaedf04449
2 files changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/tconstruct/tools/inventory/CraftingStationContainer.java
+3 -3
View File
@@ -46,8 +46,8 @@ public class CraftingStationContainer extends Container
if (logic.chest != null)
{
craftingOffsetX += 122;
inventoryOffsetX += 122;
craftingOffsetX += 116;
inventoryOffsetX += 116;
}
this.addSlotToContainer(new SlotCraftingStation(inventorplayer.player, this.craftMatrix, this.craftResult, 0, craftingOffsetX + 94, 35));
@@ -92,7 +92,7 @@ public class CraftingStationContainer extends Container
for (row = 0; row < 6; row++)
{
int value = count < 27 ? count : count - 27;
this.addSlotToContainer(new Slot(count < 27 ? firstChest : secondChest, value, 14 + row * 18, 19 + column * 18));
this.addSlotToContainer(new Slot(count < 27 ? firstChest : secondChest, value, 8 + row * 18, 19 + column * 18));
count++;
if (count >= 27 && secondChest == null)
break;
src/main/java/tconstruct/tools/inventory/PartCrafterChestContainer.java
+4 -4
View File
@@ -25,7 +25,7 @@ public class PartCrafterChestContainer extends ActiveContainer
patternLogic = pLogic;
largeInventory = true;
inventory = new Slot[] { new SlotPattern(partLogic, 0, 162, 27), new SlotPattern(partLogic, 1, 162, 45), new Slot(partLogic, 2, 180, 27), new Slot(partLogic, 3, 180, 45), new SlotOnlyTake(partLogic, 4, 224, 27), new SlotOnlyTake(partLogic, 5, 242, 27), new SlotOnlyTake(partLogic, 6, 224, 45), new SlotOnlyTake(partLogic, 7, 242, 45) };
inventory = new Slot[] { new SlotPattern(partLogic, 0, 156, 27), new SlotPattern(partLogic, 1, 156, 45), new Slot(partLogic, 2, 174, 27), new Slot(partLogic, 3, 174, 45), new SlotOnlyTake(partLogic, 4, 218, 27), new SlotOnlyTake(partLogic, 5, 236, 27), new SlotOnlyTake(partLogic, 6, 218, 45), new SlotOnlyTake(partLogic, 7, 236, 45) };
for (int iter = 0; iter < inventory.length; iter++)
this.addSlotToContainer(inventory[iter]);
@@ -34,7 +34,7 @@ public class PartCrafterChestContainer extends ActiveContainer
{
for (int row = 0; row < 6; row++)
{
this.addSlotToContainer(new SlotPattern(pLogic, row + column * 6, 14 + row * 18, 30 + column * 18));
this.addSlotToContainer(new SlotPattern(pLogic, row + column * 6, 8 + row * 18, 30 + column * 18));
}
}
@@ -43,13 +43,13 @@ public class PartCrafterChestContainer extends ActiveContainer
{
for (int row = 0; row < 9; row++)
{
this.addSlotToContainer(new Slot(inventoryplayer, row + column * 9 + 9, 130 + row * 18, 84 + column * 18));
this.addSlotToContainer(new Slot(inventoryplayer, row + column * 9 + 9, 124 + row * 18, 84 + column * 18));
}
}
for (int column = 0; column < 9; column++)
{
this.addSlotToContainer(new Slot(inventoryplayer, column, 130 + column * 18, 142));
this.addSlotToContainer(new Slot(inventoryplayer, column, 124 + column * 18, 142));
}
}