Skip to content

Commit ba43362

Browse files
committed
uneeded cast
write stack better spotless
1 parent 3f47d8c commit ba43362

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

src/main/java/gregtech/api/mui/GTGuis.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package gregtech.api.mui;
22

3-
import com.cleanroommc.modularui.api.IPanelHandler;
4-
53
import gregtech.api.cover.Cover;
64
import gregtech.api.items.metaitem.MetaItem;
75
import gregtech.api.metatileentity.MetaTileEntity;
@@ -11,6 +9,7 @@
119

1210
import net.minecraft.item.ItemStack;
1311

12+
import com.cleanroommc.modularui.api.IPanelHandler;
1413
import com.cleanroommc.modularui.factory.GuiManager;
1514
import com.cleanroommc.modularui.screen.ModularPanel;
1615
import com.cleanroommc.modularui.utils.Alignment;

src/main/java/gregtech/common/covers/filter/BaseFilterContainer.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
import net.minecraft.util.math.MathHelper;
1111
import net.minecraftforge.items.ItemStackHandler;
1212

13+
import com.cleanroommc.modularui.api.IPanelHandler;
1314
import com.cleanroommc.modularui.api.drawable.IKey;
1415
import com.cleanroommc.modularui.api.widget.IWidget;
1516
import com.cleanroommc.modularui.drawable.GuiTextures;
1617
import com.cleanroommc.modularui.factory.GuiData;
18+
import com.cleanroommc.modularui.network.NetworkUtils;
1719
import com.cleanroommc.modularui.utils.Alignment;
18-
import com.cleanroommc.modularui.value.sync.PanelSyncHandler;
1920
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
2021
import com.cleanroommc.modularui.value.sync.SyncHandlers;
2122
import com.cleanroommc.modularui.widgets.ButtonWidget;
@@ -24,8 +25,6 @@
2425
import org.jetbrains.annotations.NotNull;
2526
import org.jetbrains.annotations.Nullable;
2627

27-
import java.io.IOException;
28-
2928
public abstract class BaseFilterContainer extends ItemStackHandler {
3029

3130
private int maxTransferSize = 1;
@@ -213,7 +212,7 @@ public void handleLegacyNBT(NBTTagCompound nbt) {
213212

214213
/** Uses Cleanroom MUI */
215214
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) -> {
217216
var filter = hasFilter() ? getFilter() : BaseFilter.ERROR_FILTER;
218217
filter.setMaxTransferSize(getMaxTransferSize());
219218
return filter.createPopupPanel(syncManager);
@@ -253,17 +252,13 @@ public IWidget initUI(GuiData data, PanelSyncManager manager) {
253252
}
254253

255254
public void writeInitialSyncData(PacketBuffer packetBuffer) {
256-
packetBuffer.writeItemStack(this.getFilterStack());
255+
NetworkUtils.writeItemStack(packetBuffer, this.getFilterStack());
257256
packetBuffer.writeInt(this.maxTransferSize);
258257
packetBuffer.writeInt(this.transferSize);
259258
}
260259

261260
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));
267262
this.setMaxTransferSize(packetBuffer.readInt());
268263
this.setTransferSize(packetBuffer.readInt());
269264
}

0 commit comments

Comments
 (0)