Skip to content

Commit

Permalink
removal of 1.14 and 1.15 part 3: todos and version checks
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Feb 5, 2022
1 parent f8e13e9 commit bf8e23b
Show file tree
Hide file tree
Showing 27 changed files with 182 additions and 391 deletions.
6 changes: 2 additions & 4 deletions paper/src/main/java/com/denizenscript/denizen/paper/PaperModule.java
View file
Expand Up @@ -55,10 +55,8 @@ public static void init() {
PropertyParser.registerProperty(EntityArmsRaised.class, EntityTag.class);
PropertyParser.registerProperty(EntityCanTick.class, EntityTag.class);
PropertyParser.registerProperty(EntityCarryingEgg.class, EntityTag.class);
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16)) {
PropertyParser.registerProperty(EntityDrinkingPotion.class, EntityTag.class);
PropertyParser.registerProperty(EntityWitherInvulnerable.class, EntityTag.class);
}
PropertyParser.registerProperty(EntityDrinkingPotion.class, EntityTag.class);
PropertyParser.registerProperty(EntityWitherInvulnerable.class, EntityTag.class);
PropertyParser.registerProperty(ItemArmorStand.class, ItemTag.class);

// Paper extension properties
Expand Down
6 changes: 2 additions & 4 deletions plugin/src/main/java/com/denizenscript/denizen/Denizen.java
View file
Expand Up @@ -423,7 +423,7 @@ else if (javaVersion.startsWith("17")) {
DenizenCore.tick(50); // Sadly, minecraft has no delta timing, so a tick is always 50ms.
}, 1, 1);
InventoryTag.setupInventoryTracker();
if (!MapTagBasedFlagTracker.skipAllCleanings && NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16)) {
if (!MapTagBasedFlagTracker.skipAllCleanings) {
BukkitWorldScriptHelper.cleanAllWorldChunkFlags();
}
Bukkit.getPluginManager().registerEvents(new PlayerFlagHandler(), this);
Expand Down Expand Up @@ -596,9 +596,7 @@ public ChunkGenerator getDefaultWorldGenerator(String worldName, String id) {
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_17)) {
return new VoidGenerator1_17();
}
else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16)) {
return new VoidGenerator();
}
return new VoidGenerator();
}
return null;
}
Expand Down
14 changes: 4 additions & 10 deletions plugin/src/main/java/com/denizenscript/denizen/events/ScriptEventRegistry.java
View file
Expand Up @@ -116,9 +116,7 @@ public static void registerMainEvents() {
ScriptEvent.registerScriptEvent(FireworkBurstsScriptEvent.class);
ScriptEvent.registerScriptEvent(HangingBreaksScriptEvent.class);
ScriptEvent.registerScriptEvent(HorseJumpsScriptEvent.class);
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16)) {
ScriptEvent.registerScriptEvent(PiglinBarterScriptEvent.class);
}
ScriptEvent.registerScriptEvent(PiglinBarterScriptEvent.class);
ScriptEvent.registerScriptEvent(PigZappedScriptEvent.class);
ScriptEvent.registerScriptEvent(ProjectileHitsBlockScriptEvent.class);
ScriptEvent.registerScriptEvent(ProjectileHitsEntityScriptEvent.class);
Expand Down Expand Up @@ -200,10 +198,8 @@ public static void registerMainEvents() {
ScriptEvent.registerScriptEvent(PlayerRightClicksEntityScriptEvent.class);
ScriptEvent.registerScriptEvent(PlayerRiptideScriptEvent.class);
ScriptEvent.registerScriptEvent(PlayerShearsScriptEvent.class);
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16)) {
ScriptEvent.registerScriptEvent(PlayerSmithsItemScriptEvent.class);
ScriptEvent.registerScriptEvent(PlayersPrepareSmithingTableScriptEvent.class);
}
ScriptEvent.registerScriptEvent(PlayerSmithsItemScriptEvent.class);
ScriptEvent.registerScriptEvent(PlayersPrepareSmithingTableScriptEvent.class);
ScriptEvent.registerScriptEvent(PlayerSneakScriptEvent.class);
ScriptEvent.registerScriptEvent(PlayerSprintScriptEvent.class);
ScriptEvent.registerScriptEvent(PlayerStandsOnScriptEvent.class);
Expand Down Expand Up @@ -242,9 +238,7 @@ public static void registerMainEvents() {
ScriptEvent.registerScriptEvent(ChunkUnloadScriptEvent.class);
ScriptEvent.registerScriptEvent(LightningStrikesScriptEvent.class);
ScriptEvent.registerScriptEvent(LingeringPotionSplashScriptEvent.class);
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_15)) {
ScriptEvent.registerScriptEvent(LootGenerateScriptEvent.class);
}
ScriptEvent.registerScriptEvent(LootGenerateScriptEvent.class);
ScriptEvent.registerScriptEvent(PortalCreateScriptEvent.class);
ScriptEvent.registerScriptEvent(PotionSplashScriptEvent.class);
ScriptEvent.registerScriptEvent(SpawnChangeScriptEvent.class);
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/com/denizenscript/denizen/events/world/ThunderChangesScriptEvent.java
View file
Expand Up @@ -20,7 +20,7 @@ public class ThunderChangesScriptEvent extends BukkitScriptEvent implements List
//
// @Cancellable true
//
// @Triggers when thunder changes in a world.
// @Triggers when thunder starts or stops in a world.
//
// @Context
// <context.world> returns the WorldTag the thunder changed in.
Expand Down
4 changes: 0 additions & 4 deletions plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java
View file
Expand Up @@ -253,10 +253,6 @@ public boolean isLoadedSafe() {

@Override
public AbstractFlagTracker getFlagTracker() {
if (!NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16)) {
Debug.echoError("Chunk flags are only available in 1.16+");
return null;
}
return new DataPersistenceFlagTracker(getChunk(), "flag_chunk_");
}

