fix playeffect in 1.16

DenizenScript · Jul 6, 2022 · 71a9d36 · 71a9d36
1 parent 936e036
commit 71a9d36
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 28 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
@@ -23,7 +23,6 @@
 import com.denizenscript.denizencore.objects.*;
 import com.denizenscript.denizen.nms.NMSHandler;
 import com.denizenscript.denizen.nms.abstracts.ProfileEditor;
-import com.denizenscript.denizen.nms.interfaces.EntityHelper;
 import com.denizenscript.denizen.nms.interfaces.FakePlayer;
 import com.denizenscript.denizen.npc.traits.MirrorTrait;
 import com.denizenscript.denizencore.objects.core.*;
@@ -46,7 +45,6 @@
 import org.bukkit.entity.*;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.inventory.*;
-import org.bukkit.inventory.meta.MapMeta;
 import org.bukkit.loot.LootTable;
 import org.bukkit.loot.Lootable;
 import org.bukkit.potion.*;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/MaterialTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/MaterialTag.java
@@ -10,7 +10,6 @@
 import com.denizenscript.denizencore.flags.RedirectionFlagTracker;
 import com.denizenscript.denizencore.objects.*;
 import com.denizenscript.denizen.nms.NMSHandler;
-import com.denizenscript.denizen.tags.BukkitTagContext;
 import com.denizenscript.denizencore.objects.core.DurationTag;
 import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.objects.core.ListTag;

diff --git a/...ain/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitElementProperties.java b/...ain/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitElementProperties.java
@@ -13,7 +13,6 @@
 import com.denizenscript.denizencore.utilities.AsciiMatcher;
 import com.denizenscript.denizencore.utilities.CoreUtilities;
 import com.denizenscript.denizen.utilities.implementation.BukkitScriptEntryData;
-import com.denizenscript.denizen.tags.BukkitTagContext;
 import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.objects.Mechanism;
 import com.denizenscript.denizencore.objects.ObjectTag;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/InventoryCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/InventoryCommand.java
@@ -20,7 +20,6 @@
 import com.denizenscript.denizencore.scripts.commands.AbstractCommand;
 import com.denizenscript.denizencore.scripts.commands.core.FlagCommand;
 import com.denizenscript.denizen.utilities.BukkitImplDeprecations;
-import com.denizenscript.denizencore.tags.TagContext;
 import com.denizenscript.denizencore.utilities.data.DataAction;
 import com.denizenscript.denizencore.utilities.data.DataActionHelper;
 import org.bukkit.Bukkit;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlayEffectCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlayEffectCommand.java
@@ -2,13 +2,12 @@
 
 import com.denizenscript.denizen.nms.NMSVersion;
 import com.denizenscript.denizen.objects.*;
+import com.denizenscript.denizen.utilities.MultiVersionHelper1_17;
 import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizen.nms.NMSHandler;
 import com.denizenscript.denizen.nms.interfaces.Particle;
 import com.denizenscript.denizencore.exceptions.InvalidArgumentsException;
 import com.denizenscript.denizencore.objects.Argument;
-import com.denizenscript.denizencore.objects.ObjectTag;
-import com.denizenscript.denizencore.objects.core.DurationTag;
 import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.objects.core.ListTag;
 import com.denizenscript.denizencore.scripts.ScriptEntry;
@@ -294,7 +293,7 @@ else if (clazz == ItemStack.class) {
                         dataObject = itemType.getItemStack();
                     }
                     // Intentionally list last due to requiring 1.17+
