mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 12:42:26 +00:00
Made some more public fields either private or final.
This commit is contained in:
1 parent
756c58d5cb
commit
75032ebf9c
32 files changed
+355
-331
No files matched your search
@@ -6,7 +6,7 @@ import net.minecraftforge.items.IItemHandlerModifiable;
|
||||
|
||||
public class EmptyHandler implements IItemHandlerModifiable
|
||||
{
|
||||
public static IItemHandler INSTANCE = new EmptyHandler();
|
||||
public static final IItemHandler INSTANCE = new EmptyHandler();
|
||||
|
||||
@Override
|
||||
public int getSlots()
|
||||
|
||||
@@ -7,7 +7,7 @@ import net.minecraftforge.items.ItemHandlerHelper;
|
||||
|
||||
public class InvWrapper implements IItemHandlerModifiable
|
||||
{
|
||||
public final IInventory inv;
|
||||
private final IInventory inv;
|
||||
|
||||
public InvWrapper(IInventory inv)
|
||||
{
|
||||
@@ -24,26 +24,26 @@ public class InvWrapper implements IItemHandlerModifiable
|
||||
|
||||
InvWrapper that = (InvWrapper) o;
|
||||
|
||||
return inv.equals(that.inv);
|
||||
return getInv().equals(that.getInv());
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode()
|
||||
{
|
||||
return inv.hashCode();
|
||||
return getInv().hashCode();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSlots()
|
||||
{
|
||||
return inv.getSizeInventory();
|
||||
return getInv().getSizeInventory();
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStackInSlot(int slot)
|
||||
{
|
||||
return inv.getStackInSlot(slot);
|
||||
return getInv().getStackInSlot(slot);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -52,10 +52,10 @@ public class InvWrapper implements IItemHandlerModifiable
|
||||
if (stack == null)
|
||||
return null;
|
||||
|
||||
if (!inv.isItemValidForSlot(slot, stack))
|
||||
if (!getInv().isItemValidForSlot(slot, stack))
|
||||
return stack;
|
||||
|
||||
ItemStack stackInSlot = inv.getStackInSlot(slot);
|
||||
ItemStack stackInSlot = getInv().getStackInSlot(slot);
|
||||
|
||||
int m;
|
||||
if (stackInSlot != null)
|
||||
@@ -63,7 +63,7 @@ public class InvWrapper implements IItemHandlerModifiable
|
||||
if (!ItemHandlerHelper.canItemStacksStack(stack, stackInSlot))
|
||||
return stack;
|
||||
|
||||
m = Math.min(stack.getMaxStackSize(), inv.getInventoryStackLimit()) - stackInSlot.stackSize;
|
||||
m = Math.min(stack.getMaxStackSize(), getInv().getInventoryStackLimit()) - stackInSlot.stackSize;
|
||||
|
||||
if (stack.stackSize <= m)
|
||||
{
|
||||
@@ -71,8 +71,8 @@ public class InvWrapper implements IItemHandlerModifiable
|
||||
{
|
||||
ItemStack copy = stack.copy();
|
||||
copy.stackSize += stackInSlot.stackSize;
|
||||
inv.setInventorySlotContents(slot, copy);
|
||||
inv.markDirty();
|
||||
getInv().setInventorySlotContents(slot, copy);
|
||||
getInv().markDirty();
|
||||
}
|
||||
|
||||
return null;
|
||||
@@ -85,8 +85,8 @@ public class InvWrapper implements IItemHandlerModifiable
|
||||
{
|
||||
ItemStack copy = stack.splitStack(m);
|
||||
copy.stackSize += stackInSlot.stackSize;
|
||||
inv.setInventorySlotContents(slot, copy);
|
||||
inv.markDirty();
|
||||
getInv().setInventorySlotContents(slot, copy);
|
||||
getInv().markDirty();
|
||||
return stack;
|
||||
}
|
||||
else
|
||||
@@ -98,15 +98,15 @@ public class InvWrapper implements IItemHandlerModifiable
|
||||
}
|
||||
else
|
||||
{
|
||||
m = Math.min(stack.getMaxStackSize(), inv.getInventoryStackLimit());
|
||||
m = Math.min(stack.getMaxStackSize(), getInv().getInventoryStackLimit());
|
||||
if (m < stack.stackSize)
|
||||
{
|
||||
// copy the stack to not modify the original one
|
||||
stack = stack.copy();
|
||||
if (!simulate)
|
||||
{
|
||||
inv.setInventorySlotContents(slot, stack.splitStack(m));
|
||||
inv.markDirty();
|
||||
getInv().setInventorySlotContents(slot, stack.splitStack(m));
|
||||
getInv().markDirty();
|
||||
return stack;
|
||||
}
|
||||
else
|
||||
@@ -119,8 +119,8 @@ public class InvWrapper implements IItemHandlerModifiable
|
||||
{
|
||||
if (!simulate)
|
||||
{
|
||||
inv.setInventorySlotContents(slot, stack);
|
||||
inv.markDirty();
|
||||
getInv().setInventorySlotContents(slot, stack);
|
||||
getInv().markDirty();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@@ -134,7 +134,7 @@ public class InvWrapper implements IItemHandlerModifiable
|
||||
if (amount == 0)
|
||||
return null;
|
||||
|
||||
ItemStack stackInSlot = inv.getStackInSlot(slot);
|
||||
ItemStack stackInSlot = getInv().getStackInSlot(slot);
|
||||
|
||||
if (stackInSlot == null)
|
||||
return null;
|
||||
@@ -156,8 +156,8 @@ public class InvWrapper implements IItemHandlerModifiable
|
||||
{
|
||||
int m = Math.min(stackInSlot.stackSize, amount);
|
||||
|
||||
ItemStack decrStackSize = inv.decrStackSize(slot, m);
|
||||
inv.markDirty();
|
||||
ItemStack decrStackSize = getInv().decrStackSize(slot, m);
|
||||
getInv().markDirty();
|
||||
return decrStackSize;
|
||||
}
|
||||
}
|
||||
@@ -165,6 +165,11 @@ public class InvWrapper implements IItemHandlerModifiable
|
||||
@Override
|
||||
public void setStackInSlot(int slot, ItemStack stack)
|
||||
{
|
||||
inv.setInventorySlotContents(slot, stack);
|
||||
getInv().setInventorySlotContents(slot, stack);
|
||||
}
|
||||
|
||||
public IInventory getInv()
|
||||
{
|
||||
return inv;
|
||||
}
|
||||
}
|
||||
@@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack;
|
||||
|
||||
public class PlayerArmorInvWrapper extends RangedWrapper
|
||||
{
|
||||
public final InventoryPlayer inventoryPlayer;
|
||||
private final InventoryPlayer inventoryPlayer;
|
||||
|
||||
public PlayerArmorInvWrapper(InventoryPlayer inv)
|
||||
{
|
||||
@@ -27,10 +27,15 @@ public class PlayerArmorInvWrapper extends RangedWrapper
|
||||
}
|
||||
}
|
||||
// check if it's valid for the armor slot
|
||||
if (slot < 4 && stack != null && stack.getItem().isValidArmor(stack, equ, inventoryPlayer.player))
|
||||
if (slot < 4 && stack != null && stack.getItem().isValidArmor(stack, equ, getInventoryPlayer().player))
|
||||
{
|
||||
return super.insertItem(slot, stack, simulate);
|
||||
}
|
||||
return stack;
|
||||
}
|
||||
|
||||
public InventoryPlayer getInventoryPlayer()
|
||||
{
|
||||
return inventoryPlayer;
|
||||
}
|
||||
}
|
||||
@@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack;
|
||||
*/
|
||||
public class PlayerMainInvWrapper extends RangedWrapper
|
||||
{
|
||||
public final InventoryPlayer inventoryPlayer;
|
||||
private final InventoryPlayer inventoryPlayer;
|
||||
|
||||
public PlayerMainInvWrapper(InventoryPlayer inv)
|
||||
{
|
||||
@@ -28,15 +28,20 @@ public class PlayerMainInvWrapper extends RangedWrapper
|
||||
ItemStack inSlot = getStackInSlot(slot);
|
||||
if(inSlot != null)
|
||||
{
|
||||
if (inventoryPlayer.player.worldObj.isRemote)
|
||||
if (getInventoryPlayer().player.worldObj.isRemote)
|
||||
{
|
||||
inSlot.animationsToGo = 5;
|
||||
}
|
||||
else if(inventoryPlayer.player instanceof EntityPlayerMP) {
|
||||
inventoryPlayer.player.openContainer.detectAndSendChanges();
|
||||
else if(getInventoryPlayer().player instanceof EntityPlayerMP) {
|
||||
getInventoryPlayer().player.openContainer.detectAndSendChanges();
|
||||
}
|
||||
}
|
||||
}
|
||||
return rest;
|
||||
}
|
||||
|
||||
public InventoryPlayer getInventoryPlayer()
|
||||
{
|
||||
return inventoryPlayer;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user