mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 12:42:26 +00:00
Initial 1.11-pre1 update
This commit is contained in:
1 parent
c177219ff3
commit
4e6a774075
294 files changed
+3099
-2846
No files matched your search
+4
-4
@@ -90,7 +90,7 @@ public class FluidHandlerItemStack implements IFluidHandler, ICapabilityProvider
|
||||
@Override
|
||||
public int fill(FluidStack resource, boolean doFill)
|
||||
{
|
||||
if (container.stackSize != 1 || resource == null || resource.amount <= 0 || !canFillFluidType(resource))
|
||||
if (container.func_190916_E() != 1 || resource == null || resource.amount <= 0 || !canFillFluidType(resource))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -130,7 +130,7 @@ public class FluidHandlerItemStack implements IFluidHandler, ICapabilityProvider
|
||||
@Override
|
||||
public FluidStack drain(FluidStack resource, boolean doDrain)
|
||||
{
|
||||
if (container.stackSize != 1 || resource == null || resource.amount <= 0 || !resource.isFluidEqual(getFluid()))
|
||||
if (container.func_190916_E() != 1 || resource == null || resource.amount <= 0 || !resource.isFluidEqual(getFluid()))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@@ -140,7 +140,7 @@ public class FluidHandlerItemStack implements IFluidHandler, ICapabilityProvider
|
||||
@Override
|
||||
public FluidStack drain(int maxDrain, boolean doDrain)
|
||||
{
|
||||
if (container.stackSize != 1 || maxDrain <= 0)
|
||||
if (container.func_190916_E() != 1 || maxDrain <= 0)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@@ -219,7 +219,7 @@ public class FluidHandlerItemStack implements IFluidHandler, ICapabilityProvider
|
||||
protected void setContainerToEmpty()
|
||||
{
|
||||
super.setContainerToEmpty();
|
||||
container.stackSize--;
|
||||
container.func_190918_g(1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+4
-4
@@ -88,7 +88,7 @@ public class FluidHandlerItemStackSimple implements IFluidHandler, ICapabilityPr
|
||||
@Override
|
||||
public int fill(FluidStack resource, boolean doFill)
|
||||
{
|
||||
if (container.stackSize != 1 || resource == null || resource.amount <= 0 || !canFillFluidType(resource))
|
||||
if (container.func_190916_E() != 1 || resource == null || resource.amount <= 0 || !canFillFluidType(resource))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -114,7 +114,7 @@ public class FluidHandlerItemStackSimple implements IFluidHandler, ICapabilityPr
|
||||
@Override
|
||||
public FluidStack drain(FluidStack resource, boolean doDrain)
|
||||
{
|
||||
if (container.stackSize != 1 || resource == null || resource.amount <= 0 || !resource.isFluidEqual(getFluid()))
|
||||
if (container.func_190916_E() != 1 || resource == null || resource.amount <= 0 || !resource.isFluidEqual(getFluid()))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@@ -124,7 +124,7 @@ public class FluidHandlerItemStackSimple implements IFluidHandler, ICapabilityPr
|
||||
@Override
|
||||
public FluidStack drain(int maxDrain, boolean doDrain)
|
||||
{
|
||||
if (container.stackSize != 1 || maxDrain <= 0)
|
||||
if (container.func_190916_E() != 1 || maxDrain <= 0)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@@ -196,7 +196,7 @@ public class FluidHandlerItemStackSimple implements IFluidHandler, ICapabilityPr
|
||||
protected void setContainerToEmpty()
|
||||
{
|
||||
super.setContainerToEmpty();
|
||||
container.stackSize--;
|
||||
container.func_190918_g(1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -119,7 +119,7 @@ public class FluidBucketWrapper implements IFluidHandler, ICapabilityProvider
|
||||
@Override
|
||||
public int fill(FluidStack resource, boolean doFill)
|
||||
{
|
||||
if (container.stackSize != 1 || resource == null || resource.amount < Fluid.BUCKET_VOLUME || container.getItem() instanceof ItemBucketMilk || getFluid() != null || !canFillFluidType(resource))
|
||||
if (container.func_190916_E() != 1 || resource == null || resource.amount < Fluid.BUCKET_VOLUME || container.getItem() instanceof ItemBucketMilk || getFluid() != null || !canFillFluidType(resource))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -136,7 +136,7 @@ public class FluidBucketWrapper implements IFluidHandler, ICapabilityProvider
|
||||
@Override
|
||||
public FluidStack drain(FluidStack resource, boolean doDrain)
|
||||
{
|
||||
if (container.stackSize != 1 || resource == null || resource.amount < Fluid.BUCKET_VOLUME)
|
||||
if (container.func_190916_E() != 1 || resource == null || resource.amount < Fluid.BUCKET_VOLUME)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@@ -158,7 +158,7 @@ public class FluidBucketWrapper implements IFluidHandler, ICapabilityProvider
|
||||
@Override
|
||||
public FluidStack drain(int maxDrain, boolean doDrain)
|
||||
{
|
||||
if (container.stackSize != 1 || maxDrain < Fluid.BUCKET_VOLUME)
|
||||
if (container.func_190916_E() != 1 || maxDrain < Fluid.BUCKET_VOLUME)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
+3
-3
@@ -55,7 +55,7 @@ public class FluidContainerItemWrapper implements IFluidHandler, ICapabilityProv
|
||||
@Override
|
||||
public int fill(FluidStack resource, boolean doFill)
|
||||
{
|
||||
if (container.stackSize != 1)
|
||||
if (container.func_190916_E() != 1)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -65,7 +65,7 @@ public class FluidContainerItemWrapper implements IFluidHandler, ICapabilityProv
|
||||
@Override
|
||||
public FluidStack drain(FluidStack resource, boolean doDrain)
|
||||
{
|
||||
if (container.stackSize != 1 || resource == null)
|
||||
if (container.func_190916_E() != 1 || resource == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@@ -84,7 +84,7 @@ public class FluidContainerItemWrapper implements IFluidHandler, ICapabilityProv
|
||||
@Override
|
||||
public FluidStack drain(int maxDrain, boolean doDrain)
|
||||
{
|
||||
if (container.stackSize != 1)
|
||||
if (container.func_190916_E() != 1)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
+4
-4
@@ -58,7 +58,7 @@ public class FluidContainerRegistryWrapper implements IFluidHandler, ICapability
|
||||
@Override
|
||||
public int fill(FluidStack resource, boolean doFill)
|
||||
{
|
||||
if (container.stackSize != 1 || resource == null)
|
||||
if (container.func_190916_E() != 1 || resource == null)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -87,7 +87,7 @@ public class FluidContainerRegistryWrapper implements IFluidHandler, ICapability
|
||||
@Override
|
||||
public FluidStack drain(FluidStack resource, boolean doDrain)
|
||||
{
|
||||
if (container.stackSize != 1 || resource == null)
|
||||
if (container.func_190916_E() != 1 || resource == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@@ -105,7 +105,7 @@ public class FluidContainerRegistryWrapper implements IFluidHandler, ICapability
|
||||
@Override
|
||||
public FluidStack drain(int maxDrain, boolean doDrain)
|
||||
{
|
||||
if (container.stackSize != 1)
|
||||
if (container.func_190916_E() != 1)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@@ -122,7 +122,7 @@ public class FluidContainerRegistryWrapper implements IFluidHandler, ICapability
|
||||
{
|
||||
if (FluidContainerRegistry.hasNullEmptyContainer(container))
|
||||
{
|
||||
emptyContainer.stackSize = 0;
|
||||
emptyContainer.func_190920_e(0);
|
||||
}
|
||||
container.deserializeNBT(emptyContainer.serializeNBT());
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user