Skip to content

Commit 96cda95

Browse files
committed
send resources
1 parent 7e6894e commit 96cda95

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

TODO.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Bugfixes
3535

3636
Quality of Life
3737
---------------
38-
[] Add commands to send resources
38+
[🟡] Add commands to send resources
3939
[❌] Ravagers that are mounted no longer aggro automatically onto buildings
4040
- This prevents them hurting themselves from the splash damage
4141
[🟡] Button to toggle spider climbing

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

+7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.mojang.brigadier.context.CommandContext;
66
import com.mojang.brigadier.exceptions.CommandSyntaxException;
77
import com.mojang.math.Axis;
8+
import com.solegendary.reignofnether.alliance.AlliancesClient;
89
import com.solegendary.reignofnether.hud.HudClientEvents;
910
import com.solegendary.reignofnether.keybinds.Keybindings;
1011
import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
@@ -209,6 +210,12 @@ public static int trySendingResources(CommandContext<CommandSourceStack> context
209210
if (res == null || thisPlayer == null)
210211
return 0;
211212

213+
if (!AlliancesClient.isAllied(thisPlayer.getName().getString(), sendToPlayer.getName().getString())) {
214+
thisPlayer.sendSystemMessage(Component.literal(""));
215+
thisPlayer.sendSystemMessage(Component.literal(I18n.get("server.resources.reignofnether.not_allies")));
216+
thisPlayer.sendSystemMessage(Component.literal(""));
217+
}
218+
212219
switch (resourceName) {
213220
case FOOD -> {
214221
if (res.food < amount) {

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

+1
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,7 @@
640640

641641
"server.resources.reignofnether.sent_resources": "You gave %d %s to %d!",
642642
"server.resources.reignofnether.received_resources": "You received %d %s from %d!",
643+
"server.resources.reignofnether.not_allies": "You can only send resources to allies",
643644

644645
"research.reignofnether.upgrade_completed": "Upgrade completed: %s",
645646
"research.reignofnether.advanced_portals": "Advanced Portals",

0 commit comments

Comments
 (0)