rename handlers, fix build issue

DenizenScript · Aug 16, 2019 · 0c8988c · 0c8988c
1 parent bea9b95
commit 0c8988c
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 19 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/ItemMergesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/ItemMergesScriptEvent.java
@@ -3,7 +3,6 @@
 import com.denizenscript.denizen.objects.EntityTag;
 import com.denizenscript.denizen.objects.ItemTag;
 import com.denizenscript.denizen.objects.LocationTag;
-import com.denizenscript.denizen.objects.MaterialTag;
 import com.denizenscript.denizen.events.BukkitScriptEvent;
 import com.denizenscript.denizencore.objects.ObjectTag;
 import com.denizenscript.denizencore.scripts.containers.ScriptContainer;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/ChatScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/ChatScriptEvent.java
@@ -1,6 +1,5 @@
 package com.denizenscript.denizen.events.player;
 
-import com.denizenscript.denizen.objects.EntityTag;
 import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizen.scripts.containers.core.FormatScriptContainer;
 import com.denizenscript.denizen.utilities.debugging.Debug;

diff --git a/.../src/main/java/com/denizenscript/denizen/events/player/ResourcePackStatusScriptEvent.java b/.../src/main/java/com/denizenscript/denizen/events/player/ResourcePackStatusScriptEvent.java
@@ -6,8 +6,6 @@
 import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.objects.ObjectTag;
 import com.denizenscript.denizencore.scripts.ScriptEntryData;