Expand Down
10 changes: 2 additions & 8 deletions plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
View file
Expand Up @@ -1402,10 +1402,7 @@ public static void registerTags() {
if (object.getLivingEntity() instanceof AbstractHorse) {
return new ItemTag(((AbstractHorse) object.getLivingEntity()).getInventory().getSaddle());
}
else if (NMSHandler.getVersion().isAtMost(NMSVersion.v1_15) && object.getLivingEntity() instanceof Pig) {
return new ItemTag(((Pig) object.getLivingEntity()).hasSaddle() ? Material.SADDLE : Material.AIR);
}
else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16) && object.getLivingEntity() instanceof Steerable) {
else if (object.getLivingEntity() instanceof Steerable) {
return new ItemTag(((Steerable) object.getLivingEntity()).hasSaddle() ? Material.SADDLE : Material.AIR);
}
return null;
Expand Down Expand Up @@ -1436,10 +1433,7 @@ else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16) && object.getLiving
if (object.getLivingEntity() instanceof AbstractHorse) {
return new ElementTag(((AbstractHorse) object.getLivingEntity()).getInventory().getSaddle().getType() == Material.SADDLE);
}
else if (NMSHandler.getVersion().isAtMost(NMSVersion.v1_15) && object.getLivingEntity() instanceof Pig) {
return new ElementTag(((Pig) object.getLivingEntity()).hasSaddle());
}
else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16) && object.getLivingEntity() instanceof Steerable) {
else if (object.getLivingEntity() instanceof Steerable) {
return new ElementTag(((Steerable) object.getLivingEntity()).hasSaddle());
}
return null;
Expand Down
11 changes: 2 additions & 9 deletions plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java
View file
Expand Up @@ -550,10 +550,6 @@ public LocationTag getBlockLocation() {

@Override
public AbstractFlagTracker getFlagTracker() {
if (!NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16)) {
Debug.echoError("Location flags are only available in 1.16+");
return null;
}
if (getWorld() == null) {
return null;
}
Expand Down Expand Up @@ -1217,9 +1213,6 @@ public static void registerTags() {
// -->
tagProcessor.registerTag(LocationTag.class, "highest", (attribute, object) -> {
Location result = object.getHighestBlockForTag(attribute);
if (NMSHandler.getVersion().isAtMost(NMSVersion.v1_14)) {
result = result.subtract(0, 1, 0);
}
return new LocationTag(result);
});

Expand Down Expand Up @@ -3884,10 +3877,10 @@ else if (PolygonTag.matches(attribute.getParam())) {
tagProcessor.registerTag(LocationTag.class, "attached_to", (attribute, object) -> {
BlockFace face = BlockFace.SELF;
MaterialTag material = new MaterialTag(object.getBlockForTag(attribute));
if (material.getMaterial() == Material.TORCH || material.getMaterial() == Material.REDSTONE_TORCH || (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16) && material.getMaterial() == Material.SOUL_TORCH)) {
if (material.getMaterial() == Material.TORCH || material.getMaterial() == Material.REDSTONE_TORCH || material.getMaterial() == Material.SOUL_TORCH) {
face = BlockFace.DOWN;
}
else if (material.getMaterial() == Material.WALL_TORCH || material.getMaterial() == Material.REDSTONE_WALL_TORCH || (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16) && material.getMaterial() == Material.SOUL_WALL_TORCH)) {
else if (material.getMaterial() == Material.WALL_TORCH || material.getMaterial() == Material.REDSTONE_WALL_TORCH || material.getMaterial() == Material.SOUL_WALL_TORCH) {
face = ((Directional) material.getModernData()).getFacing().getOppositeFace();
}
else if (MaterialSwitchFace.describes(material)) {
Expand Down
45 changes: 12 additions & 33 deletions plugin/src/main/java/com/denizenscript/denizen/objects/properties/PropertyRegistry.java
View file
Expand Up @@ -39,20 +39,13 @@ public static void registerMainProperties() {
PropertyParser.registerProperty(EntityAttributeModifiers.class, EntityTag.class);
PropertyParser.registerProperty(EntityArmorPose.class, EntityTag.class);
PropertyParser.registerProperty(EntityArms.class, EntityTag.class);
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_15)) {
PropertyParser.registerProperty(EntityAware.class, EntityTag.class);
}
PropertyParser.registerProperty(EntityAware.class, EntityTag.class);
PropertyParser.registerProperty(EntityBasePlate.class, EntityTag.class);
PropertyParser.registerProperty(EntityBeamTarget.class, EntityTag.class);
PropertyParser.registerProperty(EntityBoatType.class, EntityTag.class);
PropertyParser.registerProperty(EntityBodyArrows.class, EntityTag.class);
PropertyParser.registerProperty(EntityBoundingBox.class, EntityTag.class);
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16)) {
PropertyParser.registerProperty(EntityCanJoinRaid.class, EntityTag.class);
}
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_15)) {
PropertyParser.registerProperty(EntityCannotEnterHive.class, EntityTag.class);
}
PropertyParser.registerProperty(EntityCanJoinRaid.class, EntityTag.class);
PropertyParser.registerProperty(EntityCharged.class, EntityTag.class);
PropertyParser.registerProperty(EntityChestCarrier.class, EntityTag.class);
PropertyParser.registerProperty(EntityColor.class, EntityTag.class);
Expand All @@ -75,25 +68,17 @@ public static void registerMainProperties() {
}
PropertyParser.registerProperty(EntityFixed.class, EntityTag.class);
PropertyParser.registerProperty(EntityFlags.class, EntityTag.class);
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_15)) {
PropertyParser.registerProperty(EntityFlower.class, EntityTag.class);
}
PropertyParser.registerProperty(EntityFlower.class, EntityTag.class);
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_17)) {
PropertyParser.registerProperty(EntityFreezeDuration.class, EntityTag.class);
}
PropertyParser.registerProperty(EntityFramed.class, EntityTag.class);
PropertyParser.registerProperty(EntityGravity.class, EntityTag.class);
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_15)) {
PropertyParser.registerProperty(EntityHasNectar.class, EntityTag.class);
PropertyParser.registerProperty(EntityHasStung.class, EntityTag.class);
}
PropertyParser.registerProperty(EntityHasNectar.class, EntityTag.class);
PropertyParser.registerProperty(EntityHasStung.class, EntityTag.class);
PropertyParser.registerProperty(EntityHealth.class, EntityTag.class);
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_15)) {
PropertyParser.registerProperty(EntityHive.class, EntityTag.class);
}
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16)) {
PropertyParser.registerProperty(EntityImmune.class, EntityTag.class);
}
PropertyParser.registerProperty(EntityHive.class, EntityTag.class);
PropertyParser.registerProperty(EntityImmune.class, EntityTag.class);
PropertyParser.registerProperty(EntityInventory.class, EntityTag.class);
PropertyParser.registerProperty(EntityInvulnerable.class, EntityTag.class);
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_17)) {
Expand Down Expand Up @@ -124,10 +109,8 @@ public static void registerMainProperties() {
PropertyParser.registerProperty(EntityRotation.class, EntityTag.class);
PropertyParser.registerProperty(EntityScoreboardTags.class, EntityTag.class);
PropertyParser.registerProperty(EntitySmall.class, EntityTag.class);
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16)) {
PropertyParser.registerProperty(EntityShivering.class, EntityTag.class);
PropertyParser.registerProperty(EntityShulkerPeek.class, EntityTag.class);
}
PropertyParser.registerProperty(EntityShivering.class, EntityTag.class);
PropertyParser.registerProperty(EntityShulkerPeek.class, EntityTag.class);
PropertyParser.registerProperty(EntitySilent.class, EntityTag.class);
PropertyParser.registerProperty(EntitySitting.class, EntityTag.class);
PropertyParser.registerProperty(EntitySize.class, EntityTag.class);
Expand Down Expand Up @@ -172,10 +155,8 @@ public static void registerMainProperties() {
PropertyParser.registerProperty(ItemInventory.class, ItemTag.class);
PropertyParser.registerProperty(ItemKnowledgeBookRecipes.class, ItemTag.class);
PropertyParser.registerProperty(ItemLock.class, ItemTag.class);
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16)) {
PropertyParser.registerProperty(ItemLodestoneLocation.class, ItemTag.class);
PropertyParser.registerProperty(ItemLodestoneTracked.class, ItemTag.class);
}
PropertyParser.registerProperty(ItemLodestoneLocation.class, ItemTag.class);
PropertyParser.registerProperty(ItemLodestoneTracked.class, ItemTag.class);
PropertyParser.registerProperty(ItemLore.class, ItemTag.class);
PropertyParser.registerProperty(ItemMap.class, ItemTag.class);
PropertyParser.registerProperty(ItemNBT.class, ItemTag.class);
Expand Down Expand Up @@ -218,9 +199,7 @@ public static void registerMainProperties() {
PropertyParser.registerProperty(MaterialPersistent.class, MaterialTag.class);
PropertyParser.registerProperty(MaterialPower.class, MaterialTag.class);
PropertyParser.registerProperty(MaterialShape.class, MaterialTag.class);
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16)) {
PropertyParser.registerProperty(MaterialSides.class, MaterialTag.class);
}
PropertyParser.registerProperty(MaterialSides.class, MaterialTag.class);
PropertyParser.registerProperty(MaterialSnowable.class, MaterialTag.class);
PropertyParser.registerProperty(MaterialSwitchable.class, MaterialTag.class);
PropertyParser.registerProperty(MaterialSwitchFace.class, MaterialTag.class);
Expand Down
5 changes: 1 addition & 4 deletions plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAnger.java
View file
@@ -1,7 +1,5 @@
package com.denizenscript.denizen.objects.properties.entity;

import com.denizenscript.denizen.nms.NMSHandler;
import com.denizenscript.denizen.nms.NMSVersion;
import com.denizenscript.denizen.objects.EntityTag;
import com.denizenscript.denizencore.objects.core.DurationTag;
import com.denizenscript.denizencore.objects.Mechanism;
Expand All @@ -19,8 +17,7 @@ public static boolean describes(ObjectTag entity) {
return false;
}
Entity bukkitEntity = ((EntityTag) entity).getBukkitEntity();
return bukkitEntity instanceof PigZombie ||
(NMSHandler.getVersion().isAtLeast(NMSVersion.v1_15) && bukkitEntity instanceof Bee);
return bukkitEntity instanceof PigZombie || bukkitEntity instanceof Bee;
}

public static EntityAnger getFrom(ObjectTag entity) {
Expand Down

0 comments on commit bf8e23b

Please sign in to comment.