Use capability casts instead of casting manually

This commit is contained in:
Raoul Van den Berge
2016-12-04 03:21:43 +01:00
parent 9405d3f9fa
commit 0ae86b684e
25 changed files with 25 additions and 25 deletions

View File

@@ -195,7 +195,7 @@ public abstract class ContainerBase extends Container {
return ItemStack.EMPTY;
}
protected ItemStack mergeItemStackToSpecimen(ItemStack stack, int begin, int end) {
protected ItemStack mergeItemStackToFilters(ItemStack stack, int begin, int end) {
for (int i = begin; i < end; ++i) {
if (API.instance().getComparer().isEqualNoQuantity(getStackFromSlot(getSlot(i)), stack)) {
return ItemStack.EMPTY;

View File

@@ -34,7 +34,7 @@ public class ContainerConstructor extends ContainerBase {
return ItemStack.EMPTY;
}
} else if (!mergeItemStack(stack, 0, 4, false)) {
return mergeItemStackToSpecimen(stack, 4, 4 + 1);
return mergeItemStackToFilters(stack, 4, 4 + 1);
}
if (stack.getCount() == 0) {

View File

@@ -36,7 +36,7 @@ public class ContainerDestructor extends ContainerBase {
return ItemStack.EMPTY;
}
} else if (!mergeItemStack(stack, 0, 4, false)) {
return mergeItemStackToSpecimen(stack, 4, 4 + 9);
return mergeItemStackToFilters(stack, 4, 4 + 9);
}
if (stack.getCount() == 0) {

View File

@@ -20,7 +20,7 @@ public class ContainerDetector extends ContainerBase {
Slot slot = getSlot(index);
if (slot.getHasStack() && index > 0) {
return mergeItemStackToSpecimen(slot.getStack(), 0, 1);
return mergeItemStackToFilters(slot.getStack(), 0, 1);
}
return null;

View File

@@ -39,7 +39,7 @@ public class ContainerDiskDrive extends ContainerBase {
return ItemStack.EMPTY;
}
} else if (!mergeItemStack(stack, 0, 8, false)) {
return mergeItemStackToSpecimen(stack, 8, 8 + 9);
return mergeItemStackToFilters(stack, 8, 8 + 9);
}
if (stack.getCount() == 0) {

View File

@@ -44,7 +44,7 @@ public class ContainerDiskManipulator extends ContainerBase {
return ItemStack.EMPTY;
}
} else if (!mergeItemStack(stack, 0, 4 + 3, false)) {
return mergeItemStackToSpecimen(stack, 4 + 6, 4 + 6 + 9);
return mergeItemStackToFilters(stack, 4 + 6, 4 + 6 + 9);
}
if (stack.getCount() == 0) {

View File

@@ -36,7 +36,7 @@ public class ContainerExporter extends ContainerBase {
return ItemStack.EMPTY;
}
} else if (!mergeItemStack(stack, 0, 4, false)) {
return mergeItemStackToSpecimen(stack, 4, 4 + 9);
return mergeItemStackToFilters(stack, 4, 4 + 9);
}
if (stack.getCount() == 0) {

View File

@@ -22,7 +22,7 @@ public class ContainerExternalStorage extends ContainerBase {
Slot slot = getSlot(index);
if (slot.getHasStack() && index >= 8) {
return mergeItemStackToSpecimen(slot.getStack(), 0, 9);
return mergeItemStackToFilters(slot.getStack(), 0, 9);
}
return ItemStack.EMPTY;

View File

@@ -35,7 +35,7 @@ public class ContainerFluidInterface extends ContainerBase {
return ItemStack.EMPTY;
}
} else if (!mergeItemStack(stack, 0, 4 + 1, false)) {
return mergeItemStackToSpecimen(stack, 5, 6);
return mergeItemStackToFilters(stack, 5, 6);
}
if (stack.getCount() == 0) {

View File

@@ -22,7 +22,7 @@ public class ContainerFluidStorage extends ContainerBase {
Slot slot = getSlot(index);
if (slot.getHasStack() && index >= 8) {
return mergeItemStackToSpecimen(slot.getStack(), 0, 9);
return mergeItemStackToFilters(slot.getStack(), 0, 9);
}
return ItemStack.EMPTY;

View File

@@ -37,7 +37,7 @@ public class ContainerGridFilter extends ContainerBase {
stack = slot.getStack();
if (index > 9 - 1) {
return mergeItemStackToSpecimen(stack, 0, 9);
return mergeItemStackToFilters(stack, 0, 9);
}
return ItemStack.EMPTY;

View File

@@ -36,7 +36,7 @@ public class ContainerImporter extends ContainerBase {
return ItemStack.EMPTY;
}
} else if (!mergeItemStack(stack, 0, 4, false)) {
return mergeItemStackToSpecimen(stack, 4, 4 + 9);
return mergeItemStackToFilters(stack, 4, 4 + 9);
}
if (stack.getCount() == 0) {

View File

@@ -22,7 +22,7 @@ public class ContainerStorage extends ContainerBase {
Slot slot = getSlot(index);
if (slot.getHasStack() && index >= 8) {
return mergeItemStackToSpecimen(slot.getStack(), 0, 9);
return mergeItemStackToFilters(slot.getStack(), 0, 9);
}
return ItemStack.EMPTY;

View File

@@ -330,7 +330,7 @@ public class TileConstructor extends TileNode implements IComparable, IType {
@Override
public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
return (T) upgrades;
return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(upgrades);
}
return super.getCapability(capability, facing);

View File

@@ -214,7 +214,7 @@ public class TileCrafter extends TileNode implements ICraftingPatternContainer {
@Override
public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && facing != getDirection()) {
return (T) patterns;
return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(patterns);
}
return super.getCapability(capability, facing);

View File

@@ -297,7 +297,7 @@ public class TileDestructor extends TileNode implements IComparable, IFilterable
@Override
public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
return (T) upgrades;
return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(upgrades);
}
return super.getCapability(capability, facing);

View File

@@ -573,7 +573,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag
@Override
public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
return (T) disks;
return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(disks);
}
return super.getCapability(capability, facing);

View File

@@ -602,7 +602,7 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
@Override
public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
return facing == EnumFacing.DOWN ? (T) outputDisks : (T) inputDisks;
return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(facing == EnumFacing.DOWN ? outputDisks : inputDisks);
}
return super.getCapability(capability, facing);

View File

@@ -191,7 +191,7 @@ public class TileExporter extends TileNode implements IComparable, IType {
@Override
public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
return (T) upgrades;
return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(upgrades);
}
return super.getCapability(capability, facing);

View File

@@ -240,7 +240,7 @@ public class TileFluidInterface extends TileNode implements IComparable {
@Override
public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return facing == EnumFacing.DOWN ? (T) tankOut : (T) tankIn;
return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(facing == EnumFacing.DOWN ? tankOut : tankIn);
}
return super.getCapability(capability, facing);

View File

@@ -209,7 +209,7 @@ public class TileImporter extends TileNode implements IComparable, IFilterable,
@Override
public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
return (T) upgrades;
return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(upgrades);
}
return super.getCapability(capability, facing);

View File

@@ -193,7 +193,7 @@ public class TileInterface extends TileNode implements IComparable {
@Override
public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
return facing == EnumFacing.DOWN ? (T) exportItems : (T) importItems;
return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(facing == EnumFacing.DOWN ? exportItems : importItems);
}
return super.getCapability(capability, facing);

View File

@@ -129,7 +129,7 @@ public class TileProcessingPatternEncoder extends TileBase {
@Override
public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
return (T) patterns;
return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(patterns);
}
return super.getCapability(capability, facing);

View File

@@ -200,7 +200,7 @@ public class TileSolderer extends TileNode {
@Override
public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
return facing == EnumFacing.DOWN ? (T) result : (T) items;
return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(facing == EnumFacing.DOWN ? result : items);
}
return super.getCapability(capability, facing);

View File

@@ -94,7 +94,7 @@ public class TileWirelessTransmitter extends TileNode implements IWirelessTransm
@Override
public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
return (T) upgrades;
return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(upgrades);
}
return super.getCapability(capability, facing);