allow render simple blockentity with overlay module

Author: zyxkad

src/main/java/de/srendi/advancedperipherals/client/smartglasses/objects/threedim/BlockRenderer.java

@@ -5,29 +5,40 @@
 import de.srendi.advancedperipherals.client.APRenderTypes;
 import de.srendi.advancedperipherals.client.RenderUtil;
 import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.three_dim.BlockObject;
+import de.srendi.advancedperipherals.common.util.fakelevel.FakeLevel;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.color.block.BlockColors;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.block.BlockRenderDispatcher;
 import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher;
+import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
 import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.util.RandomSource;
+import net.minecraft.world.level.block.EntityBlock;
+import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.client.event.RenderLevelStageEvent;
 import org.joml.Quaternionf;
 
 import java.util.List;
+import java.util.WeakHashMap;
 
 public class BlockRenderer implements IThreeDObjectRenderer<BlockObject> {
+    private final WeakHashMap<ClientLevel, FakeLevel> fakeLevels = new WeakHashMap<>();
 
     @Override
     public void renderBatch(List<BlockObject> batch, RenderLevelStageEvent event, PoseStack poseStack, Vec3 eyePos, Quaternionf eyeRotation) {
         Minecraft minecraft = Minecraft.getInstance();
         BlockRenderDispatcher blockRenderer = minecraft.getBlockRenderer();
+        BlockEntityRenderDispatcher blockEntityRenderer = minecraft.getBlockEntityRenderDispatcher();
+        float partialTick = event.getPartialTick();
         MultiBufferSource.BufferSource bufferSource = minecraft.renderBuffers().bufferSource();
 
         RandomSource random = RandomSource.create();
@@ -55,10 +66,10 @@ public void renderBatch(List<BlockObject> batch, RenderLevelStageEvent event, Po
             poseStack.translate(block.x, block.y, block.z);
             poseStack.mulPose(block.getRotation());
             poseStack.scale(block.sizeX, block.sizeY, block.sizeZ);
-            poseStack.translate(-0.5f, -0.5f, -0.5f);
 
             float alpha = block.opacity;
 
+            poseStack.translate(-0.5f, -0.5f, -0.5f);
             renderBlockModel(
                 poseStack.last(),
                 bufferBuilder,
@@ -72,6 +83,24 @@ public void renderBatch(List<BlockObject> batch, RenderLevelStageEvent event, Po
                 OverlayTexture.NO_OVERLAY,
                 random
             );
+            if (!(state.getBlock() instanceof EntityBlock eb)) {
+                continue;
+            }
+            BlockEntity blockEntity = eb.newBlockEntity(BlockPos.ZERO, state);
+            if (blockEntity == null) {
+                continue;
+            }
+            FakeLevel fakeLevel = this.fakeLevels.computeIfAbsent(minecraft.level, (level) -> new FakeLevel(minecraft.getConnection(), level));
+            fakeLevel.setBlockAndUpdate(BlockPos.ZERO, state);
+            fakeLevel.setBlockEntity(blockEntity);
+            blockEntity.setLevel(fakeLevel);
+            @SuppressWarnings("rawtypes")
+            BlockEntityRenderer renderer = blockEntityRenderer.getRenderer(blockEntity);
+            if (renderer == null) {
+                continue;
+            }
+            poseStack.translate(0.5f, 0.5f, 0.5f);
+            renderer.render(blockEntity, partialTick, poseStack, bufferSource, LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY);
         }
         poseStack.popPose();
     }

src/main/java/de/srendi/advancedperipherals/common/addons/ae2/AEApi.java

@@ -645,7 +645,7 @@ public static long getUsedExternalFluidStorage(IGrid grid) {
     /**
      * Calculates the available external item storage of a given grid node.
      *
-     * @param gird The grid for which to calculate the available external item storage.
+     * @param grid The grid for which to calculate the available external item storage.
      * @return The available external item storage.
      */
     public static double getAvailableExternalItemStorage(IGrid grid) {

src/main/java/de/srendi/advancedperipherals/common/items/SmartGlassesInterfaceItem.java

@@ -45,7 +45,7 @@ public InteractionResultHolder<ItemStack> use(Level level, Player player, Intera
         PlatformHelper.get().openMenu(
             player,
             glasses.getHoverName(),
-            new SmartGlassesMenuProvider(computer, glasses, itemHandler)::createMenu,
+            new SmartGlassesMenuProvider(computer, glasses, itemHandler),
             new ComputerContainerData(computer, glasses)
         );
 

src/main/java/de/srendi/advancedperipherals/common/items/SmartGlassesItem.java

@@ -65,8 +65,6 @@
 
 public class SmartGlassesItem extends ArmorItem implements IComputerItem, IMedia {
 
-    private static final String NBT_UPGRADE = "Upgrade";
-    private static final String NBT_UPGRADE_INFO = "UpgradeInfo";
     public static final String NBT_LIGHT = "Light";
     public static final String NBT_ON = "On";
 
@@ -272,7 +270,7 @@ public InteractionResultHolder<ItemStack> use(Level level, Player player, Intera
         PlatformHelper.get().openMenu(
             player,
             glasses.getHoverName(),
-            new SmartGlassesMenuProvider(computer, glasses, itemHandler)::createMenu,
+            new SmartGlassesMenuProvider(computer, glasses, itemHandler),
             new ComputerContainerData(computer, glasses)
         );
         return InteractionResultHolder.consume(glasses);

src/main/java/de/srendi/advancedperipherals/common/util/LuaConverter.java

@@ -76,18 +76,19 @@ public static <T extends Entity> void registerEntityConverter(Class<T> clazz, En
     public interface EntityConverter<T extends Entity> {
         void entityToMap(T entity, Map<String, Object> data, Context ctx);
 
-        record Context(boolean detailed, ItemStack itemInHand, Vec3 position, Matrix3dc orientation) {}
+        record Context(boolean detailed, @NotNull ItemStack itemInHand, Vec3 position, Matrix3dc orientation) {}
     }
 
-    private static final EntityConverter.Context EMPTY_ENTITY_CONVERTER_CONTEXT = new EntityConverter.Context(false, null, null, null);
+    private static final EntityConverter.Context EMPTY_ENTITY_CONVERTER_CONTEXT = new EntityConverter.Context(false, ItemStack.EMPTY, null, null);
 
     public static EntityContextBuilder entityContextBuilder() {
         return new EntityContextBuilder();
     }
 
     public static final class EntityContextBuilder {
         private boolean detailed = false;
-        private ItemStack itemInHand = null;
+        @NotNull
+        private ItemStack itemInHand = ItemStack.EMPTY;
         private Vec3 position = null;
         private Matrix3dc orientation = null;
 
@@ -100,7 +101,7 @@ public EntityContextBuilder detailed() {
             return this.detailed(true);
         }
 
-        public EntityContextBuilder itemInHand(ItemStack stack) {
+        public EntityContextBuilder itemInHand(@NotNull ItemStack stack) {
             this.itemInHand = stack;
             return this;
         }

src/main/java/de/srendi/advancedperipherals/common/util/fakelevel/FakeLevel.java

@@ -0,0 +1,21 @@
+package de.srendi.advancedperipherals.common.util.fakelevel;
+
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.multiplayer.ClientPacketListener;
+
+public class FakeLevel extends ClientLevel {
+    public FakeLevel(ClientPacketListener connection, ClientLevel level) {
+        super(
+            connection,
+            level.getLevelData(),
+            level.dimension(),
+            level.dimensionTypeRegistration(),
+            2,
+            1,
+            level.getProfilerSupplier(),
+            null,
+            false,
+            0
+        );
+    }
+}