Refactoring

APickledWalrus · Nov 15, 2023 · bb69e4d · bb69e4d
1 parent a98534b
commit bb69e4d
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 13 deletions.
diff --git 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/...lements/events/EvtPlaceholderRequest.java → ...kript/elements/EvtPlaceholderRequest.java b/...lements/events/EvtPlaceholderRequest.java → ...kript/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/...nts/expressions/ExprParsePlaceholder.java → ...skript/elements/ExprParsePlaceholder.java b/...nts/expressions/ExprParsePlaceholder.java → ...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<String> {
 
 	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/...elements/expressions/ExprPlaceholder.java → ...ders/skript/elements/ExprPlaceholder.java b/...elements/expressions/ExprPlaceholder.java → ...ders/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/...ts/expressions/ExprPlaceholderResult.java → ...kript/elements/ExprPlaceholderResult.java b/...ts/expressions/ExprPlaceholderResult.java → ...kript/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/...java/io/github/apickledwalrus/skriptplaceholders/skript/elements/events/package-info.java b/...java/io/github/apickledwalrus/skriptplaceholders/skript/elements/events/package-info.java
diff --git a/...pt/elements/expressions/package-info.java → ...holders/skript/elements/package-info.java b/...pt/elements/expressions/package-info.java → ...holders/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;