(experimental) Remove the redundant NMSHandler module

DenizenScript · Aug 16, 2019 · d8b89ce · d8b89ce
1 parent 9d72bdc
commit d8b89ce
Show file tree

Hide file tree

Showing 72 changed files with 4 additions and 76 deletions.
diff --git a/dist/pom.xml b/dist/pom.xml
@@ -26,12 +26,6 @@
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>com.denizenscript</groupId>
-            <artifactId>denizen-nmshandler</artifactId>
-            <version>${project.parent.version}</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>com.denizenscript</groupId>
             <artifactId>denizen-v1_12_R1</artifactId>

diff --git a/nmshandler/pom.xml b/nmshandler/pom.xml
diff --git a/...denizenscript/denizen/nms/NMSHandler.java → ...denizenscript/denizen/nms/NMSHandler.java b/...denizenscript/denizen/nms/NMSHandler.java → ...denizenscript/denizen/nms/NMSHandler.java
diff --git a/...denizenscript/denizen/nms/NMSVersion.java → ...denizenscript/denizen/nms/NMSVersion.java b/...denizenscript/denizen/nms/NMSVersion.java → ...denizenscript/denizen/nms/NMSVersion.java
diff --git a/...enizen/nms/abstracts/AnimationHelper.java → ...enizen/nms/abstracts/AnimationHelper.java b/...enizen/nms/abstracts/AnimationHelper.java → ...enizen/nms/abstracts/AnimationHelper.java
diff --git a/...cript/denizen/nms/abstracts/BiomeNMS.java → ...cript/denizen/nms/abstracts/BiomeNMS.java b/...cript/denizen/nms/abstracts/BiomeNMS.java → ...cript/denizen/nms/abstracts/BiomeNMS.java
diff --git a/...ipt/denizen/nms/abstracts/BlockLight.java → ...ipt/denizen/nms/abstracts/BlockLight.java b/...ipt/denizen/nms/abstracts/BlockLight.java → ...ipt/denizen/nms/abstracts/BlockLight.java
diff --git a/.../nms/abstracts/ImprovedOfflinePlayer.java → .../nms/abstracts/ImprovedOfflinePlayer.java b/.../nms/abstracts/ImprovedOfflinePlayer.java → .../nms/abstracts/ImprovedOfflinePlayer.java
diff --git a/...enizen/nms/abstracts/ModernBlockData.java → ...enizen/nms/abstracts/ModernBlockData.java b/...enizen/nms/abstracts/ModernBlockData.java → ...enizen/nms/abstracts/ModernBlockData.java
diff --git a/...denizen/nms/abstracts/ParticleHelper.java → ...denizen/nms/abstracts/ParticleHelper.java b/...denizen/nms/abstracts/ParticleHelper.java → ...denizen/nms/abstracts/ParticleHelper.java
diff --git a/.../denizen/nms/abstracts/ProfileEditor.java → .../denizen/nms/abstracts/ProfileEditor.java b/.../denizen/nms/abstracts/ProfileEditor.java → .../denizen/nms/abstracts/ProfileEditor.java
diff --git a/...script/denizen/nms/abstracts/Sidebar.java → ...script/denizen/nms/abstracts/Sidebar.java b/...script/denizen/nms/abstracts/Sidebar.java → ...script/denizen/nms/abstracts/Sidebar.java
diff --git a/...t/denizen/nms/enums/CustomEntityType.java → ...t/denizen/nms/enums/CustomEntityType.java b/...t/denizen/nms/enums/CustomEntityType.java → ...t/denizen/nms/enums/CustomEntityType.java
diff --git a/...zen/nms/interfaces/AdvancementHelper.java → ...zen/nms/interfaces/AdvancementHelper.java b/...zen/nms/interfaces/AdvancementHelper.java → ...zen/nms/interfaces/AdvancementHelper.java
diff --git a/...ipt/denizen/nms/interfaces/BlockData.java → ...ipt/denizen/nms/interfaces/BlockData.java b/...ipt/denizen/nms/interfaces/BlockData.java → ...ipt/denizen/nms/interfaces/BlockData.java
diff --git a/...t/denizen/nms/interfaces/BlockHelper.java → ...t/denizen/nms/interfaces/BlockHelper.java b/...t/denizen/nms/interfaces/BlockHelper.java → ...t/denizen/nms/interfaces/BlockHelper.java
diff --git a/...denizen/nms/interfaces/BossBarHelper.java → ...denizen/nms/interfaces/BossBarHelper.java b/...denizen/nms/interfaces/BossBarHelper.java → ...denizen/nms/interfaces/BossBarHelper.java
diff --git a/...t/denizen/nms/interfaces/ChunkHelper.java → ...t/denizen/nms/interfaces/ChunkHelper.java b/...t/denizen/nms/interfaces/ChunkHelper.java → ...t/denizen/nms/interfaces/ChunkHelper.java
diff --git a/.../denizen/nms/interfaces/CustomEntity.java → .../denizen/nms/interfaces/CustomEntity.java b/.../denizen/nms/interfaces/CustomEntity.java → .../denizen/nms/interfaces/CustomEntity.java
diff --git a/...en/nms/interfaces/CustomEntityHelper.java → ...en/nms/interfaces/CustomEntityHelper.java b/...en/nms/interfaces/CustomEntityHelper.java → ...en/nms/interfaces/CustomEntityHelper.java
diff --git a/...nizen/nms/interfaces/EntityAnimation.java → ...nizen/nms/interfaces/EntityAnimation.java b/...nizen/nms/interfaces/EntityAnimation.java → ...nizen/nms/interfaces/EntityAnimation.java
diff --git a/.../denizen/nms/interfaces/EntityHelper.java → .../denizen/nms/interfaces/EntityHelper.java b/.../denizen/nms/interfaces/EntityHelper.java → .../denizen/nms/interfaces/EntityHelper.java
diff --git a/...ipt/denizen/nms/interfaces/FakeArrow.java → ...ipt/denizen/nms/interfaces/FakeArrow.java b/...ipt/denizen/nms/interfaces/FakeArrow.java → ...ipt/denizen/nms/interfaces/FakeArrow.java
diff --git a/...pt/denizen/nms/interfaces/FakePlayer.java → ...pt/denizen/nms/interfaces/FakePlayer.java b/...pt/denizen/nms/interfaces/FakePlayer.java → ...pt/denizen/nms/interfaces/FakePlayer.java
diff --git a/...denizen/nms/interfaces/FishingHelper.java → ...denizen/nms/interfaces/FishingHelper.java b/...denizen/nms/interfaces/FishingHelper.java → ...denizen/nms/interfaces/FishingHelper.java
diff --git a/...pt/denizen/nms/interfaces/ItemHelper.java → ...pt/denizen/nms/interfaces/ItemHelper.java b/...pt/denizen/nms/interfaces/ItemHelper.java → ...pt/denizen/nms/interfaces/ItemHelper.java
diff --git a/...enizen/nms/interfaces/ItemProjectile.java → ...enizen/nms/interfaces/ItemProjectile.java b/...enizen/nms/interfaces/ItemProjectile.java → ...enizen/nms/interfaces/ItemProjectile.java
diff --git a/.../denizen/nms/interfaces/PacketHelper.java → .../denizen/nms/interfaces/PacketHelper.java b/.../denizen/nms/interfaces/PacketHelper.java → .../denizen/nms/interfaces/PacketHelper.java
diff --git a/...ript/denizen/nms/interfaces/Particle.java → ...ript/denizen/nms/interfaces/Particle.java b/...ript/denizen/nms/interfaces/Particle.java → ...ript/denizen/nms/interfaces/Particle.java
diff --git a/.../denizen/nms/interfaces/PlayerHelper.java → .../denizen/nms/interfaces/PlayerHelper.java b/.../denizen/nms/interfaces/PlayerHelper.java → .../denizen/nms/interfaces/PlayerHelper.java
diff --git a/...t/denizen/nms/interfaces/SoundHelper.java → ...t/denizen/nms/interfaces/SoundHelper.java b/...t/denizen/nms/interfaces/SoundHelper.java → ...t/denizen/nms/interfaces/SoundHelper.java
diff --git a/...t/denizen/nms/interfaces/WorldAccess.java → ...t/denizen/nms/interfaces/WorldAccess.java b/...t/denizen/nms/interfaces/WorldAccess.java → ...t/denizen/nms/interfaces/WorldAccess.java
diff --git a/...t/denizen/nms/interfaces/WorldHelper.java → ...t/denizen/nms/interfaces/WorldHelper.java b/...t/denizen/nms/interfaces/WorldHelper.java → ...t/denizen/nms/interfaces/WorldHelper.java
diff --git a/...nms/interfaces/packets/PacketHandler.java → ...nms/interfaces/packets/PacketHandler.java b/...nms/interfaces/packets/PacketHandler.java → ...nms/interfaces/packets/PacketHandler.java
diff --git a/...s/packets/PacketInResourcePackStatus.java → ...s/packets/PacketInResourcePackStatus.java b/...s/packets/PacketInResourcePackStatus.java → ...s/packets/PacketInResourcePackStatus.java
diff --git a/...erfaces/packets/PacketInSteerVehicle.java → ...erfaces/packets/PacketInSteerVehicle.java b/...erfaces/packets/PacketInSteerVehicle.java → ...erfaces/packets/PacketInSteerVehicle.java
diff --git a/...nms/interfaces/packets/PacketOutChat.java → ...nms/interfaces/packets/PacketOutChat.java b/...nms/interfaces/packets/PacketOutChat.java → ...nms/interfaces/packets/PacketOutChat.java
diff --git a/...aces/packets/PacketOutEntityMetadata.java → ...aces/packets/PacketOutEntityMetadata.java b/...aces/packets/PacketOutEntityMetadata.java → ...aces/packets/PacketOutEntityMetadata.java
diff --git a/.../interfaces/packets/PacketOutSetSlot.java → .../interfaces/packets/PacketOutSetSlot.java b/.../interfaces/packets/PacketOutSetSlot.java → .../interfaces/packets/PacketOutSetSlot.java
diff --git a/...erfaces/packets/PacketOutSpawnEntity.java → ...erfaces/packets/PacketOutSpawnEntity.java b/...erfaces/packets/PacketOutSpawnEntity.java → ...erfaces/packets/PacketOutSpawnEntity.java
diff --git a/...nterfaces/packets/PacketOutTradeList.java → ...nterfaces/packets/PacketOutTradeList.java b/...nterfaces/packets/PacketOutTradeList.java → ...nterfaces/packets/PacketOutTradeList.java
diff --git a/...erfaces/packets/PacketOutWindowItems.java → ...erfaces/packets/PacketOutWindowItems.java b/...erfaces/packets/PacketOutWindowItems.java → ...erfaces/packets/PacketOutWindowItems.java
diff --git a/...nscript/denizen/nms/util/Advancement.java → ...nscript/denizen/nms/util/Advancement.java b/...nscript/denizen/nms/util/Advancement.java → ...nscript/denizen/nms/util/Advancement.java
diff --git a/...nscript/denizen/nms/util/BoundingBox.java → ...nscript/denizen/nms/util/BoundingBox.java b/...nscript/denizen/nms/util/BoundingBox.java → ...nscript/denizen/nms/util/BoundingBox.java
diff --git a/...cript/denizen/nms/util/PlayerProfile.java → ...cript/denizen/nms/util/PlayerProfile.java b/...cript/denizen/nms/util/PlayerProfile.java → ...cript/denizen/nms/util/PlayerProfile.java
diff --git a/...pt/denizen/nms/util/ReflectionHelper.java → ...pt/denizen/nms/util/ReflectionHelper.java b/...pt/denizen/nms/util/ReflectionHelper.java → ...pt/denizen/nms/util/ReflectionHelper.java
diff --git a/...enscript/denizen/nms/util/TradeOffer.java → ...enscript/denizen/nms/util/TradeOffer.java b/...enscript/denizen/nms/util/TradeOffer.java → ...enscript/denizen/nms/util/TradeOffer.java
diff --git a/...zenscript/denizen/nms/util/Utilities.java → ...zenscript/denizen/nms/util/Utilities.java b/...zenscript/denizen/nms/util/Utilities.java → ...zenscript/denizen/nms/util/Utilities.java
diff --git a/...t/denizen/nms/util/jnbt/ByteArrayTag.java → ...t/denizen/nms/util/jnbt/ByteArrayTag.java b/...t/denizen/nms/util/jnbt/ByteArrayTag.java → ...t/denizen/nms/util/jnbt/ByteArrayTag.java
diff --git a/...script/denizen/nms/util/jnbt/ByteTag.java → ...script/denizen/nms/util/jnbt/ByteTag.java b/...script/denizen/nms/util/jnbt/ByteTag.java → ...script/denizen/nms/util/jnbt/ByteTag.java
diff --git a/...pt/denizen/nms/util/jnbt/CompoundTag.java → ...pt/denizen/nms/util/jnbt/CompoundTag.java b/...pt/denizen/nms/util/jnbt/CompoundTag.java → ...pt/denizen/nms/util/jnbt/CompoundTag.java
diff --git a/...zen/nms/util/jnbt/CompoundTagBuilder.java → ...zen/nms/util/jnbt/CompoundTagBuilder.java b/...zen/nms/util/jnbt/CompoundTagBuilder.java → ...zen/nms/util/jnbt/CompoundTagBuilder.java
diff --git a/...ript/denizen/nms/util/jnbt/DoubleTag.java → ...ript/denizen/nms/util/jnbt/DoubleTag.java b/...ript/denizen/nms/util/jnbt/DoubleTag.java → ...ript/denizen/nms/util/jnbt/DoubleTag.java
diff --git a/...nscript/denizen/nms/util/jnbt/EndTag.java → ...nscript/denizen/nms/util/jnbt/EndTag.java b/...nscript/denizen/nms/util/jnbt/EndTag.java → ...nscript/denizen/nms/util/jnbt/EndTag.java
diff --git a/...cript/denizen/nms/util/jnbt/FloatTag.java → ...cript/denizen/nms/util/jnbt/FloatTag.java b/...cript/denizen/nms/util/jnbt/FloatTag.java → ...cript/denizen/nms/util/jnbt/FloatTag.java
diff --git a/...pt/denizen/nms/util/jnbt/IntArrayTag.java → ...pt/denizen/nms/util/jnbt/IntArrayTag.java b/...pt/denizen/nms/util/jnbt/IntArrayTag.java → ...pt/denizen/nms/util/jnbt/IntArrayTag.java
diff --git a/...nscript/denizen/nms/util/jnbt/IntTag.java → ...nscript/denizen/nms/util/jnbt/IntTag.java b/...nscript/denizen/nms/util/jnbt/IntTag.java → ...nscript/denizen/nms/util/jnbt/IntTag.java
diff --git a/...script/denizen/nms/util/jnbt/ListTag.java → ...script/denizen/nms/util/jnbt/ListTag.java b/...script/denizen/nms/util/jnbt/ListTag.java → ...script/denizen/nms/util/jnbt/ListTag.java
diff --git a/...denizen/nms/util/jnbt/ListTagBuilder.java → ...denizen/nms/util/jnbt/ListTagBuilder.java b/...denizen/nms/util/jnbt/ListTagBuilder.java → ...denizen/nms/util/jnbt/ListTagBuilder.java
diff --git a/...script/denizen/nms/util/jnbt/LongTag.java → ...script/denizen/nms/util/jnbt/LongTag.java b/...script/denizen/nms/util/jnbt/LongTag.java → ...script/denizen/nms/util/jnbt/LongTag.java
diff --git a/...t/denizen/nms/util/jnbt/NBTConstants.java → ...t/denizen/nms/util/jnbt/NBTConstants.java b/...t/denizen/nms/util/jnbt/NBTConstants.java → ...t/denizen/nms/util/jnbt/NBTConstants.java
diff --git a/...denizen/nms/util/jnbt/NBTInputStream.java → ...denizen/nms/util/jnbt/NBTInputStream.java b/...denizen/nms/util/jnbt/NBTInputStream.java → ...denizen/nms/util/jnbt/NBTInputStream.java
diff --git a/...enizen/nms/util/jnbt/NBTOutputStream.java → ...enizen/nms/util/jnbt/NBTOutputStream.java b/...enizen/nms/util/jnbt/NBTOutputStream.java → ...enizen/nms/util/jnbt/NBTOutputStream.java
diff --git a/...cript/denizen/nms/util/jnbt/NBTUtils.java → ...cript/denizen/nms/util/jnbt/NBTUtils.java b/...cript/denizen/nms/util/jnbt/NBTUtils.java → ...cript/denizen/nms/util/jnbt/NBTUtils.java
diff --git a/...cript/denizen/nms/util/jnbt/NamedTag.java → ...cript/denizen/nms/util/jnbt/NamedTag.java b/...cript/denizen/nms/util/jnbt/NamedTag.java → ...cript/denizen/nms/util/jnbt/NamedTag.java
diff --git a/...cript/denizen/nms/util/jnbt/ShortTag.java → ...cript/denizen/nms/util/jnbt/ShortTag.java b/...cript/denizen/nms/util/jnbt/ShortTag.java → ...cript/denizen/nms/util/jnbt/ShortTag.java
diff --git a/...ript/denizen/nms/util/jnbt/StringTag.java → ...ript/denizen/nms/util/jnbt/StringTag.java b/...ript/denizen/nms/util/jnbt/StringTag.java → ...ript/denizen/nms/util/jnbt/StringTag.java
diff --git a/...izenscript/denizen/nms/util/jnbt/Tag.java → ...izenscript/denizen/nms/util/jnbt/Tag.java b/...izenscript/denizen/nms/util/jnbt/Tag.java → ...izenscript/denizen/nms/util/jnbt/Tag.java
diff --git a/pom.xml b/pom.xml
@@ -19,11 +19,10 @@
     </properties>
 
     <modules>
