Fix PSD button, default zoom for room preview

[no ci]

Author: robotgryphon

forge-main/src/main/java/dev/compactmods/machines/machine/CompactMachineBlock.java

@@ -27,6 +27,7 @@
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.core.GlobalPos;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
@@ -201,7 +202,7 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player
 
                         RoomNetworkHandler.CHANNEL.send(
                                 PacketDistributor.PLAYER.with(() -> (ServerPlayer) player),
-                                new OpenMachinePreviewScreenPacket(room, roomBlocks)
+                                new OpenMachinePreviewScreenPacket(GlobalPos.of(level.dimension(), pos), room, roomBlocks)
                         );
                     } catch (NonexistentRoomException | MissingDimensionException e) {
                         e.printStackTrace();

forge-main/src/main/java/dev/compactmods/machines/room/Rooms.java

@@ -82,7 +82,7 @@ public static StructureTemplate getInternalBlocks(MinecraftServer server, ChunkP
         final var bounds = roomInfo.getRoomBounds();
         final int inside = roomInfo.getSize().getInternalSize();
         tem.fillFromWorld(compactDim, new BlockPos((int)bounds.minX, (int)bounds.minY - 1, (int)bounds.minZ),
-                new Vec3i(inside, inside + 1, inside), false, null);
+                new Vec3i(inside, inside + 2, inside), false, null);
 
         return tem;
     }

forge-main/src/main/java/dev/compactmods/machines/room/client/MachineRoomScreen.java

@@ -12,6 +12,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.phys.AABB;
 
 public class MachineRoomScreen extends Screen {
 
@@ -52,9 +53,16 @@ protected void init() {
     private void updateSceneRenderers() {
         if (this.scene != null) {
             renderer.setData(scene);
+            renderer.camera().zoom(calculateZoomForRoom(AABB.of(scene.blockBoundaries())));
         }
     }
 
+    private static float calculateZoomForRoom(AABB internalSize) {
+        double maxSize = Math.max(internalSize.getXsize(), internalSize.getZsize());
+
+        return (float) (-1.0f * maxSize) - 3;
+    }
+
     private boolean hasPsdItem() {
         return minecraft.player.getInventory().contains(new ItemStack(Shrinking.PERSONAL_SHRINKING_DEVICE.get()));
     }
@@ -63,10 +71,9 @@ private boolean hasPsdItem() {
     public void tick() {
         super.tick();
 
-        if (this.scene != null) {
-            var level = ((VirtualLevel) scene.originalLevel().get());
-            level.tick(minecraft.getPartialTick());
-            level.animateTick();
+        if (this.scene != null && scene.originalLevel().get() instanceof VirtualLevel vl) {
+            vl.tick(minecraft.getPartialTick());
+            vl.animateTick();
         }
 
         if(psdButton != null)
@@ -83,21 +90,10 @@ public boolean mouseDragged(double mx, double my, int mButton, double dx, double
         return true;
     }
 
-    @Override
-    public boolean mouseScrolled(double p_94686_, double p_94687_, double p_94688_) {
-        this.renderer.zoom(p_94688_);
-        return super.mouseScrolled(p_94686_, p_94687_, p_94688_);
-    }
-
     @Override
     public boolean keyPressed(int code, int scanCode, int modifiers) {
         final float rotateSpeed = 1 / 12f;
 
-//        if (code == InputConstants.KEY_A) {
-//            this.autoRotate = !autoRotate;
-//            return true;
-//        }
-
         if (code == InputConstants.KEY_R) {
             renderer.camera().resetLook();
             this.renderer.recalculateTranslucency();

forge-main/src/main/java/dev/compactmods/machines/room/network/OpenMachinePreviewScreenPacket.java

@@ -3,6 +3,8 @@
 import dev.compactmods.machines.CompactMachines;
 import dev.compactmods.machines.room.network.client.ClientRoomNetworkHandler;
 import java.util.function.Supplier;
+
+import net.minecraft.core.GlobalPos;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtAccounter;
@@ -11,20 +13,22 @@
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
 import net.minecraftforge.network.NetworkEvent;
 
-public record OpenMachinePreviewScreenPacket(ChunkPos roomChunk, StructureTemplate internalBlocks) {
+public record OpenMachinePreviewScreenPacket(GlobalPos machinePos, ChunkPos roomChunk, StructureTemplate internalBlocks) {
     public void toNetwork(FriendlyByteBuf friendlyByteBuf) {
+        friendlyByteBuf.writeGlobalPos(machinePos);
         friendlyByteBuf.writeChunkPos(roomChunk);
 
         final var tag = internalBlocks.save(new CompoundTag());
         friendlyByteBuf.writeNbt(tag);
     }
 
     public static OpenMachinePreviewScreenPacket fromNetwork(FriendlyByteBuf friendlyByteBuf) {
+        final var machinePos = friendlyByteBuf.readGlobalPos();
         final var chunkPos = friendlyByteBuf.readChunkPos();
         final var blocks = new StructureTemplate();
         blocks.load(BuiltInRegistries.BLOCK.asLookup(), friendlyByteBuf.readNbt(NbtAccounter.UNLIMITED));
 
-        return new OpenMachinePreviewScreenPacket(chunkPos, blocks);
+        return new OpenMachinePreviewScreenPacket(machinePos, chunkPos, blocks);
     }
 
     public static boolean handle(OpenMachinePreviewScreenPacket pkt, Supplier<NetworkEvent.Context> context) {

forge-main/src/main/java/dev/compactmods/machines/room/network/client/ClientRoomNetworkHandler.java

@@ -16,7 +16,7 @@
 public class ClientRoomNetworkHandler {
     public static void openRoomPreviewScreen(OpenMachinePreviewScreenPacket pkt) {
         final var mc = Minecraft.getInstance();
-        mc.setScreen(new MachineRoomScreen(Component.empty(), GlobalPos.of(mc.level.dimension(), BlockPos.ZERO), pkt.roomChunk()));
+        mc.setScreen(new MachineRoomScreen(Component.empty(), pkt.machinePos(), pkt.roomChunk()));
         if(mc.screen instanceof MachineRoomScreen mrs) {
             var virtualLevel = new VirtualLevel(Minecraft.getInstance().level.registryAccess());
             var bounds = pkt.internalBlocks().getBoundingBox(new StructurePlaceSettings(), BlockPos.ZERO);