Skip to content

Commit 8957f9f

Browse files
committed
Update ContainerMachine.java
Replaced copy/pasted code with super for method mergeItemStack
1 parent 40133f7 commit 8957f9f

File tree

1 file changed

+1
-87
lines changed

1 file changed

+1
-87
lines changed

src/main/java/com/FMM/client/interfaces/blockMachine/ContainerMachine.java

Lines changed: 1 addition & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -214,91 +214,5 @@ protected boolean mergeItemStack(ItemStack stack, int maxSlot, int minSlot, bool
214214
break;
215215
else if(i == minSlot -1)
216216
return false;
217-
boolean flag1 = false;
218-
int k = maxSlot;
219-
220-
if (par4)
221-
{
222-
k = minSlot - 1;
223-
}
224-
225-
Slot slot;
226-
ItemStack itemstack1;
227-
228-
if (stack.isStackable())
229-
{
230-
while (stack.stackSize > 0 && (!par4 && k < minSlot || par4 && k >= maxSlot))
231-
{
232-
slot = (Slot)this.inventorySlots.get(k);
233-
itemstack1 = slot.getStack();
234-
235-
if (itemstack1 != null && itemstack1.getItem() == stack.getItem() && (!stack.getHasSubtypes() || stack.getItemDamage() == itemstack1.getItemDamage()) && ItemStack.areItemStackTagsEqual(stack, itemstack1))
236-
{
237-
int l = itemstack1.stackSize + stack.stackSize;
238-
239-
if (l <= stack.getMaxStackSize())
240-
{
241-
stack.stackSize = 0;
242-
itemstack1.stackSize = l;
243-
slot.onSlotChanged();
244-
flag1 = true;
245-
}
246-
else if (itemstack1.stackSize < stack.getMaxStackSize())
247-
{
248-
stack.stackSize -= stack.getMaxStackSize() - itemstack1.stackSize;
249-
itemstack1.stackSize = stack.getMaxStackSize();
250-
slot.onSlotChanged();
251-
flag1 = true;
252-
}
253-
}
254-
255-
if (par4)
256-
{
257-
--k;
258-
}
259-
else
260-
{
261-
++k;
262-
}
263-
}
264-
}
265-
266-
if (stack.stackSize > 0)
267-
{
268-
if (par4)
269-
{
270-
k = minSlot - 1;
271-
}
272-
else
273-
{
274-
k = maxSlot;
275-
}
276-
277-
while (!par4 && k < minSlot || par4 && k >= maxSlot)
278-
{
279-
slot = (Slot)this.inventorySlots.get(k);
280-
itemstack1 = slot.getStack();
281-
282-
if (itemstack1 == null)
283-
{
284-
slot.putStack(stack.copy());
285-
slot.onSlotChanged();
286-
stack.stackSize = 0;
287-
flag1 = true;
288-
break;
289-
}
290-
291-
if (par4)
292-
{
293-
--k;
294-
}
295-
else
296-
{
297-
++k;
298-
}
299-
}
300-
}
301-
302-
return flag1;
303-
}
217+
super.mergeItemStack(stack, maxSlot, minSlot, par4);
304218
}

0 commit comments

Comments
 (0)