diff --git a/nmshandler/src/main/java/net/aufdemrand/denizen/nms/NMSVersion.java b/nmshandler/src/main/java/net/aufdemrand/denizen/nms/NMSVersion.java index d5968845f8..8187355b04 100644 --- a/nmshandler/src/main/java/net/aufdemrand/denizen/nms/NMSVersion.java +++ b/nmshandler/src/main/java/net/aufdemrand/denizen/nms/NMSVersion.java @@ -3,8 +3,6 @@ public enum NMSVersion { NOT_SUPPORTED, - v1_8_R3, - v1_9_R2, v1_10_R1, v1_11_R1, v1_12_R1, diff --git a/nmshandler/src/main/java/net/aufdemrand/denizen/nms/abstracts/ImprovedOfflinePlayer.java b/nmshandler/src/main/java/net/aufdemrand/denizen/nms/abstracts/ImprovedOfflinePlayer.java index a57472bf66..18d1866b88 100644 --- a/nmshandler/src/main/java/net/aufdemrand/denizen/nms/abstracts/ImprovedOfflinePlayer.java +++ b/nmshandler/src/main/java/net/aufdemrand/denizen/nms/abstracts/ImprovedOfflinePlayer.java @@ -107,13 +107,11 @@ public void setLocation(Location location) { } public float getHealthFloat() { - String id = NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) ? "Health" : "HealF"; - return this.compound.getFloat(id); + return this.compound.getFloat("Health"); } public void setHealthFloat(float input) { - String id = NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) ? "Health" : "HealF"; - this.compound = compound.createBuilder().putFloat(id, input).build(); + this.compound = compound.createBuilder().putFloat("Health", input).build(); if (this.autosave) { savePlayerData(); } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java b/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java index 7a56321064..50d3712841 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java @@ -614,9 +614,7 @@ public void onEnable() { ScriptEvent.registerScriptEvent(new ChunkUnloadScriptEvent()); ScriptEvent.registerScriptEvent(new CreeperPoweredScriptEvent()); ScriptEvent.registerScriptEvent(new EntityBreaksHangingScriptEvent()); - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_10_R1)) { - ScriptEvent.registerScriptEvent(new EntityBreedScriptEvent()); - } + ScriptEvent.registerScriptEvent(new EntityBreedScriptEvent()); ScriptEvent.registerScriptEvent(new EntityChangesBlockScriptEvent()); ScriptEvent.registerScriptEvent(new EntityCombustsScriptEvent()); ScriptEvent.registerScriptEvent(new EntityCreatePortalScriptEvent()); @@ -631,9 +629,7 @@ public void onEnable() { ScriptEvent.registerScriptEvent(new EntityExplosionPrimesScriptEvent()); ScriptEvent.registerScriptEvent(new EntityFoodLevelChangeScriptEvent()); ScriptEvent.registerScriptEvent(new EntityFormsBlockScriptEvent()); - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2)) { - ScriptEvent.registerScriptEvent(new EntityGlideScriptEvent()); - } + ScriptEvent.registerScriptEvent(new EntityGlideScriptEvent()); ScriptEvent.registerScriptEvent(new EntityHealsScriptEvent()); ScriptEvent.registerScriptEvent(new EntityInteractScriptEvent()); ScriptEvent.registerScriptEvent(new EntityKilledScriptEvent()); @@ -662,9 +658,7 @@ public void onEnable() { ScriptEvent.registerScriptEvent(new ItemSpawnsScriptEvent()); ScriptEvent.registerScriptEvent(new LeafDecaysScriptEvent()); ScriptEvent.registerScriptEvent(new LightningStrikesScriptEvent()); - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2)) { - ScriptEvent.registerScriptEvent(new LingeringPotionSplashScriptEvent()); - } + ScriptEvent.registerScriptEvent(new LingeringPotionSplashScriptEvent()); ScriptEvent.registerScriptEvent(new LiquidSpreadScriptEvent()); ScriptEvent.registerScriptEvent(new ListPingScriptEvent()); ScriptEvent.registerScriptEvent(new PigZappedScriptEvent()); @@ -721,10 +715,8 @@ public void onEnable() { } ScriptEvent.registerScriptEvent(new PlayerReceivesMessageScriptEvent()); ScriptEvent.registerScriptEvent(new PlayerRespawnsScriptEvent()); - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2)) { - ScriptEvent.registerScriptEvent(new PlayerRightClicksAtEntityScriptEvent()); - ScriptEvent.registerScriptEvent(new PlayerSwapsItemsScriptEvent()); - } + ScriptEvent.registerScriptEvent(new PlayerRightClicksAtEntityScriptEvent()); + ScriptEvent.registerScriptEvent(new PlayerSwapsItemsScriptEvent()); ScriptEvent.registerScriptEvent(new PlayerRightClicksEntityScriptEvent()); ScriptEvent.registerScriptEvent(new PlayerShearsScriptEvent()); ScriptEvent.registerScriptEvent(new PlayerSneakScriptEvent()); @@ -733,9 +725,7 @@ public void onEnable() { ScriptEvent.registerScriptEvent(new PlayerStatisticIncrementsScriptEvent()); ScriptEvent.registerScriptEvent(new PlayerSteersEntityScriptEvent()); ScriptEvent.registerScriptEvent(new PlayerStepsOnScriptEvent()); - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2)) { - ScriptEvent.registerScriptEvent(new PlayerTabCompleteScriptEvent()); - } + ScriptEvent.registerScriptEvent(new PlayerTabCompleteScriptEvent()); ScriptEvent.registerScriptEvent(new PlayerTakesFromFurnaceScriptEvent()); ScriptEvent.registerScriptEvent(new PlayerThrowsEggScriptEvent()); ScriptEvent.registerScriptEvent(new PlayerUsesPortalScriptEvent()); @@ -817,18 +807,14 @@ public void onEnable() { PropertyParser.registerProperty(EntityAI.class, dEntity.class); PropertyParser.registerProperty(EntityAnger.class, dEntity.class); PropertyParser.registerProperty(EntityAngry.class, dEntity.class); - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2)) { - PropertyParser.registerProperty(EntityAreaEffectCloud.class, dEntity.class); - PropertyParser.registerProperty(EntityArmorBonus.class, dEntity.class); - PropertyParser.registerProperty(EntityInvulnerable.class, dEntity.class); - PropertyParser.registerProperty(EntityBoatType.class, dEntity.class); - } + PropertyParser.registerProperty(EntityAreaEffectCloud.class, dEntity.class); + PropertyParser.registerProperty(EntityArmorBonus.class, dEntity.class); + PropertyParser.registerProperty(EntityInvulnerable.class, dEntity.class); + PropertyParser.registerProperty(EntityBoatType.class, dEntity.class); PropertyParser.registerProperty(EntityArmorPose.class, dEntity.class); PropertyParser.registerProperty(EntityArms.class, dEntity.class); PropertyParser.registerProperty(EntityBasePlate.class, dEntity.class); - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2)) { - PropertyParser.registerProperty(EntityBeamTarget.class, dEntity.class); - } + PropertyParser.registerProperty(EntityBeamTarget.class, dEntity.class); PropertyParser.registerProperty(EntityBodyArrows.class, dEntity.class); PropertyParser.registerProperty(EntityBoundingBox.class, dEntity.class); PropertyParser.registerProperty(EntityChestCarrier.class, dEntity.class); @@ -845,9 +831,7 @@ public void onEnable() { PropertyParser.registerProperty(EntityHealth.class, dEntity.class); PropertyParser.registerProperty(EntityInfected.class, dEntity.class); PropertyParser.registerProperty(EntityInventory.class, dEntity.class); - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2)) { - PropertyParser.registerProperty(EntityIsShowingBottom.class, dEntity.class); - } + PropertyParser.registerProperty(EntityIsShowingBottom.class, dEntity.class); PropertyParser.registerProperty(EntityItem.class, dEntity.class); PropertyParser.registerProperty(EntityJumpStrength.class, dEntity.class); PropertyParser.registerProperty(EntityKnockback.class, dEntity.class); @@ -895,25 +879,19 @@ public void onEnable() { PropertyParser.registerProperty(ItemFirework.class, dItem.class); PropertyParser.registerProperty(ItemFlags.class, dItem.class); PropertyParser.registerProperty(ItemInventory.class, dItem.class); - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_10_R1)) { - PropertyParser.registerProperty(ItemLock.class, dItem.class); - } + PropertyParser.registerProperty(ItemLock.class, dItem.class); PropertyParser.registerProperty(ItemLore.class, dItem.class); PropertyParser.registerProperty(ItemMap.class, dItem.class); PropertyParser.registerProperty(ItemNBT.class, dItem.class); PropertyParser.registerProperty(ItemAttributeNBT.class, dItem.class); PropertyParser.registerProperty(ItemPatterns.class, dItem.class); PropertyParser.registerProperty(ItemPlantgrowth.class, dItem.class); - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2)) { - PropertyParser.registerProperty(ItemPotion.class, dItem.class); - } + PropertyParser.registerProperty(ItemPotion.class, dItem.class); PropertyParser.registerProperty(ItemQuantity.class, dItem.class); PropertyParser.registerProperty(ItemScript.class, dItem.class); PropertyParser.registerProperty(ItemSignContents.class, dItem.class); PropertyParser.registerProperty(ItemSkullskin.class, dItem.class); - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2)) { - PropertyParser.registerProperty(ItemSpawnEgg.class, dItem.class); - } + PropertyParser.registerProperty(ItemSpawnEgg.class, dItem.class); PropertyParser.registerProperty(ItemUnbreakable.class, dItem.class); if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13_R2)) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerClicksBlockScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerClicksBlockScriptEvent.java index 9906618b2b..4e78f8eb52 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerClicksBlockScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerClicksBlockScriptEvent.java @@ -220,7 +220,7 @@ public void playerClicksBlock(PlayerInteractEvent event) { if (event.getAction() == Action.PHYSICAL) { return; } - hand = new Element(NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) ? event.getHand().name() : "HAND"); + hand = new Element(event.getHand().name()); item = new dItem(event.getItem()); location = event.hasBlock() ? new dLocation(event.getClickedBlock().getLocation()) : null; relative = event.hasBlock() ? new dLocation(event.getClickedBlock().getRelative(event.getBlockFace()).getLocation()) : null; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksEntityScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksEntityScriptEvent.java index 057daee2a6..6f78409fc6 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksEntityScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksEntityScriptEvent.java @@ -118,7 +118,7 @@ else if (name.equals("cuboids")) { @EventHandler public void playerRightClicksEntity(PlayerInteractEntityEvent event) { - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) && event.getHand() == EquipmentSlot.OFF_HAND) { + if (event.getHand() == EquipmentSlot.OFF_HAND) { return; } entity = new dEntity(event.getRightClicked()); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/dEntity.java index 63d579512f..47826a25a3 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/objects/dEntity.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/dEntity.java @@ -2115,7 +2115,7 @@ else if (mtr.angle == BlockFace.EAST) { // @description // Returns whether the entity is collidable. // --> - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) && attribute.startsWith("is_collidable")) { + if (attribute.startsWith("is_collidable")) { return new Element(getLivingEntity().isCollidable()) .getAttribute(attribute.fulfill(1)); } @@ -2271,7 +2271,7 @@ && getBukkitEntity() instanceof Item) { // @description // Returns whether this entity is gliding. // --> - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) && attribute.startsWith("gliding")) { + if (attribute.startsWith("gliding")) { return new Element(getLivingEntity().isGliding()) .getAttribute(attribute.fulfill(1)); } @@ -2297,7 +2297,7 @@ && getBukkitEntity() instanceof Item) { // @description // Returns whether this entity is glowing. // --> - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) && attribute.startsWith("glowing")) { + if (attribute.startsWith("glowing")) { return new Element(getBukkitEntity().isGlowing()) .getAttribute(attribute.fulfill(1)); } @@ -2908,7 +2908,7 @@ && getBukkitEntity() instanceof Sheep) { // @tags // // --> - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) && mechanism.matches("collidable") + if (mechanism.matches("collidable") && mechanism.requireBoolean()) { getLivingEntity().setCollidable(mechanism.getValue().asBoolean()); } @@ -3015,7 +3015,7 @@ && getBukkitEntity() instanceof Sheep) { // @tags // // --> - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) && mechanism.matches("gliding") && mechanism.requireBoolean()) { + if (mechanism.matches("gliding") && mechanism.requireBoolean()) { getLivingEntity().setGliding(mechanism.getValue().asBoolean()); } @@ -3028,7 +3028,7 @@ && getBukkitEntity() instanceof Sheep) { // @tags // // --> - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) && mechanism.matches("glowing") && mechanism.requireBoolean()) { + if (mechanism.matches("glowing") && mechanism.requireBoolean()) { getBukkitEntity().setGlowing(mechanism.getValue().asBoolean()); if (Depends.citizens != null && CitizensAPI.getNPCRegistry().isNPC(getLivingEntity())) { CitizensAPI.getNPCRegistry().getNPC(getLivingEntity()).data().setPersistent(NPC.GLOWING_METADATA, mechanism.getValue().asBoolean()); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/dInventory.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/dInventory.java index c3ae8a763b..2d17bb1789 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/objects/dInventory.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/dInventory.java @@ -697,7 +697,7 @@ public ItemStack[] getContents() { public ItemStack[] getStorageContents() { if (inventory != null) { - return NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) ? inventory.getStorageContents() : inventory.getContents(); + return inventory.getStorageContents(); } else { return new ItemStack[0]; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/dLocation.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/dLocation.java index bd6052b0ae..f063463917 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/objects/dLocation.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/dLocation.java @@ -786,8 +786,7 @@ public String getAttribute(Attribute attribute) { // @description // Returns the password to a locked container. // --> - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_10_R1) - && attribute.startsWith("lock") && getBlock().getState() instanceof Lockable) { + if (attribute.startsWith("lock") && getBlock().getState() instanceof Lockable) { Lockable lock = (Lockable) getBlock().getState(); return new Element(lock.isLocked() ? lock.getLock() : null) .getAttribute(attribute.fulfill(1)); @@ -800,8 +799,7 @@ public String getAttribute(Attribute attribute) { // @description // Returns whether the container is locked. // --> - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_10_R1) - && attribute.startsWith("is_locked") && getBlock().getState() instanceof Lockable) { + if (attribute.startsWith("is_locked") && getBlock().getState() instanceof Lockable) { return new Element(((Lockable) getBlock().getState()).isLocked()) .getAttribute(attribute.fulfill(1)); } @@ -813,8 +811,7 @@ public String getAttribute(Attribute attribute) { // @description // Returns whether the container is lockable. // --> - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_10_R1) - && attribute.startsWith("is_lockable")) { + if (attribute.startsWith("is_lockable")) { return new Element(getBlock().getState() instanceof Lockable) .getAttribute(attribute.fulfill(1)); } @@ -2471,8 +2468,7 @@ && getBlock().getState() instanceof CreatureSpawner) { // // // --> - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_10_R1) - && mechanism.matches("lock") && getBlock().getState() instanceof Lockable) { + if (mechanism.matches("lock") && getBlock().getState() instanceof Lockable) { BlockState state = getBlock().getState(); ((Lockable) state).setLock(mechanism.hasValue() ? mechanism.getValue().asString() : null); state.update(); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java index 0800649eb1..e05ed78d31 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java @@ -325,8 +325,7 @@ public MaterialData getMaterialData() { } public boolean isStructure() { - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) - && material == Material.CHORUS_PLANT) { + if (material == Material.CHORUS_PLANT) { return true; } else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13_R2) diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java index 511ec79469..fb1c3ee695 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java @@ -1715,11 +1715,6 @@ && getPlayerEntity().getOpenInventory().getTopInventory() instanceof MerchantInv if (attribute.startsWith("attack_cooldown")) { attribute.fulfill(1); - if (!NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2)) { - dB.echoError("Attack cooldowns don't exist prior to 1.9."); - return null; - } - // <--[tag] // @attribute // @returns Duration @@ -2485,12 +2480,7 @@ public void adjust(Mechanism mechanism) { // // --> if (mechanism.matches("redo_attack_cooldown")) { - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2)) { - NMSHandler.getInstance().getPlayerHelper().setAttackCooldown(getPlayerEntity(), 0); - } - else { - dB.echoError("Attack cooldowns don't exist prior to 1.9."); - } + NMSHandler.getInstance().getPlayerHelper().setAttackCooldown(getPlayerEntity(), 0); } // <--[mechanism] @@ -2507,14 +2497,8 @@ public void adjust(Mechanism mechanism) { // // --> if (mechanism.matches("reset_attack_cooldown")) { - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2)) { - PlayerHelper playerHelper = NMSHandler.getInstance().getPlayerHelper(); - playerHelper.setAttackCooldown(getPlayerEntity(), - Math.round(playerHelper.getMaxAttackCooldownTicks(getPlayerEntity()))); - } - else { - dB.echoError("Attack cooldowns don't exist prior to 1.9."); - } + PlayerHelper playerHelper = NMSHandler.getInstance().getPlayerHelper(); + playerHelper.setAttackCooldown(getPlayerEntity(), Math.round(playerHelper.getMaxAttackCooldownTicks(getPlayerEntity()))); } // <--[mechanism] @@ -2531,20 +2515,15 @@ public void adjust(Mechanism mechanism) { // // --> if (mechanism.matches("attack_cooldown_percent") && mechanism.requireFloat()) { - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2)) { - float percent = mechanism.getValue().asFloat(); - System.out.println(percent + " >> " + (percent >= 0 && percent <= 1)); - if (percent >= 0 && percent <= 1) { - PlayerHelper playerHelper = NMSHandler.getInstance().getPlayerHelper(); - playerHelper.setAttackCooldown(getPlayerEntity(), - Math.round(playerHelper.getMaxAttackCooldownTicks(getPlayerEntity()) * mechanism.getValue().asFloat())); - } - else { - dB.echoError("Invalid percentage! \"" + percent + "\" is not between 0 and 1!"); - } + float percent = mechanism.getValue().asFloat(); + System.out.println(percent + " >> " + (percent >= 0 && percent <= 1)); + if (percent >= 0 && percent <= 1) { + PlayerHelper playerHelper = NMSHandler.getInstance().getPlayerHelper(); + playerHelper.setAttackCooldown(getPlayerEntity(), + Math.round(playerHelper.getMaxAttackCooldownTicks(getPlayerEntity()) * mechanism.getValue().asFloat())); } else { - dB.echoError("Attack cooldowns don't exist prior to 1.9."); + dB.echoError("Invalid percentage! \"" + percent + "\" is not between 0 and 1!"); } } @@ -2562,13 +2541,8 @@ public void adjust(Mechanism mechanism) { // // --> if (mechanism.matches("attack_cooldown") && mechanism.requireObject(Duration.class)) { - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2)) { - NMSHandler.getInstance().getPlayerHelper().setAttackCooldown(getPlayerEntity(), - mechanism.getValue().asType(Duration.class).getTicksAsInt()); - } - else { - dB.echoError("Attack cooldowns don't exist prior to 1.9."); - } + NMSHandler.getInstance().getPlayerHelper().setAttackCooldown(getPlayerEntity(), + mechanism.getValue().asType(Duration.class).getTicksAsInt()); } // <--[mechanism] @@ -3175,7 +3149,7 @@ else if (split.length > 1) { // The book can safely be removed from the player's offhand // without the player closing the book. // --> - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) && mechanism.matches("open_offhand_book")) { + if (mechanism.matches("open_offhand_book")) { NMSHandler.getInstance().getPacketHelper().openBook(getPlayerEntity(), EquipmentSlot.OFF_HAND); } @@ -3186,7 +3160,7 @@ else if (split.length > 1) { // @description // Displays a book to a player. // --> - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) && mechanism.matches("show_book") + if (mechanism.matches("show_book") && mechanism.requireObject(dItem.class)) { dItem book = mechanism.valueAsType(dItem.class); if (!book.getItemStack().hasItemMeta() || !(book.getItemStack().getItemMeta() instanceof BookMeta)) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityGravity.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityGravity.java index a2bae2ba50..891788834e 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityGravity.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityGravity.java @@ -13,10 +13,7 @@ public class EntityGravity implements Property { public static boolean describes(dObject entity) { - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_10_R1)) { - return entity instanceof dEntity; - } - return entity instanceof dEntity && ((dEntity) entity).getBukkitEntity() instanceof ArmorStand; + return entity instanceof dEntity; } public static EntityGravity getFrom(dObject entity) { @@ -53,16 +50,7 @@ private EntityGravity(dEntity entity) { @Override public String getPropertyString() { - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_10_R1)) { - if (dentity.getBukkitEntity().hasGravity()) { - return null; - } - else { - return "false"; - } - } - - if (((ArmorStand) dentity.getBukkitEntity()).hasGravity()) { + if (dentity.getBukkitEntity().hasGravity()) { return null; } else { @@ -95,11 +83,7 @@ public String getAttribute(Attribute attribute) { // Returns whether the entity has gravity. // --> if (attribute.startsWith("gravity")) { - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_10_R1)) { - return new Element(dentity.getBukkitEntity().hasGravity()) - .getAttribute(attribute.fulfill(1)); - } - return new Element(((ArmorStand) dentity.getBukkitEntity()).hasGravity()) + return new Element(dentity.getBukkitEntity().hasGravity()) .getAttribute(attribute.fulfill(1)); } @@ -120,12 +104,7 @@ public void adjust(Mechanism mechanism) { // --> if (mechanism.matches("gravity") && mechanism.requireBoolean()) { - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_10_R1)) { - dentity.getBukkitEntity().setGravity(mechanism.getValue().asBoolean()); - } - else { - ((ArmorStand) dentity.getBukkitEntity()).setGravity(mechanism.getValue().asBoolean()); - } + dentity.getBukkitEntity().setGravity(mechanism.getValue().asBoolean()); } } } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPotionEffects.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPotionEffects.java index dcdfe50855..ad1e588d0d 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPotionEffects.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPotionEffects.java @@ -1,7 +1,5 @@ package net.aufdemrand.denizen.objects.properties.entity; -import net.aufdemrand.denizen.nms.NMSHandler; -import net.aufdemrand.denizen.nms.NMSVersion; import net.aufdemrand.denizen.objects.dEntity; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizencore.objects.Element; @@ -24,8 +22,7 @@ public class EntityPotionEffects implements Property { public static boolean describes(dObject object) { return object instanceof dEntity && (((dEntity) object).isLivingEntity() - || ((NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) - && ((dEntity) object).getBukkitEntityType() == EntityType.TIPPED_ARROW))); + || ((dEntity) object).getBukkitEntityType() == EntityType.TIPPED_ARROW); } public static EntityPotionEffects getFrom(dObject object) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityProfession.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityProfession.java index 998c728f84..b58c5c57b0 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityProfession.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityProfession.java @@ -22,8 +22,7 @@ public static boolean describes(dObject entity) { return false; } return ((dEntity) entity).getBukkitEntityType() == EntityType.VILLAGER - || (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) - && ((dEntity) entity).getBukkitEntityType() == EntityType.ZOMBIE) + || ((dEntity) entity).getBukkitEntityType() == EntityType.ZOMBIE || (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_11_R1) && ((dEntity) entity).getBukkitEntityType() == EntityType.ZOMBIE_VILLAGER); } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemColor.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemColor.java index b489e078cb..4a962f6076 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemColor.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemColor.java @@ -22,10 +22,9 @@ public static boolean describes(dObject item) { || ((dItem) item).getItemStack().getType() == Material.LEATHER_CHESTPLATE || ((dItem) item).getItemStack().getType() == Material.LEATHER_HELMET || ((dItem) item).getItemStack().getType() == Material.LEATHER_LEGGINGS - || (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) - && (((dItem) item).getItemStack().getType() == Material.POTION + || ((dItem) item).getItemStack().getType() == Material.POTION || ((dItem) item).getItemStack().getType() == Material.SPLASH_POTION - || ((dItem) item).getItemStack().getType() == Material.LINGERING_POTION))); + || ((dItem) item).getItemStack().getType() == Material.LINGERING_POTION); } public static ItemColor getFrom(dObject _item) { @@ -69,10 +68,9 @@ public String getAttribute(Attribute attribute) { // --> if (attribute.startsWith("color") || attribute.startsWith("dye_color")) { Material mat = item.getItemStack().getType(); - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) - && (mat == Material.POTION + if (mat == Material.POTION || mat == Material.LINGERING_POTION - || mat == Material.SPLASH_POTION)) { + || mat == Material.SPLASH_POTION) { PotionMeta pm = (PotionMeta) item.getItemStack().getItemMeta(); if (!pm.hasColor()) { return new dColor(Color.WHITE).getAttribute(attribute.fulfill((1))); @@ -89,10 +87,9 @@ public String getAttribute(Attribute attribute) { @Override public String getPropertyString() { Material mat = item.getItemStack().getType(); - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) - && (mat == Material.POTION + if (mat == Material.POTION || mat == Material.LINGERING_POTION - || mat == Material.SPLASH_POTION)) { + || mat == Material.SPLASH_POTION) { PotionMeta pm = (PotionMeta) item.getItemStack().getItemMeta(); if (!pm.hasColor()) { return null; @@ -124,10 +121,9 @@ public void adjust(Mechanism mechanism) { || mechanism.matches("color")) && (mechanism.requireObject(dColor.class))) { dColor color = mechanism.valueAsType(dColor.class); Material mat = item.getItemStack().getType(); - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) - && (mat == Material.POTION + if (mat == Material.POTION || mat == Material.LINGERING_POTION - || mat == Material.SPLASH_POTION)) { + || mat == Material.SPLASH_POTION) { PotionMeta meta = (PotionMeta) item.getItemStack().getItemMeta(); meta.setColor(color.getColor()); item.getItemStack().setItemMeta(meta); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemPotion.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemPotion.java index 05615ba9c8..6d4c2100c5 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemPotion.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemPotion.java @@ -27,10 +27,9 @@ public class ItemPotion implements Property { public static boolean describes(dObject item) { return item instanceof dItem && (((dItem) item).getItemStack().getType() == Material.POTION - || (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) - && (((dItem) item).getItemStack().getType() == Material.SPLASH_POTION + || ((dItem) item).getItemStack().getType() == Material.SPLASH_POTION || ((dItem) item).getItemStack().getType() == Material.LINGERING_POTION - || ((dItem) item).getItemStack().getType() == Material.TIPPED_ARROW))); + || ((dItem) item).getItemStack().getType() == Material.TIPPED_ARROW); } public static ItemPotion getFrom(dObject _item) { @@ -211,10 +210,6 @@ public String getAttribute(Attribute attribute) { dB.echoError("Custom effects with the color option are not supported as of Minecraft version 1.13."); return null; } - else if (!NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2)) { - dB.echoError("Custom effects with the color option are not supported before Minecraft version 1.9."); - return null; - } return new dColor(meta.getCustomEffects().get(potN).getColor()) .getAttribute(attribute.fulfill(1)); } @@ -360,21 +355,19 @@ public void adjust(Mechanism mechanism) { Color color = null; boolean icon = false; if (d2.length > 5) { - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2)) { - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13_R2)) { - Element check = new Element(d2[5]); - if (check.isBoolean()) { - icon = check.asBoolean(); - } - else { - dB.echoError("Custom effects with the color option are not supported as of Minecraft version 1.13."); - } + if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13_R2)) { + Element check = new Element(d2[5]); + if (check.isBoolean()) { + icon = check.asBoolean(); } else { - String check = d2[5].replace("&comma", ","); - if (dColor.matches(check)) { - color = dColor.valueOf(check).getColor(); - } + dB.echoError("Custom effects with the color option are not supported as of Minecraft version 1.13."); + } + } + else { + String check = d2[5].replace("&comma", ","); + if (dColor.matches(check)) { + color = dColor.valueOf(check).getColor(); } } } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/BukkitCommandRegistry.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/BukkitCommandRegistry.java index 85531b2a97..1456072235 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/BukkitCommandRegistry.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/BukkitCommandRegistry.java @@ -576,10 +576,8 @@ public void registerCoreMembers() { // Delete the boss bar. // - bossbar remove MyMessageID // --> - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2)) { - registerCoreMember(BossBarCommand.class, - "BOSSBAR", "bossbar ({create}/update/remove) [] (players:|...) (title:) (progress:<#.#>) (color:<color>) (style:<style>) (flags:<flag>|...)", 1); - } + registerCoreMember(BossBarCommand.class, + "BOSSBAR", "bossbar ({create}/update/remove) [<id>] (players:<player>|...) (title:<title>) (progress:<#.#>) (color:<color>) (style:<style>) (flags:<flag>|...)", 1); // <--[command] @@ -1698,10 +1696,8 @@ public void registerCoreMembers() { // Use to make the player's target not glow. // - glow <player.target> false // --> - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2)) { - registerCoreMember(GlowCommand.class, - "GLOW", "glow [<entity>|...] (<should glow>)", 1); - } + registerCoreMember(GlowCommand.class, + "GLOW", "glow [<entity>|...] (<should glow>)", 1); // <--[command] diff --git a/plugin/src/main/java/net/aufdemrand/denizen/utilities/MaterialCompat.java b/plugin/src/main/java/net/aufdemrand/denizen/utilities/MaterialCompat.java index d781313d24..cee4ab2867 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/utilities/MaterialCompat.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/utilities/MaterialCompat.java @@ -130,7 +130,7 @@ public static ItemStack updateItem(int oldMat, byte bit) { } public static boolean isBannerOrShield(Material material) { - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) && material == Material.SHIELD) { + if (material == Material.SHIELD) { return true; } else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13_R2)) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/utilities/nbt/CustomNBT.java b/plugin/src/main/java/net/aufdemrand/denizen/utilities/nbt/CustomNBT.java index d43a546074..8a106a9c42 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/utilities/nbt/CustomNBT.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/utilities/nbt/CustomNBT.java @@ -33,9 +33,7 @@ public static MapOfEnchantments getEnchantments(ItemStack item) { slotMap.put(EquipmentSlot.LEGS, 2); slotMap.put(EquipmentSlot.CHEST, 3); slotMap.put(EquipmentSlot.HEAD, 4); - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2)) { - slotMap.put(EquipmentSlot.OFF_HAND, 5); - } + slotMap.put(EquipmentSlot.OFF_HAND, 5); } /* diff --git a/plugin/src/main/java/net/aufdemrand/denizen/utilities/world/DenizenWorldAccess.java b/plugin/src/main/java/net/aufdemrand/denizen/utilities/world/DenizenWorldAccess.java index bd800aeed8..1ac356e135 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/utilities/world/DenizenWorldAccess.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/utilities/world/DenizenWorldAccess.java @@ -17,7 +17,7 @@ public class DenizenWorldAccess implements WorldAccess { @Override public void despawn(Entity entity) { try { - if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) && entity instanceof LivingEntity) { + if (entity instanceof LivingEntity) { GlowCommand.unGlow((LivingEntity) entity); } if (dEntity.isCitizensNPC(entity)) {