minor cleanup of Jobs PR

DenizenScript · Aug 22, 2022 · d896bca · d896bca
1 parent 87a0e19
commit d896bca
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 13 deletions.
diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/jobs/JobsJobsJoinScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/jobs/JobsJobsJoinScriptEvent.java
@@ -3,11 +3,9 @@
 import com.denizenscript.denizen.events.BukkitScriptEvent;
 import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizen.utilities.implementation.BukkitScriptEntryData;
-import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.ObjectTag;
 import com.denizenscript.denizencore.scripts.ScriptEntryData;
 import com.denizenscript.depenizen.bukkit.objects.jobs.JobsJobTag;
-import com.gamingmesh.jobs.Jobs;
 import com.gamingmesh.jobs.api.JobsJoinEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/jobs/JobsJobsLeaveScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/jobs/JobsJobsLeaveScriptEvent.java
@@ -3,11 +3,9 @@
 import com.denizenscript.denizen.events.BukkitScriptEvent;
 import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizen.utilities.implementation.BukkitScriptEntryData;
-import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.ObjectTag;
 import com.denizenscript.denizencore.scripts.ScriptEntryData;
 import com.denizenscript.depenizen.bukkit.objects.jobs.JobsJobTag;
-import com.gamingmesh.jobs.Jobs;
 import com.gamingmesh.jobs.api.JobsLeaveEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/jobs/JobsJobsLevelUpScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/jobs/JobsJobsLevelUpScriptEvent.java
@@ -3,11 +3,9 @@
 import com.denizenscript.denizen.events.BukkitScriptEvent;
 import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizen.utilities.implementation.BukkitScriptEntryData;
-import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.ObjectTag;
 import com.denizenscript.denizencore.scripts.ScriptEntryData;
 import com.denizenscript.depenizen.bukkit.objects.jobs.JobsJobTag;
-import com.gamingmesh.jobs.Jobs;
 import com.gamingmesh.jobs.api.JobsLevelUpEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/jobs/JobsJobsPaymentScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/jobs/JobsJobsPaymentScriptEvent.java
@@ -10,7 +10,6 @@
 import com.denizenscript.depenizen.bukkit.objects.jobs.JobsJobTag;
 import com.gamingmesh.jobs.Jobs;
 import com.gamingmesh.jobs.api.JobsPrePaymentEvent;
-import com.gamingmesh.jobs.container.ActionType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/objects/jobs/JobsJobTag.java b/src/main/java/com/denizenscript/depenizen/bukkit/objects/jobs/JobsJobTag.java
@@ -16,10 +16,6 @@
 import com.denizenscript.denizencore.tags.Attribute;
 import com.denizenscript.denizencore.tags.TagContext;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
 public class JobsJobTag implements ObjectTag, Adjustable {
     public static ObjectTagProcessor<JobsJobTag> tagProcessor = new ObjectTagProcessor<>();
 
@@ -264,6 +260,7 @@ public static void registerTags() {
         // @attribute <JobsJobTag.xp>
         // @returns ElementTag(Decimal)
         // @plugin Depenizen, Jobs
+        // @mechanism JobsJobTag.xp
         // @description
         // Returns the current experience a player has for the current level in a specified job.
         // -->
@@ -338,6 +335,8 @@ public void adjust(Mechanism mechanism) {
         // @plugin Depenizen, Jobs
         // @description
         // Set the amount of job XP the player has in this job.
+        // @tags
+        // <JobsJobTag.xp>
         // -->
         if (!mechanism.isProperty && mechanism.matches("xp") && mechanism.requireDouble()) {
             if (jobProgression == null) {

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/properties/jobs/JobsPlayerProperties.java b/src/main/java/com/denizenscript/depenizen/bukkit/properties/jobs/JobsPlayerProperties.java
@@ -1,13 +1,11 @@
 package com.denizenscript.depenizen.bukkit.properties.jobs;
 
-import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.objects.core.ListTag;
 import com.denizenscript.denizencore.objects.properties.Property;
 import com.denizenscript.denizencore.objects.Mechanism;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
 import com.denizenscript.depenizen.bukkit.objects.jobs.JobsJobTag;
 import com.gamingmesh.jobs.Jobs;
-import com.gamingmesh.jobs.container.Job;
 import com.gamingmesh.jobs.container.JobProgression;
 import com.gamingmesh.jobs.container.JobsPlayer;
 import com.denizenscript.denizen.objects.PlayerTag;