Merge pull request #110 from AlessioGr/item-revamp

Item revamp

build.gradle.kts

@@ -28,7 +28,7 @@ plugins {
 
 
 group = "rocks.gravili.notquests"
-version = "4.25.1"
+version = "4.26.1"
 
 
 repositories {

docs/rocks/gravili/notquests/paper/commands/arguments/MaterialOrHandArgument.Builder.html

@@ -74,7 +74,7 @@ <h1 title="Class MaterialOrHandArgument.Builder" class="title">Class MaterialOrH
 </div>
 <div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
 <div class="inheritance">cloud.commandframework.arguments.CommandArgument.Builder&lt;C,<wbr><a href="wrappers/MaterialOrHand.html" title="class in rocks.gravili.notquests.paper.commands.arguments.wrappers">MaterialOrHand</a>&gt;
-<div class="inheritance">rocks.gravili.notquests.paper.commands.arguments.MaterialOrHandArgument.Builder&lt;C&gt;</div>
+<div class="inheritance">rocks.gravili.notquests.paper.commands.arguments.ItemStackSelectionArgument.Builder&lt;C&gt;</div>
 </div>
 </div>
 <section class="class-description" id="class-description">

docs/rocks/gravili/notquests/paper/commands/arguments/MaterialOrHandArgument.MaterialParseException.html

@@ -78,7 +78,7 @@ <h1 title="Class MaterialOrHandArgument.MaterialParseException" class="title">Cl
 <div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/RuntimeException.html" title="class or interface in java.lang" class="external-link">java.lang.RuntimeException</a>
 <div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">java.lang.IllegalArgumentException</a>
 <div class="inheritance">cloud.commandframework.exceptions.parsing.ParserException
-<div class="inheritance">rocks.gravili.notquests.paper.commands.arguments.MaterialOrHandArgument.MaterialParseException</div>
+<div class="inheritance">rocks.gravili.notquests.paper.commands.arguments.ItemStackSelectionArgument.MaterialParseException</div>
 </div>
 </div>
 </div>
@@ -101,7 +101,7 @@ <h1 title="Class MaterialOrHandArgument.MaterialParseException" class="title">Cl
 <dt>See Also:</dt>
 <dd>
 <ul class="see-list">
-<li><a href="../../../../../../serialized-form.html#rocks.gravili.notquests.paper.commands.arguments.MaterialOrHandArgument.MaterialParseException">Serialized Form</a></li>
+<li><a href="../../../../../../serialized-form.html#rocks.gravili.notquests.paper.commands.arguments.ItemStackSelectionArgument.MaterialParseException">Serialized Form</a></li>
 </ul>
 </dd>
 </dl>

docs/rocks/gravili/notquests/paper/commands/arguments/MaterialOrHandArgument.MaterialParser.html

@@ -73,7 +73,7 @@
 <h1 title="Class MaterialOrHandArgument.MaterialParser" class="title">Class MaterialOrHandArgument.MaterialParser&lt;C&gt;</h1>
 </div>
 <div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance">rocks.gravili.notquests.paper.commands.arguments.MaterialOrHandArgument.MaterialParser&lt;C&gt;</div>
+<div class="inheritance">rocks.gravili.notquests.paper.commands.arguments.ItemStackSelectionArgument.MaterialParser&lt;C&gt;</div>
 </div>
 <section class="class-description" id="class-description">
 <dl class="notes">

docs/rocks/gravili/notquests/paper/commands/arguments/MaterialOrHandArgument.html

@@ -74,7 +74,7 @@ <h1 title="Class MaterialOrHandArgument" class="title">Class MaterialOrHandArgum
 </div>
 <div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
 <div class="inheritance">cloud.commandframework.arguments.CommandArgument&lt;C,<wbr><a href="wrappers/MaterialOrHand.html" title="class in rocks.gravili.notquests.paper.commands.arguments.wrappers">MaterialOrHand</a>&gt;
-<div class="inheritance">rocks.gravili.notquests.paper.commands.arguments.MaterialOrHandArgument&lt;C&gt;</div>
+<div class="inheritance">rocks.gravili.notquests.paper.commands.arguments.ItemStackSelectionArgument&lt;C&gt;</div>
 </div>
 </div>
 <section class="class-description" id="class-description">

docs/serialized-form.html

@@ -57,8 +57,8 @@ <h1 title="Serialized Form" class="title">Serialized Form</h1>
 <h2 title="Package">Package&nbsp;<a href="rocks/gravili/notquests/paper/commands/arguments/package-summary.html">rocks.gravili.notquests.paper.commands.arguments</a></h2>
 <ul class="block-list">
 <li>
-<section class="serialized-class-details" id="rocks.gravili.notquests.paper.commands.arguments.MaterialOrHandArgument.MaterialParseException">
-<h3>Exception&nbsp;<a href="rocks/gravili/notquests/paper/commands/arguments/MaterialOrHandArgument.MaterialParseException.html" title="class in rocks.gravili.notquests.paper.commands.arguments">rocks.gravili.notquests.paper.commands.arguments.MaterialOrHandArgument.MaterialParseException</a></h3>
+<section class="serialized-class-details" id="rocks.gravili.notquests.paper.commands.arguments.ItemStackSelectionArgument.MaterialParseException">
+<h3>Exception&nbsp;<a href="rocks/gravili/notquests/paper/commands/arguments/MaterialOrHandArgument.MaterialParseException.html" title="class in rocks.gravili.notquests.paper.commands.arguments">rocks.gravili.notquests.paper.commands.arguments.ItemStackSelectionArgument.MaterialParseException</a></h3>
 <div class="type-signature">class MaterialParseException extends cloud.commandframework.exceptions.parsing.ParserException implements <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></div>
 <dl class="name-value">
 <dt>serialVersionUID:</dt>

paper/build.gradle.kts

@@ -36,32 +36,32 @@ java {
 repositories {
     mavenCentral()
 
-    maven("https://papermc.io/repo/repository/maven-public/"){
+    maven("https://papermc.io/repo/repository/maven-public/") {
         content {
             includeGroup("io.papermc.paper")
             includeGroup("net.kyori")
         }
     }
 
-    maven("https://hub.jeff-media.com/nexus/repository/jeff-media-public/"){
+    maven("https://hub.jeff-media.com/nexus/repository/jeff-media-public/") {
         content {
             includeGroup("com.jeff_media")
         }
     }
 
-    maven("https://repo.citizensnpcs.co/"){
+    maven("https://repo.citizensnpcs.co/") {
         content {
             includeGroup("net.citizensnpcs")
         }
     }
 
-    maven("https://repo.extendedclip.com/content/repositories/placeholderapi/"){
+    maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") {
         content {
             includeGroup("me.clip")
         }
     }
 
-    maven("https://jitpack.io"){
+    maven("https://jitpack.io") {
         content {
             includeGroup("com.github.MilkBowl")
             includeGroup("com.github.TheBusyBiscuit")
@@ -81,8 +81,8 @@ repositories {
         }
     }
 
-    maven("https://repo.glaremasters.me/repository/towny/"){
-        content{
+    maven("https://repo.glaremasters.me/repository/towny/") {
+        content {
             includeGroup("com.palmergames.bukkit.towny")
         }
     }
@@ -93,14 +93,14 @@ repositories {
         }
     }*/
 
-    maven("https://mvn.lumine.io/repository/maven-public/"){
+    maven("https://mvn.lumine.io/repository/maven-public/") {
         content {
             includeGroup("io.lumine.xikage")
             includeGroup("io.lumine")
         }
     }
 
-    maven("https://betonquest.org/nexus/repository/betonquest/"){
+    maven("https://betonquest.org/nexus/repository/betonquest/") {
         content {
             includeGroup("org.betonquest")
         }
@@ -109,7 +109,7 @@ repositories {
         }
     }
 
-    maven("https://maven.enginehub.org/repo/"){
+    maven("https://maven.enginehub.org/repo/") {
         content {
             includeGroup("com.sk89q.worldedit")
         }
@@ -118,26 +118,26 @@ repositories {
         }
     }
 
-    maven("https://oss.sonatype.org/content/repositories/snapshots"){
+    maven("https://oss.sonatype.org/content/repositories/snapshots") {
         content {
             includeGroup("org.incendo.interfaces")
             includeGroup("cloud.commandframework")
         }
     }
 
-    maven("https://repo.thbn.me/snapshots"){
+    maven("https://repo.thbn.me/snapshots") {
         content {
             includeGroup("org.incendo.interfaces")
         }
     }
 
-    maven("https://libraries.minecraft.net/"){
+    maven("https://libraries.minecraft.net/") {
         content {
             includeGroup("com.mojang")
         }
     }
 
-    maven("https://redempt.dev"){
+    maven("https://redempt.dev") {
         content {
             includeGroup("com.github.Redempt")
         }
@@ -201,8 +201,8 @@ dependencies {
     //Interfaces
     implementation("org.incendo.interfaces:interfaces-core:1.0.0-SNAPSHOT")
 
-    implementation("org.incendo.interfaces:interfaces-paper:1.0.0-SNAPSHOT"){
-        exclude(group= "com.destroystokyo.paper", module= "paper-api")
+    implementation("org.incendo.interfaces:interfaces-paper:1.0.0-SNAPSHOT") {
+        exclude(group = "com.destroystokyo.paper", module = "paper-api")
     }
 
     //compileOnly("com.mojang:brigadier:1.0.18")

paper/src/main/java/rocks/gravili/notquests/paper/commands/AdminCommands.java

@@ -29,6 +29,9 @@
 import cloud.commandframework.bukkit.parsers.selector.SinglePlayerSelectorArgument;
 import cloud.commandframework.meta.CommandMeta;
 import cloud.commandframework.paper.PaperCommandManager;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.apache.commons.lang.StringUtils;
@@ -43,23 +46,27 @@
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import rocks.gravili.notquests.paper.NotQuests;
-import rocks.gravili.notquests.paper.commands.arguments.*;
+import rocks.gravili.notquests.paper.commands.arguments.ActiveQuestSelector;
+import rocks.gravili.notquests.paper.commands.arguments.CategorySelector;
+import rocks.gravili.notquests.paper.commands.arguments.ConditionSelector;
+import rocks.gravili.notquests.paper.commands.arguments.MiniMessageSelector;
+import rocks.gravili.notquests.paper.commands.arguments.QuestSelector;
 import rocks.gravili.notquests.paper.managers.data.Category;
-import rocks.gravili.notquests.paper.structs.*;
+import rocks.gravili.notquests.paper.structs.ActiveObjective;
+import rocks.gravili.notquests.paper.structs.ActiveQuest;
+import rocks.gravili.notquests.paper.structs.CompletedQuest;
+import rocks.gravili.notquests.paper.structs.Quest;
+import rocks.gravili.notquests.paper.structs.QuestPlayer;
 import rocks.gravili.notquests.paper.structs.actions.Action;
 import rocks.gravili.notquests.paper.structs.conditions.Condition;
 import rocks.gravili.notquests.paper.structs.objectives.Objective;
 import rocks.gravili.notquests.paper.structs.objectives.TriggerCommandObjective;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 public class AdminCommands {
+    public final ArrayList<String> placeholders;
     private final NotQuests main;
     private final PaperCommandManager<CommandSender> manager;
     private final Command.Builder<CommandSender> builder;
-    public final ArrayList<String> placeholders;
     private final Date resultDate;