Altitude/PlotPermissions
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated minimessage and galaxy

Browse Source
This commit is contained in:
Teriuihi 2022-05-30 16:50:19 +02:00
parent 6463755d5c
commit 2b18d7d64c
6 changed files with 36 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle.kts
View File

@ -44,7 +44,6 @@ tasks {
} }
dependencies { dependencies {
compileOnly("com.alttd:Galaxy-API:1.18.1-R0.1-SNAPSHOT") //Galaxy compileOnly("com.alttd:Galaxy-API:1.18.2-R0.1-SNAPSHOT") //Galaxy
compileOnly("net.kyori:adventure-text-minimessage:4.2.0-SNAPSHOT") // Minimessage
compileOnly("net.luckperms:api:5.3") // Luckperms compileOnly("net.luckperms:api:5.3") // Luckperms
} }

2
settings.gradle.kts
View File

@ -2,7 +2,7 @@ rootProject.name = "PlotPermissions"
dependencyResolutionManagement { dependencyResolutionManagement {
repositories { repositories {
mavenLocal() // mavenLocal()
mavenCentral() mavenCentral()
maven("https://repo.destro.xyz/snapshots") // Altitude - Galaxy maven("https://repo.destro.xyz/snapshots") // Altitude - Galaxy
maven("https://oss.sonatype.org/content/groups/public/") // Adventure maven("https://oss.sonatype.org/content/groups/public/") // Adventure

8
src/main/java/com/alttd/commands/CommandManager.java
View File

@ -9,8 +9,7 @@ import com.alttd.config.Config;
import com.alttd.util.Logger; import com.alttd.util.Logger;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import org.bukkit.command.*; import org.bukkit.command.*;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@ -110,8 +109,7 @@ public class CommandManager implements CommandExecutor, TabExecutor {
if (stringBuilder.length() != 0) if (stringBuilder.length() != 0)
stringBuilder.replace(stringBuilder.length() - 1, stringBuilder.length(), ""); stringBuilder.replace(stringBuilder.length() - 1, stringBuilder.length(), "");
return miniMessage.deserialize(Config.HELP_MESSAGE_WRAPPER, TemplateResolver.resolving( return miniMessage.deserialize(Config.HELP_MESSAGE_WRAPPER,
Template.template("commands", miniMessage.deserialize(stringBuilder.toString())) Placeholder.component("commands", miniMessage.deserialize(stringBuilder.toString())));
));
} }
} }

21
src/main/java/com/alttd/commands/subcommands/Add.java
View File

@ -4,7 +4,8 @@ import com.alttd.commands.SubCommand;
import com.alttd.config.Config; import com.alttd.config.Config;
import com.alttd.util.API; import com.alttd.util.API;
import com.alttd.util.Utility; import com.alttd.util.Utility;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import net.luckperms.api.LuckPerms; import net.luckperms.api.LuckPerms;
import net.luckperms.api.model.user.User; import net.luckperms.api.model.user.User;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -26,23 +27,23 @@ public class Add extends SubCommand {
} }
OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayerIfCached(args[1]); OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayerIfCached(args[1]);
if (offlinePlayer == null || !offlinePlayer.hasPlayedBefore()) { if (offlinePlayer == null || !offlinePlayer.hasPlayedBefore()) {
commandSender.sendMiniMessage(Config.INVALID_USER, List.of( commandSender.sendMiniMessage(Config.INVALID_USER, TagResolver.resolver(
Template.template("player", args[1]) Placeholder.unparsed("player", args[1])
)); ));
return true; return true;
} }
LuckPerms luckperms = API.getLuckperms(); LuckPerms luckperms = API.getLuckperms();
User user = luckperms.getUserManager().getUser(offlinePlayer.getUniqueId()); User user = luckperms.getUserManager().getUser(offlinePlayer.getUniqueId());
if (user == null) { if (user == null) {
commandSender.sendMiniMessage(Config.INVALID_USER, List.of( commandSender.sendMiniMessage(Config.INVALID_USER, TagResolver.resolver(
Template.template("player", args[1]) Placeholder.unparsed("player", args[1])
)); ));
return true; return true;
} }
World world = Bukkit.getWorld(args[2]); World world = Bukkit.getWorld(args[2]);
if (world == null) { if (world == null) {
commandSender.sendMiniMessage(Config.INVALID_WORLD, List.of( commandSender.sendMiniMessage(Config.INVALID_WORLD, TagResolver.resolver(
Template.template("world", args[2]) Placeholder.unparsed("world", args[2])
)); ));
return true; return true;
} }
@ -56,9 +57,9 @@ public class Add extends SubCommand {
int maxPlots = Utility.getMaxPlots(user, args[2]); int maxPlots = Utility.getMaxPlots(user, args[2]);
Utility.removePlotPerms(user, world.getName()); Utility.removePlotPerms(user, world.getName());
Utility.setPlotAmount(user, world.getName(), maxPlots + plus); Utility.setPlotAmount(user, world.getName(), maxPlots + plus);
commandSender.sendMiniMessage(Config.SET_PLOT_AMOUNT, List.of( commandSender.sendMiniMessage(Config.SET_PLOT_AMOUNT, TagResolver.resolver(
Template.template("player", offlinePlayer.getName() == null ? args[1] : offlinePlayer.getName()), Placeholder.unparsed("player", offlinePlayer.getName() == null ? args[1] : offlinePlayer.getName()),
Template.template("amount", String.valueOf(maxPlots + plus)) Placeholder.unparsed("amount", String.valueOf(maxPlots + plus))
)); ));
return true; return true;
} }

23
src/main/java/com/alttd/commands/subcommands/Info.java
View File

