Make PacketUtils#container nullable instead of using an optional

Author: pupnewfster

src/main/java/mekanism/common/network/PacketHandler.java

@@ -174,8 +174,12 @@ protected void registerServerToClient(PacketRegistrar registrar) {
         //QIO
         registrar.play(PacketBatchItemViewerSync.ID, PacketBatchItemViewerSync::new);
         registrar.play(PacketUpdateItemViewer.ID, PacketUpdateItemViewer::new);
-        killItemViewer = registrar.playInstanced(Mekanism.rl("kill_qio"), context -> PacketUtils.container(context, QIOItemViewerContainer.class)
-              .ifPresent(QIOItemViewerContainer::handleKill));
+        killItemViewer = registrar.playInstanced(Mekanism.rl("kill_qio"), context -> {
+            QIOItemViewerContainer container = PacketUtils.container(context, QIOItemViewerContainer.class);
+            if (container != null) {
+                container.handleKill();
+            }
+        });
 
         //Transmitters
         registrar.play(PacketNetworkScale.ID, PacketNetworkScale::new);

src/main/java/mekanism/common/network/PacketUtils.java

@@ -138,11 +138,13 @@ public static BlockEntity blockEntity(IPayloadContext context, BlockPos pos) {
         return WorldUtils.getTileEntity(context.level().orElse(null), pos);
     }
 
-    public static <CLASS extends AbstractContainerMenu> Optional<CLASS> container(IPayloadContext context, Class<CLASS> clazz) {
-        return context.player()
-              .map(player -> player.containerMenu)
-              .filter(clazz::isInstance)
-              .map(clazz::cast);
+    @Nullable
+    public static <CLASS extends AbstractContainerMenu> CLASS container(IPayloadContext context, Class<CLASS> clazz) {
+        Player player = context.player().orElse(null);
+        if (player != null && clazz.isInstance(player.containerMenu)) {
+            return clazz.cast(player.containerMenu);
+        }
+        return null;
     }
 
     /**

src/main/java/mekanism/common/network/to_client/container/PacketUpdateContainer.java

@@ -1,7 +1,6 @@
 package mekanism.common.network.to_client.container;
 
 import java.util.List;
-import java.util.Optional;
 import mekanism.common.Mekanism;
 import mekanism.common.inventory.container.MekanismContainer;
 import mekanism.common.network.IMekanismPacket;
@@ -31,16 +30,12 @@ public ResourceLocation id() {
 
     @Override
     public void handle(PlayPayloadContext context) {
-        //Ensure that the container is one of ours,
-        Optional<MekanismContainer> containered = PacketUtils.container(context, MekanismContainer.class);
-        if (containered.isPresent()) {
-            MekanismContainer container = containered.get();
-            // the window id is the same as we expect it to be
-            if (container.containerId == windowId) {
-                // and if so handle the packet
-                for (PropertyData datum : data) {
-                    datum.handleWindowProperty(container);
-                }
+        MekanismContainer container = PacketUtils.container(context, MekanismContainer.class);
+        //Ensure that the container is one of ours, and the window id is the same as we expect it to be
+        if (container != null && container.containerId == windowId) {
+            // and if so handle the packet
+            for (PropertyData datum : data) {
+                datum.handleWindowProperty(container);
             }
         }
     }

src/main/java/mekanism/common/network/to_client/qio/PacketBatchItemViewerSync.java

@@ -30,8 +30,7 @@ public ResourceLocation id() {
 
     @Override
     public void handle(PlayPayloadContext context) {
-        //noinspection SimplifyOptionalCallChains - Capturing lambda
-        QIOItemViewerContainer container = PacketUtils.container(context, QIOItemViewerContainer.class).orElse(null);
+        QIOItemViewerContainer container = PacketUtils.container(context, QIOItemViewerContainer.class);
         if (container != null) {
             container.handleBatchUpdate(itemMap, countCapacity, typeCapacity);
         }

src/main/java/mekanism/common/network/to_client/qio/PacketUpdateItemViewer.java

@@ -30,8 +30,7 @@ public ResourceLocation id() {
 
     @Override
     public void handle(PlayPayloadContext context) {
-        //noinspection SimplifyOptionalCallChains - Capturing lambda
-        QIOItemViewerContainer container = PacketUtils.container(context, QIOItemViewerContainer.class).orElse(null);
+        QIOItemViewerContainer container = PacketUtils.container(context, QIOItemViewerContainer.class);
         if (container != null) {
             container.handleUpdate(itemMap, countCapacity, typeCapacity);
         }

src/main/java/mekanism/common/network/to_server/qio/PacketQIOItemViewerSlotPlace.java

@@ -27,7 +27,7 @@ public ResourceLocation id() {
 
     @Override
     public void handle(PlayPayloadContext context) {
-        QIOItemViewerContainer container = PacketUtils.container(context, QIOItemViewerContainer.class).orElse(null);
+        QIOItemViewerContainer container = PacketUtils.container(context, QIOItemViewerContainer.class);
         if (container != null) {
             QIOFrequency freq = container.getFrequency();
             if (freq != null) {

src/main/java/mekanism/common/network/to_server/qio/PacketQIOItemViewerSlotTake.java

@@ -31,7 +31,7 @@ public ResourceLocation id() {
 
     @Override
     public void handle(PlayPayloadContext context) {
-        QIOItemViewerContainer container = PacketUtils.container(context, QIOItemViewerContainer.class).orElse(null);
+        QIOItemViewerContainer container = PacketUtils.container(context, QIOItemViewerContainer.class);
         if (container != null) {
             QIOFrequency freq = container.getFrequency();
             if (freq != null) {