-        <module>nmshandler</module>
+        <module>plugin</module>
         <module>v1_12_R1</module>
         <module>v1_13_R2</module>
         <module>v1_14_R1</module>
-        <module>plugin</module>
         <module>paper</module>
         <module>dist</module>
     </modules>

diff --git a/v1_12_R1/pom.xml b/v1_12_R1/pom.xml
@@ -13,17 +13,11 @@
     <dependencies>
         <dependency>
             <groupId>com.denizenscript</groupId>
-            <artifactId>denizen-nmshandler</artifactId>
+            <artifactId>denizen</artifactId>
             <version>${project.parent.version}</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>com.denizenscript</groupId>
-            <artifactId>denizencore</artifactId>
-            <version>${dcore.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>

diff --git a/v1_13_R2/pom.xml b/v1_13_R2/pom.xml
@@ -13,17 +13,11 @@
     <dependencies>
         <dependency>
             <groupId>com.denizenscript</groupId>
-            <artifactId>denizen-nmshandler</artifactId>
+            <artifactId>denizen</artifactId>
             <version>${project.parent.version}</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>com.denizenscript</groupId>
-            <artifactId>denizencore</artifactId>
-            <version>${dcore.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>

diff --git a/v1_14_R1/pom.xml b/v1_14_R1/pom.xml
@@ -14,17 +14,11 @@
     <dependencies>
         <dependency>
             <groupId>com.denizenscript</groupId>
-            <artifactId>denizen-nmshandler</artifactId>
+            <artifactId>denizen</artifactId>
             <version>${project.parent.version}</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>com.denizenscript</groupId>
-            <artifactId>denizencore</artifactId>
-            <version>${dcore.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>