mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-16 02:04:59 +00:00
[ci skip] spotlessApply with the new settings
This commit is contained in:
1 parent
f1dea5460a
commit
f106b5e766
172 files changed
+2552
-2088
No files matched your search
@@ -1,7 +1,5 @@
|
||||
package codechicken.nei;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.inventory.Container;
|
||||
@@ -11,8 +9,13 @@ import net.minecraft.item.ItemArmor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
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) {
|
||||
@@ -38,14 +41,15 @@ public class ContainerCreativeInv extends Container {
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,20 +58,22 @@ public class ContainerCreativeInv extends Container {
|
||||
public ContainerCreativeInv(EntityPlayer player, ExtendedCreativeInv extraInv) {
|
||||
this.player = player;
|
||||
InventoryPlayer invPlayer = player.inventory;
|
||||
for (int row = 0; row < 6; row++)
|
||||
for (int col = 0; col < 9; col++)
|
||||
addSlotToContainer(new Slot(extraInv, col + row * 9, 8 + col * 18, 5 + row * 18));
|
||||
for (int row = 0; row < 6; row++) for (int col = 0; col < 9; col++)
|
||||
addSlotToContainer(new Slot(extraInv, col + row * 9, 8 + col * 18, 5 + row * 18));
|
||||
|
||||
for (int row = 0; row < 3; ++row)
|
||||
for (int col = 0; col < 9; ++col)
|
||||
addSlotToContainer(new Slot(invPlayer, col + row * 9 + 9, 8 + col * 18, 118 + row * 18));
|
||||
for (int row = 0; row < 3; ++row) 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));
|
||||
|
||||
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));
|
||||
for (int armorType = 1; armorType < 4; armorType++) addSlotToContainer(
|
||||
new SlotArmor(
|
||||
invPlayer,
|
||||
invPlayer.getSizeInventory() - 1 - armorType,
|
||||
-15,
|
||||
23 + armorType * 18,
|
||||
armorType));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user