-                    else if (clazz == org.bukkit.Particle.DustTransition.class) {
+                    else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_17) && clazz == org.bukkit.Particle.DustTransition.class) {
                         ListTag dataList = ListTag.valueOf(special_data.asString(), scriptEntry.getContext());
                         if (dataList.size() != 3) {
                             Debug.echoError("DustTransition special_data must have 3 list entries for particle: " + particleEffect.getName());
@@ -307,24 +306,14 @@ else if (clazz == org.bukkit.Particle.DustTransition.class) {
                             dataObject = new org.bukkit.Particle.DustTransition(fromColor.getColor(), toColor.getColor(), size);
                         }
                     }
-                    else if (clazz == Vibration.class) {
+                    else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_17) && clazz == Vibration.class) {
                         ListTag dataList = ListTag.valueOf(special_data.asString(), scriptEntry.getContext());
                         if (dataList.size() != 3) {
                             Debug.echoError("Vibration special_data must have 3 list entries for particle: " + particleEffect.getName());
                             return;
                         }
                         else {
-                            DurationTag duration = dataList.getObject(0).asType(DurationTag.class, scriptEntry.context);
-                            LocationTag origin = dataList.getObject(1).asType(LocationTag.class, scriptEntry.context);
-                            ObjectTag destination = dataList.getObject(2);
-                            Vibration.Destination destObj;
-                            if (destination.shouldBeType(EntityTag.class)) {
-                                destObj = new Vibration.Destination.EntityDestination(destination.asType(EntityTag.class, scriptEntry.context).getBukkitEntity());
-                            }
-                            else {
-                                destObj = new Vibration.Destination.BlockDestination(destination.asType(LocationTag.class, scriptEntry.context));
-                            }
-                            dataObject = new Vibration(origin, destObj, duration.getTicksAsInt());
+                            dataObject = MultiVersionHelper1_17.getPlayEffectVibrationObject(dataList, scriptEntry);
                         }
                     }
                     else {

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/MultiVersionHelper1_17.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/MultiVersionHelper1_17.java
@@ -1,11 +1,17 @@
 package com.denizenscript.denizen.utilities;
 
+import com.denizenscript.denizen.objects.EntityTag;
+import com.denizenscript.denizen.objects.LocationTag;
 import com.denizenscript.denizen.objects.properties.entity.EntityColor;
 import com.denizenscript.denizen.objects.properties.material.MaterialBlockType;
 import com.denizenscript.denizen.objects.properties.material.MaterialMode;
 import com.denizenscript.denizencore.objects.Mechanism;
+import com.denizenscript.denizencore.objects.ObjectTag;
+import com.denizenscript.denizencore.objects.core.DurationTag;
 import com.denizenscript.denizencore.objects.core.ListTag;
+import com.denizenscript.denizencore.scripts.ScriptEntry;
 import com.denizenscript.denizencore.utilities.CoreUtilities;
+import org.bukkit.Vibration;
 import org.bukkit.block.data.type.BigDripleaf;
 import org.bukkit.block.data.type.PointedDripstone;
 import org.bukkit.block.data.type.SculkSensor;
@@ -66,4 +72,18 @@ else if (object.isBigDripleaf() && mechanism.requireEnum(BigDripleaf.Tilt.class)
             ((BigDripleaf) object.material.getModernData()).setTilt(BigDripleaf.Tilt.valueOf(mechanism.getValue().asString().toUpperCase()));
         }
     }
+
+    public static Object getPlayEffectVibrationObject(ListTag dataList, ScriptEntry scriptEntry) {
+        DurationTag duration = dataList.getObject(0).asType(DurationTag.class, scriptEntry.context);
+        LocationTag origin = dataList.getObject(1).asType(LocationTag.class, scriptEntry.context);
+        ObjectTag destination = dataList.getObject(2);
+        Vibration.Destination destObj;
+        if (destination.shouldBeType(EntityTag.class)) {
+            destObj = new Vibration.Destination.EntityDestination(destination.asType(EntityTag.class, scriptEntry.context).getBukkitEntity());
+        }
+        else {
+            destObj = new Vibration.Destination.BlockDestination(destination.asType(LocationTag.class, scriptEntry.context));
+        }
+        return new Vibration(origin, destObj, duration.getTicksAsInt());
+    }
 }
diff --git a/...n/src/main/java/com/denizenscript/denizen/utilities/flags/DataPersistenceFlagTracker.java b/...n/src/main/java/com/denizenscript/denizen/utilities/flags/DataPersistenceFlagTracker.java
@@ -3,14 +3,11 @@
 import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.nms.NMSHandler;
 import com.denizenscript.denizen.utilities.DataPersistenceHelper;
