Skip to content

Commit 86227d9

Browse files
Copilotrubensworks
andcommitted
Fix CI build failure: add getRowColumnProvider() implementation
Co-authored-by: rubensworks <440384+rubensworks@users.noreply.github.com>
1 parent 1674895 commit 86227d9

2 files changed

Lines changed: 8 additions & 16 deletions

File tree

src/main/java/org/cyclops/integratedterminals/core/terminalstorage/TerminalStorageTabEnderChestClient.java

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
package org.cyclops.integratedterminals.core.terminalstorage;
22

33
import com.google.common.collect.Lists;
4-
import com.mojang.blaze3d.vertex.PoseStack;
5-
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
64
import net.minecraft.network.chat.Component;
75
import net.minecraft.resources.ResourceLocation;
86
import net.minecraft.world.inventory.AbstractContainerMenu;
97
import net.minecraft.world.inventory.Slot;
108
import net.minecraft.world.item.ItemStack;
119
import net.minecraft.world.level.block.Blocks;
1210
import org.cyclops.integratedterminals.api.terminalstorage.ITerminalButton;
11+
import org.cyclops.integratedterminals.api.terminalstorage.ITerminalRowColumnProvider;
1312
import org.cyclops.integratedterminals.api.terminalstorage.ITerminalStorageSlot;
1413
import org.cyclops.integratedterminals.api.terminalstorage.ITerminalStorageTabClient;
15-
import org.cyclops.integratedterminals.api.terminalstorage.ITerminalStorageTabCommon;
16-
import org.cyclops.integratedterminals.client.gui.container.ContainerScreenTerminalStorage;
1714
import org.cyclops.integratedterminals.inventory.container.ContainerTerminalStorageBase;
1815

1916
import java.util.Collections;
@@ -77,6 +74,11 @@ public List<ITerminalStorageSlot> getSlots(int channel, int offset, int limit) {
7774
return Collections.emptyList();
7875
}
7976

77+
@Override
78+
public ITerminalRowColumnProvider getRowColumnProvider() {
79+
return () -> new ITerminalRowColumnProvider.RowsAndColumns(3, 9);
80+
}
81+
8082
@Override
8183
public boolean isEnabled() {
8284
return true;
@@ -147,16 +149,6 @@ public int getSlotOffsetY() {
147149
return 58; // Adjusted to position the Ender Chest slots properly
148150
}
149151

150-
@Override
151-
public int getSlotVisibleRows() {
152-
return 3; // Ender Chest has 3 rows
153-
}
154-
155-
@Override
156-
public int getSlotRowLength() {
157-
return 9; // 9 columns
158-
}
159-
160152
@Override
161153
public boolean isSlotValidForDraggingInto(int channel, Slot slot) {
162154
// Allow dragging into Ender Chest slots

src/main/java/org/cyclops/integratedterminals/core/terminalstorage/TerminalStorageTabEnderChestCommon.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ public List<Pair<Slot, ISlotPositionCallback>> loadSlots(AbstractContainerMenu c
4343
int slotIndex = col + row * 9;
4444
int finalRow = row;
4545
int finalCol = col;
46-
46+
4747
Slot slot = new Slot(player.getEnderChestInventory(), slotIndex, 0, 0);
4848
ISlotPositionCallback positionCallback = (factors) -> {
4949
int x = factors.offsetX() + finalCol * 18;
5050
int y = factors.offsetY() + finalRow * 18 + 18; // Add offset to position below tab area
5151
return Pair.of(x, y);
5252
};
53-
53+
5454
slots.add(Pair.of(slot, positionCallback));
5555
}
5656
}

0 commit comments

Comments
 (0)