@ -4,7 +4,8 @@ import com.alttd.commands.SubCommand;
import com.alttd.config.Config; import com.alttd.config.Config;
import com.alttd.util.API; import com.alttd.util.API;
import com.alttd.util.Utility; import com.alttd.util.Utility;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import net.luckperms.api.LuckPerms; import net.luckperms.api.LuckPerms;
import net.luckperms.api.model.user.User; import net.luckperms.api.model.user.User;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -26,31 +27,31 @@ public class Info extends SubCommand {
} }
OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayerIfCached(args[1]); OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayerIfCached(args[1]);
if (offlinePlayer == null || !offlinePlayer.hasPlayedBefore()) { if (offlinePlayer == null || !offlinePlayer.hasPlayedBefore()) {
commandSender.sendMiniMessage(Config.INVALID_USER, List.of( commandSender.sendMiniMessage(Config.INVALID_USER, TagResolver.resolver(
Template.template("player", args[1]) Placeholder.unparsed("player", args[1])
)); ));
return true; return true;
} }
LuckPerms luckperms = API.getLuckperms(); LuckPerms luckperms = API.getLuckperms();
User user = luckperms.getUserManager().getUser(offlinePlayer.getUniqueId()); User user = luckperms.getUserManager().getUser(offlinePlayer.getUniqueId());
if (user == null) { if (user == null) {
commandSender.sendMiniMessage(Config.INVALID_USER, List.of( commandSender.sendMiniMessage(Config.INVALID_USER, TagResolver.resolver(
Template.template("player", args[1]) Placeholder.unparsed("player", args[1])
)); ));
return true; return true;
} }
World world = Bukkit.getWorld(args[2]); World world = Bukkit.getWorld(args[2]);
if (world == null) { if (world == null) {
commandSender.sendMiniMessage(Config.INVALID_WORLD, List.of( commandSender.sendMiniMessage(Config.INVALID_WORLD, TagResolver.resolver(
Template.template("world", args[2]) Placeholder.unparsed("world", args[2])
)); ));
return true; return true;
} }
int maxPlots = Utility.getMaxPlots(user, world.getName()); int maxPlots = Utility.getMaxPlots(user, world.getName());
commandSender.sendMiniMessage(Config.PLAYER_MAX_PLOTS, List.of( commandSender.sendMiniMessage(Config.PLAYER_MAX_PLOTS, TagResolver.resolver(
Template.template("player", offlinePlayer.getName() == null ? args[1] : offlinePlayer.getName()), Placeholder.unparsed("player", offlinePlayer.getName() == null ? args[1] : offlinePlayer.getName()),
Template.template("plots", String.valueOf(maxPlots)), Placeholder.unparsed("plots", String.valueOf(maxPlots)),
Template.template("world", world.getName()) Placeholder.unparsed("world", world.getName())
)); ));
return true; return true;
} }

22
src/main/java/com/alttd/commands/subcommands/Remove.java
View File

@ -4,7 +4,8 @@ import com.alttd.commands.SubCommand;
import com.alttd.config.Config; import com.alttd.config.Config;
import com.alttd.util.API; import com.alttd.util.API;
import com.alttd.util.Utility; import com.alttd.util.Utility;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import net.luckperms.api.LuckPerms; import net.luckperms.api.LuckPerms;
import net.luckperms.api.model.user.User; import net.luckperms.api.model.user.User;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -26,24 +27,18 @@ public class Remove extends SubCommand {
} }
OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayerIfCached(args[1]); OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayerIfCached(args[1]);
if (offlinePlayer == null || !offlinePlayer.hasPlayedBefore()) { if (offlinePlayer == null || !offlinePlayer.hasPlayedBefore()) {
commandSender.sendMiniMessage(Config.INVALID_USER, List.of( commandSender.sendMiniMessage(Config.INVALID_USER, Placeholder.unparsed("player", args[1]));
Template.template("player", args[1])
));
return true; return true;
} }
LuckPerms luckperms = API.getLuckperms(); LuckPerms luckperms = API.getLuckperms();
User user = luckperms.getUserManager().getUser(offlinePlayer.getUniqueId()); User user = luckperms.getUserManager().getUser(offlinePlayer.getUniqueId());
if (user == null) { if (user == null) {
commandSender.sendMiniMessage(Config.INVALID_USER, List.of( commandSender.sendMiniMessage(Config.INVALID_USER, Placeholder.unparsed("player", args[1]));
Template.template("player", args[1])
));
return true; return true;
} }
World world = Bukkit.getWorld(args[2]); World world = Bukkit.getWorld(args[2]);
if (world == null) { if (world == null) {
commandSender.sendMiniMessage(Config.INVALID_WORLD, List.of( commandSender.sendMiniMessage(Config.INVALID_WORLD, Placeholder.unparsed("world", args[2]));
Template.template("world", args[2])
));
return true; return true;
} }
int minus; int minus;
@ -60,10 +55,9 @@ public class Remove extends SubCommand {
Utility.setPlotAmount(user, world.getName(), newTotal); Utility.setPlotAmount(user, world.getName(), newTotal);
else else
newTotal = Config.DEFAULT_PLOTS; newTotal = Config.DEFAULT_PLOTS;
commandSender.sendMiniMessage(Config.SET_PLOT_AMOUNT, List.of( commandSender.sendMiniMessage(Config.SET_PLOT_AMOUNT, TagResolver.resolver(
Template.template("player", offlinePlayer.getName() == null ? args[1] : offlinePlayer.getName()), Placeholder.unparsed("player", offlinePlayer.getName() == null ? args[1] : offlinePlayer.getName()),
Template.template("amount", String.valueOf(newTotal)) Placeholder.unparsed("amount", String.valueOf(newTotal))));
));
return true; return true;
} }