Add screen size functions which are synced from the client to the server

Author: SirEndii

src/main/java/de/srendi/advancedperipherals/common/network/APNetworking.java

@@ -2,13 +2,15 @@
 
 import de.srendi.advancedperipherals.AdvancedPeripherals;
 import de.srendi.advancedperipherals.common.network.base.IPacket;
+import de.srendi.advancedperipherals.common.network.toclient.OverlayModuleClientRequestPacket;
 import de.srendi.advancedperipherals.common.network.toclient.RenderableObjectBulkSyncPacket;
 import de.srendi.advancedperipherals.common.network.toclient.RenderableObjectClearPacket;
 import de.srendi.advancedperipherals.common.network.toclient.RenderableObjectDeletePacket;
 import de.srendi.advancedperipherals.common.network.toclient.RenderableObjectSyncPacket;
 import de.srendi.advancedperipherals.common.network.toclient.SaddleTurtleInfoPacket;
 import de.srendi.advancedperipherals.common.network.toclient.ToastToClientPacket;
 import de.srendi.advancedperipherals.common.network.toserver.GlassesHotkeyPacket;
+import de.srendi.advancedperipherals.common.network.toserver.OverlayModuleClientInfoPacket;
 import de.srendi.advancedperipherals.common.network.toserver.SaddleTurtleControlPacket;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.FriendlyByteBuf;
