From c7925b2b6c6de3aed48679c3aa032b9065568871 Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Mon, 22 Aug 2022 14:38:43 +0800 Subject: [PATCH 1/3] fix npe from drops render --- .../github/client/render/ItemDropRender.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glodblock/github/client/render/ItemDropRender.java b/src/main/java/com/glodblock/github/client/render/ItemDropRender.java index fe4173f4..78be0de4 100644 --- a/src/main/java/com/glodblock/github/client/render/ItemDropRender.java +++ b/src/main/java/com/glodblock/github/client/render/ItemDropRender.java @@ -82,8 +82,15 @@ public class ItemDropRender implements IItemRenderer { } int colour = fluid.getColor(); if (colour == 0xFFFFFF) { - TextureAtlasSprite sprite = Minecraft.getMinecraft().getTextureMapBlocks() - .getTextureExtry(fluid.getStillIcon().getIconName()); + TextureAtlasSprite sprite; + try { + sprite = Minecraft.getMinecraft().getTextureMapBlocks() + .getTextureExtry(fluid.getStillIcon().getIconName()); + } catch (NullPointerException e) { + colourCache.put(fluid.getName(), colour); + return colour; + } + if (sprite != null && sprite.getFrameCount() > 0) { int[][] image = sprite.getFrameTextureData(0); int r = 0, g = 0, b = 0, count = 0; From acf8ab44d785976e8c502c088622ef0571f07485 Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Mon, 22 Aug 2022 14:44:46 +0800 Subject: [PATCH 2/3] remove unnecessary update event --- .../glodblock/github/common/tile/TileFluidDiscretizer.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java b/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java index 613dd20a..fa98049e 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java @@ -123,11 +123,6 @@ public class TileFluidDiscretizer extends AENetworkTile implements IPriorityHost updateState(); } - @MENetworkEventSubscribe - public void onStorageUpdate(MENetworkStorageEvent event) { - updateState(); - } - private class FluidDiscretizingInventory implements IMEInventory, IMEMonitorHandlerReceiver { private final MEInventoryHandler invHandler = new MEInventoryHandler<>(this, getChannel()); From de3715cbf3e5bc5aeb79f8f7361145d2db07f6b2 Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Mon, 22 Aug 2022 15:11:50 +0800 Subject: [PATCH 3/3] subnet fluid check --- .../glodblock/github/common/tile/TileFluidDiscretizer.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java b/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java index fa98049e..613dd20a 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java @@ -123,6 +123,11 @@ public class TileFluidDiscretizer extends AENetworkTile implements IPriorityHost updateState(); } + @MENetworkEventSubscribe + public void onStorageUpdate(MENetworkStorageEvent event) { + updateState(); + } + private class FluidDiscretizingInventory implements IMEInventory, IMEMonitorHandlerReceiver { private final MEInventoryHandler invHandler = new MEInventoryHandler<>(this, getChannel());