mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-16 18:54:45 +00:00
Update buildscript & apply automatic formatting rules
This commit is contained in:
1 parent
a7683b885d
commit
f7a900e910
173 files changed
+4581
-5321
No files matched your search
@@ -11,10 +11,8 @@ import net.minecraft.item.ItemArmor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
public class ContainerCreativeInv extends Container
|
||||
{
|
||||
private class SlotArmor extends Slot
|
||||
{
|
||||
public class ContainerCreativeInv extends Container {
|
||||
private class SlotArmor extends Slot {
|
||||
final int armorType;
|
||||
|
||||
public SlotArmor(IInventory inv, int x, int y, int slot, int armor) {
|
||||
@@ -39,15 +37,15 @@ public class ContainerCreativeInv extends Container
|
||||
}
|
||||
}
|
||||
|
||||
private class SlotBlockArmor extends SlotArmor
|
||||
{
|
||||
private class SlotBlockArmor extends SlotArmor {
|
||||
public SlotBlockArmor(IInventory inv, int x, int y, int slot, int armor) {
|
||||
super(inv, x, y, slot, armor);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isItemValid(ItemStack stack) {
|
||||
return super.isItemValid(stack) || stack != null;// && Block.getBlockFromItem(stack.getItem()) != Blocks.air;
|
||||
return super.isItemValid(stack)
|
||||
|| stack != null; // && Block.getBlockFromItem(stack.getItem()) != Blocks.air;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,12 +62,12 @@ public class ContainerCreativeInv extends Container
|
||||
for (int col = 0; col < 9; ++col)
|
||||
addSlotToContainer(new Slot(invPlayer, col + row * 9 + 9, 8 + col * 18, 118 + row * 18));
|
||||
|
||||
for (int col = 0; col < 9; ++col)
|
||||
addSlotToContainer(new Slot(invPlayer, col, 8 + col * 18, 176));
|
||||
for (int col = 0; col < 9; ++col) addSlotToContainer(new Slot(invPlayer, col, 8 + col * 18, 176));
|
||||
|
||||
addSlotToContainer(new SlotBlockArmor(invPlayer, invPlayer.getSizeInventory() - 1, -15, 23, 0));
|
||||
for (int armorType = 1; armorType < 4; armorType++)
|
||||
addSlotToContainer(new SlotArmor(invPlayer, invPlayer.getSizeInventory() - 1 - armorType, -15, 23 + armorType * 18, armorType));
|
||||
addSlotToContainer(new SlotArmor(
|
||||
invPlayer, invPlayer.getSizeInventory() - 1 - armorType, -15, 23 + armorType * 18, armorType));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -91,16 +89,13 @@ public class ContainerCreativeInv extends Container
|
||||
}
|
||||
|
||||
if (slotIndex < 54) {
|
||||
if (!this.mergeItemStack(stack, 54, 90, true))
|
||||
return null;
|
||||
if (!this.mergeItemStack(stack, 54, 90, true)) return null;
|
||||
} else if (!this.mergeItemStack(stack, 0, 54, false)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (stack.stackSize == 0)
|
||||
slot.putStack(null);
|
||||
else
|
||||
slot.onSlotChanged();
|
||||
if (stack.stackSize == 0) slot.putStack(null);
|
||||
else slot.onSlotChanged();
|
||||
}
|
||||
|
||||
return transferredStack;
|
||||
|
||||
Reference in new issue
Block a user