2 Commits

Author SHA1 Message Date
lukasabbe c3116f0f6f fixed so it works with newers versions 2024-08-08 22:05:54 +02:00
lukasabbe 0e084d7e7c check on code, fixed some cursed formating 2024-08-07 21:00:51 +02:00
4 changed files with 18 additions and 14 deletions
+2 -2
View File
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
loader_version=0.15.11
# Mod Properties
mod_version = 1.0
mod_version = 1.0.1
maven_group = me.lukasabbe
archives_base_name = VoiceChatGroupMsg
@@ -17,5 +17,5 @@ org.gradle.jvmargs=-Xmx1G
# Dependencies
# check this on https://modmuss50.me/fabric.html
fabric_version=0.100.7+1.21
fabric_version=0.102.0+1.21
voicechat_api_version=2.5.0
@@ -17,13 +17,11 @@ import java.util.List;
public class Commands {
public static void CreateGroupMsgCommand(CommandDispatcher<ServerCommandSource> dispatcher, CommandRegistryAccess commandRegistryAccess, CommandManager.RegistrationEnvironment registrationEnvironment) {
dispatcher.register(
CommandManager
.literal("msgvc")
.then(
CommandManager
.argument("message", MessageArgumentType.message())
.executes(Commands::runCommand)));
dispatcher.register(CommandManager
.literal("msgvc")
.then(CommandManager
.argument("message", MessageArgumentType.message())
.executes(Commands::runCommand)));
}
private static int runCommand(CommandContext<ServerCommandSource> ctx) throws CommandSyntaxException {
@@ -40,10 +38,16 @@ public class Commands {
Group group = VoiceChatGroupMsg.getPlayerGroup(player);
List<ServerPlayerEntity> players = VoiceChatGroupMsg.GroupPlayers(group.getId(), source.getWorld());
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 -> {
if(!player1.getUuid().equals(source.getPlayer().getUuid())){
player1.sendChatMessage(SentMessage.of(signedMessage),true, MessageType.params(MessageType.TEAM_MSG_COMMAND_INCOMING,source).withTargetName(Text.of(group.getName())));
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())));
}
});
});
@@ -44,7 +44,7 @@ public class VoiceChatGroupMsg implements DedicatedServerModInitializer, Voicech
}
public static boolean isPlayerInGroup(ServerPlayerEntity player, UUID groupID){
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);
}catch (NullPointerException ignore){
+1 -1
View File
@@ -22,7 +22,7 @@
"depends": {
"fabricloader": ">=${loader_version}",
"fabric": "*",
"minecraft": "${minecraft_version}",
"minecraft": ">=${minecraft_version}",
"voicechat": ">=${minecraft_version}-${voicechat_api_version}"
}
}