Ellpeck/PrettyPipes
1
0
Fork 0
mirror of https://github.com/Ellpeck/PrettyPipes.git synced 2024-11-22 11:53:29 +01:00
Code Issues Projects Releases Wiki Activity

fixed crafting modules all sharing an inventory

Browse source
This commit is contained in:
Ell 2024-09-27 16:29:08 +02:00
parent 2597923ec8
commit 3fbcd8c80a
3 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/de/ellpeck/prettypipes/Utility.java
View file

@ -167,6 +167,18 @@ public final class Utility {
return null; return null;
} }
public static void copyInto(ItemStackHandler handler, ItemStackHandler dest) {
dest.setSize(handler.getSlots());
for (var i = 0; i < handler.getSlots(); i++)
dest.setStackInSlot(i, handler.getStackInSlot(i).copy());
}
public static ItemStackHandler copy(ItemStackHandler handler) {
var ret = new ItemStackHandler();
copyInto(handler, ret);
return ret;
}
public interface IMergeItemStack { public interface IMergeItemStack {
boolean mergeItemStack(ItemStack stack, int startIndex, int endIndex, boolean reverseDirection); boolean mergeItemStack(ItemStack stack, int startIndex, int endIndex, boolean reverseDirection);

4
src/main/java/de/ellpeck/prettypipes/misc/ItemFilter.java
View file

@ -138,9 +138,7 @@ public class ItemFilter {
public void load() { public void load() {
var content = this.stack.get(Data.TYPE); var content = this.stack.get(Data.TYPE);
if (content != null) { if (content != null) {
this.content.setSize(content.items.getSlots()); Utility.copyInto(content.items, this.content);
for (var i = 0; i < this.content.getSlots(); i++)
this.content.setStackInSlot(i, content.items.getStackInSlot(i));
this.isWhitelist = content.whitelist; this.isWhitelist = content.whitelist;
} }
} }

9
src/main/java/de/ellpeck/prettypipes/pipe/modules/craft/CraftingModuleContainer.java
View file

@ -1,5 +1,6 @@
package de.ellpeck.prettypipes.pipe.modules.craft; package de.ellpeck.prettypipes.pipe.modules.craft;
import de.ellpeck.prettypipes.Utility;
import de.ellpeck.prettypipes.misc.FilterSlot; import de.ellpeck.prettypipes.misc.FilterSlot;
import de.ellpeck.prettypipes.pipe.containers.AbstractPipeContainer; import de.ellpeck.prettypipes.pipe.containers.AbstractPipeContainer;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
@ -20,7 +21,7 @@ public class CraftingModuleContainer extends AbstractPipeContainer<CraftingModul
@Override @Override
protected void addSlots() { protected void addSlots() {
var contents = this.moduleStack.get(CraftingModuleItem.Contents.TYPE); var contents = this.moduleStack.get(CraftingModuleItem.Contents.TYPE);
this.input = contents.input(); this.input = Utility.copy(contents.input());
for (var i = 0; i < this.input.getSlots(); i++) { for (var i = 0; i < this.input.getSlots(); i++) {
this.addSlot(new FilterSlot(this.input, i, (176 - this.input.getSlots() * 18) / 2 + 1 + i % 9 * 18, 17 + 32 + i / 9 * 18, false) { this.addSlot(new FilterSlot(this.input, i, (176 - this.input.getSlots() * 18) / 2 + 1 + i % 9 * 18, 17 + 32 + i / 9 * 18, false) {
@Override @Override
@ -32,7 +33,7 @@ public class CraftingModuleContainer extends AbstractPipeContainer<CraftingModul
}); });
} }
this.output = contents.output(); this.output = Utility.copy(contents.output());
for (var i = 0; i < this.output.getSlots(); i++) { for (var i = 0; i < this.output.getSlots(); i++) {
this.addSlot(new FilterSlot(this.output, i, (176 - this.output.getSlots() * 18) / 2 + 1 + i % 9 * 18, 85 + i / 9 * 18, false) { this.addSlot(new FilterSlot(this.output, i, (176 - this.output.getSlots() * 18) / 2 + 1 + i % 9 * 18, 85 + i / 9 * 18, false) {
@Override @Override
@ -47,8 +48,10 @@ public class CraftingModuleContainer extends AbstractPipeContainer<CraftingModul
@Override @Override
public void removed(Player playerIn) { public void removed(Player playerIn) {
super.removed(playerIn); super.removed(playerIn);
if (this.modified) if (this.modified) {
this.moduleStack.set(CraftingModuleItem.Contents.TYPE, new CraftingModuleItem.Contents(this.input, this.output)); this.moduleStack.set(CraftingModuleItem.Contents.TYPE, new CraftingModuleItem.Contents(this.input, this.output));
this.tile.setChanged();
}
} }
} }