refactor!: changed package
bump to 2.0.0
This commit is contained in:
41 files changed
+123
-130
No files matched your search
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.dreamerzero.miniplaceholders;
|
||||
package io.github.miniplaceholders.jmh;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package me.dreamerzero.miniplaceholders;
|
||||
package io.github.miniplaceholders.jmh;
|
||||
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||
@@ -9,8 +9,8 @@ import org.openjdk.jmh.annotations.Benchmark;
|
||||
import org.openjdk.jmh.annotations.Scope;
|
||||
import org.openjdk.jmh.annotations.State;
|
||||
|
||||
import me.dreamerzero.miniplaceholders.api.Expansion;
|
||||
import me.dreamerzero.miniplaceholders.api.MiniPlaceholders;
|
||||
import io.github.miniplaceholders.api.Expansion;
|
||||
import io.github.miniplaceholders.api.MiniPlaceholders;
|
||||
|
||||
@State(Scope.Benchmark)
|
||||
public class PlaceholderBenchmark {
|
||||
+5
-5
@@ -1,5 +1,7 @@
|
||||
package me.dreamerzero.miniplaceholders.api;
|
||||
package io.github.miniplaceholders.api;
|
||||
|
||||
import io.github.miniplaceholders.api.placeholder.AudiencePlaceholder;
|
||||
import io.github.miniplaceholders.api.placeholder.RelationalPlaceholder;
|
||||
import org.jetbrains.annotations.Contract;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
@@ -7,8 +9,6 @@ import org.jetbrains.annotations.Nullable;
|
||||
import java.util.function.BiFunction;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
import me.dreamerzero.miniplaceholders.api.placeholder.AudiencePlaceholder;
|
||||
import me.dreamerzero.miniplaceholders.api.placeholder.RelationalPlaceholder;
|
||||
import net.kyori.adventure.audience.Audience;
|
||||
import net.kyori.adventure.builder.AbstractBuilder;
|
||||
import net.kyori.adventure.text.minimessage.Context;
|
||||
@@ -83,7 +83,7 @@ public interface Expansion {
|
||||
* @return a new expansion builder
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public static @NotNull Expansion.Builder builder(final @NotNull String name){
|
||||
static @NotNull Expansion.Builder builder(final @NotNull String name){
|
||||
return new ExpansionImpl.Builder(name);
|
||||
}
|
||||
|
||||
@@ -109,7 +109,7 @@ public interface Expansion {
|
||||
*
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public static interface Builder extends AbstractBuilder<Expansion> {
|
||||
interface Builder extends AbstractBuilder<Expansion> {
|
||||
/**
|
||||
* Adds an audience placeholder
|
||||
*
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
package me.dreamerzero.miniplaceholders.api;
|
||||
package io.github.miniplaceholders.api;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
@@ -6,15 +6,15 @@ import java.util.Locale;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
|
||||
import io.github.miniplaceholders.api.placeholder.AudiencePlaceholder;
|
||||
import io.github.miniplaceholders.api.placeholder.RelationalPlaceholder;
|
||||
import io.github.miniplaceholders.api.utils.Conditions;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.function.BiFunction;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
import me.dreamerzero.miniplaceholders.api.placeholder.AudiencePlaceholder;
|
||||
import me.dreamerzero.miniplaceholders.api.placeholder.RelationalPlaceholder;
|
||||
import me.dreamerzero.miniplaceholders.api.utils.Conditions;
|
||||
import net.kyori.adventure.audience.Audience;
|
||||
import net.kyori.adventure.text.minimessage.Context;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
+8
-20
@@ -1,14 +1,14 @@
|
||||
package me.dreamerzero.miniplaceholders.api;
|
||||
package io.github.miniplaceholders.api;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import io.github.miniplaceholders.api.enums.Platform;
|
||||
import io.github.miniplaceholders.api.utils.Resolvers;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import me.dreamerzero.miniplaceholders.api.enums.Platform;
|
||||
import me.dreamerzero.miniplaceholders.api.utils.Resolvers;
|
||||
import me.dreamerzero.miniplaceholders.connect.InternalPlatform;
|
||||
import io.github.miniplaceholders.connect.InternalPlatform;
|
||||
import net.kyori.adventure.audience.Audience;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
|
||||
@@ -86,7 +86,7 @@ public final class MiniPlaceholders {
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the relationals placeholders based on two audiences
|
||||
* Get the relational placeholders based on two audiences
|
||||
*
|
||||
* <pre>TagResolver resolver = MiniPlaceholders.getRelationalPlaceholders({@link Audience}, {@link Audience});
|
||||
* Component messageParsed = MiniMessage.miniMessage().deserialize({@link String}, resolver);</pre>
|
||||
@@ -142,7 +142,7 @@ public final class MiniPlaceholders {
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the relationals placeholders based on two audiences, based on the first audience,
|
||||
* Get the relational placeholders based on two audiences, based on the first audience,
|
||||
* and the global placeholders
|
||||
*
|
||||
* <pre>
|
||||
@@ -177,23 +177,11 @@ public final class MiniPlaceholders {
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the ammount of expansion registered
|
||||
* @return the ammount of expansions registered
|
||||
* Get the amount of expansion registered
|
||||
* @return the amount of expansions registered
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public static int getExpansionCount(){
|
||||
return expansions.size();
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the platform
|
||||
* @param platform the platform
|
||||
* @deprecated dont use this, INTERNAL
|
||||
* @since 1.0.0
|
||||
*/
|
||||
@Deprecated(forRemoval = true, since = "1.1.0")
|
||||
@org.jetbrains.annotations.ApiStatus.Internal
|
||||
public static void setPlatform(Platform platform){
|
||||
throw new UnsupportedOperationException("Cannot set platform twice");
|
||||
}
|
||||
}
|
||||
+3
-3
@@ -1,12 +1,12 @@
|
||||
package me.dreamerzero.miniplaceholders.api;
|
||||
package io.github.miniplaceholders.api;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
import io.github.miniplaceholders.api.placeholder.AudiencePlaceholder;
|
||||
import io.github.miniplaceholders.api.placeholder.RelationalPlaceholder;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import me.dreamerzero.miniplaceholders.api.placeholder.AudiencePlaceholder;
|
||||
import me.dreamerzero.miniplaceholders.api.placeholder.RelationalPlaceholder;
|
||||
import net.kyori.adventure.audience.Audience;
|
||||
import net.kyori.adventure.text.minimessage.Context;
|
||||
import net.kyori.adventure.text.minimessage.ParsingException;
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
package me.dreamerzero.miniplaceholders.api.enums;
|
||||
package io.github.miniplaceholders.api.enums;
|
||||
|
||||
/**Platforms on which MiniPlaceholders can be used */
|
||||
public enum Platform {
|
||||
@@ -7,5 +7,5 @@ public enum Platform {
|
||||
/**Velocity Platform */
|
||||
VELOCITY,
|
||||
/**Krypton Platform */
|
||||
KRYPTON;
|
||||
KRYPTON
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
/**Plugin enums */
|
||||
package io.github.miniplaceholders.api.enums;
|
||||
@@ -0,0 +1,4 @@
|
||||
/**
|
||||
* MiniPlaceholders core package
|
||||
*/
|
||||
package io.github.miniplaceholders.api;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.dreamerzero.miniplaceholders.api.placeholder;
|
||||
package io.github.miniplaceholders.api.placeholder;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.dreamerzero.miniplaceholders.api.placeholder;
|
||||
package io.github.miniplaceholders.api.placeholder;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/**
|
||||
* Placeholders available based on information obtained from Audiences
|
||||
*/
|
||||
package me.dreamerzero.miniplaceholders.api.placeholder;
|
||||
package io.github.miniplaceholders.api.placeholder;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.dreamerzero.miniplaceholders.api.utils;
|
||||
package io.github.miniplaceholders.api.utils;
|
||||
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.TextComponent;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.dreamerzero.miniplaceholders.api.utils;
|
||||
package io.github.miniplaceholders.api.utils;
|
||||
|
||||
import java.util.function.Supplier;
|
||||
|
||||
+12
-11
@@ -1,10 +1,9 @@
|
||||
package me.dreamerzero.miniplaceholders.api.utils;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
package io.github.miniplaceholders.api.utils;
|
||||
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage;
|
||||
|
||||
@@ -12,7 +11,8 @@ import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage;
|
||||
* Legacy utils
|
||||
*/
|
||||
public final class LegacyUtils {
|
||||
private LegacyUtils(){}
|
||||
private LegacyUtils() {
|
||||
}
|
||||
|
||||
/**
|
||||
* Legacy serializer with hex support
|
||||
@@ -20,21 +20,22 @@ public final class LegacyUtils {
|
||||
* it is recommended to use MiniMessage instead of this serializer</p>
|
||||
*/
|
||||
public static final LegacyComponentSerializer LEGACY_HEX_SERIALIZER = LegacyComponentSerializer.builder()
|
||||
.character('&')
|
||||
.hexColors()
|
||||
.build();
|
||||
.character('&')
|
||||
.hexColors()
|
||||
.build();
|
||||
|
||||
/**
|
||||
* Parse a string with possible legacy symbols
|
||||
*
|
||||
* @param string the string
|
||||
* @return a parsed string
|
||||
* @since 1.0.0
|
||||
*/
|
||||
public static @NotNull Component parsePossibleLegacy(@Nullable String string) {
|
||||
if(string == null || string.isBlank()) return Component.empty();
|
||||
if(string.indexOf('&') != 0){
|
||||
if (string == null || string.isBlank()) return Component.empty();
|
||||
if (string.indexOf('&') != 0) {
|
||||
return miniMessage().deserialize(
|
||||
miniMessage().serialize(LEGACY_HEX_SERIALIZER.deserialize(string))
|
||||
miniMessage().serialize(LEGACY_HEX_SERIALIZER.deserialize(string))
|
||||
);
|
||||
} else {
|
||||
return miniMessage().deserialize(string);
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.dreamerzero.miniplaceholders.api.utils;
|
||||
package io.github.miniplaceholders.api.utils;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
+3
-3
@@ -1,9 +1,9 @@
|
||||
package me.dreamerzero.miniplaceholders.api.utils;
|
||||
package io.github.miniplaceholders.api.utils;
|
||||
|
||||
import io.github.miniplaceholders.api.placeholder.AudiencePlaceholder;
|
||||
import io.github.miniplaceholders.api.placeholder.RelationalPlaceholder;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import me.dreamerzero.miniplaceholders.api.placeholder.AudiencePlaceholder;
|
||||
import me.dreamerzero.miniplaceholders.api.placeholder.RelationalPlaceholder;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
|
||||
+1
-1
@@ -2,4 +2,4 @@
|
||||
* General Utilities
|
||||
* Here you will find utilities that will help you in the development of expansions
|
||||
*/
|
||||
package me.dreamerzero.miniplaceholders.api.utils;
|
||||
package io.github.miniplaceholders.api.utils;
|
||||
@@ -1,2 +0,0 @@
|
||||
/**Plugin enums */
|
||||
package me.dreamerzero.miniplaceholders.api.enums;
|
||||
@@ -1,4 +0,0 @@
|
||||
/**
|
||||
* MiniPlaceholders core package
|
||||
*/
|
||||
package me.dreamerzero.miniplaceholders.api;
|
||||
@@ -1,14 +1,14 @@
|
||||
/** MiniPlaceholdes API Module */
|
||||
open module me.dreamerzero.miniplaceholders.api {
|
||||
/** MiniPlaceholders API Module */
|
||||
open module io.github.miniplaceholders.api {
|
||||
requires net.kyori.adventure;
|
||||
requires net.kyori.adventure.text.minimessage;
|
||||
requires net.kyori.examination.api;
|
||||
requires static org.jetbrains.annotations;
|
||||
requires me.dreamerzero.miniplaceholders.connect;
|
||||
requires io.github.miniplaceholders.connect;
|
||||
requires net.kyori.adventure.text.serializer.legacy;
|
||||
|
||||
exports me.dreamerzero.miniplaceholders.api;
|
||||
exports me.dreamerzero.miniplaceholders.api.enums;
|
||||
exports me.dreamerzero.miniplaceholders.api.utils;
|
||||
exports me.dreamerzero.miniplaceholders.api.placeholder;
|
||||
exports io.github.miniplaceholders.api;
|
||||
exports io.github.miniplaceholders.api.enums;
|
||||
exports io.github.miniplaceholders.api.utils;
|
||||
exports io.github.miniplaceholders.api.placeholder;
|
||||
}
|
||||
+3
-3
@@ -1,12 +1,12 @@
|
||||
package me.dreamerzero.miniplaceholders;
|
||||
package io.github.miniplaceholders.test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import me.dreamerzero.miniplaceholders.api.Expansion;
|
||||
import me.dreamerzero.miniplaceholders.api.utils.TagsUtils;
|
||||
import io.github.miniplaceholders.api.Expansion;
|
||||
import io.github.miniplaceholders.api.utils.TagsUtils;
|
||||
|
||||
class ExpansionsTest {
|
||||
@Test
|
||||
+4
-4
@@ -1,13 +1,13 @@
|
||||
package me.dreamerzero.miniplaceholders;
|
||||
package io.github.miniplaceholders.test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import me.dreamerzero.miniplaceholders.api.Expansion;
|
||||
import me.dreamerzero.miniplaceholders.api.MiniPlaceholders;
|
||||
import me.dreamerzero.miniplaceholders.api.utils.TagsUtils;
|
||||
import io.github.miniplaceholders.api.Expansion;
|
||||
import io.github.miniplaceholders.api.MiniPlaceholders;
|
||||
import io.github.miniplaceholders.api.utils.TagsUtils;
|
||||
import net.kyori.adventure.audience.Audience;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
|
||||
+4
-4
@@ -1,13 +1,13 @@
|
||||
package me.dreamerzero.miniplaceholders;
|
||||
package io.github.miniplaceholders.test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
import io.github.miniplaceholders.test.testobjects.TestAudience;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
|
||||
import me.dreamerzero.miniplaceholders.api.Expansion;
|
||||
import me.dreamerzero.miniplaceholders.api.MiniPlaceholders;
|
||||
import me.dreamerzero.miniplaceholders.testobjects.TestAudience;
|
||||
import io.github.miniplaceholders.api.Expansion;
|
||||
import io.github.miniplaceholders.api.MiniPlaceholders;
|
||||
import net.kyori.adventure.audience.Audience;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.format.NamedTextColor;
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
package me.dreamerzero.miniplaceholders;
|
||||
package io.github.miniplaceholders.test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
@@ -8,9 +8,9 @@ import java.util.function.BiFunction;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import me.dreamerzero.miniplaceholders.api.Expansion;
|
||||
import me.dreamerzero.miniplaceholders.api.MiniPlaceholders;
|
||||
import me.dreamerzero.miniplaceholders.api.utils.TagsUtils;
|
||||
import io.github.miniplaceholders.api.Expansion;
|
||||
import io.github.miniplaceholders.api.MiniPlaceholders;
|
||||
import io.github.miniplaceholders.api.utils.TagsUtils;
|
||||
import net.kyori.adventure.text.minimessage.Context;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.dreamerzero.miniplaceholders.testobjects;
|
||||
package io.github.miniplaceholders.test.testobjects;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
@@ -20,7 +20,7 @@ dependencies {
|
||||
|
||||
blossom{
|
||||
replaceToken("{version}", project.version)
|
||||
replaceTokenIn("src/main/java/me/dreamerzero/miniplaceholders/common/PluginConstants.java")
|
||||
replaceTokenIn("src/main/java/io/github/miniplaceholders/common/PluginConstants.java")
|
||||
}
|
||||
|
||||
tasks {
|
||||
@@ -31,7 +31,7 @@ tasks {
|
||||
|
||||
jar {
|
||||
manifest {
|
||||
attributes("Automatic-Module-Name" to "me.dreamerzero.miniplaceholders.common")
|
||||
attributes("Automatic-Module-Name" to "io.github.miniplaceholders.common")
|
||||
}
|
||||
}
|
||||
}
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package me.dreamerzero.miniplaceholders.common;
|
||||
package io.github.miniplaceholders.common;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.function.Function;
|
||||
@@ -12,8 +12,8 @@ import com.mojang.brigadier.tree.LiteralCommandNode;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import me.dreamerzero.miniplaceholders.api.Expansion;
|
||||
import me.dreamerzero.miniplaceholders.api.MiniPlaceholders;
|
||||
import io.github.miniplaceholders.api.Expansion;
|
||||
import io.github.miniplaceholders.api.MiniPlaceholders;
|
||||
import net.kyori.adventure.audience.Audience;
|
||||
import net.kyori.adventure.permission.PermissionChecker;
|
||||
import net.kyori.adventure.text.Component;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.dreamerzero.miniplaceholders.common;
|
||||
package io.github.miniplaceholders.common;
|
||||
|
||||
public interface PlaceholdersPlugin {
|
||||
void loadDefaultExpansions();
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.dreamerzero.miniplaceholders.common;
|
||||
package io.github.miniplaceholders.common;
|
||||
|
||||
public final class PluginConstants {
|
||||
public static final String VERSION = "{version}";
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.dreamerzero.miniplaceholders.connect;
|
||||
package io.github.miniplaceholders.connect;
|
||||
|
||||
public enum InternalPlatform {
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
module me.dreamerzero.miniplaceholders.connect {
|
||||
exports me.dreamerzero.miniplaceholders.connect;
|
||||
module io.github.miniplaceholders.connect {
|
||||
exports io.github.miniplaceholders.connect;
|
||||
}
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
group = io.github.miniplaceholders
|
||||
version = 1.4.0-SNAPSHOT
|
||||
version = 2.0.0-SNAPSHOT
|
||||
description = MiniMessage Component-based Placeholders for PaperMC, Krypton and Velocity platforms
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package me.dreamerzero.miniplaceholders.kotlin
|
||||
package io.github.miniplaceholders.kotlin
|
||||
|
||||
import me.dreamerzero.miniplaceholders.api.Expansion
|
||||
import io.github.miniplaceholders.api.Expansion
|
||||
|
||||
/**
|
||||
* Create a new Expansion
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.dreamerzero.miniplaceholders.kotlin
|
||||
package io.github.miniplaceholders.kotlin
|
||||
|
||||
import net.kyori.adventure.text.ComponentLike
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.dreamerzero.miniplaceholders.kotlin
|
||||
package io.github.miniplaceholders.kotlin
|
||||
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver
|
||||
|
||||
+12
-10
@@ -1,13 +1,13 @@
|
||||
package me.dreamerzero.miniplaceholders.krypton
|
||||
package io.github.miniplaceholders.krypton
|
||||
|
||||
import com.google.inject.Inject
|
||||
import me.dreamerzero.miniplaceholders.api.utils.TagsUtils
|
||||
import me.dreamerzero.miniplaceholders.common.PlaceholdersCommand
|
||||
import me.dreamerzero.miniplaceholders.common.PlaceholdersPlugin
|
||||
import me.dreamerzero.miniplaceholders.common.PluginConstants
|
||||
import me.dreamerzero.miniplaceholders.connect.InternalPlatform
|
||||
import me.dreamerzero.miniplaceholders.kotlin.asClosingTag
|
||||
import me.dreamerzero.miniplaceholders.kotlin.expansion
|
||||
import io.github.miniplaceholders.api.utils.TagsUtils
|
||||
import io.github.miniplaceholders.common.PlaceholdersCommand
|
||||
import io.github.miniplaceholders.common.PlaceholdersPlugin
|
||||
import io.github.miniplaceholders.common.PluginConstants
|
||||
import io.github.miniplaceholders.connect.InternalPlatform
|
||||
import io.github.miniplaceholders.kotlin.asClosingTag
|
||||
import io.github.miniplaceholders.kotlin.expansion
|
||||
import me.lucko.spark.api.statistic.StatisticWindow
|
||||
import net.kyori.adventure.key.Key
|
||||
import net.kyori.adventure.text.Component
|
||||
@@ -83,10 +83,12 @@ class KotlinKryptonPlugin @Inject constructor(
|
||||
|
||||
override fun registerPlatformCommand() {
|
||||
val command = PlaceholdersCommand<Sender>(
|
||||
{ server.players
|
||||
{
|
||||
server.players
|
||||
.map { it.name }
|
||||
.map { plainText().serialize(it) }
|
||||
}, server::player)
|
||||
}, server::player
|
||||
)
|
||||
val brigadierCMD = BrigadierCommand.of(command.placeholderTestCommand("miniplaceholders"))
|
||||
server.commandManager.register(brigadierCMD)
|
||||
}
|
||||
@@ -11,9 +11,10 @@ dependencies {
|
||||
paperweight.paperDevBundle(libs.versions.paper.get())
|
||||
}
|
||||
|
||||
// TODO: Migrate to Paper Plugin
|
||||
bukkit {
|
||||
name = "MiniPlaceholders"
|
||||
main = "me.dreamerzero.miniplaceholders.paper.PaperPlugin"
|
||||
main = "io.github.miniplaceholders.paper.PaperPlugin"
|
||||
apiVersion = "1.18"
|
||||
website = "https://github.com/4drian3d/MiniPlaceholders"
|
||||
authors = listOf("4drian3d")
|
||||
@@ -36,7 +37,7 @@ tasks {
|
||||
}
|
||||
jar {
|
||||
manifest {
|
||||
attributes("Automatic-Module-Name" to "me.dreamerzero.miniplaceholders.paper")
|
||||
attributes("Automatic-Module-Name" to "io.github.miniplaceholders.paper")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+7
-6
@@ -1,4 +1,4 @@
|
||||
package me.dreamerzero.miniplaceholders.paper;
|
||||
package io.github.miniplaceholders.paper;
|
||||
|
||||
import java.math.RoundingMode;
|
||||
import java.text.DecimalFormat;
|
||||
@@ -8,17 +8,18 @@ import org.bukkit.entity.Player;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
import io.papermc.paper.datapack.Datapack;
|
||||
import me.dreamerzero.miniplaceholders.api.Expansion;
|
||||
import me.dreamerzero.miniplaceholders.api.utils.TagsUtils;
|
||||
import me.dreamerzero.miniplaceholders.common.PlaceholdersCommand;
|
||||
import me.dreamerzero.miniplaceholders.common.PlaceholdersPlugin;
|
||||
import me.dreamerzero.miniplaceholders.connect.InternalPlatform;
|
||||
import io.github.miniplaceholders.api.Expansion;
|
||||
import io.github.miniplaceholders.api.utils.TagsUtils;
|
||||
import io.github.miniplaceholders.common.PlaceholdersCommand;
|
||||
import io.github.miniplaceholders.common.PlaceholdersPlugin;
|
||||
import io.github.miniplaceholders.connect.InternalPlatform;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.TextComponent;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.minecraft.commands.CommandSourceStack;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
public final class PaperPlugin extends JavaPlugin implements PlaceholdersPlugin {
|
||||
private final DecimalFormat tpsFormat = new DecimalFormat("###.##");
|
||||
private final DecimalFormat msptFormat = new DecimalFormat("###.###");
|
||||
@@ -21,7 +21,7 @@ tasks {
|
||||
|
||||
jar {
|
||||
manifest {
|
||||
attributes("Automatic-Module-Name" to "me.dreamerzero.miniplaceholders.velocity")
|
||||
attributes("Automatic-Module-Name" to "io.github.miniplaceholders.velocity")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+8
-8
@@ -1,4 +1,4 @@
|
||||
package me.dreamerzero.miniplaceholders.velocity;
|
||||
package io.github.miniplaceholders.velocity;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.velocitypowered.api.command.BrigadierCommand;
|
||||
@@ -11,13 +11,13 @@ import com.velocitypowered.api.proxy.ProxyServer;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
|
||||
import me.dreamerzero.miniplaceholders.api.Expansion;
|
||||
import me.dreamerzero.miniplaceholders.api.utils.Components;
|
||||
import me.dreamerzero.miniplaceholders.api.utils.TagsUtils;
|
||||
import me.dreamerzero.miniplaceholders.common.PlaceholdersCommand;
|
||||
import me.dreamerzero.miniplaceholders.common.PlaceholdersPlugin;
|
||||
import me.dreamerzero.miniplaceholders.common.PluginConstants;
|
||||
import me.dreamerzero.miniplaceholders.connect.InternalPlatform;
|
||||
import io.github.miniplaceholders.api.Expansion;
|
||||
import io.github.miniplaceholders.api.utils.Components;
|
||||
import io.github.miniplaceholders.api.utils.TagsUtils;
|
||||
import io.github.miniplaceholders.common.PlaceholdersCommand;
|
||||
import io.github.miniplaceholders.common.PlaceholdersPlugin;
|
||||
import io.github.miniplaceholders.common.PluginConstants;
|
||||
import io.github.miniplaceholders.connect.InternalPlatform;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
|
||||
Reference in new issue
Block a user