Skip to content

Commit

Permalink
remove 1.8/1.9 related nmsversion checks
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Mar 23, 2019
1 parent 6d21efd commit db65fe3
Show file tree
Hide file tree
Showing 19 changed files with 79 additions and 178 deletions.
2 changes: 0 additions & 2 deletions nmshandler/src/main/java/net/aufdemrand/denizen/nms/NMSVersion.java
View file
Expand Up @@ -3,8 +3,6 @@
public enum NMSVersion {

NOT_SUPPORTED,
v1_8_R3,
v1_9_R2,
v1_10_R1,
v1_11_R1,
v1_12_R1,
Expand Down
6 changes: 2 additions & 4 deletions nmshandler/src/main/java/net/aufdemrand/denizen/nms/abstracts/ImprovedOfflinePlayer.java
View file
Expand Up @@ -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();
}
Expand Down
52 changes: 15 additions & 37 deletions plugin/src/main/java/net/aufdemrand/denizen/Denizen.java
View file
Expand Up @@ -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());
Expand All @@ -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());
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand All @@ -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());
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerClicksBlockScriptEvent.java
View file
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksEntityScriptEvent.java
View file
Expand Up @@ -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());
Expand Down
12 changes: 6 additions & 6 deletions plugin/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
View file
Expand Up @@ -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));
}
Expand Down Expand Up @@ -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));
}
Expand All @@ -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));
}
Expand Down Expand Up @@ -2908,7 +2908,7 @@ && getBukkitEntity() instanceof Sheep) {
// @tags
// <e@entity.is_collidable>
// -->
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) && mechanism.matches("collidable")
if (mechanism.matches("collidable")
&& mechanism.requireBoolean()) {
getLivingEntity().setCollidable(mechanism.getValue().asBoolean());
}
Expand Down Expand Up @@ -3015,7 +3015,7 @@ && getBukkitEntity() instanceof Sheep) {
// @tags
// <e@entity.gliding>
// -->
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_9_R2) && mechanism.matches("gliding") && mechanism.requireBoolean()) {
if (mechanism.matches("gliding") && mechanism.requireBoolean()) {
getLivingEntity().setGliding(mechanism.getValue().asBoolean());
}

Expand All @@ -3028,7 +3028,7 @@ && getBukkitEntity() instanceof Sheep) {
// @tags
// <e@entity.glowing>
// -->
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());
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/net/aufdemrand/denizen/objects/dInventory.java
View file
Expand Up @@ -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];
Expand Down
12 changes: 4 additions & 8 deletions plugin/src/main/java/net/aufdemrand/denizen/objects/dLocation.java
View file
Expand Up @@ -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));
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand Down Expand Up @@ -2471,8 +2468,7 @@ && getBlock().getState() instanceof CreatureSpawner) {
// <l@location.is_locked>
// <l@location.is_lockable>
// -->
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();
Expand Down
3 changes: 1 addition & 2 deletions plugin/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java
View file
Expand Up @@ -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)
Expand Down

0 comments on commit db65fe3

Please sign in to comment.