From bb69e4d12b2da0f0f7356337c3824817e45886b9 Mon Sep 17 00:00:00 2001 From: APickledWalrus Date: Wed, 15 Nov 2023 14:07:32 -0500 Subject: [PATCH] Refactoring --- .../skriptplaceholders/SkriptPlaceholders.java | 2 +- .../skript/elements/{events => }/EvtPlaceholderRequest.java | 2 +- .../elements/{expressions => }/ExprParsePlaceholder.java | 4 ++-- .../skript/elements/{expressions => }/ExprPlaceholder.java | 2 +- .../elements/{expressions => }/ExprPlaceholderResult.java | 3 +-- .../skript/elements/events/package-info.java | 5 ----- .../skript/elements/{expressions => }/package-info.java | 2 +- 7 files changed, 7 insertions(+), 13 deletions(-) rename src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/{events => }/EvtPlaceholderRequest.java (99%) rename src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/{expressions => }/ExprParsePlaceholder.java (98%) rename src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/{expressions => }/ExprPlaceholder.java (99%) rename src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/{expressions => }/ExprPlaceholderResult.java (98%) delete mode 100644 src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/events/package-info.java rename src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/{expressions => }/package-info.java (92%) diff --git a/src/main/java/io/github/apickledwalrus/skriptplaceholders/SkriptPlaceholders.java b/src/main/java/io/github/apickledwalrus/skriptplaceholders/SkriptPlaceholders.java index d86e7e1..adec388 100644 --- a/src/main/java/io/github/apickledwalrus/skriptplaceholders/SkriptPlaceholders.java +++ b/src/main/java/io/github/apickledwalrus/skriptplaceholders/SkriptPlaceholders.java @@ -17,7 +17,7 @@ public void onEnable() { if (plugin.isInstalled()) { break; } - getLogger().severe("[skript-placeholders] No placeholders plugin found! Disabling!"); + getLogger().severe("No placeholder plugins were found. Do you have any installed? Disabling..."); getServer().getPluginManager().disablePlugin(this); return; } diff --git a/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/events/EvtPlaceholderRequest.java b/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/EvtPlaceholderRequest.java similarity index 99% rename from src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/events/EvtPlaceholderRequest.java rename to src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/EvtPlaceholderRequest.java index ea19a16..e81c119 100644 --- a/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/events/EvtPlaceholderRequest.java +++ b/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/EvtPlaceholderRequest.java @@ -1,4 +1,4 @@ -package io.github.apickledwalrus.skriptplaceholders.skript.elements.events; +package io.github.apickledwalrus.skriptplaceholders.skript.elements; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; diff --git a/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/expressions/ExprParsePlaceholder.java b/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/ExprParsePlaceholder.java similarity index 98% rename from src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/expressions/ExprParsePlaceholder.java rename to src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/ExprParsePlaceholder.java index 3ebfc62..97cdbab 100644 --- a/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/expressions/ExprParsePlaceholder.java +++ b/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/ExprParsePlaceholder.java @@ -1,4 +1,4 @@ -package io.github.apickledwalrus.skriptplaceholders.skript.elements.expressions; +package io.github.apickledwalrus.skriptplaceholders.skript.elements; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -31,7 +31,7 @@ public class ExprParsePlaceholder extends SimpleExpression { static { - Skript.registerExpression(ExprParsePlaceholder.class, String.class, ExpressionType.SIMPLE, + Skript.registerExpression(ExprParsePlaceholder.class, String.class, ExpressionType.COMBINED, "[the] ([value of] placeholder[s]|placeholder [value] [of]) %strings% [(from|of) %-players/offlineplayers%]", "parse placeholder[s] %strings% [(for|as) %-players/offlineplayers%]" ); diff --git a/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/expressions/ExprPlaceholder.java b/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/ExprPlaceholder.java similarity index 99% rename from src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/expressions/ExprPlaceholder.java rename to src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/ExprPlaceholder.java index bebf1c5..a498359 100644 --- a/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/expressions/ExprPlaceholder.java +++ b/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/ExprPlaceholder.java @@ -1,4 +1,4 @@ -package io.github.apickledwalrus.skriptplaceholders.skript.elements.expressions; +package io.github.apickledwalrus.skriptplaceholders.skript.elements; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; diff --git a/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/expressions/ExprPlaceholderResult.java b/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/ExprPlaceholderResult.java similarity index 98% rename from src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/expressions/ExprPlaceholderResult.java rename to src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/ExprPlaceholderResult.java index d69d08e..0d22b96 100644 --- a/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/expressions/ExprPlaceholderResult.java +++ b/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/ExprPlaceholderResult.java @@ -1,4 +1,4 @@ -package io.github.apickledwalrus.skriptplaceholders.skript.elements.expressions; +package io.github.apickledwalrus.skriptplaceholders.skript.elements; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer.ChangeMode; @@ -11,7 +11,6 @@ import ch.njol.skript.lang.ExpressionType; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; -import ch.njol.skript.log.ErrorQuality; import ch.njol.util.Kleenean; import ch.njol.util.coll.CollectionUtils; import io.github.apickledwalrus.skriptplaceholders.placeholder.PlaceholderEvent; diff --git a/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/events/package-info.java b/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/events/package-info.java deleted file mode 100644 index 8b13e5c..0000000 --- a/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/events/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@NonNullByDefault({DefaultLocation.PARAMETER, DefaultLocation.RETURN_TYPE, DefaultLocation.FIELD}) -package io.github.apickledwalrus.skriptplaceholders.skript.elements.events; - -import org.eclipse.jdt.annotation.DefaultLocation; -import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/expressions/package-info.java b/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/package-info.java similarity index 92% rename from src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/expressions/package-info.java rename to src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/package-info.java index 76a4e4c..102ddc3 100644 --- a/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/expressions/package-info.java +++ b/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/package-info.java @@ -1,5 +1,5 @@ @NonNullByDefault({DefaultLocation.PARAMETER, DefaultLocation.RETURN_TYPE, DefaultLocation.FIELD}) -package io.github.apickledwalrus.skriptplaceholders.skript.elements.expressions; +package io.github.apickledwalrus.skriptplaceholders.skript.elements; import org.eclipse.jdt.annotation.DefaultLocation; import org.eclipse.jdt.annotation.NonNullByDefault; \ No newline at end of file