check on code, fixed some cursed formating

This commit is contained in:
lukasabbe
2024-08-07 21:00:51 +02:00
parent 684af95851
commit 0e084d7e7c
2 changed files with 15 additions and 11 deletions
@@ -17,11 +17,9 @@ import java.util.List;
public class Commands { public class Commands {
public static void CreateGroupMsgCommand(CommandDispatcher<ServerCommandSource> dispatcher, CommandRegistryAccess commandRegistryAccess, CommandManager.RegistrationEnvironment registrationEnvironment) { public static void CreateGroupMsgCommand(CommandDispatcher<ServerCommandSource> dispatcher, CommandRegistryAccess commandRegistryAccess, CommandManager.RegistrationEnvironment registrationEnvironment) {
dispatcher.register( dispatcher.register(CommandManager
CommandManager
.literal("msgvc") .literal("msgvc")
.then( .then(CommandManager
CommandManager
.argument("message", MessageArgumentType.message()) .argument("message", MessageArgumentType.message())
.executes(Commands::runCommand))); .executes(Commands::runCommand)));
} }
@@ -40,10 +38,16 @@ public class Commands {
Group group = VoiceChatGroupMsg.getPlayerGroup(player); Group group = VoiceChatGroupMsg.getPlayerGroup(player);
List<ServerPlayerEntity> players = VoiceChatGroupMsg.GroupPlayers(group.getId(), source.getWorld()); List<ServerPlayerEntity> players = VoiceChatGroupMsg.GroupPlayers(group.getId(), source.getWorld());
MessageArgumentType.getSignedMessage(ctx, "message", signedMessage -> { MessageArgumentType.getSignedMessage(ctx, "message", signedMessage -> {
player.sendChatMessage(SentMessage.of(signedMessage),true, MessageType.params(MessageType.TEAM_MSG_COMMAND_OUTGOING,source).withTargetName(Text.of(group.getName()))); player.sendChatMessage(
SentMessage.of(signedMessage),
true,
MessageType.params(MessageType.TEAM_MSG_COMMAND_OUTGOING,source).withTargetName(Text.of(group.getName())));
players.forEach(player1 -> { players.forEach(player1 -> {
if(!player1.getUuid().equals(source.getPlayer().getUuid())){ if(!player1.getUuid().equals(player.getUuid())){
player1.sendChatMessage(SentMessage.of(signedMessage),true, MessageType.params(MessageType.TEAM_MSG_COMMAND_INCOMING,source).withTargetName(Text.of(group.getName()))); player1.sendChatMessage(
SentMessage.of(signedMessage),
true,
MessageType.params(MessageType.TEAM_MSG_COMMAND_INCOMING,source).withTargetName(Text.of(group.getName())));
} }
}); });
}); });
@@ -44,7 +44,7 @@ public class VoiceChatGroupMsg implements DedicatedServerModInitializer, Voicech
} }
public static boolean isPlayerInGroup(ServerPlayerEntity player, UUID groupID){ public static boolean isPlayerInGroup(ServerPlayerEntity player, UUID groupID){
try{ try{
if(!API.getConnectionOf(player.getUuid()).isInGroup())return false; if(!API.getConnectionOf(player.getUuid()).isInGroup()) return false;
return API.getConnectionOf(player.getUuid()).getGroup().getId().equals(groupID); return API.getConnectionOf(player.getUuid()).getGroup().getId().equals(groupID);
}catch (NullPointerException ignore){ }catch (NullPointerException ignore){