Upload my Code Changes/Format/imports

This commit is contained in:
Alexander committed 2014-02-16 14:23:50 -05:00
1 parent 5bcdb7ca46
commit 5d4e38c0cb
264 files changed
+4014 -3972

No files matched your search

@@ -1,11 +1,11 @@
package tconstruct.inventory;
import tconstruct.blocks.logic.StencilTableLogic;
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 tconstruct.blocks.logic.StencilTableLogic;
public class PatternShaperContainer extends Container
{
@@ -16,13 +16,11 @@ public class PatternShaperContainer extends Container
logic = shaper;
this.addSlotToContainer(new Slot(shaper, 0, 48, 35));
this.addSlotToContainer(new SlotOnlyTake(shaper, 1, 106, 35));
/*for (int i = 0; i < 3; i++)
{
for (int l = 0; l < 3; l++)
{
this.addSlotToContainer(new Slot(craftMatrix, l + i * 3, 30 + l * 18, 17 + i * 18));
}
}*/
/*
* for (int i = 0; i < 3; i++) { for (int l = 0; l < 3; l++) {
* this.addSlotToContainer(new Slot(craftMatrix, l + i * 3, 30 + l * 18,
* 17 + i * 18)); } }
*/
/* Player inventory */
for (int column = 0; column < 3; column++)
@@ -39,25 +37,19 @@ public class PatternShaperContainer extends Container
}
}
/*public void onCraftMatrixChanged(IInventory iinventory)
{
craftResult.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(craftMatrix, worldObj));
}*/
/*
* public void onCraftMatrixChanged(IInventory iinventory) {
* craftResult.setInventorySlotContents(0,
* CraftingManager.getInstance().findMatchingRecipe(craftMatrix, worldObj));
* }
*/
/*@Override
public void onContainerClosed(EntityPlayer entityplayer)
{
super.onContainerClosed(entityplayer);
if (logic.worldObj.isRemote)
{
return;
}
ItemStack itemstack = logic.getStackInSlot(0);
if (itemstack != null)
{
entityplayer.dropPlayerItem(itemstack);
}
}*/
/*
* @Override public void onContainerClosed(EntityPlayer entityplayer) {
* super.onContainerClosed(entityplayer); if (logic.worldObj.isRemote) {
* return; } ItemStack itemstack = logic.getStackInSlot(0); if (itemstack !=
* null) { entityplayer.dropPlayerItem(itemstack); } }
*/
@Override
public boolean canInteractWith (EntityPlayer entityplayer)
@@ -69,37 +61,24 @@ public class PatternShaperContainer extends Container
public ItemStack transferStackInSlot (EntityPlayer player, int slotID)
{
return null;
/*ItemStack stack = null;
Slot slot = (Slot)this.inventorySlots.get(slotID);
if (slot != null && slot.getHasStack())
{
ItemStack slotStack = slot.getStack();
stack = slotStack.copy();
if (slotID < logic.getSizeInventory())
{
if (!this.mergeItemStack(slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true))
{
return null;
}
}
else if (!this.mergeItemStack(slotStack, 0, logic.getSizeInventory()-1, false))
{
return null;
}
if (slotStack.stackSize == 0)
{
slot.putStack((ItemStack)null);
}
else
{
slot.onSlotChanged();
}
}
return stack;*/
/*
* ItemStack stack = null; Slot slot =
* (Slot)this.inventorySlots.get(slotID);
*
* if (slot != null && slot.getHasStack()) { ItemStack slotStack =
* slot.getStack(); stack = slotStack.copy();
*
* if (slotID < logic.getSizeInventory()) { if
* (!this.mergeItemStack(slotStack, logic.getSizeInventory(),
* this.inventorySlots.size(), true)) { return null; } } else if
* (!this.mergeItemStack(slotStack, 0, logic.getSizeInventory()-1,
* false)) { return null; }
*
* if (slotStack.stackSize == 0) { slot.putStack((ItemStack)null); }
* else { slot.onSlotChanged(); } }
*
* return stack;
*/
}
}