Dev

mod.hjson

@@ -30,6 +30,6 @@ author: '''
 Port: 00SunRay00 & RE2b2m22
 '''
 minGameVersion: 157
-version: 2.1.2
+version: 2.1.3
 hidden: true
 main: scheme.Main

src/java/scheme/Main.java

@@ -43,7 +43,7 @@ public void init() {
         MessageQueue.load();
         RainbowTeam.load();
         SBinding.load();
-        new com.xpdustry.claj.client.Main().init();
+        if(mods.getMod("claj") == null || !mods.getMod("claj").enabled())new com.xpdustry.claj.client.Main().init();
 
         ui.schematics = schemas;
         ui.listfrag = listfrag;

src/java/scheme/ServerIntegration.java

@@ -3,6 +3,7 @@
 import arc.Core;
 import arc.Events;
 import arc.struct.IntMap;
+import arc.util.Log;
 import arc.util.Strings;
 import arc.util.Time;
 import mindustry.game.EventType.*;
@@ -47,18 +48,28 @@ public static void load() {
         });
 
         netServer.addPacketHandler("MySubtitle", (target, args) -> {
-            SSUsers.put(target.id, args);
-            IntMap<String> single = new IntMap<>(1);
-            single.put(target.id, args);
-            Call.clientPacketReliable("Subtitles", JsonIO.write(single));
-
-            if (SSUsers.size > 1) {
-                Call.clientPacketReliable(target.con, "Subtitles", JsonIO.write(SSUsers));
+            try {
+                if (args != null && args.length() > 256) return;
+                SSUsers.put(target.id, args);
+                IntMap<String> single = new IntMap<>(1);
+                single.put(target.id, args);
+                Call.clientPacketReliable("Subtitles", JsonIO.write(single));
+
+                if (SSUsers.size > 1) {
+                    Call.clientPacketReliable(target.con, "Subtitles", JsonIO.write(SSUsers));
+                }
+            } catch (Exception e) {
+                Log.warn("Invalid MySubtitle packet from @", target.name, e);
             }
         });
 
         netServer.addBinaryPacketHandler("schemesize.available", (player, data) -> {
-            Call.clientBinaryPacketReliable(player.con, "schemesize.available", data);
+            try {
+                if (data == null || data.length > 64) return;
+                Call.clientBinaryPacketReliable(player.con, "schemesize.available", data);
+            } catch (Exception e) {
+                Log.warn("Invalid schemesize.available packet from @", player.name, e);
+            }
         });
 
         // endregion
@@ -68,23 +79,38 @@ public static void load() {
         Events.run(ClientPreConnectEvent.class, ServerIntegration::clear);
 
         netClient.addPacketHandler("SendMeSubtitle", args -> {
-            Call.serverPacketReliable("MySubtitle", settings.getString("subtitle"));
-            if (args != null) hostID = Strings.parseInt(args, -1);
+            try {
+                Call.serverPacketReliable("MySubtitle", settings.getString("subtitle"));
+                if (args != null) hostID = Strings.parseInt(args, -1);
+            } catch (Exception e) {
+                Log.warn("Invalid SendMeSubtitle packet", e);
+            }
         });
 
         netClient.addPacketHandler("Subtitles", args -> {
-            IntMap<String> received = JsonIO.read(IntMap.class, args);
-            for (var entry : received) {
-                if (entry.value == null || entry.value.isEmpty()) SSUsers.remove(entry.key);
-                else SSUsers.put(entry.key, entry.value);
+            try {
+                if (args == null || args.isEmpty()) return;
+                IntMap<String> received = JsonIO.read(IntMap.class, args);
+                if (received == null) return;
+                for (var entry : received) {
+                    if (entry.value == null || entry.value.isEmpty()) SSUsers.remove(entry.key);
+                    else SSUsers.put(entry.key, entry.value);
+                }
+                hasData = true;
+            } catch (Exception e) {
+                Log.warn("Invalid Subtitles packet", e);
             }
-            hasData = true;
         });
 
         netClient.addBinaryPacketHandler("schemesize.available", (data) -> {
-            schemeAvailable = true;
-            DisabledTools.clear();
-            DisabledTools.set(data);
+            try {
+                if (data == null || data.length == 0) return;
+                schemeAvailable = true;
+                DisabledTools.clear();
+                DisabledTools.set(data);
+            } catch (Exception e) {
+                Log.warn("Invalid schemesize.available packet", e);
+            }
         });
 
         Events.on(WorldLoadEndEvent.class, e -> {

src/java/scheme/moded/ModedDesktopInput.java

@@ -19,6 +19,7 @@
 import mindustry.input.*;
 import mindustry.input.Placement.NormalizeDrawResult;
 import mindustry.input.Placement.NormalizeResult;
+import mindustry.gen.Building;
 import mindustry.gen.Mechc;
 import scheme.tools.DisabledTools;
 import mindustry.world.Block;
@@ -47,6 +48,7 @@ public class ModedDesktopInput extends DesktopInput implements ModedInputHandler
     public Vec2 shootXY = new Vec2();
     public boolean ctrlMove;
     public Vec2 mi2uMove = new Vec2();
+    public Building forceTapped = null;
 
     @Override
     protected void removeSelection(int x1, int y1, int x2, int y2, int maxLength) {
@@ -98,6 +100,15 @@ public void drawTop() {
 
         drawCommanded();
 
+        if (settings.getBool("forceTapTile") && block == null && !scene.hasMouse()) {
+            Vec2 vec = input.mouseWorld(getMouseX(), getMouseY());
+            Building build = world.buildWorld(vec.x, vec.y);
+            if (build != null && build.team != player.team()) {
+                build.drawSelect();
+                if (!build.enabled && build.block.drawDisabled) build.drawDisabled();
+            }
+        }
+
         Draw.reset();
     }
 
@@ -151,6 +162,17 @@ public void update() {
 
         if (scene.hasKeyboard()) return;
 
+        if (input.keyTap(Binding.select) && !scene.hasMouse() && corefrag.choosesNode) corefrag.trySetNode(tileX(getMouseX()), tileY(getMouseY()));
+
+        if (settings.getBool("forceTapTile") && input.keyTap(Binding.select) && !scene.hasMouse()) {
+            if (player.dead()) {
+                var build = world.buildWorld(input.mouseWorldX(), input.mouseWorldY());
+                forceTap(build, true);
+            } else {
+                forceTap(prevSelected == null ? null : prevSelected.build, false);
+            }
+        }
+
         modedInput();
         buildInput();
 
@@ -334,6 +356,41 @@ public void move(Vec2 movement) {
         mi2uMove.set(movement);
     }
 
+    private void forceTap(Building build, boolean includeSelfTeam) {
+        if (build == null) return;
+        if (!includeSelfTeam && build.interactable(player.team())) return;
+
+        if (build == forceTapped) {
+            inv.hide();
+            config.hideConfig();
+            forceTapped = null;
+            return;
+        }
+
+        var ptm = state.playtestingMap;
+        state.playtestingMap = state.map;
+
+        if (build.block.configurable) {
+            if ((!config.isShown() && build.shouldShowConfigure(player))
+                    || (config.isShown() && config.getSelected().onConfigureBuildTapped(build))) {
+                config.showConfig(build);
+            }
+        } else if (!config.hasConfigMouse()) {
+            if (config.isShown() && config.getSelected().onConfigureBuildTapped(build)) {
+                config.hideConfig();
+            }
+        }
+
+        if (build.block.synthetic() && build.block.allowConfigInventory) {
+            if (build.block.hasItems && build.items.total() > 0) {
+                inv.showFor(build);
+            }
+        }
+
+        forceTapped = build;
+        state.playtestingMap = ptm;
+    }
+
     @Override
     public void clear() {
         ctrlBoost = false;

src/java/scheme/moded/ModedMobileInput.java

@@ -13,6 +13,7 @@
 import mindustry.gen.Mechc;
 import mindustry.gen.Player;
 import mindustry.gen.Unit;
+import mindustry.gen.Building;
 import mindustry.input.*;
 import mindustry.input.Placement.NormalizeResult;
 import mindustry.world.blocks.power.PowerNode;
@@ -39,6 +40,7 @@ public class ModedMobileInput extends MobileInput implements ModedInputHandler,
     public Vec2 shootXY = new Vec2();
     public boolean ctrlMove;
     public Vec2 mi2uMove = new Vec2();
+    public Building forceTapped = null;
 
     private boolean isRelease() {
         return lastTouched && !input.isTouched(0);
@@ -89,6 +91,14 @@ else if (mode == rebuildSelect)
             drawEditSelection(lastX, lastY, build.size);
 
         drawCommanded();
+
+        if (settings.getBool("forceTapTile") && !scene.hasMouse()) {
+            var build = world.buildWorld(input.mouseWorldX(), input.mouseWorldY());
+            if (build != null && build.team != player.team()) {
+                build.drawSelect();
+                if (!build.enabled && build.block.drawDisabled) build.drawDisabled();
+            }
+        }
     }
 
     @Override
@@ -114,6 +124,13 @@ public void update() {
             if (input.isTouched(0) && !scene.hasMouse()) observed = null;
         }
 
+        if (isTap() && !scene.hasMouse() && corefrag.choosesNode) corefrag.trySetNode(tileX(), tileY());
+
+        if (settings.getBool("forceTapTile") && isTap() && !scene.hasMouse()) {
+            var build = world.buildWorld(input.mouseWorldX(), input.mouseWorldY());
+            forceTap(build, player.dead());
+        }
+
         buildInput();
         if (movementLocked) {
             if (player.unit() == null) return;
@@ -265,6 +282,41 @@ public void move(Vec2 movement) {
         mi2uMove.set(movement);
     }
 
+    private void forceTap(Building build, boolean includeSelfTeam) {
+        if (build == null) return;
+        if (!includeSelfTeam && build.interactable(player.team())) return;
+
+        if (build == forceTapped) {
+            inv.hide();
+            config.hideConfig();
+            forceTapped = null;
+            return;
+        }
+
+        var ptm = state.playtestingMap;
+        state.playtestingMap = state.map;
+
+        if (build.block.configurable) {
+            if ((!config.isShown() && build.shouldShowConfigure(player))
+                    || (config.isShown() && config.getSelected().onConfigureBuildTapped(build))) {
+                config.showConfig(build);
+            }
+        } else if (!config.hasConfigMouse()) {
+            if (config.isShown() && config.getSelected().onConfigureBuildTapped(build)) {
+                config.hideConfig();
+            }
+        }
+
+        if (build.block.synthetic() && build.block.allowConfigInventory) {
+            if (build.block.hasItems && build.items.total() > 0) {
+                inv.showFor(build);
+            }
+        }
+
+        forceTapped = build;
+        state.playtestingMap = ptm;
+    }
+
     @Override
     public void clear() {
         ctrlBoost = false;