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

Remove worldguard from mcmmo and remove mavenLocal() from build.gradle.kts

Browse Source
This commit is contained in:
Len 2022-09-09 21:35:35 +02:00
parent 720226486c
commit bf88098f12
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugin/build.gradle.kts
View File

@ -12,9 +12,8 @@ dependencies {
// MyPet // MyPet
compileOnly("de.keyle:mypet:3.12-SNAPSHOT") compileOnly("de.keyle:mypet:3.12-SNAPSHOT")
// mcMMO // mcMMO
compileOnly("com.gmail.nossr50.mcMMO:mcMMO:2.1.206") compileOnly("com.gmail.nossr50.mcMMO:mcMMO:2.1.206") {
compileOnly("com.sk89q.worldguard:worldguard-core:7.0.4") { exclude("com.sk89q.worldguard")
exclude("com.google.code.findbugs")
} }
//Jackson (json) //Jackson (json)

4
settings.gradle.kts
View File

@ -5,14 +5,14 @@ include(":velocity")
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
maven("https://papermc.io/repo/repository/maven-public/") // Velocity maven("https://papermc.io/repo/repository/maven-public/") // Velocity
maven("https://repo.spongepowered.org/maven") // Configurate maven("https://repo.spongepowered.org/maven") // Configurate
maven("https://nexus.neetgames.com/repository/maven-releases/") // mcMMO maven("https://nexus.neetgames.com/repository/maven-releases/") // mcMMO
maven("https://maven.enginehub.org/repo/") // worldguard // maven("https://maven.enginehub.org/repo/") // worldguard
maven { // mypet maven { // mypet
name = "GitHubPackages" name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/MyPetORG/MyPet") url = uri("https://maven.pkg.github.com/MyPetORG/MyPet")

29
velocity/src/main/java/com/alttd/vboosters/commands/BoosterCommand.java
View File

@ -17,6 +17,7 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.builder.RequiredArgumentBuilder; import com.mojang.brigadier.builder.RequiredArgumentBuilder;
import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.Suggestions;
import com.mojang.brigadier.suggestion.SuggestionsBuilder; import com.mojang.brigadier.suggestion.SuggestionsBuilder;
import com.mojang.brigadier.tree.LiteralCommandNode;
import com.velocitypowered.api.command.BrigadierCommand; import com.velocitypowered.api.command.BrigadierCommand;
import com.velocitypowered.api.command.CommandMeta; import com.velocitypowered.api.command.CommandMeta;
import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.command.CommandSource;
@ -24,6 +25,7 @@ import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.ProxyServer;
import com.velocitypowered.api.util.GameProfile; import com.velocitypowered.api.util.GameProfile;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.JoinConfiguration;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@ -65,28 +67,31 @@ public class BoosterCommand {
long expiryTime = new Date().getTime() + booster.getDuration(); long expiryTime = new Date().getTime() + booster.getDuration();
TagResolver.Builder tagResolver = TagResolver.builder(); TagResolver.Builder tagResolver = TagResolver.builder();
List<TagResolver> templates = List.of( List<TagResolver> templates = new ArrayList<>(List.of(
Placeholder.unparsed("type", booster.getType().getBoosterName()), Placeholder.unparsed("type", booster.getType().getBoosterName()),
Placeholder.unparsed("activator", booster.getActivator()), Placeholder.unparsed("activator", booster.getActivator()),
Placeholder.unparsed("start_time", DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT).format(booster.getStartingTime())), Placeholder.unparsed("start_time", DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT).format(booster.getStartingTime())),
Placeholder.unparsed("duration", TimeUnit.MILLISECONDS.toHours(booster.getDuration()) + " hours"), Placeholder.unparsed("duration", TimeUnit.MILLISECONDS.toHours(booster.getDuration()) + " hours"),
Placeholder.unparsed("multiplier", String.valueOf(booster.getMultiplier()))); Placeholder.unparsed("multiplier", String.valueOf(booster.getMultiplier()))));
if (booster.isActive())
templates.add(Placeholder.unparsed("end_time", DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT).format(expiryTime)));
else
templates.add(Placeholder.unparsed("end_time", "unknown"));
for (TagResolver tagResolver1 : templates) for (TagResolver tagResolver1 : templates)
tagResolver.resolver(tagResolver1); // cheaty and lazy way I know tagResolver.resolver(tagResolver1); // cheaty and lazy way I know
if (booster.isActive()) if (booster.isActive())
templates.add(Template.of("end_time", DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT).format(expiryTime))); activeBoosterComponents.add(miniMessage.deserialize(activeBooster, tagResolver.build()));
else
templates.add(Template.of("end_time", "unknown"));
if (booster.isActive())
activeBoosterComponents.add(miniMessage.parse(activeBooster, templates));
else if (!booster.finished()) else if (!booster.finished())
queuedBoosterComponents.add(miniMessage.parse(queuedBooster, templates)); queuedBoosterComponents.add(miniMessage.deserialize(queuedBooster, tagResolver.build()));
} }
Component separator = miniMessage.parse("\n"); Component separator = miniMessage.deserialize("\n");
context.getSource().sendMessage(miniMessage.parse(message, List.of( context.getSource().sendMessage(miniMessage.deserialize(message, TagResolver.resolver(
Template.of("active_boosters", Component.join(separator, activeBoosterComponents)), Placeholder.component("active_boosters", Component.join(JoinConfiguration.separator(separator), activeBoosterComponents)),
Template.of("queued_boosters", Component.join(separator, queuedBoosterComponents)) Placeholder.component("queued_boosters", Component.join(JoinConfiguration.separator(separator), queuedBoosterComponents))
))); )));
return 1; return 1;
}) })