todo

Author: SoLegendary

TODO.txt

@@ -34,12 +34,12 @@ Controlling non-RoN mobs
 
 Bugfixes
 --------
-
+[🟡] Can no longer send resources to a non-RTS ally
 
 
 Quality of Life
 ---------------
-
+[🟡] Updated /rts-help list
 
 Balancing
 ---------

src/main/java/com/solegendary/reignofnether/player/PlayerClientEvents.java

@@ -113,6 +113,8 @@ public static void onRegisterCommand(RegisterClientCommandsEvent evt) {
                 MC.player.sendSystemMessage(Component.translatable("commands.reignofnether.lock", "/rts-lock enable/disable"));
                 MC.player.sendSystemMessage(Component.translatable("commands.reignofnether.ally", "/ally"));
                 MC.player.sendSystemMessage(Component.translatable("commands.reignofnether.disband", "/disband"));
+                MC.player.sendSystemMessage(Component.translatable("commands.reignofnether.send_resources", "/sendfood|wood|ore <playername> <amount>"));
+                MC.player.sendSystemMessage(Component.translatable("commands.reignofnether.camera", "/rts-camera"));
             }
             return 1;
         }));

src/main/java/com/solegendary/reignofnether/resources/ResourcesServerEvents.java

@@ -330,9 +330,12 @@ public static int trySendingResources(CommandContext<CommandSourceStack> context
         if (sendingPlayerName.equals(receivingPlayerName)) {
             PlayerServerEvents.sendMessageToPlayer(sendingPlayerName, "server.resources.reignofnether.sending_to_self");
             return 0;
-        } else if (!AlliancesServerEvents.isAllied(sendingPlayerName, receivingPlayerName)) {
+        } else if (!PlayerServerEvents.isRTSPlayer(receivingPlayerName)) {
             PlayerServerEvents.sendMessageToPlayer(sendingPlayerName, "server.resources.reignofnether.not_allies");
             return 0;
+        }  else if (!AlliancesServerEvents.isAllied(sendingPlayerName, receivingPlayerName)) {
+            PlayerServerEvents.sendMessageToPlayer(sendingPlayerName, "server.resources.reignofnether.not_rts_player");
+            return 0;
         } else if (!canAfford(sendingPlayerName, resourceName, amount)) {
             ResourcesClientboundPacket.warnInsufficientResources(sendingPlayerName,
                     resourceName == ResourceName.FOOD,

src/main/resources/assets/reignofnether/lang/en_us.json

@@ -468,6 +468,8 @@
     "commands.reignofnether.lock": "%s - Prevent all players from joining the RTS match",
     "commands.reignofnether.ally": "%s - Send an ally request to another player",
     "commands.reignofnether.disband": "%s - Disband an alliance with another player",
+    "commands.reignofnether.send_resources": "%s - Send resources to an allied RTS player",
+    "commands.reignofnether.camera": "%s - Toggle RTS camera",
     "commands.reignofnether.gamerule.do_log_falling": "Tree logs fall when cut",
     "commands.reignofnether.gamerule.neutral_aggro": "Auto-attack neutral units/buildings",
     "commands.reignofnether.gamerule.max_population": "Highest possible population limit",
@@ -646,6 +648,7 @@
     "server.resources.reignofnether.sent_ore": "You gave %d ore to %d!",
     "server.resources.reignofnether.received_ore": "You received %d ore from %d!",
     "server.resources.reignofnether.not_allies": "You can only send resources to allies",
+    "server.resources.reignofnether.not_rts_player": "That player isn't an RTS player",
     "server.resources.reignofnether.sending_to_self": "You can't send resources to yourself",
 
     "research.reignofnether.upgrade_completed": "Upgrade completed: %s",