run repo through formatter

This commit is contained in:
Progwml6 committed 2014-02-05 09:11:06 -05:00
1 parent 5585d680a3
commit ffaea7d4b7
140 files changed
+1050 -892

No files matched your search

@@ -217,13 +217,13 @@ public class ContainerLandmine extends Container
{
if (par2 == 0)
{
par4EntityPlayer.dropPlayerItemWithRandomChoice(inventoryplayer.getItemStack(),false);
par4EntityPlayer.dropPlayerItemWithRandomChoice(inventoryplayer.getItemStack(), false);
inventoryplayer.setItemStack((ItemStack) null);
}
if (par2 == 1)
{
par4EntityPlayer.dropPlayerItemWithRandomChoice(inventoryplayer.getItemStack().splitStack(1),false);
par4EntityPlayer.dropPlayerItemWithRandomChoice(inventoryplayer.getItemStack().splitStack(1), false);
if (inventoryplayer.getItemStack().stackSize == 0)
{
@@ -238,7 +238,7 @@ public class ContainerLandmine extends Container
{
return null;
}
Object localObject2;
slot2 = (Slot) this.inventorySlots.get(par1);
@@ -249,7 +249,7 @@ public class ContainerLandmine extends Container
if (itemstack1 != null)
{
localObject2 = ((ItemStack)itemstack1).getItem();
localObject2 = ((ItemStack) itemstack1).getItem();
itemstack = itemstack1.copy();
if (slot2 != null && slot2.getStack() != null && slot2.getStack().getItem() == localObject2)
@@ -372,8 +372,8 @@ public class ContainerLandmine extends Container
inventoryplayer.setItemStack(itemstack1);
}
}
else if (itemstack1 == itemstack4 && itemstack4.getMaxStackSize() > 1
&& (!itemstack1.getHasSubtypes() || itemstack1.getItemDamage() == itemstack4.getItemDamage()) && ItemStack.areItemStackTagsEqual(itemstack1, itemstack4))
else if (itemstack1 == itemstack4 && itemstack4.getMaxStackSize() > 1 && (!itemstack1.getHasSubtypes() || itemstack1.getItemDamage() == itemstack4.getItemDamage())
&& ItemStack.areItemStackTagsEqual(itemstack1, itemstack4))
{
k1 = itemstack1.stackSize;
@@ -460,7 +460,7 @@ public class ContainerLandmine extends Container
{
itemstack1 = slot2.decrStackSize(par2 == 0 ? 1 : slot2.getStack().stackSize);
slot2.onPickupFromSlot(par4EntityPlayer, itemstack1);
par4EntityPlayer.dropPlayerItemWithRandomChoice(itemstack1,false);
par4EntityPlayer.dropPlayerItemWithRandomChoice(itemstack1, false);
}
}
else if (par3 == 6 && par1 >= 0)
@@ -143,7 +143,7 @@ public class CraftingStationContainer extends Container
if (itemstack != null)
{
par1EntityPlayer.dropPlayerItemWithRandomChoice(itemstack,false);
par1EntityPlayer.dropPlayerItemWithRandomChoice(itemstack, false);
}
}
}
@@ -14,7 +14,7 @@ public class FrypanContainer extends Container
public FrypanContainer(EntityPlayer player, FrypanLogic frypan)
{
InventoryPlayer inventoryplayer = player.inventory;
InventoryPlayer inventoryplayer = player.inventory;
logic = frypan;
this.addSlotToContainer(new Slot(frypan, 1, 26, 45));
for (int y = 0; y < 2; y++)
@@ -6,25 +6,30 @@ import net.minecraft.item.*;
import net.minecraft.nbt.NBTTagCompound;
import tconstruct.achievements.TAchievements;
public class SlotFrypan extends Slot{
public class SlotFrypan extends Slot
{
public EntityPlayer player;
public SlotFrypan(IInventory par1IInventory, int par2, int par3, int par4, EntityPlayer player) {
super(par1IInventory, par2, par3, par4);
this.player = player;
}
@Override
public void putStack(ItemStack par1ItemStack){
public EntityPlayer player;
public SlotFrypan(IInventory par1IInventory, int par2, int par3, int par4, EntityPlayer player)
{
super(par1IInventory, par2, par3, par4);
this.player = player;
}
@Override
public void putStack (ItemStack par1ItemStack)
{
super.putStack(par1ItemStack);
if(par1ItemStack != null && par1ItemStack.getItem() != null && par1ItemStack.getItem() instanceof ItemFood && par1ItemStack.hasTagCompound()){
NBTTagCompound stackTagCompound = par1ItemStack.getTagCompound();
if(stackTagCompound == null || !stackTagCompound.getBoolean("frypanKill")){
return;
}
player.addStat(TAchievements.achievements.get("tconstruct.dualConvenience"), 1);
if (par1ItemStack != null && par1ItemStack.getItem() != null && par1ItemStack.getItem() instanceof ItemFood && par1ItemStack.hasTagCompound())
{
NBTTagCompound stackTagCompound = par1ItemStack.getTagCompound();
if (stackTagCompound == null || !stackTagCompound.getBoolean("frypanKill"))
{
return;
}
player.addStat(TAchievements.achievements.get("tconstruct.dualConvenience"), 1);
}
}
}
}