Skip to content

1.21.5 Area effect cloud fixes #2722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 3, 2025
Merged

1.21.5 Area effect cloud fixes #2722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
65c4e27
Base potion type controls
tal5 Mar 30, 2025
dd4785c
Merge remote-tracking branch 'upstream/dev' into Area_Effect_Cloud_Fixes
tal5 Apr 25, 2025
792bf51
Custom effect controls
tal5 Apr 25, 2025
808bc21
Particle color controls
tal5 Apr 26, 2025
22c273c
Backsupport particle names + TODO
tal5 Apr 26, 2025
860376b
Wrap up
tal5 Apr 26, 2025
73bb08d
Fix meta syntax
tal5 May 1, 2025
8751ad0
Fix meta syntax x2
tal5 May 1, 2025
30525fa
Final fixups
tal5 May 2, 2025
a0118b3
Merge branch 'dev' into Area_Effect_Cloud_Fixes
tal5 May 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions plugin/src/main/java/com/denizenscript/denizen/objects/properties/PropertyRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ public static void registerMainProperties() {
PropertyParser.registerProperty(EntityAI.class, EntityTag.class);
PropertyParser.registerProperty(EntityAnger.class, EntityTag.class);
PropertyParser.registerProperty(EntityAngry.class, EntityTag.class);
if (NMSHandler.getVersion().isAtMost(NMSVersion.v1_19)) {
PropertyParser.registerProperty(EntityAreaEffectCloud.class, EntityTag.class);
}
PropertyParser.registerProperty(EntityAreaEffectCloud.class, EntityTag.class);
PropertyParser.registerProperty(EntityArmorBonus.class, EntityTag.class);
PropertyParser.registerProperty(EntityArrowDamage.class, EntityTag.class);
PropertyParser.registerProperty(EntityArrowPierceLevel.class, EntityTag.class);
Expand Down
129 changes: 71 additions & 58 deletions .../main/java/com/denizenscript/denizen/objects/properties/entity/EntityAreaEffectCloud.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
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.denizen.objects.properties.bukkit.BukkitColorExtensions;
import com.denizenscript.denizen.utilities.BukkitImplDeprecations;
import com.denizenscript.denizen.utilities.Utilities;
import com.denizenscript.denizen.utilities.entity.AreaEffectCloudHelper;
import com.denizenscript.denizencore.objects.*;
import com.denizenscript.denizen.objects.EntityTag;
import com.denizenscript.denizencore.objects.Mechanism;
import com.denizenscript.denizencore.objects.ObjectTag;
import com.denizenscript.denizencore.objects.core.ColorTag;
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.objects.properties.Property;
import com.denizenscript.denizencore.tags.Attribute;
import com.denizenscript.denizencore.utilities.CoreUtilities;
import org.bukkit.Particle;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.potion.PotionEffect;
Expand All @@ -20,7 +26,7 @@

import java.util.List;

// TODO: 1.20.6: PotionData API
// TODO: most of the tags and mechs here need to become properties/be merged into existing properties
public class EntityAreaEffectCloud implements Property {

public static boolean describes(ObjectTag entity) {
Expand Down Expand Up @@ -75,20 +81,22 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
// @attribute <EntityTag.base_potion>
// @returns ElementTag
// @mechanism EntityTag.base_potion
// @group properties
// @deprecated use 'EntityTag.potion_type' on MC 1.20+.
// @description
// Returns the Area Effect Cloud's base potion data.
// In the format Type,Upgraded,Extended
// Deprecated in favor of <@link property EntityTag.potion_type> on MC 1.20+.
// -->
if (attribute.startsWith("base_potion")) {
attribute = attribute.fulfill(1);
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_20)) {
BukkitImplDeprecations.areaEffectCloudControls.warn(attribute.context);
}

// <--[tag]
// @attribute <EntityTag.base_potion.type>
// @returns ElementTag
// @group properties
// @deprecated use 'EntityTag.potion_type' on MC 1.20+.
// @description
// Returns the Area Effect Cloud's base potion type.
// Deprecated in favor of <@link property EntityTag.potion_type> on MC 1.20+.
// -->
if (attribute.startsWith("type")) {
return new ElementTag(getHelper().getBPName())
Expand All @@ -98,9 +106,9 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
// <--[tag]
// @attribute <EntityTag.base_potion.is_upgraded>
// @returns ElementTag(Boolean)
// @group properties
// @deprecated use 'EntityTag.potion_type' on MC 1.20+.
// @description
// Returns whether the Area Effect Cloud's base potion is upgraded.
// Deprecated in favor of <@link property EntityTag.potion_type> on MC 1.20+.
// -->
if (attribute.startsWith("is_upgraded")) {
return new ElementTag(getHelper().getBPUpgraded())
Expand All @@ -110,9 +118,9 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
// <--[tag]
// @attribute <EntityTag.base_potion.is_extended>
// @returns ElementTag(Boolean)
// @group properties
// @deprecated use 'EntityTag.potion_type' on MC 1.20+.
// @description
// Returns whether the Area Effect Cloud's base potion is extended.
// Deprecated in favor of <@link property EntityTag.potion_type> on MC 1.20+.
// -->
if (attribute.startsWith("is_extended")) {
return new ElementTag(getHelper().getBPExtended())
Expand All @@ -136,11 +144,12 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
// <--[tag]
// @attribute <EntityTag.particle.color>
// @returns ColorTag
// @group properties
// @deprecated use 'EntityTag.color'.
// @description
// Returns the Area Effect Cloud's particle color.
// Deprecated in favor of <@link property EntityTag.color>.
// -->
if (attribute.startsWith("color")) {
BukkitImplDeprecations.areaEffectCloudControls.warn(attribute.context);
return BukkitColorExtensions.fromColor(getHelper().getColor())
.getObjectAttribute(attribute.fulfill(1));
}
Expand Down Expand Up @@ -246,12 +255,12 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
// @attribute <EntityTag.has_custom_effect[(<effect>)]>
// @returns ElementTag(Boolean)
// @mechanism EntityTag.custom_effects
// @group properties
// @deprecated use 'EntityTag.has_effect'.
// @description
// Returns whether the Area Effect Cloud has a specified effect.
// If no effect is specified, returns whether it has any custom effect.
// Deprecated in favor of <@link tag EntityTag.has_effect>.
// -->
if (attribute.startsWith("has_custom_effect")) {
BukkitImplDeprecations.areaEffectCloudControls.warn(attribute.context);
if (attribute.hasParam()) {
PotionEffectType effectType = PotionEffectType.getByName(attribute.getParam());
for (PotionEffect effect : getHelper().getCustomEffects()) {
Expand Down Expand Up @@ -285,12 +294,12 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
// @attribute <EntityTag.custom_effects>
// @returns ListTag
// @mechanism EntityTag.custom_effects
// @group properties
// @deprecated use 'EntityTag.effects_data'.
// @description
// Returns a ListTag of the Area Effect Cloud's custom effects
// In the form Type,Amplifier,Duration,Ambient,Particles|...
// Deprecated in favor of <@link tag EntityTag.effects_data>.
// -->
if (attribute.startsWith("custom_effects")) {
BukkitImplDeprecations.areaEffectCloudControls.warn(attribute.context);
List<PotionEffect> effects = getHelper().getCustomEffects();
if (!attribute.hasParam()) {
ListTag list = new ListTag();
Expand All @@ -313,9 +322,9 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
// <--[tag]
// @attribute <EntityTag.custom_effects[<#>].type>
// @returns ElementTag
// @group properties
// @deprecated use 'EntityTag.effects_data'.
// @description
// Returns the specified Area Effect Cloud potion effect type.
// Deprecated in favor of <@link tag EntityTag.effects_data>.
// -->
if (attribute.startsWith("type")) {
return new ElementTag(effect.getType().getName())
Expand All @@ -325,9 +334,9 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
// <--[tag]
// @attribute <EntityTag.custom_effects[<#>].amplifier>
// @returns ElementTag(Number)
// @group properties
// @deprecated use 'EntityTag.effects_data'.
// @description
// Returns the specified Area Effect Cloud potion effect amplifier.
// Deprecated in favor of <@link tag EntityTag.effects_data>.
// -->
if (attribute.startsWith("amplifier")) {
return new ElementTag(effect.getAmplifier())
Expand All @@ -337,9 +346,9 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
// <--[tag]
// @attribute <EntityTag.custom_effects[<#>].duration>
// @returns DurationTag
// @group properties
// @deprecated use 'EntityTag.effects_data'.
// @description
// Returns the specified Area Effect Cloud potion effect duration.
// Deprecated in favor of <@link tag EntityTag.effects_data>.
// -->
if (attribute.startsWith("duration")) {
return new DurationTag((long) effect.getDuration())
Expand All @@ -349,9 +358,9 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
// <--[tag]
// @attribute <EntityTag.custom_effects[<#>].has_particles>
// @returns ElementTag(Boolean)
// @group properties
// @deprecated use 'EntityTag.effects_data'.
// @description
// Returns whether the specified Area Effect Cloud potion effect has particles.
// Deprecated in favor of <@link tag EntityTag.effects_data>.
// -->
if (attribute.startsWith("has_particles")) {
return new ElementTag(effect.hasParticles())
Expand All @@ -361,9 +370,9 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
// <--[tag]
// @attribute <EntityTag.custom_effects[<#>].is_ambient>
// @returns ElementTag(Boolean)
// @group properties
// @deprecated use 'EntityTag.effects_data'.
// @description
// Returns whether the specified Area Effect Cloud potion effect is ambient.
// Deprecated in favor of <@link tag EntityTag.effects_data>.
// -->
if (attribute.startsWith("is_ambient")) {
return new ElementTag(effect.isAmbient())
Expand Down Expand Up @@ -391,25 +400,29 @@ public void adjust(Mechanism mechanism) {
// @object EntityTag
// @name clear_custom_effects
// @input None
// @deprecated use 'EntityTag.potion_effects'.
// @description
// Clears all custom effects from the Area Effect Cloud
// Deprecated in favor of <@link mechanism EntityTag.potion_effects>.
// @tags
// <EntityTag.custom_effects>
// -->
if (mechanism.matches("clear_custom_effects")) {
BukkitImplDeprecations.areaEffectCloudControls.warn(mechanism.context);
getHelper().clearEffects();
}

// <--[mechanism]
// @object EntityTag
// @name remove_custom_effect
// @input ElementTag
// @deprecated use 'EntityTag.potion_effects'.
// @description
// Removes the specified custom effect from the Area Effect Cloud
// Deprecated in favor of <@link mechanism EntityTag.potion_effects>.
// @tags
// <EntityTag.custom_effects>
// -->
if (mechanism.matches("remove_custom_effect")) {
BukkitImplDeprecations.areaEffectCloudControls.warn(mechanism.context);
PotionEffectType type = PotionEffectType.getByName(mechanism.getValue().asString().toUpperCase());
if (type != null) {
getHelper().removeEffect(type);
Expand All @@ -420,13 +433,14 @@ public void adjust(Mechanism mechanism) {
// @object EntityTag
// @name custom_effects
// @input ListTag
// @deprecated use 'EntityTag.potion_effects'.
// @description
// Adds a list of custom potion effects to the Area Effect Cloud
// In the form Type,Amplifier,Duration(,Ambient,Particles)|...
// Deprecated in favor of <@link mechanism EntityTag.potion_effects>.
// @tags
// <EntityTag.custom_effects>
// -->
if (mechanism.matches("custom_effects")) {
BukkitImplDeprecations.areaEffectCloudControls.warn(mechanism.context);
ListTag list = mechanism.valueAsType(ListTag.class);
getHelper().clearEffects();

Expand Down Expand Up @@ -458,50 +472,48 @@ public void adjust(Mechanism mechanism) {
// @object EntityTag
// @name particle_color
// @input ColorTag
// @deprecated use 'EntityTag.color'.
// @description
// Sets the Area Effect Cloud's particle color.
// Deprecated in favor of <@link property EntityTag.color>.
// @tags
// <EntityTag.particle.color>
// -->
if (mechanism.matches("particle_color") && mechanism.requireObject(ColorTag.class)) {
BukkitImplDeprecations.areaEffectCloudControls.warn(mechanism.context);
getHelper().setColor(BukkitColorExtensions.getColor(mechanism.valueAsType(ColorTag.class)));
}

// <--[mechanism]
// @object EntityTag
// @name base_potion
// @input ElementTag
// @deprecated use 'EntityTag.potion_type' on MC 1.20+.
// @description
// Sets the Area Effect Cloud's base potion.
// In the form: Type,Upgraded,Extended
// NOTE: Potion cannot be both upgraded and extended
// Deprecated in favor of <@link property EntityTag.potion_type> on MC 1.20+.
// @tags
// <EntityTag.base_potion>
// <EntityTag.base_potion.type>
// <EntityTag.base_potion.is_upgraded>
// <EntityTag.base_potion.is_extended>
// <server.potion_types>
// -->
if (mechanism.matches("base_potion")) {
if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_20)) {
BukkitImplDeprecations.areaEffectCloudControls.warn(mechanism.context);
}
List<String> data = CoreUtilities.split(mechanism.getValue().asString().toUpperCase(), ',');
if (data.size() != 3) {
mechanism.echoError(mechanism.getValue().asString() + " is not a valid base potion!");
mechanism.echoError(mechanism.getValue() + " is not a valid base potion!");
return;
}
PotionType type = Utilities.elementToEnumlike(new ElementTag(data.get(0), true), PotionType.class);
if (type == null) {
mechanism.echoError(mechanism.getValue() + " is not a valid base potion!");
return;
}
boolean upgraded = type.isUpgradeable() && CoreUtilities.equalsIgnoreCase(data.get(1), "true");
boolean extended = type.isExtendable() && CoreUtilities.equalsIgnoreCase(data.get(2), "true");
if (extended && upgraded) {
mechanism.echoError("Potion cannot be both upgraded and extended");
}
else {
try {
PotionType type = PotionType.valueOf(data.get(0));
boolean upgraded = type.isUpgradeable() && CoreUtilities.equalsIgnoreCase(data.get(1), "true");
boolean extended = type.isExtendable() && CoreUtilities.equalsIgnoreCase(data.get(2), "true");
if (extended && upgraded) {
mechanism.echoError("Potion cannot be both upgraded and extended");
}
else {
getHelper().setBP(type, extended, upgraded);
}
}
catch (Exception e) {
mechanism.echoError(mechanism.getValue().asString() + " is not a valid base potion!");
}
getHelper().setBP(type, extended, upgraded);
}
}

Expand Down Expand Up @@ -541,7 +553,8 @@ public void adjust(Mechanism mechanism) {
// @tags
// <EntityTag.particle>
// -->
if (mechanism.matches("particle") && mechanism.hasValue()) {
// TODO: some particles require additional data - need a new property that supports playeffect's special_data input
if (mechanism.matches("particle") && Utilities.requireEnumlike(mechanism, Particle.class)) {
getHelper().setParticle(mechanism.getValue().asString().toUpperCase());
}

Expand Down
9 changes: 7 additions & 2 deletions plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityColor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public static boolean describes(EntityTag entity) {
type == EntityType.TROPICAL_FISH ||
type == EntityType.GOAT ||
type == EntityType.AXOLOTL ||
type == EntityType.AREA_EFFECT_CLOUD ||
(NMSHandler.getVersion().isAtLeast(NMSVersion.v1_19) && MultiVersionHelper1_19.colorIsApplicable(type));
}

Expand Down Expand Up @@ -214,6 +215,9 @@ else if (type == EntityType.GOAT) {
else if (type == EntityType.AXOLOTL && mechanism.requireEnum(Axolotl.Variant.class)) {
as(Axolotl.class).setVariant(color.asEnum(Axolotl.Variant.class));
}
else if (type == EntityType.AREA_EFFECT_CLOUD && mechanism.requireObject(ColorTag.class)) {
as(AreaEffectCloud.class).setColor(BukkitColorExtensions.getColor(mechanism.valueAsType(ColorTag.class)));
}
else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_19) && MultiVersionHelper1_19.colorIsApplicable(type)) {
MultiVersionHelper1_19.setColor(getEntity(), mechanism);
}
Expand Down Expand Up @@ -274,6 +278,7 @@ public String getColor(boolean includeDeprecated) {
}
case GOAT -> as(Goat.class).isScreaming() ? "screaming" : "normal";
case AXOLOTL -> as(Axolotl.class).getVariant().name();
case AREA_EFFECT_CLOUD -> BukkitColorExtensions.fromColor(as(AreaEffectCloud.class).getColor()).identify();
default -> null;
};
}
Expand Down Expand Up @@ -313,7 +318,7 @@ public ListTag getAllowedColors() {
yield result;
}
case AXOLOTL -> Utilities.listTypes(Axolotl.Variant.class);
default -> null; // includes Ocelot (deprecated) and arrow (ColorTag)
default -> null; // includes Ocelot (deprecated) and arrow/area effect cloud (ColorTag)
};
}

Expand All @@ -340,7 +345,7 @@ public ListTag getAllowedColors() {
// For tropical_fish, the input is PATTERN|BODYCOLOR|PATTERNCOLOR, where BodyColor and PatterenColor are both DyeColor (see below),
// and PATTERN is KOB, SUNSTREAK, SNOOPER, DASHER, BRINELY, SPOTTY, FLOPPER, STRIPEY, GLITTER, BLOCKFISH, BETTY, is CLAYFISH.
// For sheep, wolf, and shulker entities, the input is a Dye Color.
// For Tipped Arrow entities, the input is a ColorTag.
// For Tipped Arrow and Area effect cloud entities, the input is a ColorTag.
// For goats, the input is SCREAMING or NORMAL.
// For axolotl, the types are BLUE, CYAN, GOLD, LUCY, or WILD.
// For frogs, the types are TEMPERATE, WARM, or COLD.
Expand Down
Loading