-import com.denizenscript.denizencore.scripts.containers.ScriptContainer;
-import com.denizenscript.denizencore.utilities.CoreUtilities;
 
 public class ResourcePackStatusScriptEvent extends BukkitScriptEvent {
 

diff --git a/plugin/src/main/java/com/denizenscript/denizen/nms/NMSHandler.java b/plugin/src/main/java/com/denizenscript/denizen/nms/NMSHandler.java
@@ -46,7 +46,7 @@ public static boolean initialize(JavaPlugin plugin) {
         }
         try {
             // Get the class of our handler for this version
-            final Class<?> clazz = Class.forName("com.denizenscript.denizen.nms.Handler_" + version.name());
+            final Class<?> clazz = Class.forName("com.denizenscript.denizen.nms." + version.name() + ".Handler");
             if (NMSHandler.class.isAssignableFrom(clazz)) {
                 // Found and loaded - good to go!
                 instance = (NMSHandler) clazz.newInstance();

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/TradeTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/TradeTag.java
@@ -11,7 +11,6 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.MerchantRecipe;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.regex.Matcher;
 

diff --git a/...cript/denizen/v1_12/Handler_v1_12_R1.java → .../denizenscript/denizen/v1_12/Handler.java b/...cript/denizen/v1_12/Handler_v1_12_R1.java → .../denizenscript/denizen/v1_12/Handler.java
@@ -1,7 +1,6 @@
 package com.denizenscript.denizen.v1_12;
 
 import com.denizenscript.denizen.nms.NMSHandler;
-import com.denizenscript.denizen.nms.helpers.*;
 import com.denizenscript.denizen.v1_12.impl.BiomeNMS_v1_12_R1;
 import com.denizenscript.denizen.v1_12.impl.ProfileEditor_v1_12_R1;
 import com.denizenscript.denizen.v1_12.impl.Sidebar_v1_12_R1;
@@ -36,7 +35,7 @@
 
 import java.util.Map;
 
-public class Handler_v1_12_R1 extends NMSHandler {
+public class Handler extends NMSHandler {
 
     private final AdvancementHelper advancementHelper = new AdvancementHelper_v1_12_R1();
     private final AnimationHelper animationHelper = new AnimationHelper_v1_12_R1();

diff --git a/...cript/denizen/v1_13/Handler_v1_13_R2.java → .../denizenscript/denizen/v1_13/Handler.java b/...cript/denizen/v1_13/Handler_v1_13_R2.java → .../denizenscript/denizen/v1_13/Handler.java
@@ -1,7 +1,6 @@
 package com.denizenscript.denizen.v1_13;
 
 import com.denizenscript.denizen.nms.NMSHandler;
-import com.denizenscript.denizen.nms.helpers.*;
 import com.denizenscript.denizen.v1_13.impl.BiomeNMS_v1_13_R2;
 import com.denizenscript.denizen.v1_13.impl.ProfileEditor_v1_13_R2;
 import com.denizenscript.denizen.v1_13.impl.Sidebar_v1_13_R2;
@@ -37,7 +36,7 @@
 
 import java.util.Map;
 
-public class Handler_v1_13_R2 extends NMSHandler {
+public class Handler extends NMSHandler {
 
     private final AdvancementHelper advancementHelper = new AdvancementHelper_v1_13_R2();
     private final AnimationHelper animationHelper = new AnimationHelper_v1_13_R2();

diff --git a/...cript/denizen/v1_14/Handler_v1_14_R1.java → .../denizenscript/denizen/v1_14/Handler.java b/...cript/denizen/v1_14/Handler_v1_14_R1.java → .../denizenscript/denizen/v1_14/Handler.java
@@ -2,7 +2,6 @@
 
 import com.denizenscript.denizen.nms.NMSHandler;
 import com.denizenscript.denizen.nms.abstracts.*;
-import com.denizenscript.denizen.nms.helpers.*;
 import com.denizenscript.denizen.v1_14.impl.BiomeNMS_v1_14_R1;
 import com.denizenscript.denizen.v1_14.impl.ProfileEditor_v1_14_R1;
 import com.denizenscript.denizen.v1_14.impl.Sidebar_v1_14_R1;
@@ -41,7 +40,7 @@
 import java.lang.reflect.Field;
 import java.util.Map;
 
-public class Handler_v1_14_R1 extends NMSHandler {
+public class Handler extends NMSHandler {
 
     private final AdvancementHelper advancementHelper = new AdvancementHelper_v1_14_R1();
     private final AnimationHelper animationHelper = new AnimationHelper_v1_14_R1();

diff --git a/...src/main/java/com/denizenscript/denizen/v1_14/impl/entities/EntityFakeArrow_v1_14_R1.java b/...src/main/java/com/denizenscript/denizen/v1_14/impl/entities/EntityFakeArrow_v1_14_R1.java
@@ -1,6 +1,6 @@
 package com.denizenscript.denizen.v1_14.impl.entities;
 
-import com.denizenscript.denizen.v1_14.Handler_v1_14_R1;
+import com.denizenscript.denizen.v1_14.Handler;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
 import net.minecraft.server.v1_14_R1.EntitySpectralArrow;
 import net.minecraft.server.v1_14_R1.EntityTypes;
@@ -17,7 +17,7 @@ public EntityFakeArrow_v1_14_R1(CraftWorld craftWorld, Location location) {
         // TODO: 1.14 - provide a custom EntityTypes?
         super(EntityTypes.SPECTRAL_ARROW, craftWorld.getHandle());
         try {
-            Handler_v1_14_R1.ENTITY_BUKKITYENTITY.set(this, new CraftFakeArrow_v1_14_R1((CraftServer) Bukkit.getServer(), this));
+            Handler.ENTITY_BUKKITYENTITY.set(this, new CraftFakeArrow_v1_14_R1((CraftServer) Bukkit.getServer(), this));
         }
         catch (Exception ex) {
             Debug.echoError(ex);

diff --git a/...rc/main/java/com/denizenscript/denizen/v1_14/impl/entities/EntityFakePlayer_v1_14_R1.java b/...rc/main/java/com/denizenscript/denizen/v1_14/impl/entities/EntityFakePlayer_v1_14_R1.java
@@ -1,7 +1,7 @@
 package com.denizenscript.denizen.v1_14.impl.entities;
 
 import com.mojang.authlib.GameProfile;
-import com.denizenscript.denizen.v1_14.Handler_v1_14_R1;
+import com.denizenscript.denizen.v1_14.Handler;
 import com.denizenscript.denizen.v1_14.impl.network.FakeNetworkManager_v1_14_R1;
 import com.denizenscript.denizen.v1_14.impl.network.FakePlayerConnection_v1_14_R1;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
@@ -15,7 +15,7 @@ public class EntityFakePlayer_v1_14_R1 extends EntityPlayer {
     public EntityFakePlayer_v1_14_R1(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
         super(minecraftserver, worldserver, gameprofile, playerinteractmanager);
         try {
-            Handler_v1_14_R1.ENTITY_BUKKITYENTITY.set(this, new CraftFakePlayer_v1_14_R1((CraftServer) Bukkit.getServer(), this));
+            Handler.ENTITY_BUKKITYENTITY.set(this, new CraftFakePlayer_v1_14_R1((CraftServer) Bukkit.getServer(), this));
         }
         catch (Exception ex) {
             Debug.echoError(ex);

diff --git a/...ain/java/com/denizenscript/denizen/v1_14/impl/entities/EntityItemProjectile_v1_14_R1.java b/...ain/java/com/denizenscript/denizen/v1_14/impl/entities/EntityItemProjectile_v1_14_R1.java
@@ -1,6 +1,6 @@
 package com.denizenscript.denizen.v1_14.impl.entities;
 
-import com.denizenscript.denizen.v1_14.Handler_v1_14_R1;
+import com.denizenscript.denizen.v1_14.Handler;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
 import net.minecraft.server.v1_14_R1.*;
 import org.bukkit.Bukkit;
@@ -26,7 +26,7 @@ public class EntityItemProjectile_v1_14_R1 extends EntityItem implements IProjec
     public EntityItemProjectile_v1_14_R1(CraftWorld craftWorld, Location location, org.bukkit.inventory.ItemStack itemStack) {
         super(EntityTypes.ITEM, craftWorld.getHandle());
         try {
-            Handler_v1_14_R1.ENTITY_BUKKITYENTITY.set(this, new CraftItemProjectile_v1_14_R1((CraftServer) Bukkit.getServer(), this));
+            Handler.ENTITY_BUKKITYENTITY.set(this, new CraftItemProjectile_v1_14_R1((CraftServer) Bukkit.getServer(), this));
         }
         catch (Exception ex) {
             Debug.echoError(ex);

diff --git a/...com/denizenscript/denizen/v1_14/impl/packets/handlers/DenizenNetworkManager_v1_14_R1.java b/...com/denizenscript/denizen/v1_14/impl/packets/handlers/DenizenNetworkManager_v1_14_R1.java
@@ -2,7 +2,6 @@
 
 import com.denizenscript.denizen.v1_14.impl.blocks.BlockLight_v1_14_R1;
 import com.denizenscript.denizen.v1_14.impl.entities.EntityFakePlayer_v1_14_R1;
-import com.denizenscript.denizen.nms.impl.packets.*;
 import com.denizenscript.denizen.nms.interfaces.packets.PacketHandler;
 import com.denizenscript.denizen.nms.interfaces.packets.PacketOutSpawnEntity;
 import com.denizenscript.denizen.v1_14.impl.packets.*;