From 5eec83f726bd681ce1cc17ab610704f99fe3777d Mon Sep 17 00:00:00 2001 From: vemacs Date: Thu, 9 Jun 2016 19:25:45 -0600 Subject: [PATCH] Remove old spawn egg providers in favor of reflection-based implementation --- Essentials/pom.xml | 36 ------ .../com/earth2me/essentials/Essentials.java | 6 - nms/1_10_R1Provider/pom.xml | 35 ------ .../ess3/nms/v1_10_R1/SpawnEgg1_10_R1.java | 115 ------------------ .../v1_10_R1/v1_10_R1SpawnEggProvider.java | 22 ---- nms/1_9_R1Provider/pom.xml | 35 ------ .../net/ess3/nms/v1_9_R1/nms/SpawnEgg1_9.java | 115 ------------------ .../nms/v1_9_R1/v1_9_R1SpawnEggProvider.java | 23 ---- nms/1_9_R2Provider/pom.xml | 35 ------ .../net/ess3/nms/v1_9_R2/SpawnEgg1_9_R2.java | 115 ------------------ .../nms/v1_9_R2/v1_9_R2SpawnEggProvider.java | 22 ---- pom.xml | 3 - 12 files changed, 562 deletions(-) delete mode 100644 nms/1_10_R1Provider/pom.xml delete mode 100644 nms/1_10_R1Provider/src/net/ess3/nms/v1_10_R1/SpawnEgg1_10_R1.java delete mode 100644 nms/1_10_R1Provider/src/net/ess3/nms/v1_10_R1/v1_10_R1SpawnEggProvider.java delete mode 100644 nms/1_9_R1Provider/pom.xml delete mode 100644 nms/1_9_R1Provider/src/net/ess3/nms/v1_9_R1/nms/SpawnEgg1_9.java delete mode 100644 nms/1_9_R1Provider/src/net/ess3/nms/v1_9_R1/v1_9_R1SpawnEggProvider.java delete mode 100644 nms/1_9_R2Provider/pom.xml delete mode 100644 nms/1_9_R2Provider/src/net/ess3/nms/v1_9_R2/SpawnEgg1_9_R2.java delete mode 100644 nms/1_9_R2Provider/src/net/ess3/nms/v1_9_R2/v1_9_R2SpawnEggProvider.java diff --git a/Essentials/pom.xml b/Essentials/pom.xml index f8b8d22ba..f565236cb 100644 --- a/Essentials/pom.xml +++ b/Essentials/pom.xml @@ -121,42 +121,6 @@ 2.0.1 compile - - net.ess3 - 1_9_R1Provider - 2.0.1 - compile - - - org.bukkit - craftbukkit - - - - - net.ess3 - 1_9_R2Provider - 2.0.1 - compile - - - org.bukkit - craftbukkit - - - - - net.ess3 - 1_10_R1Provider - 2.0.1 - compile - - - org.bukkit - craftbukkit - - - net.ess3 ReflectionProvider diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index 835a485a7..a8b0460bc 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -43,11 +43,8 @@ import net.ess3.nms.updatedmeta.BasePotionDataProvider; import net.ess3.nms.updatedmeta.BlockMetaSpawnerProvider; import net.ess3.nms.legacy.LegacySpawnEggProvider; import net.ess3.nms.legacy.LegacySpawnerProvider; -import net.ess3.nms.v1_10_R1.v1_10_R1SpawnEggProvider; import net.ess3.nms.v1_8_R1.v1_8_R1SpawnerProvider; import net.ess3.nms.v1_8_R2.v1_8_R2SpawnerProvider; -import net.ess3.nms.v1_9_R1.v1_9_R1SpawnEggProvider; -import net.ess3.nms.v1_9_R2.v1_9_R2SpawnEggProvider; import net.ess3.providers.ProviderFactory; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -218,9 +215,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials { spawnEggProvider = new ProviderFactory<>(getLogger(), Arrays.asList( ReflSpawnEggProvider.class, - v1_10_R1SpawnEggProvider.class, - v1_9_R2SpawnEggProvider.class, - v1_9_R1SpawnEggProvider.class, LegacySpawnEggProvider.class ), "spawn egg").getProvider(); potionMetaProvider = new ProviderFactory<>(getLogger(), diff --git a/nms/1_10_R1Provider/pom.xml b/nms/1_10_R1Provider/pom.xml deleted file mode 100644 index b949710de..000000000 --- a/nms/1_10_R1Provider/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - EssentialsXParent - net.ess3 - 2.0.1 - ../../pom.xml - - 4.0.0 - - 1_10_R1Provider - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/groups/public/ - - - - - - org.bukkit - craftbukkit - 1.10-R0.1-SNAPSHOT - provided - - - net.ess3 - NMSProvider - 2.0.1 - - - \ No newline at end of file diff --git a/nms/1_10_R1Provider/src/net/ess3/nms/v1_10_R1/SpawnEgg1_10_R1.java b/nms/1_10_R1Provider/src/net/ess3/nms/v1_10_R1/SpawnEgg1_10_R1.java deleted file mode 100644 index cf1349fa3..000000000 --- a/nms/1_10_R1Provider/src/net/ess3/nms/v1_10_R1/SpawnEgg1_10_R1.java +++ /dev/null @@ -1,115 +0,0 @@ -/******************************************************************************* - * This file is part of ASkyBlock. - *

- * ASkyBlock is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * ASkyBlock is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with ASkyBlock. If not, see . - *******************************************************************************/ -package net.ess3.nms.v1_10_R1; - -import net.minecraft.server.v1_10_R1.NBTTagCompound; -import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftItemStack; -import org.bukkit.entity.EntityType; -import org.bukkit.inventory.ItemStack; - -/** - * Represents a spawn egg that can be used to spawn mobs. Only for V1.9 servers - * - * @author tastybento - */ -public class SpawnEgg1_10_R1 { - private EntityType type; - - public SpawnEgg1_10_R1(EntityType type) { - this.type = type; - } - - /** - * Get the type of entity this egg will spawn. - * - * @return The entity type. - */ - public EntityType getSpawnedType() { - return type; - } - - /** - * Set the type of entity this egg will spawn. - * - * @param type The entity type. - */ - public void setSpawnedType(EntityType type) { - if (type.isAlive()) { - this.type = type; - } - } - - @Override - public String toString() { - return "SPAWN EGG{" + getSpawnedType() + "}"; - } - - /** - * Get an ItemStack of one spawn egg - * @return ItemStack - */ - public ItemStack toItemStack() { - return toItemStack(1); - } - - /** - * Get an itemstack of spawn eggs - * @param amount - * @return ItemStack of spawn eggs - */ - @SuppressWarnings("deprecation") - public ItemStack toItemStack(int amount) { - ItemStack item = new ItemStack(Material.MONSTER_EGG, amount); - net.minecraft.server.v1_10_R1.ItemStack stack = CraftItemStack.asNMSCopy(item); - NBTTagCompound tagCompound = stack.getTag(); - if (tagCompound == null) { - tagCompound = new NBTTagCompound(); - } - NBTTagCompound id = new NBTTagCompound(); - id.setString("id", type.getName()); - tagCompound.set("EntityTag", id); - stack.setTag(tagCompound); - return CraftItemStack.asBukkitCopy(stack); - } - - /** - * Converts from an item stack to a spawn egg 1.9 - * @param item - ItemStack, quantity is disregarded - * @return SpawnEgg 1.9 - */ - public static SpawnEgg1_10_R1 fromItemStack(ItemStack item) throws IllegalArgumentException { - if (item == null) - throw new IllegalArgumentException("Item cannot be null"); - if (item.getType() != Material.MONSTER_EGG) - throw new IllegalArgumentException("Item is not a monster egg"); - net.minecraft.server.v1_10_R1.ItemStack stack = CraftItemStack.asNMSCopy(item); - NBTTagCompound tagCompound = stack.getTag(); - if (tagCompound != null) { - @SuppressWarnings("deprecation") - EntityType type = EntityType.fromName(tagCompound.getCompound("EntityTag").getString("id")); - if (type != null) { - return new SpawnEgg1_10_R1(type); - } else { - throw new IllegalArgumentException("Unable to parse type from item"); - } - } else { - throw new IllegalArgumentException("Item is lacking tag compound"); - } - } -} - diff --git a/nms/1_10_R1Provider/src/net/ess3/nms/v1_10_R1/v1_10_R1SpawnEggProvider.java b/nms/1_10_R1Provider/src/net/ess3/nms/v1_10_R1/v1_10_R1SpawnEggProvider.java deleted file mode 100644 index b15ae4c88..000000000 --- a/nms/1_10_R1Provider/src/net/ess3/nms/v1_10_R1/v1_10_R1SpawnEggProvider.java +++ /dev/null @@ -1,22 +0,0 @@ -package net.ess3.nms.v1_10_R1; - -import net.ess3.nms.SpawnEggProvider; -import org.bukkit.entity.EntityType; -import org.bukkit.inventory.ItemStack; - -public class v1_10_R1SpawnEggProvider extends SpawnEggProvider { - @Override - public ItemStack createEggItem(EntityType type) throws IllegalArgumentException { - return new SpawnEgg1_10_R1(type).toItemStack(); - } - - @Override - public EntityType getSpawnedType(ItemStack eggItem) throws IllegalArgumentException { - return SpawnEgg1_10_R1.fromItemStack(eggItem).getSpawnedType(); - } - - @Override - public String getHumanName() { - return "CraftBukkit 1.10 NMS-based provider"; - } -} diff --git a/nms/1_9_R1Provider/pom.xml b/nms/1_9_R1Provider/pom.xml deleted file mode 100644 index 04730888f..000000000 --- a/nms/1_9_R1Provider/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - EssentialsXParent - net.ess3 - 2.0.1 - ../../pom.xml - - 4.0.0 - - 1_9_R1Provider - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/groups/public/ - - - - - - org.bukkit - craftbukkit - 1.9-R0.1-SNAPSHOT - provided - - - net.ess3 - NMSProvider - 2.0.1 - - - \ No newline at end of file diff --git a/nms/1_9_R1Provider/src/net/ess3/nms/v1_9_R1/nms/SpawnEgg1_9.java b/nms/1_9_R1Provider/src/net/ess3/nms/v1_9_R1/nms/SpawnEgg1_9.java deleted file mode 100644 index 49b56c7e0..000000000 --- a/nms/1_9_R1Provider/src/net/ess3/nms/v1_9_R1/nms/SpawnEgg1_9.java +++ /dev/null @@ -1,115 +0,0 @@ -/******************************************************************************* - * This file is part of ASkyBlock. - *

- * ASkyBlock is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * ASkyBlock is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with ASkyBlock. If not, see . - *******************************************************************************/ -package net.ess3.nms.v1_9_R1.nms; - -import net.minecraft.server.v1_9_R1.NBTTagCompound; -import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftItemStack; -import org.bukkit.entity.EntityType; -import org.bukkit.inventory.ItemStack; - -/** - * Represents a spawn egg that can be used to spawn mobs. Only for V1.9 servers - * - * @author tastybento - */ -public class SpawnEgg1_9 { - private EntityType type; - - public SpawnEgg1_9(EntityType type) { - this.type = type; - } - - /** - * Get the type of entity this egg will spawn. - * - * @return The entity type. - */ - public EntityType getSpawnedType() { - return type; - } - - /** - * Set the type of entity this egg will spawn. - * - * @param type The entity type. - */ - public void setSpawnedType(EntityType type) { - if (type.isAlive()) { - this.type = type; - } - } - - @Override - public String toString() { - return "SPAWN EGG{" + getSpawnedType() + "}"; - } - - /** - * Get an ItemStack of one spawn egg - * @return ItemStack - */ - public ItemStack toItemStack() { - return toItemStack(1); - } - - /** - * Get an itemstack of spawn eggs - * @param amount - * @return ItemStack of spawn eggs - */ - @SuppressWarnings("deprecation") - public ItemStack toItemStack(int amount) { - ItemStack item = new ItemStack(Material.MONSTER_EGG, amount); - net.minecraft.server.v1_9_R1.ItemStack stack = CraftItemStack.asNMSCopy(item); - NBTTagCompound tagCompound = stack.getTag(); - if (tagCompound == null) { - tagCompound = new NBTTagCompound(); - } - NBTTagCompound id = new NBTTagCompound(); - id.setString("id", type.getName()); - tagCompound.set("EntityTag", id); - stack.setTag(tagCompound); - return CraftItemStack.asBukkitCopy(stack); - } - - /** - * Converts from an item stack to a spawn egg 1.9 - * @param item - ItemStack, quantity is disregarded - * @return SpawnEgg 1.9 - */ - public static SpawnEgg1_9 fromItemStack(ItemStack item) throws IllegalArgumentException { - if (item == null) - throw new IllegalArgumentException("Item cannot be null"); - if (item.getType() != Material.MONSTER_EGG) - throw new IllegalArgumentException("Item is not a monster egg"); - net.minecraft.server.v1_9_R1.ItemStack stack = CraftItemStack.asNMSCopy(item); - NBTTagCompound tagCompound = stack.getTag(); - if (tagCompound != null) { - @SuppressWarnings("deprecation") - EntityType type = EntityType.fromName(tagCompound.getCompound("EntityTag").getString("id")); - if (type != null) { - return new SpawnEgg1_9(type); - } else { - throw new IllegalArgumentException("Unable to parse type from item"); - } - } else { - throw new IllegalArgumentException("Item is lacking tag compound"); - } - } -} - diff --git a/nms/1_9_R1Provider/src/net/ess3/nms/v1_9_R1/v1_9_R1SpawnEggProvider.java b/nms/1_9_R1Provider/src/net/ess3/nms/v1_9_R1/v1_9_R1SpawnEggProvider.java deleted file mode 100644 index b33a7961d..000000000 --- a/nms/1_9_R1Provider/src/net/ess3/nms/v1_9_R1/v1_9_R1SpawnEggProvider.java +++ /dev/null @@ -1,23 +0,0 @@ -package net.ess3.nms.v1_9_R1; - -import net.ess3.nms.SpawnEggProvider; -import net.ess3.nms.v1_9_R1.nms.SpawnEgg1_9; -import org.bukkit.entity.EntityType; -import org.bukkit.inventory.ItemStack; - -public class v1_9_R1SpawnEggProvider extends SpawnEggProvider { - @Override - public ItemStack createEggItem(EntityType type) throws IllegalArgumentException { - return new SpawnEgg1_9(type).toItemStack(); - } - - @Override - public EntityType getSpawnedType(ItemStack eggItem) throws IllegalArgumentException { - return SpawnEgg1_9.fromItemStack(eggItem).getSpawnedType(); - } - - @Override - public String getHumanName() { - return "CraftBukkit 1.9 NMS-based provider"; - } -} diff --git a/nms/1_9_R2Provider/pom.xml b/nms/1_9_R2Provider/pom.xml deleted file mode 100644 index 1dd6e17c7..000000000 --- a/nms/1_9_R2Provider/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - EssentialsXParent - net.ess3 - 2.0.1 - ../../pom.xml - - 4.0.0 - - 1_9_R2Provider - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/groups/public/ - - - - - - org.bukkit - craftbukkit - 1.9.4-R0.1-SNAPSHOT - provided - - - net.ess3 - NMSProvider - 2.0.1 - - - \ No newline at end of file diff --git a/nms/1_9_R2Provider/src/net/ess3/nms/v1_9_R2/SpawnEgg1_9_R2.java b/nms/1_9_R2Provider/src/net/ess3/nms/v1_9_R2/SpawnEgg1_9_R2.java deleted file mode 100644 index cf80c762d..000000000 --- a/nms/1_9_R2Provider/src/net/ess3/nms/v1_9_R2/SpawnEgg1_9_R2.java +++ /dev/null @@ -1,115 +0,0 @@ -/******************************************************************************* - * This file is part of ASkyBlock. - *

- * ASkyBlock is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * ASkyBlock is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with ASkyBlock. If not, see . - *******************************************************************************/ -package net.ess3.nms.v1_9_R2; - -import net.minecraft.server.v1_9_R2.NBTTagCompound; -import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftItemStack; -import org.bukkit.entity.EntityType; -import org.bukkit.inventory.ItemStack; - -/** - * Represents a spawn egg that can be used to spawn mobs. Only for V1.9 servers - * - * @author tastybento - */ -public class SpawnEgg1_9_R2 { - private EntityType type; - - public SpawnEgg1_9_R2(EntityType type) { - this.type = type; - } - - /** - * Get the type of entity this egg will spawn. - * - * @return The entity type. - */ - public EntityType getSpawnedType() { - return type; - } - - /** - * Set the type of entity this egg will spawn. - * - * @param type The entity type. - */ - public void setSpawnedType(EntityType type) { - if (type.isAlive()) { - this.type = type; - } - } - - @Override - public String toString() { - return "SPAWN EGG{" + getSpawnedType() + "}"; - } - - /** - * Get an ItemStack of one spawn egg - * @return ItemStack - */ - public ItemStack toItemStack() { - return toItemStack(1); - } - - /** - * Get an itemstack of spawn eggs - * @param amount - * @return ItemStack of spawn eggs - */ - @SuppressWarnings("deprecation") - public ItemStack toItemStack(int amount) { - ItemStack item = new ItemStack(Material.MONSTER_EGG, amount); - net.minecraft.server.v1_9_R2.ItemStack stack = CraftItemStack.asNMSCopy(item); - NBTTagCompound tagCompound = stack.getTag(); - if (tagCompound == null) { - tagCompound = new NBTTagCompound(); - } - NBTTagCompound id = new NBTTagCompound(); - id.setString("id", type.getName()); - tagCompound.set("EntityTag", id); - stack.setTag(tagCompound); - return CraftItemStack.asBukkitCopy(stack); - } - - /** - * Converts from an item stack to a spawn egg 1.9 - * @param item - ItemStack, quantity is disregarded - * @return SpawnEgg 1.9 - */ - public static SpawnEgg1_9_R2 fromItemStack(ItemStack item) throws IllegalArgumentException { - if (item == null) - throw new IllegalArgumentException("Item cannot be null"); - if (item.getType() != Material.MONSTER_EGG) - throw new IllegalArgumentException("Item is not a monster egg"); - net.minecraft.server.v1_9_R2.ItemStack stack = CraftItemStack.asNMSCopy(item); - NBTTagCompound tagCompound = stack.getTag(); - if (tagCompound != null) { - @SuppressWarnings("deprecation") - EntityType type = EntityType.fromName(tagCompound.getCompound("EntityTag").getString("id")); - if (type != null) { - return new SpawnEgg1_9_R2(type); - } else { - throw new IllegalArgumentException("Unable to parse type from item"); - } - } else { - throw new IllegalArgumentException("Item is lacking tag compound"); - } - } -} - diff --git a/nms/1_9_R2Provider/src/net/ess3/nms/v1_9_R2/v1_9_R2SpawnEggProvider.java b/nms/1_9_R2Provider/src/net/ess3/nms/v1_9_R2/v1_9_R2SpawnEggProvider.java deleted file mode 100644 index 81e14eb23..000000000 --- a/nms/1_9_R2Provider/src/net/ess3/nms/v1_9_R2/v1_9_R2SpawnEggProvider.java +++ /dev/null @@ -1,22 +0,0 @@ -package net.ess3.nms.v1_9_R2; - -import net.ess3.nms.SpawnEggProvider; -import org.bukkit.entity.EntityType; -import org.bukkit.inventory.ItemStack; - -public class v1_9_R2SpawnEggProvider extends SpawnEggProvider { - @Override - public ItemStack createEggItem(EntityType type) throws IllegalArgumentException { - return new SpawnEgg1_9_R2(type).toItemStack(); - } - - @Override - public EntityType getSpawnedType(ItemStack eggItem) throws IllegalArgumentException { - return SpawnEgg1_9_R2.fromItemStack(eggItem).getSpawnedType(); - } - - @Override - public String getHumanName() { - return "CraftBukkit 1.9.4 NMS-based provider"; - } -} diff --git a/pom.xml b/pom.xml index 5dffbf14a..4c4e227a9 100644 --- a/pom.xml +++ b/pom.xml @@ -46,9 +46,6 @@ nms/1_8_R1Provider nms/1_8_R2Provider nms/LegacyProvider - nms/1_9_R1Provider - nms/1_9_R2Provider - nms/1_10_R1Provider nms/ReflectionProvider