allow using inventory Preview on Empty Block Entities.

sakura-ryoko · Dec 7, 2024 · 57181c2 · 57181c2
1 parent 73c3ab8
commit 57181c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/main/java/fi/dy/masa/tweakeroo/renderer/RenderUtils.java b/src/main/java/fi/dy/masa/tweakeroo/renderer/RenderUtils.java
@@ -191,7 +191,7 @@ else if (context.nbt() != null)
                 }
             }
 
-            //Tweakeroo.logger.warn("renderInventoryOverlay: type [{}] // Nbt Type [{}]", type.toString(), context.nbt() != null ? InventoryOverlay.getInventoryType(context.nbt()) : "INVALID");
+            //Tweakeroo.logger.warn("renderInventoryOverlay: type [{}] // Nbt Type [{}] // inv.isEmpty({})", type.toString(), context.nbt() != null ? InventoryOverlay.getInventoryType(context.nbt()) : "INVALID", inv.isEmpty());
 
             if (context.be() != null && context.be().getCachedState().getBlock() instanceof ShulkerBoxBlock sbb)
             {

diff --git a/src/main/java/fi/dy/masa/tweakeroo/util/RayTraceUtils.java b/src/main/java/fi/dy/masa/tweakeroo/util/RayTraceUtils.java
@@ -167,8 +167,7 @@ public static HitResult getRayTraceFromEntity(World worldIn, Entity entityIn, bo
                     lastBlockEntityContext = null;
                 }
 
-                if (ctx != null &&
-                    (ctx.inv() != null && !ctx.inv().isEmpty()))
+                if (ctx != null && ctx.inv() != null)
                 {
                     lastBlockEntityContext = Pair.of(pos, ctx);
                     return ctx;
@@ -208,7 +207,7 @@ else if (trace.getType() == HitResult.Type.ENTITY)
             }
 
             if (ctx != null &&
-                (ctx.inv() != null && !ctx.inv().isEmpty()))
+               (ctx.inv() != null && !ctx.inv().isEmpty()))
             {
                 lastEntityContext = Pair.of(entity.getId(), ctx);
                 return ctx;
@@ -370,8 +369,8 @@ else if (inv != null && nbt.contains(NbtKeys.SADDLE))
             }
             // Fix for empty Villager/Piglin inv
             else if (inv != null && inv.size() == 8 &&
-                    nbt.contains(NbtKeys.INVENTORY) &&
-                    !nbt.getList(NbtKeys.INVENTORY, Constants.NBT.TAG_COMPOUND).isEmpty())
+                     nbt.contains(NbtKeys.INVENTORY) &&
+                     !nbt.getList(NbtKeys.INVENTORY, Constants.NBT.TAG_COMPOUND).isEmpty())
             {
                 inv2 = InventoryUtils.getNbtInventory(nbt, 8, entity.getRegistryManager());
                 inv = null;
-Original file line number
+Diff line change
@@ Expand Up / @@ -191,7 +191,7 @@ else if (context.nbt() != null) @@
                     }
                 }
-                //Tweakeroo.logger.warn("renderInventoryOverlay: type [{}] // Nbt Type [{}]", type.toString(), context.nbt() != null ? InventoryOverlay.getInventoryType(context.nbt()) : "INVALID");
+                //Tweakeroo.logger.warn("renderInventoryOverlay: type [{}] // Nbt Type [{}] // inv.isEmpty({})", type.toString(), context.nbt() != null ? InventoryOverlay.getInventoryType(context.nbt()) : "INVALID", inv.isEmpty());
                 if (context.be() != null && context.be().getCachedState().getBlock() instanceof ShulkerBoxBlock sbb)
                 {
@@ Expand Down @@