Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ repositories {
name = "Ladysnake Libs"
url = uri("https://maven.ladysnake.org/releases")
}
maven {
name = "Modrinth"
url = uri("https://api.modrinth.com/maven")
}
}
val accessWidener = rootProject.file("src/main/resources/solstice.accesswidener")
loom {
Expand All @@ -50,6 +54,7 @@ dependencies {
modCompileOnly("dev.emi:trinkets:${property("trinkets_version")}")
modCompileOnly("net.luckperms:api:5.4")
modRuntimeOnly("net.luckperms:api:5.4")
modCompileOnly("maven.modrinth:vanish:${project.property("vanish_version")}")
Comment thread
Ale32bit marked this conversation as resolved.
}
tasks.processResources {
val mcConstraint = project.property("minecraft_constraint") as String
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package me.alexdevs.solstice.integrations;

import me.drex.vanish.api.VanishAPI;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.server.level.ServerPlayer;

import java.util.List;

public class VanishIntegration {
public static boolean isAvailable() {
return FabricLoader.getInstance().isModLoaded("melius-vanish");
}

public static List<ServerPlayer> getVisiblePlayers(CommandSourceStack source) {
return VanishAPI.getVisiblePlayers(source);
}

public static String[] getVisiblePlayersAsString(CommandSourceStack source) {
return getVisiblePlayers(source).stream()
.map(player -> player.getName().getString())
.toList().toArray(String[]::new);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public LiteralArgumentBuilder<CommandSourceStack> command(String name) {

//? if < 1.21.11 {
var oldHeadStack = inventory.armor.get(3); // head slot
//inventory.setItem(inventory.selected, oldHeadStack.copyAndClear());
inventory.setItem(inventory.selected, oldHeadStack.copyAndClear());
Comment thread
Ale32bit marked this conversation as resolved.
//? } else {
/*var oldHeadStack = player.getItemBySlot(EquipmentSlot.HEAD);
inventory.setItem(inventory.getSelectedSlot(), oldHeadStack.copyAndClear());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,17 @@ public void updateTab() {
"phase", String.valueOf(phase)
);

server.getPlayerList().getPlayers().forEach(player -> {
var playerContext = PlaceholderContext.of(player);
var header = RawPlaceholder.parse(String.join("\n", config.header), placeholders);
var footer = RawPlaceholder.parse(String.join("\n", config.footer), placeholders);
player.connection.send(new ClientboundTabListPacket(
Format.parse(header, playerContext),
Format.parse(footer, playerContext)
));
});
server.execute(() ->
server.getPlayerList().getPlayers().forEach(player -> {
Comment thread
Ale32bit marked this conversation as resolved.
var playerContext = PlaceholderContext.of(player);
var header = RawPlaceholder.parse(String.join("\n", config.header), placeholders);
var footer = RawPlaceholder.parse(String.join("\n", config.footer), placeholders);
player.connection.send(new ClientboundTabListPacket(
Format.parse(header, playerContext),
Format.parse(footer, playerContext)
));
})
);
}

/*public List<String> getGroupsOrder() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
import com.mojang.brigadier.context.CommandContext;
import me.alexdevs.solstice.api.module.ModCommand;
import me.alexdevs.solstice.api.module.Utils;
import me.alexdevs.solstice.integrations.VanishIntegration;
import me.alexdevs.solstice.modules.tell.TellModule;
import me.drex.vanish.api.VanishAPI;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.commands.CommandBuildContext;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
Expand Down Expand Up @@ -41,8 +44,17 @@ public LiteralArgumentBuilder<CommandSourceStack> command(String name) {
.then(argument("player", StringArgumentType.word())
.suggests((context, builder) -> {
var playerManager = context.getSource().getServer().getPlayerList();
final String[] playerNamesArray;

if (VanishIntegration.isAvailable()) {
playerNamesArray = VanishIntegration.getVisiblePlayersAsString(context.getSource());
}
else {
playerNamesArray = playerManager.getPlayerNamesArray();
}

return SharedSuggestionProvider.suggest(
playerManager.getPlayerNamesArray(),
playerNamesArray,
builder);
})
.then(argument("message", StringArgumentType.greedyString())
Expand Down
1 change: 1 addition & 0 deletions versions/1.20.1/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ sgui_version=1.2.2+1.20
commoneconomy_version=1.1.1
trinkets_version=3.7.2

vanish_version=1.5.5+1.20.1
1 change: 1 addition & 0 deletions versions/1.21.1/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ sgui_version=1.6.1+1.21.1
commoneconomy_version=1.1.1
trinkets_version=3.10.0

vanish_version=1.6.6+1.21.1
1 change: 1 addition & 0 deletions versions/1.21.11/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ sgui_version=1.12.0+1.21.11
commoneconomy_version=2.0.0
trinkets_version=3.10.0

vanish_version=1.6.6+1.21.11
1 change: 1 addition & 0 deletions versions/1.21.4/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ sgui_version=1.8.2+1.21.4
commoneconomy_version=1.2.0
trinkets_version=3.10.0

vanish_version=1.6.6+1.21.4
Loading