-import com.denizenscript.denizen.utilities.Settings;
 import com.denizenscript.denizencore.flags.MapTagBasedFlagTracker;
 import com.denizenscript.denizencore.objects.ObjectTag;
 import com.denizenscript.denizencore.objects.core.MapTag;
 import com.denizenscript.denizencore.utilities.AsciiMatcher;
-import com.denizenscript.denizencore.utilities.CoreConfiguration;
 import com.denizenscript.denizencore.utilities.CoreUtilities;
-import org.bukkit.Chunk;
 import org.bukkit.NamespacedKey;
 import org.bukkit.persistence.PersistentDataHolder;
 import org.bukkit.persistence.PersistentDataType;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/DenizenPacketHandler.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/DenizenPacketHandler.java
@@ -11,7 +11,6 @@
 import com.denizenscript.denizen.scripts.commands.player.GlowCommand;
 import com.denizenscript.denizen.scripts.commands.server.ExecuteCommand;
 import com.denizenscript.denizencore.DenizenCore;
-import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.core.ElementTag;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;

diff --git a/.../com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenNetworkManagerImpl.java b/.../com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenNetworkManagerImpl.java
@@ -24,7 +24,6 @@
 import com.denizenscript.denizen.utilities.entity.HideEntitiesHelper;
 import com.denizenscript.denizen.utilities.packets.DenizenPacketHandler;
 import com.denizenscript.denizen.utilities.packets.HideParticles;
-import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.utilities.CoreConfiguration;
 import com.mojang.datafixers.util.Pair;

diff --git a/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/impl/ProfileEditorImpl.java b/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/impl/ProfileEditorImpl.java
@@ -126,7 +126,9 @@ public static void updatePlayerProfiles(ClientboundPlayerInfoPacket packet) {
 
     private static GameProfile getGameProfile(PlayerProfile playerProfile) {
         GameProfile gameProfile = new GameProfile(playerProfile.getUniqueId(), playerProfile.getName());
-        gameProfile.getProperties().put("textures", new Property("textures", playerProfile.getTexture(), playerProfile.getTextureSignature()));
+        if (playerProfile.hasTexture()) {
+            gameProfile.getProperties().put("textures", new Property("textures", playerProfile.getTexture(), playerProfile.getTextureSignature()));
+        }
         return gameProfile;
     }
 

diff --git a/.../com/denizenscript/denizen/nms/v1_18/impl/network/handlers/DenizenNetworkManagerImpl.java b/.../com/denizenscript/denizen/nms/v1_18/impl/network/handlers/DenizenNetworkManagerImpl.java
@@ -26,7 +26,6 @@
 import com.denizenscript.denizen.utilities.entity.HideEntitiesHelper;
 import com.denizenscript.denizen.utilities.packets.DenizenPacketHandler;
 import com.denizenscript.denizen.utilities.packets.HideParticles;
-import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.utilities.CoreConfiguration;
 import com.denizenscript.denizencore.utilities.CoreUtilities;

diff --git a/v1_19/src/main/java/com/denizenscript/denizen/nms/v1_19/impl/ProfileEditorImpl.java b/v1_19/src/main/java/com/denizenscript/denizen/nms/v1_19/impl/ProfileEditorImpl.java
@@ -126,7 +126,9 @@ public static void updatePlayerProfiles(ClientboundPlayerInfoPacket packet) {
 
     private static GameProfile getGameProfile(PlayerProfile playerProfile) {
         GameProfile gameProfile = new GameProfile(playerProfile.getUniqueId(), playerProfile.getName());
-        gameProfile.getProperties().put("textures", new Property("textures", playerProfile.getTexture(), playerProfile.getTextureSignature()));
+        if (playerProfile.hasTexture()) {
+            gameProfile.getProperties().put("textures", new Property("textures", playerProfile.getTexture(), playerProfile.getTextureSignature()));
+        }
         return gameProfile;
     }