mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-10 20:45:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor getDispenseStack to getDispenseLocation, delete unused variable declaration in getUseableLocations, added accidentially removed comment back

Browse Source
This commit is contained in:
grimmauld 2020-09-10 13:28:33 +02:00
parent 7784e5b58d
commit 3d006e7e87
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DispenserMovementBehaviour.java
View File

@ -31,7 +31,7 @@ public class DispenserMovementBehaviour extends DropperMovementBehaviour {
@Override
protected void activate(MovementContext context, BlockPos pos) {
DispenseItemLocation location = getDispenseStack(context);
DispenseItemLocation location = getDispenseLocation(context);
if (location.isEmpty()) {
context.world.playEvent(1001, pos, 0);
} else {
@ -56,7 +56,7 @@ public class DispenserMovementBehaviour extends DropperMovementBehaviour {
return;
}
} catch (NullPointerException ignored) {
itemstack = backup;
itemstack = backup; // Something went wrong with the TE being null in ContraptionBlockSource, reset the stack
}
setItemStackAt(location, defaultBehaviour.dispense(itemstack, context, pos), context); // the default: launch the item

7
src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DropperMovementBehaviour.java
View File

@ -19,7 +19,7 @@ public class DropperMovementBehaviour extends MovementBehaviour {
private static final Random RNG = new Random();
protected void activate(MovementContext context, BlockPos pos) {
DispenseItemLocation location = getDispenseStack(context);
DispenseItemLocation location = getDispenseLocation(context);
if (location.isEmpty()) {
context.world.playEvent(1001, pos, 0);
} else {
@ -56,7 +56,6 @@ public class DropperMovementBehaviour extends MovementBehaviour {
private ArrayList<DispenseItemLocation> getUseableLocations(MovementContext context) {
ArrayList<DispenseItemLocation> useable = new ArrayList<>();
NonNullList<ItemStack> internalStacks = getStacks(context);
for (int slot = 0; slot < getInvSize(); slot++) {
DispenseItemLocation location = new DispenseItemLocation(true, slot);
ItemStack testStack = getItemStackAt(location, context);
@ -66,7 +65,7 @@ public class DropperMovementBehaviour extends MovementBehaviour {
location = new DispenseItemLocation(false, ItemHelper.findFirstMatchingSlotIndex(context.contraption.inventory, testStack::isItemEqual));
if (!getItemStackAt(location, context).isEmpty())
useable.add(location);
} else if (internalStacks.get(slot).getCount() >= 2)
} else if (testStack.getCount() >= 2)
useable.add(location);
}
return useable;
@ -86,7 +85,7 @@ public class DropperMovementBehaviour extends MovementBehaviour {
writeExtraData(context);
}
protected DispenseItemLocation getDispenseStack(MovementContext context) {
protected DispenseItemLocation getDispenseLocation(MovementContext context) {
int i = -1;
int j = 1;
List<DispenseItemLocation> useableLocations = getUseableLocations(context);