@@ -44,8 +46,11 @@ public static void init() {
         registerServerToClient(RenderableObjectDeletePacket.class, RenderableObjectDeletePacket::decode);
         registerServerToClient(RenderableObjectClearPacket.class, RenderableObjectClearPacket::decode);
         registerServerToClient(RenderableObjectBulkSyncPacket.class, RenderableObjectBulkSyncPacket::decode);
+        registerServerToClient(OverlayModuleClientRequestPacket.class, OverlayModuleClientRequestPacket::decode);
+
         registerClientToServer(GlassesHotkeyPacket.class, GlassesHotkeyPacket::decode);
         registerClientToServer(SaddleTurtleControlPacket.class, SaddleTurtleControlPacket::decode);
+        registerClientToServer(OverlayModuleClientInfoPacket.class, OverlayModuleClientInfoPacket::decode);
     }
 
     public static <MSG extends IPacket> void registerServerToClient(Class<MSG> packet, Function<FriendlyByteBuf, MSG> decode) {

src/main/java/de/srendi/advancedperipherals/common/network/toclient/OverlayModuleClientRequestPacket.java

@@ -0,0 +1,36 @@
+package de.srendi.advancedperipherals.common.network.toclient;
+
+import de.srendi.advancedperipherals.client.smartglasses.OverlayObjectHolder;
+import de.srendi.advancedperipherals.common.addons.minecolonies.MineColonies;
+import de.srendi.advancedperipherals.common.network.APNetworking;
+import de.srendi.advancedperipherals.common.network.base.IPacket;
+import de.srendi.advancedperipherals.common.network.toserver.OverlayModuleClientInfoPacket;
+import net.minecraft.client.Minecraft;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraftforge.network.NetworkEvent;
+
+public class OverlayModuleClientRequestPacket implements IPacket {
+
+    public OverlayModuleClientRequestPacket() {
+
+    }
+
+    @Override
+    public void handle(NetworkEvent.Context context) {
+        Minecraft minecraft = Minecraft.getInstance();
+
+        int sizeX = minecraft.getWindow().getWidth(), sizeY = minecraft.getWindow().getHeight();
+        double guiScale = minecraft.getWindow().getGuiScale();
+
+        APNetworking.sendToServer(new OverlayModuleClientInfoPacket(minecraft.player.getUUID(), sizeX, sizeY, guiScale));
+    }
+
+    @Override
+    public void encode(FriendlyByteBuf buffer) {
+
+    }
+
+    public static OverlayModuleClientRequestPacket decode(FriendlyByteBuf buffer) {
+        return new OverlayModuleClientRequestPacket();
+    }
+}

src/main/java/de/srendi/advancedperipherals/common/network/toserver/OverlayModuleClientInfoPacket.java

@@ -0,0 +1,63 @@
+package de.srendi.advancedperipherals.common.network.toserver;
+
+import de.srendi.advancedperipherals.common.items.SmartGlassesItem;
+import de.srendi.advancedperipherals.common.network.base.IPacket;
+import de.srendi.advancedperipherals.common.smartglasses.SmartGlassesComputer;
+import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.OverlayModule;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.item.ItemStack;
+import net.minecraftforge.network.NetworkEvent;
+import net.minecraftforge.server.ServerLifecycleHooks;
+
+import java.util.UUID;
+
+public class OverlayModuleClientInfoPacket implements IPacket {
+
+    private final UUID player;
+    private final int screenWidth;
+    private final int screenHeight;
+    private final double guiScale;
+
+    public OverlayModuleClientInfoPacket(UUID player, int screenWidth, int screenHeight, double guiScale) {
+        this.player = player;
+        this.screenWidth = screenWidth;
+        this.screenHeight = screenHeight;
+        this.guiScale = guiScale;
+    }
+
+    @Override
+    public void handle(NetworkEvent.Context context) {
+        MinecraftServer server = ServerLifecycleHooks.getCurrentServer();
+
+        ServerPlayer serverPlayer = server.getPlayerList().getPlayer(player);
+        if (serverPlayer == null)
+            return;
+
+        for (ItemStack stack : serverPlayer.getAllSlots()) {
+            if (stack.getItem() instanceof SmartGlassesItem) {
+                SmartGlassesComputer computer = SmartGlassesItem.getServerComputer(server, stack);
+
+                if (computer != null) {
+                    OverlayModule module = computer.getModule(OverlayModule.class);
+
+                    if (module != null)
+                        module.setScreenSizes(screenWidth, screenHeight, guiScale);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void encode(FriendlyByteBuf buffer) {
+        buffer.writeUUID(player);
+        buffer.writeInt(screenWidth);
+        buffer.writeInt(screenHeight);
+        buffer.writeDouble(guiScale);
+    }
+
+    public static OverlayModuleClientInfoPacket decode(FriendlyByteBuf buffer) {
+        return new OverlayModuleClientInfoPacket(buffer.readUUID(), buffer.readInt(), buffer.readInt(), buffer.readDouble());
+    }
+}

src/main/java/de/srendi/advancedperipherals/common/smartglasses/SmartGlassesComputer.java

@@ -247,6 +247,11 @@ public Map<Integer, IModule> getModules() {
         return modules;
     }
 
+    @Nullable
+    public <T extends IModule> T getModule(Class<T> module) {
+        return modules.values().stream().filter(module::isInstance).map(module::cast).findFirst().orElse(null);
+    }
+
     @Override
     protected void onRemoved() {
         super.onRemoved();

src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/ModulePeripheral.java

@@ -3,18 +3,18 @@
 import dan200.computercraft.api.lua.LuaFunction;
 import de.srendi.advancedperipherals.common.smartglasses.SmartGlassesComputer;
 import de.srendi.advancedperipherals.lib.peripherals.BasePeripheral;
+import org.jetbrains.annotations.NotNull;
 
 public class ModulePeripheral extends BasePeripheral<ModulePeripheralOwner> {
 
     public static final String PERIPHERAL_TYPE = "smart_glasses";
 
     public ModulePeripheral(SmartGlassesComputer computer) {
         super(PERIPHERAL_TYPE, new ModulePeripheralOwner(computer));
-
     }
 
     public void updateModules() {
-        // We need to set the initialisation to false so the dynamic peripheral re-builds the plugins
+        // We need to set the initialization to false so the dynamic peripheral re-builds the plugins
         clearAllPlugins();
 
         SmartGlassesComputer computer = getPeripheralOwner().getComputer();
@@ -35,4 +35,9 @@ public boolean isEnabled() {
     public final String[] getModules() {
         return getPeripheralOwner().getComputer().getModules().values().stream().map(module -> module.getName().toString()).toArray(String[]::new);
     }
+
+    @LuaFunction(mainThread = true)
+    public final boolean hasModule(@NotNull String module) {
+        return getPeripheralOwner().getComputer().getModules().values().stream().anyMatch(m -> m.getName().toString().equals(module));
+    }
 }

src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/OverlayGlassesFunctions.java

@@ -122,10 +122,14 @@ public final MethodResult getObjectsSize() {
         return MethodResult.of(overlayModule.getObjects().size());
     }
 
-    // TODO: This will crash on dedicated servers
     @LuaFunction
     public final MethodResult getSize() {
-        return MethodResult.of(Minecraft.getInstance().getWindow().getWidth(), Minecraft.getInstance().getWindow().getHeight());
+        return MethodResult.of(overlayModule.getScreenWidth(), overlayModule.getScreenHeight());
+    }
+
+    @LuaFunction
+    public final MethodResult getGuiScale() {
+        return MethodResult.of(overlayModule.getGuiScale());
     }
 
     @LuaFunction

src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/OverlayModule.java

@@ -2,6 +2,7 @@
 
 import de.srendi.advancedperipherals.AdvancedPeripherals;
 import de.srendi.advancedperipherals.common.network.APNetworking;
+import de.srendi.advancedperipherals.common.network.toclient.OverlayModuleClientRequestPacket;
 import de.srendi.advancedperipherals.common.network.toclient.RenderableObjectBulkSyncPacket;
 import de.srendi.advancedperipherals.common.network.toclient.RenderableObjectClearPacket;
 import de.srendi.advancedperipherals.common.network.toclient.RenderableObjectDeletePacket;
@@ -11,18 +12,17 @@
 import de.srendi.advancedperipherals.common.smartglasses.modules.IModuleFunctions;
 import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.RenderableObject;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-/**
- * We want to support scripts which were made for the plethora classes. So we call this item the same as the overlay item from plethora
- * We'll first add our own implementation for a rendering system and then add the API endpoints for plethora scripts
- */
 public class OverlayModule implements IModule {
 
     public final ConcurrentHashMap<Integer, RenderableObject> objects = new ConcurrentHashMap<>();
@@ -32,6 +32,10 @@ public class OverlayModule implements IModule {
     public boolean autoUpdate = true;
     private int idCounter = 0;
 
+    private int screenWidth = 0;
+    private int screenHeight = 0;
+    private double guiScale = 1;
+
     public OverlayModule(SmartGlassesAccess access) {
         this.access = access;
     }
@@ -48,11 +52,29 @@ public IModuleFunctions getFunctions(SmartGlassesAccess smartGlassesAccess) {
 
     @Override
     public void tick(@NotNull SmartGlassesAccess smartGlassesAccess) {
-        /*
+
         Entity entity = smartGlassesAccess.getEntity();
-        if (entity != null && entity.getLevel().getGameTime() % 20 == 0)
-            AdvancedPeripherals.LOGGER.info("I'm an overlay module! And I'm alive!");
-        */
+        if (entity instanceof ServerPlayer player && entity.getLevel().getGameTime() % 2 == 0) {
+            APNetworking.sendTo(new OverlayModuleClientRequestPacket(), player);
+        }
+    }
+
+    public void setScreenSizes(int screenWidth, int screenHeight, double guiScale) {
+        this.screenWidth = screenWidth;
+        this.screenHeight = screenHeight;
+        this.guiScale = guiScale;
+    }
+
+    public int getScreenWidth() {
+        return screenWidth;
+    }
+
+    public int getScreenHeight() {
+        return screenHeight;
+    }
+
+    public double getGuiScale() {
+        return guiScale;
     }
 
     public SmartGlassesAccess getAccess() {