|
10 | 10 | import net.minecraft.util.math.MathHelper; |
11 | 11 | import net.minecraftforge.items.ItemStackHandler; |
12 | 12 |
|
| 13 | +import com.cleanroommc.modularui.api.IPanelHandler; |
13 | 14 | import com.cleanroommc.modularui.api.drawable.IKey; |
14 | 15 | import com.cleanroommc.modularui.api.widget.IWidget; |
15 | 16 | import com.cleanroommc.modularui.drawable.GuiTextures; |
16 | 17 | import com.cleanroommc.modularui.factory.GuiData; |
| 18 | +import com.cleanroommc.modularui.network.NetworkUtils; |
17 | 19 | import com.cleanroommc.modularui.utils.Alignment; |
18 | | -import com.cleanroommc.modularui.value.sync.PanelSyncHandler; |
19 | 20 | import com.cleanroommc.modularui.value.sync.PanelSyncManager; |
20 | 21 | import com.cleanroommc.modularui.value.sync.SyncHandlers; |
21 | 22 | import com.cleanroommc.modularui.widgets.ButtonWidget; |
|
24 | 25 | import org.jetbrains.annotations.NotNull; |
25 | 26 | import org.jetbrains.annotations.Nullable; |
26 | 27 |
|
27 | | -import java.io.IOException; |
28 | | - |
29 | 28 | public abstract class BaseFilterContainer extends ItemStackHandler { |
30 | 29 |
|
31 | 30 | private int maxTransferSize = 1; |
@@ -213,7 +212,7 @@ public void handleLegacyNBT(NBTTagCompound nbt) { |
213 | 212 |
|
214 | 213 | /** Uses Cleanroom MUI */ |
215 | 214 | public IWidget initUI(GuiData data, PanelSyncManager manager) { |
216 | | - PanelSyncHandler panel = (PanelSyncHandler) manager.panel("filter_panel", (syncManager, syncHandler) -> { |
| 215 | + IPanelHandler panel = manager.panel("filter_panel", (syncManager, syncHandler) -> { |
217 | 216 | var filter = hasFilter() ? getFilter() : BaseFilter.ERROR_FILTER; |
218 | 217 | filter.setMaxTransferSize(getMaxTransferSize()); |
219 | 218 | return filter.createPopupPanel(syncManager); |
@@ -253,17 +252,13 @@ public IWidget initUI(GuiData data, PanelSyncManager manager) { |
253 | 252 | } |
254 | 253 |
|
255 | 254 | public void writeInitialSyncData(PacketBuffer packetBuffer) { |
256 | | - packetBuffer.writeItemStack(this.getFilterStack()); |
| 255 | + NetworkUtils.writeItemStack(packetBuffer, this.getFilterStack()); |
257 | 256 | packetBuffer.writeInt(this.maxTransferSize); |
258 | 257 | packetBuffer.writeInt(this.transferSize); |
259 | 258 | } |
260 | 259 |
|
261 | 260 | public void readInitialSyncData(@NotNull PacketBuffer packetBuffer) { |
262 | | - var stack = ItemStack.EMPTY; |
263 | | - try { |
264 | | - stack = packetBuffer.readItemStack(); |
265 | | - } catch (IOException ignore) {} |
266 | | - this.setFilterStack(stack); |
| 261 | + this.setFilterStack(NetworkUtils.readItemStack(packetBuffer)); |
267 | 262 | this.setMaxTransferSize(packetBuffer.readInt()); |
268 | 263 | this.setTransferSize(packetBuffer.readInt()); |
269 | 264 | } |
|
0 commit comments