mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-21 21:02:24 +00:00
The great format and clean up. IMPORTANT: Read below.
All devs and contributors should use the provided formatter settings. If your IDE does not support the format, the rules are simple, it is the default java formatting rules, with 200char line lengths and 1 extra line after class definitions.
This commit is contained in:
1 parent
06c5f5930f
commit
82792ed22e
136 files changed
+10365
-11272
No files matched your search
@@ -1,92 +1,92 @@
|
||||
package com.cricketcraft.chisel.inventory;
|
||||
|
||||
import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.inventory.Container;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel;
|
||||
|
||||
public class ContainerAutoChisel extends Container {
|
||||
|
||||
public static TileEntityAutoChisel autoChisel;
|
||||
public static EntityPlayer player;
|
||||
public static TileEntityAutoChisel autoChisel;
|
||||
public static EntityPlayer player;
|
||||
|
||||
public ContainerAutoChisel(InventoryPlayer player, TileEntityAutoChisel tileEntityAutoChisel) {
|
||||
public ContainerAutoChisel(InventoryPlayer player, TileEntityAutoChisel tileEntityAutoChisel) {
|
||||
|
||||
this.player = player.player;
|
||||
autoChisel = tileEntityAutoChisel;
|
||||
ContainerAutoChisel.player = player.player;
|
||||
autoChisel = tileEntityAutoChisel;
|
||||
|
||||
addSlotToContainer(new Slot(tileEntityAutoChisel, 0, 53, 15));
|
||||
addSlotToContainer(new Slot(tileEntityAutoChisel, 1, 78, 51));
|
||||
addSlotToContainer(new Slot(tileEntityAutoChisel, 2, 103, 15));
|
||||
addSlotToContainer(new Slot(tileEntityAutoChisel, 3, 151, 51));
|
||||
addSlotToContainer(new Slot(tileEntityAutoChisel, 4, 151, 31));
|
||||
addSlotToContainer(new Slot(tileEntityAutoChisel, 5, 151, 11));
|
||||
addSlotToContainer(new Slot(tileEntityAutoChisel, 0, 53, 15));
|
||||
addSlotToContainer(new Slot(tileEntityAutoChisel, 1, 78, 51));
|
||||
addSlotToContainer(new Slot(tileEntityAutoChisel, 2, 103, 15));
|
||||
addSlotToContainer(new Slot(tileEntityAutoChisel, 3, 151, 51));
|
||||
addSlotToContainer(new Slot(tileEntityAutoChisel, 4, 151, 31));
|
||||
addSlotToContainer(new Slot(tileEntityAutoChisel, 5, 151, 11));
|
||||
|
||||
bindPlayerInventory(player);
|
||||
}
|
||||
|
||||
bindPlayerInventory(player);
|
||||
}
|
||||
protected void bindPlayerInventory(InventoryPlayer invPlayer) {
|
||||
for (int row = 0; row < 3; row++) {
|
||||
for (int column = 0; column < 9; column++) {
|
||||
addSlotToContainer(new Slot(invPlayer, column + row * 9 + 9, 8 + column * 18, 84 + row * 18));
|
||||
}
|
||||
}
|
||||
|
||||
protected void bindPlayerInventory(InventoryPlayer invPlayer) {
|
||||
for (int row = 0; row < 3; row++) {
|
||||
for (int column = 0; column < 9; column++) {
|
||||
addSlotToContainer(new Slot(invPlayer, column + row * 9 + 9, 8 + column * 18, 84 + row * 18));
|
||||
}
|
||||
}
|
||||
for (int slotNumber = 0; slotNumber < 9; slotNumber++) {
|
||||
addSlotToContainer(new Slot(invPlayer, slotNumber, 8 + slotNumber * 18, 142));
|
||||
}
|
||||
}
|
||||
|
||||
for (int slotNumber = 0; slotNumber < 9; slotNumber++) {
|
||||
addSlotToContainer(new Slot(invPlayer, slotNumber, 8 + slotNumber * 18, 142));
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public boolean canInteractWith(EntityPlayer player) {
|
||||
return autoChisel.isUseableByPlayer(player);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canInteractWith(EntityPlayer player) {
|
||||
return autoChisel.isUseableByPlayer(player);
|
||||
}
|
||||
@Override
|
||||
public ItemStack transferStackInSlot(EntityPlayer player, int slotNumber) {
|
||||
ItemStack itemStack = null;
|
||||
Slot slot = (Slot) this.inventorySlots.get(slotNumber);
|
||||
|
||||
@Override
|
||||
public ItemStack transferStackInSlot(EntityPlayer player, int slotNumber) {
|
||||
ItemStack itemStack = null;
|
||||
Slot slot = (Slot) this.inventorySlots.get(slotNumber);
|
||||
if (slot != null && slot.getHasStack()) {
|
||||
ItemStack itemStack1 = slot.getStack();
|
||||
itemStack = itemStack1.copy();
|
||||
|
||||
if (slot != null && slot.getHasStack()) {
|
||||
ItemStack itemStack1 = slot.getStack();
|
||||
itemStack = itemStack1.copy();
|
||||
if (slotNumber == 2) {
|
||||
if (!this.mergeItemStack(itemStack1, 3, 39, true)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (slotNumber == 2) {
|
||||
if (!this.mergeItemStack(itemStack1, 3, 39, true)) {
|
||||
return null;
|
||||
}
|
||||
slot.onSlotChange(itemStack1, itemStack);
|
||||
} else if (slotNumber != 1 && slotNumber != 0) {
|
||||
if (!this.mergeItemStack(itemStack1, 0, 1, true)) {
|
||||
return null;
|
||||
} else if (slotNumber >= 3 && slotNumber < 30) {
|
||||
if (this.mergeItemStack(itemStack1, 30, 39, false)) {
|
||||
return null;
|
||||
}
|
||||
} else if (slotNumber >= 30 && slotNumber < 39 && !this.mergeItemStack(itemStack1, 3, 30, false)) {
|
||||
return null;
|
||||
}
|
||||
} else if (this.mergeItemStack(itemStack1, 3, 39, false)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
slot.onSlotChange(itemStack1, itemStack);
|
||||
} else if (slotNumber != 1 && slotNumber != 0) {
|
||||
if (!this.mergeItemStack(itemStack1, 0, 1, true)) {
|
||||
return null;
|
||||
} else if (slotNumber >= 3 && slotNumber < 30) {
|
||||
if (this.mergeItemStack(itemStack1, 30, 39, false)) {
|
||||
return null;
|
||||
}
|
||||
} else if (slotNumber >= 30 && slotNumber < 39 && !this.mergeItemStack(itemStack1, 3, 30, false)) {
|
||||
return null;
|
||||
}
|
||||
} else if (this.mergeItemStack(itemStack1, 3, 39, false)) {
|
||||
return null;
|
||||
}
|
||||
if (itemStack1.stackSize == 0) {
|
||||
slot.putStack(null);
|
||||
} else {
|
||||
slot.onSlotChanged();
|
||||
}
|
||||
|
||||
if (itemStack1.stackSize == 0) {
|
||||
slot.putStack(null);
|
||||
} else {
|
||||
slot.onSlotChanged();
|
||||
}
|
||||
if (itemStack1.stackSize == itemStack.stackSize) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (itemStack1.stackSize == itemStack.stackSize) {
|
||||
return null;
|
||||
}
|
||||
slot.onPickupFromSlot(player, itemStack1);
|
||||
}
|
||||
|
||||
slot.onPickupFromSlot(player, itemStack1);
|
||||
}
|
||||
|
||||
return itemStack;
|
||||
}
|
||||
return itemStack;
|
||||
}
|
||||
}
|
||||
@@ -12,118 +12,102 @@ import com.cricketcraft.chisel.carving.Carving;
|
||||
import com.cricketcraft.chisel.item.ItemChisel;
|
||||
import com.cricketcraft.chisel.utils.General;
|
||||
|
||||
public class ContainerChisel extends Container
|
||||
{
|
||||
public final InventoryChiselSelection inventory;
|
||||
public InventoryPlayer playerInventory;
|
||||
int currentIndex;
|
||||
public ItemStack chisel;
|
||||
public boolean finished;
|
||||
public Carving carving;
|
||||
public class ContainerChisel extends Container {
|
||||
|
||||
public ContainerChisel(InventoryPlayer inventoryplayer, InventoryChiselSelection inv)
|
||||
{
|
||||
inventory = inv;
|
||||
playerInventory = inventoryplayer;
|
||||
currentIndex = playerInventory.currentItem;
|
||||
inv.container = this;
|
||||
public final InventoryChiselSelection inventory;
|
||||
public InventoryPlayer playerInventory;
|
||||
int currentIndex;
|
||||
public ItemStack chisel;
|
||||
public boolean finished;
|
||||
public Carving carving;
|
||||
|
||||
int[] leftOffsets = {8, 26, 134, 152, 44, 116};
|
||||
int[] topOffsets = {8, 26, 44, 62};
|
||||
public ContainerChisel(InventoryPlayer inventoryplayer, InventoryChiselSelection inv) {
|
||||
inventory = inv;
|
||||
playerInventory = inventoryplayer;
|
||||
currentIndex = playerInventory.currentItem;
|
||||
inv.container = this;
|
||||
|
||||
for(int i = 0; i < 2; i++)
|
||||
{
|
||||
for(int y = 0; y < 4; y++)
|
||||
{
|
||||
for(int x = 0; x < 2; x++)
|
||||
{
|
||||
addSlotToContainer(new SlotChiselSelection(this, inventory, inventory, x + i * 8 + y * 2, leftOffsets[x + i * 2], topOffsets[y]));
|
||||
}
|
||||
}
|
||||
}
|
||||
int[] leftOffsets = { 8, 26, 134, 152, 44, 116 };
|
||||
int[] topOffsets = { 8, 26, 44, 62 };
|
||||
|
||||
for(int y = 0; y < 4; y++)
|
||||
{
|
||||
for(int x = 0; x < 2; x++)
|
||||
{
|
||||
addSlotToContainer(new SlotChiselSelection(this, inventory, inventory, 16 + x + y * 2, leftOffsets[4 + x], topOffsets[3 - y]));
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < 2; i++) {
|
||||
for (int y = 0; y < 4; y++) {
|
||||
for (int x = 0; x < 2; x++) {
|
||||
addSlotToContainer(new SlotChiselSelection(this, inventory, inventory, x + i * 8 + y * 2, leftOffsets[x + i * 2], topOffsets[y]));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
addSlotToContainer(new SlotChiselInput(this, inventory, InventoryChiselSelection.normalSlots, 80, 35));
|
||||
for (int y = 0; y < 4; y++) {
|
||||
for (int x = 0; x < 2; x++) {
|
||||
addSlotToContainer(new SlotChiselSelection(this, inventory, inventory, 16 + x + y * 2, leftOffsets[4 + x], topOffsets[3 - y]));
|
||||
}
|
||||
}
|
||||
|
||||
for(int k = 0; k < 3; k++)
|
||||
{
|
||||
for(int j1 = 0; j1 < 9; j1++)
|
||||
{
|
||||
addSlotToContainer(new Slot(inventoryplayer, j1 + k * 9 + 9, 8 + j1 * 18, 102 + k * 18 - 18));
|
||||
}
|
||||
}
|
||||
addSlotToContainer(new SlotChiselInput(this, inventory, InventoryChiselSelection.normalSlots, 80, 35));
|
||||
|
||||
for(int l = 0; l < 9; l++)
|
||||
{
|
||||
addSlotToContainer(l == currentIndex ?
|
||||
new SlotChiselPlayer(this, inventoryplayer, l, 8 + l * 18, 160 - 18) :
|
||||
new Slot(inventoryplayer, l, 8 + l * 18, 160 - 18)
|
||||
);
|
||||
}
|
||||
for (int k = 0; k < 3; k++) {
|
||||
for (int j1 = 0; j1 < 9; j1++) {
|
||||
addSlotToContainer(new Slot(inventoryplayer, j1 + k * 9 + 9, 8 + j1 * 18, 102 + k * 18 - 18));
|
||||
}
|
||||
}
|
||||
|
||||
chisel = inventoryplayer.getCurrentItem();
|
||||
if(chisel.stackTagCompound != null)
|
||||
{
|
||||
ItemStack stack = ItemStack.loadItemStackFromNBT(chisel.stackTagCompound.getCompoundTag("chiselTarget"));
|
||||
inventory.setInventorySlotContents(InventoryChiselSelection.normalSlots, stack);
|
||||
}
|
||||
for (int l = 0; l < 9; l++) {
|
||||
addSlotToContainer(l == currentIndex ? new SlotChiselPlayer(this, inventoryplayer, l, 8 + l * 18, 160 - 18) : new Slot(inventoryplayer, l, 8 + l * 18, 160 - 18));
|
||||
}
|
||||
|
||||
Item item = General.getItem(chisel);
|
||||
carving = item instanceof ItemChisel ? ((ItemChisel) item).carving : Carving.chisel;
|
||||
chisel = inventoryplayer.getCurrentItem();
|
||||
if (chisel.stackTagCompound != null) {
|
||||
ItemStack stack = ItemStack.loadItemStackFromNBT(chisel.stackTagCompound.getCompoundTag("chiselTarget"));
|
||||
inventory.setInventorySlotContents(InventoryChiselSelection.normalSlots, stack);
|
||||
}
|
||||
|
||||
inventory.updateItems();
|
||||
}
|
||||
Item item = General.getItem(chisel);
|
||||
carving = item instanceof ItemChisel ? ItemChisel.carving : Carving.chisel;
|
||||
|
||||
@Override
|
||||
public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer par4EntityPlayer)
|
||||
{
|
||||
if(par3 == 2 && par2 == currentIndex)
|
||||
return null;
|
||||
inventory.updateItems();
|
||||
}
|
||||
|
||||
return super.slotClick(par1, par2, par3, par4EntityPlayer);
|
||||
}
|
||||
@Override
|
||||
public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer par4EntityPlayer) {
|
||||
if (par3 == 2 && par2 == currentIndex)
|
||||
return null;
|
||||
|
||||
@Override
|
||||
public void onContainerClosed(EntityPlayer entityplayer)
|
||||
{
|
||||
inventory.clearItems();
|
||||
super.onContainerClosed(entityplayer);
|
||||
}
|
||||
return super.slotClick(par1, par2, par3, par4EntityPlayer);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canInteractWith(EntityPlayer entityplayer)
|
||||
{
|
||||
return inventory.isUseableByPlayer(entityplayer);
|
||||
}
|
||||
@Override
|
||||
public void onContainerClosed(EntityPlayer entityplayer) {
|
||||
inventory.clearItems();
|
||||
super.onContainerClosed(entityplayer);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack transferStackInSlot(EntityPlayer entity, int i)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@Override
|
||||
public boolean canInteractWith(EntityPlayer entityplayer) {
|
||||
return inventory.isUseableByPlayer(entityplayer);
|
||||
}
|
||||
|
||||
public void onChiselSlotChanged()
|
||||
{
|
||||
ItemStack stack = playerInventory.mainInventory[currentIndex];
|
||||
if(!stack.isItemEqual(chisel)) finished = true;
|
||||
@Override
|
||||
public ItemStack transferStackInSlot(EntityPlayer entity, int i) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if(finished) return;
|
||||
public void onChiselSlotChanged() {
|
||||
ItemStack stack = playerInventory.mainInventory[currentIndex];
|
||||
if (!stack.isItemEqual(chisel))
|
||||
finished = true;
|
||||
|
||||
if(chisel.stackTagCompound == null)
|
||||
chisel.stackTagCompound = new NBTTagCompound();
|
||||
if (finished)
|
||||
return;
|
||||
|
||||
NBTTagCompound tag = new NBTTagCompound();
|
||||
if(inventory.getStackInSpecialSlot() != null)
|
||||
inventory.getStackInSpecialSlot().writeToNBT(tag);
|
||||
if (chisel.stackTagCompound == null)
|
||||
chisel.stackTagCompound = new NBTTagCompound();
|
||||
|
||||
chisel.stackTagCompound.setTag("chiselTarget", tag);
|
||||
playerInventory.mainInventory[currentIndex] = chisel;
|
||||
}
|
||||
NBTTagCompound tag = new NBTTagCompound();
|
||||
if (inventory.getStackInSpecialSlot() != null)
|
||||
inventory.getStackInSpecialSlot().writeToNBT(tag);
|
||||
|
||||
chisel.stackTagCompound.setTag("chiselTarget", tag);
|
||||
playerInventory.mainInventory[currentIndex] = chisel;
|
||||
}
|
||||
}
|
||||
@@ -5,34 +5,35 @@ import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.inventory.Slot;
|
||||
|
||||
public class ContainerPresent extends ContainerChest {
|
||||
private IInventory lower;
|
||||
private int rows;
|
||||
|
||||
public ContainerPresent(IInventory player, IInventory chest) {
|
||||
super(player, chest);
|
||||
lower = chest;
|
||||
rows = chest.getSizeInventory() / 9;
|
||||
chest.openInventory();
|
||||
int a = (rows - 4) * 18;
|
||||
private IInventory lower;
|
||||
private int rows;
|
||||
|
||||
for (int d = 0; d < rows; d++) {
|
||||
for (int e = 0; e < 9; e++) {
|
||||
addSlotToContainer(new Slot(chest, e + d * 9, 8 + e * 18, 18 + d * 18));
|
||||
}
|
||||
}
|
||||
public ContainerPresent(IInventory player, IInventory chest) {
|
||||
super(player, chest);
|
||||
lower = chest;
|
||||
rows = chest.getSizeInventory() / 9;
|
||||
chest.openInventory();
|
||||
int a = (rows - 4) * 18;
|
||||
|
||||
for (int d = 0; d < 3; d++) {
|
||||
for (int e = 0; e < 9; e++) {
|
||||
addSlotToContainer(new Slot(player, e + d * 9 + 9, 8 + e * 18, 103 + d * 18 + a));
|
||||
}
|
||||
}
|
||||
for (int d = 0; d < rows; d++) {
|
||||
for (int e = 0; e < 9; e++) {
|
||||
addSlotToContainer(new Slot(chest, e + d * 9, 8 + e * 18, 18 + d * 18));
|
||||
}
|
||||
}
|
||||
|
||||
for (int d = 0; d < 9; d++) {
|
||||
addSlotToContainer(new Slot(player, d, 8 + d * 18, 161 + a));
|
||||
}
|
||||
}
|
||||
for (int d = 0; d < 3; d++) {
|
||||
for (int e = 0; e < 9; e++) {
|
||||
addSlotToContainer(new Slot(player, e + d * 9 + 9, 8 + e * 18, 103 + d * 18 + a));
|
||||
}
|
||||
}
|
||||
|
||||
public IInventory getLowerPresentInventory() {
|
||||
return lower;
|
||||
}
|
||||
for (int d = 0; d < 9; d++) {
|
||||
addSlotToContainer(new Slot(player, d, 8 + d * 18, 161 + a));
|
||||
}
|
||||
}
|
||||
|
||||
public IInventory getLowerPresentInventory() {
|
||||
return lower;
|
||||
}
|
||||
}
|
||||
@@ -10,178 +10,155 @@ import net.minecraft.item.ItemStack;
|
||||
|
||||
import com.cricketcraft.chisel.item.ItemChisel;
|
||||
|
||||
public class InventoryChiselSelection implements IInventory
|
||||
{
|
||||
ItemStack chisel = null;
|
||||
public final static int normalSlots = 32;
|
||||
public int activeVariations = 0;
|
||||
ContainerChisel container;
|
||||
ItemStack[] inventory;
|
||||
public class InventoryChiselSelection implements IInventory {
|
||||
|
||||
public InventoryChiselSelection(ItemStack c)
|
||||
{
|
||||
super();
|
||||
ItemStack chisel = null;
|
||||
public final static int normalSlots = 32;
|
||||
public int activeVariations = 0;
|
||||
ContainerChisel container;
|
||||
ItemStack[] inventory;
|
||||
|
||||
inventory = new ItemStack[normalSlots + 1];
|
||||
chisel = c;
|
||||
}
|
||||
public InventoryChiselSelection(ItemStack c) {
|
||||
super();
|
||||
|
||||
public void onInventoryUpdate(int slot)
|
||||
{
|
||||
inventory = new ItemStack[normalSlots + 1];
|
||||
chisel = c;
|
||||
}
|
||||
|
||||
}
|
||||
public void onInventoryUpdate(int slot) {
|
||||
|
||||
@Override
|
||||
public int getSizeInventory()
|
||||
{
|
||||
return normalSlots + 1;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStackInSlot(int var1)
|
||||
{
|
||||
return inventory[var1];
|
||||
}
|
||||
@Override
|
||||
public int getSizeInventory() {
|
||||
return normalSlots + 1;
|
||||
}
|
||||
|
||||
public void updateInventoryState(int slot)
|
||||
{
|
||||
onInventoryUpdate(slot);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getStackInSlot(int var1) {
|
||||
return inventory[var1];
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack decrStackSize(int slot, int amount)
|
||||
{
|
||||
if(this.inventory[slot] != null)
|
||||
{
|
||||
ItemStack stack;
|
||||
if(this.inventory[slot].stackSize <= amount)
|
||||
{
|
||||
stack = this.inventory[slot];
|
||||
this.inventory[slot] = null;
|
||||
updateInventoryState(slot);
|
||||
return stack;
|
||||
} else
|
||||
{
|
||||
stack = this.inventory[slot].splitStack(amount);
|
||||
public void updateInventoryState(int slot) {
|
||||
onInventoryUpdate(slot);
|
||||
}
|
||||
|
||||
if(this.inventory[slot].stackSize == 0)
|
||||
this.inventory[slot] = null;
|
||||
@Override
|
||||
public ItemStack decrStackSize(int slot, int amount) {
|
||||
if (this.inventory[slot] != null) {
|
||||
ItemStack stack;
|
||||
if (this.inventory[slot].stackSize <= amount) {
|
||||
stack = this.inventory[slot];
|
||||
this.inventory[slot] = null;
|
||||
updateInventoryState(slot);
|
||||
return stack;
|
||||
} else {
|
||||
stack = this.inventory[slot].splitStack(amount);
|
||||
|
||||
updateInventoryState(slot);
|
||||
if (this.inventory[slot].stackSize == 0)
|
||||
this.inventory[slot] = null;
|
||||
|
||||
return stack;
|
||||
}
|
||||
} else return null;
|
||||
}
|
||||
updateInventoryState(slot);
|
||||
|
||||
@Override
|
||||
public String getInventoryName()
|
||||
{
|
||||
return "container.chisel";
|
||||
}
|
||||
return stack;
|
||||
}
|
||||
} else
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasCustomInventoryName()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return "container.chisel";
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getInventoryStackLimit()
|
||||
{
|
||||
return 64;
|
||||
}
|
||||
@Override
|
||||
public boolean hasCustomInventoryName() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void markDirty()
|
||||
{
|
||||
@Override
|
||||
public int getInventoryStackLimit() {
|
||||
return 64;
|
||||
}
|
||||
|
||||
}
|
||||
@Override
|
||||
public void markDirty() {
|
||||
|
||||
@Override
|
||||
public boolean isUseableByPlayer(EntityPlayer entityplayer)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
public void clearItems()
|
||||
{
|
||||
activeVariations = 0;
|
||||
for(int i = 0; i < normalSlots; i++)
|
||||
{
|
||||
inventory[i] = null;
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public boolean isUseableByPlayer(EntityPlayer entityplayer) {
|
||||
return true;
|
||||
}
|
||||
|
||||
public ItemStack getStackInSpecialSlot()
|
||||
{
|
||||
return inventory[normalSlots];
|
||||
}
|
||||
public void clearItems() {
|
||||
activeVariations = 0;
|
||||
for (int i = 0; i < normalSlots; i++) {
|
||||
inventory[i] = null;
|
||||
}
|
||||
}
|
||||
|
||||
public void updateItems()
|
||||
{
|
||||
ItemStack chiseledItem = inventory[normalSlots];
|
||||
public ItemStack getStackInSpecialSlot() {
|
||||
return inventory[normalSlots];
|
||||
}
|
||||
|
||||
clearItems();
|
||||
public void updateItems() {
|
||||
ItemStack chiseledItem = inventory[normalSlots];
|
||||
|
||||
if(chiseledItem == null)
|
||||
{
|
||||
container.onChiselSlotChanged();
|
||||
return;
|
||||
}
|
||||
clearItems();
|
||||
|
||||
Item item = chiseledItem.getItem();
|
||||
if(item == null) return;
|
||||
if (chiseledItem == null) {
|
||||
container.onChiselSlotChanged();
|
||||
return;
|
||||
}
|
||||
|
||||
if(Block.getBlockFromItem(item) == null)
|
||||
return;
|
||||
Item item = chiseledItem.getItem();
|
||||
if (item == null)
|
||||
return;
|
||||
|
||||
ArrayList<ItemStack> list = container.carving.getItems(chiseledItem);
|
||||
if (Block.getBlockFromItem(item) == null)
|
||||
return;
|
||||
|
||||
activeVariations = 0;
|
||||
while(activeVariations < normalSlots && activeVariations < list.size())
|
||||
{
|
||||
inventory[activeVariations] = list.get(activeVariations);
|
||||
activeVariations++;
|
||||
}
|
||||
ArrayList<ItemStack> list = container.carving.getItems(chiseledItem);
|
||||
|
||||
container.onChiselSlotChanged();
|
||||
}
|
||||
activeVariations = 0;
|
||||
while (activeVariations < normalSlots && activeVariations < list.size()) {
|
||||
inventory[activeVariations] = list.get(activeVariations);
|
||||
activeVariations++;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStackInSlotOnClosing(int slot)
|
||||
{
|
||||
ItemStack stack = getStackInSlot(slot);
|
||||
container.onChiselSlotChanged();
|
||||
}
|
||||
|
||||
if(stack == null)
|
||||
return null;
|
||||
inventory[slot] = null;
|
||||
@Override
|
||||
public ItemStack getStackInSlotOnClosing(int slot) {
|
||||
ItemStack stack = getStackInSlot(slot);
|
||||
|
||||
updateInventoryState(slot);
|
||||
return stack;
|
||||
}
|
||||
if (stack == null)
|
||||
return null;
|
||||
inventory[slot] = null;
|
||||
|
||||
@Override
|
||||
public void setInventorySlotContents(int slot, ItemStack stack)
|
||||
{
|
||||
inventory[slot] = stack;
|
||||
updateInventoryState(slot);
|
||||
}
|
||||
updateInventoryState(slot);
|
||||
return stack;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void openInventory()
|
||||
{
|
||||
}
|
||||
@Override
|
||||
public void setInventorySlotContents(int slot, ItemStack stack) {
|
||||
inventory[slot] = stack;
|
||||
updateInventoryState(slot);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void closeInventory()
|
||||
{
|
||||
}
|
||||
@Override
|
||||
public void openInventory() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isItemValidForSlot(int i, ItemStack stack)
|
||||
{
|
||||
return !(stack != null && (stack.getItem() instanceof ItemChisel)) && i == normalSlots;
|
||||
}
|
||||
@Override
|
||||
public void closeInventory() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isItemValidForSlot(int i, ItemStack stack) {
|
||||
return !(stack != null && (stack.getItem() instanceof ItemChisel)) && i == normalSlots;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -5,98 +5,99 @@ import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class InventoryLargePresent implements IInventory {
|
||||
private String name;
|
||||
private IInventory upper, lower;
|
||||
|
||||
public InventoryLargePresent(String name, IInventory upper, IInventory lower) {
|
||||
this.name = name;
|
||||
private String name;
|
||||
private IInventory upper, lower;
|
||||
|
||||
if (upper == null) {
|
||||
upper = lower;
|
||||
}
|
||||
public InventoryLargePresent(String name, IInventory upper, IInventory lower) {
|
||||
this.name = name;
|
||||
|
||||
if (lower == null) {
|
||||
lower = upper;
|
||||
}
|
||||
if (upper == null) {
|
||||
upper = lower;
|
||||
}
|
||||
|
||||
this.upper = upper;
|
||||
this.lower = lower;
|
||||
}
|
||||
if (lower == null) {
|
||||
lower = upper;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSizeInventory() {
|
||||
return upper.getSizeInventory() + lower.getSizeInventory();
|
||||
}
|
||||
this.upper = upper;
|
||||
this.lower = lower;
|
||||
}
|
||||
|
||||
public boolean isPartOfLargePresent(IInventory inventory) {
|
||||
return upper == inventory || lower == inventory;
|
||||
}
|
||||
@Override
|
||||
public int getSizeInventory() {
|
||||
return upper.getSizeInventory() + lower.getSizeInventory();
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStackInSlot(int slot) {
|
||||
return slot >= upper.getSizeInventory() ? lower.getStackInSlot(slot - upper.getSizeInventory()) : upper.getStackInSlot(slot);
|
||||
}
|
||||
public boolean isPartOfLargePresent(IInventory inventory) {
|
||||
return upper == inventory || lower == inventory;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack decrStackSize(int slot, int size) {
|
||||
return slot >= upper.getSizeInventory() ? lower.getStackInSlot(slot - upper.getSizeInventory()) : upper.getStackInSlot(slot);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getStackInSlot(int slot) {
|
||||
return slot >= upper.getSizeInventory() ? lower.getStackInSlot(slot - upper.getSizeInventory()) : upper.getStackInSlot(slot);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStackInSlotOnClosing(int slot) {
|
||||
return slot >= upper.getSizeInventory() ? lower.getStackInSlotOnClosing(slot - upper.getSizeInventory()) : upper.getStackInSlotOnClosing(slot);
|
||||
}
|
||||
@Override
|
||||
public ItemStack decrStackSize(int slot, int size) {
|
||||
return slot >= upper.getSizeInventory() ? lower.getStackInSlot(slot - upper.getSizeInventory()) : upper.getStackInSlot(slot);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setInventorySlotContents(int slot, ItemStack stack) {
|
||||
if (slot >= upper.getSizeInventory()) {
|
||||
lower.setInventorySlotContents(slot - upper.getSizeInventory(), stack);
|
||||
} else {
|
||||
upper.setInventorySlotContents(slot, stack);
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public ItemStack getStackInSlotOnClosing(int slot) {
|
||||
return slot >= upper.getSizeInventory() ? lower.getStackInSlotOnClosing(slot - upper.getSizeInventory()) : upper.getStackInSlotOnClosing(slot);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return upper.hasCustomInventoryName() ? upper.getInventoryName() : (lower.hasCustomInventoryName() ? lower.getInventoryName() : name);
|
||||
}
|
||||
@Override
|
||||
public void setInventorySlotContents(int slot, ItemStack stack) {
|
||||
if (slot >= upper.getSizeInventory()) {
|
||||
lower.setInventorySlotContents(slot - upper.getSizeInventory(), stack);
|
||||
} else {
|
||||
upper.setInventorySlotContents(slot, stack);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasCustomInventoryName() {
|
||||
return upper.hasCustomInventoryName() || lower.hasCustomInventoryName();
|
||||
}
|
||||
@Override
|
||||
public String getInventoryName() {
|
||||
return upper.hasCustomInventoryName() ? upper.getInventoryName() : (lower.hasCustomInventoryName() ? lower.getInventoryName() : name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getInventoryStackLimit() {
|
||||
return upper.getInventoryStackLimit();
|
||||
}
|
||||
@Override
|
||||
public boolean hasCustomInventoryName() {
|
||||
return upper.hasCustomInventoryName() || lower.hasCustomInventoryName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void markDirty() {
|
||||
upper.markDirty();
|
||||
lower.markDirty();
|
||||
}
|
||||
@Override
|
||||
public int getInventoryStackLimit() {
|
||||
return upper.getInventoryStackLimit();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isUseableByPlayer(EntityPlayer player) {
|
||||
return upper.isUseableByPlayer(player) && lower.isUseableByPlayer(player);
|
||||
}
|
||||
@Override
|
||||
public void markDirty() {
|
||||
upper.markDirty();
|
||||
lower.markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void openInventory() {
|
||||
upper.openInventory();
|
||||
lower.openInventory();
|
||||
}
|
||||
@Override
|
||||
public boolean isUseableByPlayer(EntityPlayer player) {
|
||||
return upper.isUseableByPlayer(player) && lower.isUseableByPlayer(player);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void closeInventory() {
|
||||
upper.closeInventory();
|
||||
;
|
||||
lower.closeInventory();
|
||||
}
|
||||
@Override
|
||||
public void openInventory() {
|
||||
upper.openInventory();
|
||||
lower.openInventory();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isItemValidForSlot(int slot, ItemStack stack) {
|
||||
return true;
|
||||
}
|
||||
@Override
|
||||
public void closeInventory() {
|
||||
upper.closeInventory();
|
||||
;
|
||||
lower.closeInventory();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isItemValidForSlot(int slot, ItemStack stack) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -4,39 +4,37 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class SlotChiselInput extends Slot
|
||||
{
|
||||
public SlotChiselInput(ContainerChisel container, InventoryChiselSelection inv, int i, int j, int k)
|
||||
{
|
||||
super(inv, i, j, k);
|
||||
selInventory = inv;
|
||||
this.container = container;
|
||||
}
|
||||
public class SlotChiselInput extends Slot {
|
||||
|
||||
@Override
|
||||
public boolean isItemValid(ItemStack itemstack)
|
||||
{
|
||||
if(container.finished) return false;
|
||||
public SlotChiselInput(ContainerChisel container, InventoryChiselSelection inv, int i, int j, int k) {
|
||||
super(inv, i, j, k);
|
||||
selInventory = inv;
|
||||
this.container = container;
|
||||
}
|
||||
|
||||
return super.isItemValid(itemstack);
|
||||
}
|
||||
@Override
|
||||
public boolean isItemValid(ItemStack itemstack) {
|
||||
if (container.finished)
|
||||
return false;
|
||||
|
||||
@Override
|
||||
public boolean canTakeStack(EntityPlayer par1EntityPlayer)
|
||||
{
|
||||
return !container.finished && super.canTakeStack(par1EntityPlayer);
|
||||
return super.isItemValid(itemstack);
|
||||
}
|
||||
|
||||
}
|
||||
@Override
|
||||
public boolean canTakeStack(EntityPlayer par1EntityPlayer) {
|
||||
return !container.finished && super.canTakeStack(par1EntityPlayer);
|
||||
|
||||
@Override
|
||||
public void onSlotChanged()
|
||||
{
|
||||
if(container.finished) return;
|
||||
}
|
||||
|
||||
super.onSlotChanged();
|
||||
selInventory.updateItems();
|
||||
}
|
||||
@Override
|
||||
public void onSlotChanged() {
|
||||
if (container.finished)
|
||||
return;
|
||||
|
||||
ContainerChisel container;
|
||||
InventoryChiselSelection selInventory;
|
||||
super.onSlotChanged();
|
||||
selInventory.updateItems();
|
||||
}
|
||||
|
||||
ContainerChisel container;
|
||||
InventoryChiselSelection selInventory;
|
||||
}
|
||||
@@ -5,42 +5,35 @@ import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class SlotChiselPlayer extends Slot {
|
||||
|
||||
public class SlotChiselPlayer extends Slot
|
||||
{
|
||||
public SlotChiselPlayer(ContainerChisel container, InventoryPlayer inv, int i, int j, int k) {
|
||||
super(inv, i, j, k);
|
||||
|
||||
public SlotChiselPlayer(ContainerChisel container, InventoryPlayer inv, int i, int j, int k)
|
||||
{
|
||||
super(inv, i, j, k);
|
||||
this.container = container;
|
||||
selInventory = inv;
|
||||
}
|
||||
|
||||
this.container = container;
|
||||
selInventory = inv;
|
||||
}
|
||||
@Override
|
||||
public boolean isItemValid(ItemStack par1ItemStack) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isItemValid(ItemStack par1ItemStack)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
public void onPickupFromSlot(EntityPlayer player, ItemStack itemstack) {
|
||||
container.finished = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPickupFromSlot(EntityPlayer player, ItemStack itemstack)
|
||||
{
|
||||
container.finished = true;
|
||||
}
|
||||
@Override
|
||||
public boolean getHasStack() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getHasStack()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
public ItemStack decrStackSize(int i) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack decrStackSize(int i)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
ContainerChisel container;
|
||||
InventoryPlayer selInventory;
|
||||
ContainerChisel container;
|
||||
InventoryPlayer selInventory;
|
||||
}
|
||||
@@ -7,81 +7,85 @@ import net.minecraft.item.ItemStack;
|
||||
|
||||
import com.cricketcraft.chisel.utils.General;
|
||||
|
||||
public class SlotChiselSelection extends Slot
|
||||
{
|
||||
public SlotChiselSelection(ContainerChisel container, InventoryChiselSelection inv, IInventory iinventory, int i, int j, int k)
|
||||
{
|
||||
super(iinventory, i, j, k);
|
||||
public class SlotChiselSelection extends Slot {
|
||||
|
||||
this.container = container;
|
||||
selInventory = inv;
|
||||
}
|
||||
public SlotChiselSelection(ContainerChisel container, InventoryChiselSelection inv, IInventory iinventory, int i, int j, int k) {
|
||||
super(iinventory, i, j, k);
|
||||
|
||||
@Override
|
||||
public boolean isItemValid(ItemStack itemstack)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
this.container = container;
|
||||
selInventory = inv;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canTakeStack(EntityPlayer par1EntityPlayer)
|
||||
{
|
||||
if(container.finished) return false;
|
||||
@Override
|
||||
public boolean isItemValid(ItemStack itemstack) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return par1EntityPlayer.inventory.getItemStack() == null;
|
||||
}
|
||||
@Override
|
||||
public boolean canTakeStack(EntityPlayer par1EntityPlayer) {
|
||||
if (container.finished)
|
||||
return false;
|
||||
|
||||
@Override
|
||||
public void onPickupFromSlot(EntityPlayer player, ItemStack itemstack)
|
||||
{
|
||||
ItemStack stack = player.inventory.getItemStack();
|
||||
ItemStack crafted = selInventory.inventory[InventoryChiselSelection.normalSlots];
|
||||
return par1EntityPlayer.inventory.getItemStack() == null;
|
||||
}
|
||||
|
||||
if(stack == null)
|
||||
{
|
||||
if(crafted != null && crafted.stackSize > 0) crafted.stackSize--;
|
||||
if(crafted.stackSize == 0) crafted = null;
|
||||
@Override
|
||||
public void onPickupFromSlot(EntityPlayer player, ItemStack itemstack) {
|
||||
ItemStack stack = player.inventory.getItemStack();
|
||||
ItemStack crafted = selInventory.inventory[InventoryChiselSelection.normalSlots];
|
||||
|
||||
selInventory.setInventorySlotContents(InventoryChiselSelection.normalSlots, crafted);
|
||||
} else
|
||||
{
|
||||
putStack(new ItemStack(itemstack.getItem(), itemstack.stackSize, itemstack.getItemDamage()));
|
||||
if (stack == null) {
|
||||
if (crafted != null && crafted.stackSize > 0)
|
||||
crafted.stackSize--;
|
||||
if (crafted.stackSize == 0)
|
||||
crafted = null;
|
||||
|
||||
player.inventory.setItemStack(null);
|
||||
selInventory.setInventorySlotContents(InventoryChiselSelection.normalSlots, crafted);
|
||||
} else {
|
||||
putStack(new ItemStack(itemstack.getItem(), itemstack.stackSize, itemstack.getItemDamage()));
|
||||
|
||||
if(selInventory.inventory[InventoryChiselSelection.normalSlots] == null) return;
|
||||
player.inventory.setItemStack(null);
|
||||
|
||||
player.inventory.setItemStack(new ItemStack(itemstack.getItem(), selInventory.inventory[InventoryChiselSelection.normalSlots].stackSize, itemstack.getItemDamage()));
|
||||
selInventory.setInventorySlotContents(InventoryChiselSelection.normalSlots, null);
|
||||
}
|
||||
if (selInventory.inventory[InventoryChiselSelection.normalSlots] == null)
|
||||
return;
|
||||
|
||||
|
||||
selInventory.updateItems();
|
||||
|
||||
String sound = container.carving.getVariationSound(itemstack.getItem(), itemstack.getItemDamage());
|
||||
player.worldObj.playSoundAtEntity(player, sound, 0.3f + 0.7f * General.rand.nextFloat(), 0.6f + 0.4f * General.rand.nextFloat());
|
||||
|
||||
|
||||
/* ItemStack stack=player.inventory.getItemStack();
|
||||
|
||||
putStack(new ItemStack(itemstack.itemID, itemstack.stackSize, itemstack.getItemDamage()));
|
||||
|
||||
super.onPickupFromSlot(player,itemstack);
|
||||
|
||||
player.inventory.setItemStack(null);
|
||||
|
||||
if(selInventory.items[InventoryChiselSelection.normalSlots]==null) return;
|
||||
|
||||
player.inventory.setItemStack(new ItemStack(itemstack.itemID, selInventory.items[InventoryChiselSelection.normalSlots].stackSize, itemstack.getItemDamage()));
|
||||
selInventory.setInventorySlotContents(InventoryChiselSelection.normalSlots,null);
|
||||
player.inventory.setItemStack(new ItemStack(itemstack.getItem(), selInventory.inventory[InventoryChiselSelection.normalSlots].stackSize, itemstack.getItemDamage()));
|
||||
selInventory.setInventorySlotContents(InventoryChiselSelection.normalSlots, null);
|
||||
}
|
||||
|
||||
selInventory.updateItems();
|
||||
|
||||
String sound=Carving.chisel.getVariationSound(itemstack.itemID, itemstack.getItemDamage());
|
||||
String sound = container.carving.getVariationSound(itemstack.getItem(), itemstack.getItemDamage());
|
||||
player.worldObj.playSoundAtEntity(player, sound, 0.3f + 0.7f * General.rand.nextFloat(), 0.6f + 0.4f * General.rand.nextFloat());
|
||||
*/
|
||||
}
|
||||
|
||||
ContainerChisel container;
|
||||
InventoryChiselSelection selInventory;
|
||||
/*
|
||||
* ItemStack stack=player.inventory.getItemStack();
|
||||
*
|
||||
* putStack(new ItemStack(itemstack.itemID, itemstack.stackSize,
|
||||
* itemstack.getItemDamage()));
|
||||
*
|
||||
* super.onPickupFromSlot(player,itemstack);
|
||||
*
|
||||
* player.inventory.setItemStack(null);
|
||||
*
|
||||
* if(selInventory.items[InventoryChiselSelection.normalSlots]==null)
|
||||
* return;
|
||||
*
|
||||
* player.inventory.setItemStack(new ItemStack(itemstack.itemID,
|
||||
* selInventory.items[InventoryChiselSelection.normalSlots].stackSize,
|
||||
* itemstack.getItemDamage()));
|
||||
* selInventory.setInventorySlotContents(InventoryChiselSelection
|
||||
* .normalSlots,null);
|
||||
*
|
||||
* selInventory.updateItems();
|
||||
*
|
||||
* String sound=Carving.chisel.getVariationSound(itemstack.itemID,
|
||||
* itemstack.getItemDamage()); player.worldObj.playSoundAtEntity(player,
|
||||
* sound, 0.3f + 0.7f * General.rand.nextFloat(), 0.6f + 0.4f *
|
||||
* General.rand.nextFloat());
|
||||
*/
|
||||
}
|
||||
|
||||
ContainerChisel container;
|
||||
InventoryChiselSelection selInventory;
|
||||
}
|
||||
Reference in new issue
Block a user