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

Fixed multiple modules of the same type not being openable

Browse source 
Closes #43
This commit is contained in:
Ell 2020-10-15 19:06:09 +02:00
parent 976a21b257
commit b7cd8e5cdd
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/de/ellpeck/prettypipes/pipe/containers/AbstractPipeContainer.java
View file

@ -19,6 +19,7 @@ public abstract class AbstractPipeContainer<T extends IModule> extends Container
public final PipeTileEntity tile; public final PipeTileEntity tile;
public final T module; public final T module;
public final int moduleIndex;
public final ItemStack moduleStack; public final ItemStack moduleStack;
public AbstractPipeContainer(@Nullable ContainerType<?> type, int id, PlayerEntity player, BlockPos pos, int moduleIndex) { public AbstractPipeContainer(@Nullable ContainerType<?> type, int id, PlayerEntity player, BlockPos pos, int moduleIndex) {
@ -26,6 +27,7 @@ public abstract class AbstractPipeContainer<T extends IModule> extends Container
this.tile = Utility.getTileEntity(PipeTileEntity.class, player.world, pos); this.tile = Utility.getTileEntity(PipeTileEntity.class, player.world, pos);
this.moduleStack = moduleIndex < 0 ? null : this.tile.modules.getStackInSlot(moduleIndex); this.moduleStack = moduleIndex < 0 ? null : this.tile.modules.getStackInSlot(moduleIndex);
this.module = moduleIndex < 0 ? null : (T) this.moduleStack.getItem(); this.module = moduleIndex < 0 ? null : (T) this.moduleStack.getItem();
this.moduleIndex = moduleIndex;
// needs to be done here so transferStackInSlot works correctly, bleh // needs to be done here so transferStackInSlot works correctly, bleh
this.addSlots(); this.addSlots();

12
src/main/java/de/ellpeck/prettypipes/pipe/containers/AbstractPipeGui.java
View file

@ -99,27 +99,25 @@ public abstract class AbstractPipeGui<T extends AbstractPipeContainer<?>> extend
private void initTabs() { private void initTabs() {
this.tabs.clear(); this.tabs.clear();
this.tabs.add(new Tab(new ItemStack(Registry.pipeBlock), null, 0, -1)); this.tabs.add(new Tab(new ItemStack(Registry.pipeBlock), 0, -1));
for (int i = 0; i < this.container.tile.modules.getSlots(); i++) { for (int i = 0; i < this.container.tile.modules.getSlots(); i++) {
ItemStack stack = this.container.tile.modules.getStackInSlot(i); ItemStack stack = this.container.tile.modules.getStackInSlot(i);
if (stack.isEmpty()) if (stack.isEmpty())
continue; continue;
IModule module = (IModule) stack.getItem(); IModule module = (IModule) stack.getItem();
if (module.hasContainer(stack, this.container.tile)) if (module.hasContainer(stack, this.container.tile))
this.tabs.add(new Tab(stack, module, this.tabs.size(), i)); this.tabs.add(new Tab(stack, this.tabs.size(), i));
} }
} }
private class Tab { private class Tab {
private final ItemStack moduleStack; private final ItemStack moduleStack;
private final IModule module;
private final int index; private final int index;
private final int x; private final int x;
private final int y; private final int y;
public Tab(ItemStack moduleStack, IModule module, int tabIndex, int index) { public Tab(ItemStack moduleStack, int tabIndex, int index) {
this.moduleStack = moduleStack; this.moduleStack = moduleStack;
this.module = module;
this.index = index; this.index = index;
this.x = AbstractPipeGui.this.guiLeft + 5 + tabIndex * 28; this.x = AbstractPipeGui.this.guiLeft + 5 + tabIndex * 28;
this.y = AbstractPipeGui.this.guiTop; this.y = AbstractPipeGui.this.guiTop;
@ -130,7 +128,7 @@ public abstract class AbstractPipeGui<T extends AbstractPipeContainer<?>> extend
int v = 0; int v = 0;
int height = 30; int height = 30;
int itemOffset = 9; int itemOffset = 9;
if (this.module == AbstractPipeGui.this.container.module) { if (this.index == AbstractPipeGui.this.container.moduleIndex) {
y = 0; y = 0;
v = 30; v = 30;
height = 32; height = 32;
@ -149,7 +147,7 @@ public abstract class AbstractPipeGui<T extends AbstractPipeContainer<?>> extend
} }
private boolean onClicked(double mouseX, double mouseY, int button) { private boolean onClicked(double mouseX, double mouseY, int button) {
if (this.module == AbstractPipeGui.this.container.module) if (this.index == AbstractPipeGui.this.container.moduleIndex)
return false; return false;
if (button != 0) if (button != 0)
return false; return false;