Add missing Effects from Paper

Author: PseudoKnight

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCWorld.java

@@ -298,14 +298,18 @@ public void playEffect(MCLocation l, MCEffect mCEffect, int data, int radius) {
 	@Override
 	public void playEffect(MCLocation l, MCEffect mcEffect, Object data, int radius) {
 		Effect effect = Effect.valueOf(mcEffect.name());
-		switch(effect) {
+		switch(mcEffect) {
 			case RECORD_PLAY:
 			case STEP_SOUND:
 				w.playEffect((Location) l.getHandle(), effect, ((MCMaterial) data).getHandle(), radius);
 				return;
 			case SMOKE:
+			case SHOOT_WHITE_SMOKE:
 				w.playEffect((Location) l.getHandle(), effect, BlockFace.valueOf(((MCBlockFace) data).name()), radius);
 				return;
+			case PARTICLES_AND_SOUND_BRUSH_BLOCK_COMPLETE:
+				w.playEffect((Location) l.getHandle(), effect, ((MCBlockData) data).getHandle(), radius);
+				return;
 		}
 		w.playEffect((Location) l.getHandle(), effect, data, radius);
 	}

src/main/java/com/laytonsmith/abstraction/enums/MCEffect.java

@@ -7,7 +7,8 @@ public enum MCEffect {
 	/**
 	 * VISUAL
 	 */
-	BONE_MEAL_USE, // integer for number of particles
+	BEE_GROWTH, // integer, Paper, added in 1.20.6, partially replaces VILLAGER_PLANT_GROW
+	BONE_MEAL_USE, // integer
 	COMPOSTER_FILL_ATTEMPT, // boolean for success
 	COPPER_WAX_OFF,
 	COPPER_WAX_ON,
@@ -22,11 +23,28 @@ public enum MCEffect {
 	LAVA_INTERACT,
 	MOBSPAWNER_FLAMES,
 	OXIDISED_COPPER_SCRAPE,
+	PARTICLES_EGG_CRACK, // Paper, added 1.20 - 1.20.4
+	PARTICLES_AND_SOUND_BRUSH_BLOCK_COMPLETE, // BlockData, Paper, added 1.20 - 1.20.4
+	PARTICLES_SCULK_CHARGE, // integer, Paper, added 1.20 - 1.20.4
 	POTION_BREAK, // Color
 	REDSTONE_TORCH_BURNOUT,
+	SHOOT_WHITE_SMOKE, // BlockFace for the direction, Paper, added 1.20 - 1.20.4
+	SMASH_ATTACK, // integer, Paper, added in 1.20.5
 	SMOKE, // BlockFace for the direction of the smoke particles
+	SPAWN_COBWEB, // Paper, added in 1.20.6
 	SPONGE_DRY,
-	VILLAGER_PLANT_GROW, // integer for number of particles
+	TRIAL_SPAWNER_BECOME_OMINOUS, // boolean, Paper, added 1.20.6
+	TRIAL_SPAWNER_DETECT_PLAYER, // integer, Paper, added 1.20.4
+	TRIAL_SPAWNER_DETECT_PLAYER_OMINOUS, // integer, Paper, added 1.20.6
+	TRIAL_SPAWNER_EJECT_ITEM, // Paper, added 1.20.4
+	TRIAL_SPAWNER_SPAWN, // boolean, Paper, added 1.20.4
+	TRIAL_SPAWNER_SPAWN_ITEM, // boolean, Paper, added 1.20.6
+	TRIAL_SPAWNER_SPAWN_MOB_AT, // boolean, Paper, added 1.20.4
+	TURTLE_EGG_PLACEMENT, // integer, Paper, added in 1.20.6
+	VAULT_ACTIVATE, // boolean, Paper, added in 1.20.6
+	VAULT_DEACTIVATE, // boolean, Paper, added in 1.20.6
+	VAULT_EJECT_ITEM, // Paper, added in 1.20.6
+	VILLAGER_PLANT_GROW, // integer, deprecated in 1.20.6, partially replaced by BEE_GROWTH
 	/**
 	 * SOUND
 	 */
@@ -42,11 +60,13 @@ public enum MCEffect {
 	CHORUS_FLOWER_GROW,
 	CLICK1,
 	CLICK2,
+	CRAFTER_CRAFT, // Paper, added 1.20.4
+	CRAFTER_FAIL, // Paper, added 1.20.4
 	DOOR_CLOSE, // deprecated in 1.19.3
 	DOOR_TOGGLE, // deprecated in 1.19.3
 	ENDERDRAGON_GROWL,
 	ENDERDRAGON_SHOOT,
-	ENDEREYE_LAUNCH,
+	ENDEREYE_LAUNCH, // deprecated in 1.21
 	EXTINGUISH,
 	FENCE_GATE_CLOSE, // deprecated in 1.19.3
 	FENCE_GATE_TOGGLE, // deprecated in 1.19.3
@@ -59,6 +79,7 @@ public enum MCEffect {
 	IRON_DOOR_TOGGLE, // deprecated in 1.19.3
 	IRON_TRAPDOOR_CLOSE, // deprecated in 1.19.3
 	IRON_TRAPDOOR_TOGGLE, // deprecated in 1.19.3
+	PARTICLES_SCULK_SHRIEK, // Paper, added 1.20 - 1.20.4
 	PHANTOM_BITE,
 	POINTED_DRIPSTONE_DRIP_LAVA_INTO_CAULDRON,
 	POINTED_DRIPSTONE_DRIP_WATER_INTO_CAULDRON,
@@ -67,6 +88,8 @@ public enum MCEffect {
 	RECORD_PLAY, // Material for record item
 	SKELETON_CONVERTED_TO_STRAY,
 	SMITHING_TABLE_USE,
+	SOUND_STOP_JUKEBOX_SONG, // Paper, added 1.20 - 1.20.4
+	SOUND_WITH_CHARGE_SHOT, // Paper, added 1.21
 	STEP_SOUND, // Material for block type stepped on
 	TRAPDOOR_CLOSE, // deprecated in 1.19.3
 	TRAPDOOR_TOGGLE, // deprecated in 1.19.3

src/main/java/com/laytonsmith/core/functions/Minecraft.java

@@ -13,6 +13,7 @@
 import com.laytonsmith.abstraction.MCServer;
 import com.laytonsmith.abstraction.MCWorld;
 import com.laytonsmith.abstraction.StaticLayer;
+import com.laytonsmith.abstraction.blocks.MCBlockData;
 import com.laytonsmith.abstraction.blocks.MCBlockFace;
 import com.laytonsmith.abstraction.blocks.MCMaterial;
 import com.laytonsmith.abstraction.enums.MCEffect;
@@ -62,6 +63,7 @@
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -427,12 +429,13 @@ public String docs() {
 					+ " for all players within the radius (or 64 by default). The effect can be one of the following: "
 					+ StringUtils.Join(MCEffect.values(), ", ", ", or ", " or ")
 					+ ". ---- Some effects may require an applicable block at the specified location."
-					+ " Additional data can be supplied with the syntax EFFECT:DATA."
-					+ "<br>The STEP_SOUND takes a block material name."
+					+ " Additional data can be supplied with the syntax EFFECT:DATA.<br>"
+					+ "<br>STEP_SOUND and PARTICLES_AND_SOUND_BRUSH_BLOCK_COMPLETE (Paper) take a block material name."
 					+ "<br>RECORD_PLAY takes a record material name."
-					+ "<br>SMOKE takes a facing, one of " + StringUtils.Join(MCBlockFace.values(), ", ", ", or ", " or ")
+					+ "<br>SHOOT_WHITE_SMOKE (Paper) and SMOKE take a facing, one of " + StringUtils.Join(MCBlockFace.values(), ", ", ", or ", " or ")
 					+ "<br>POTION_BREAK takes an int (represents color)."
-					+ "<br>VILLAGER_PLANT_GROW and BONE_MEAL_USE take an int for the number of particles.";
+					+ "<br>BONE_MEAL_USE, BEE_GROWTH (Paper), SMASH_ATTACK (Paper) and"
+					+ " TURTLE_EGG_PLACEMENT (Paper) take an int for the number of particles.";
 		}
 
 		@Override
@@ -478,7 +481,7 @@ public Mixed exec(Target t, Environment env, Mixed... args) throws ConfigRuntime
 			if(args.length > 2) {
 				radius = ArgumentValidation.getInt32(args[args.length - 1], t);
 			}
-			if(!dataString.equals("")) {
+			if(!dataString.isEmpty()) {
 				switch(effect) {
 					case RECORD_PLAY:
 					case STEP_SOUND:
@@ -494,6 +497,7 @@ public Mixed exec(Target t, Environment env, Mixed... args) throws ConfigRuntime
 						// Fall back to integer
 						break;
 					case SMOKE:
+					case SHOOT_WHITE_SMOKE:
 						try {
 							MCBlockFace facing = MCBlockFace.valueOf(dataString.toUpperCase());
 							try {
@@ -506,6 +510,19 @@ public Mixed exec(Target t, Environment env, Mixed... args) throws ConfigRuntime
 							// Fall back to integer
 						}
 						break;
+					case PARTICLES_AND_SOUND_BRUSH_BLOCK_COMPLETE:
+						try {
+							MCBlockData blockData = Static.getServer().createBlockData(dataString.toLowerCase(Locale.ROOT));
+							try {
+								l.getWorld().playEffect(l, effect, blockData, radius);
+							} catch (IllegalArgumentException ex) {
+								throw new CREIllegalArgumentException(ex.getMessage(), t);
+							}
+							return CVoid.VOID;
+						} catch (IllegalArgumentException ex) {
+							// Fall back to integer
+						}
+						break;
 				}
 				try {
 					data = Integer.parseInt(dataString);