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:
tterrag1098 committed 2015-01-07 19:50:18 -05:00
1 parent 906c730a3c
commit 4cfcc874dc
136 files changed
+10365 -11272

No files matched your search

@@ -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;
}