8bb902842c
Effect or LevelEvent needs to be replaced but ideally after the enum PR has been merged upstream. Until then, this test and these fixes should address all the known issues with them
124 lines
4.3 KiB
Java
124 lines
4.3 KiB
Java
package org.bukkit.craftbukkit;
|
|
|
|
import com.google.common.base.Preconditions;
|
|
import net.minecraft.world.item.Item;
|
|
import net.minecraft.world.level.block.Block;
|
|
import org.bukkit.Axis;
|
|
import org.bukkit.Color;
|
|
import org.bukkit.Effect;
|
|
import org.bukkit.Material;
|
|
import org.bukkit.block.BlockFace;
|
|
import org.bukkit.craftbukkit.block.CraftBlockType;
|
|
import org.bukkit.craftbukkit.inventory.CraftItemType;
|
|
|
|
public class CraftEffect {
|
|
public static <T> int getDataValue(Effect effect, T data) {
|
|
int datavalue;
|
|
switch (effect) {
|
|
// Paper start - add missing effects
|
|
case PARTICLES_SCULK_CHARGE:
|
|
case TRIAL_SPAWNER_DETECT_PLAYER:
|
|
case BEE_GROWTH:
|
|
case TURTLE_EGG_PLACEMENT:
|
|
case SMASH_ATTACK:
|
|
case TRIAL_SPAWNER_DETECT_PLAYER_OMINOUS:
|
|
// Paper end - add missing effects
|
|
case VILLAGER_PLANT_GROW:
|
|
datavalue = (Integer) data;
|
|
break;
|
|
case POTION_BREAK:
|
|
case INSTANT_POTION_BREAK:
|
|
datavalue = ((Color) data).asRGB();
|
|
break;
|
|
case RECORD_PLAY:
|
|
Preconditions.checkArgument(data == Material.AIR || ((Material) data).isRecord(), "Invalid record type for Material %s!", data);
|
|
datavalue = Item.getId(CraftItemType.bukkitToMinecraft((Material) data));
|
|
break;
|
|
// Paper start - handle shoot white smoke event
|
|
case SHOOT_WHITE_SMOKE:
|
|
final BlockFace face = (BlockFace) data;
|
|
Preconditions.checkArgument(face.isCartesian(), face + " isn't cartesian");
|
|
datavalue = org.bukkit.craftbukkit.block.CraftBlock.blockFaceToNotch(face).get3DDataValue();
|
|
break;
|
|
// Paper end - handle shoot white smoke event
|
|
case SMOKE:
|
|
switch ((BlockFace) data) {
|
|
case DOWN:
|
|
// SPIGOT-6318: Fallback value for the old directions
|
|
case NORTH_EAST:
|
|
case NORTH_WEST:
|
|
case SOUTH_EAST:
|
|
case SOUTH_WEST:
|
|
case SELF:
|
|
datavalue = 0;
|
|
break;
|
|
case UP:
|
|
datavalue = 1;
|
|
break;
|
|
case NORTH:
|
|
datavalue = 2;
|
|
break;
|
|
case SOUTH:
|
|
datavalue = 3;
|
|
break;
|
|
case WEST:
|
|
datavalue = 4;
|
|
break;
|
|
case EAST:
|
|
datavalue = 5;
|
|
break;
|
|
default:
|
|
throw new IllegalArgumentException("Bad smoke direction!");
|
|
}
|
|
break;
|
|
case STEP_SOUND:
|
|
if (data instanceof Material) { // Paper - support BlockData
|
|
Preconditions.checkArgument(((Material) data).isBlock(), "Material %s is not a block!", data);
|
|
datavalue = Block.getId(CraftBlockType.bukkitToMinecraft((Material) data).defaultBlockState());
|
|
// Paper start - support BlockData
|
|
break;
|
|
}
|
|
case PARTICLES_AND_SOUND_BRUSH_BLOCK_COMPLETE:
|
|
datavalue = Block.getId(((org.bukkit.craftbukkit.block.data.CraftBlockData) data).getState());
|
|
// Paper end
|
|
break;
|
|
case COMPOSTER_FILL_ATTEMPT:
|
|
// Paper start - add missing effects
|
|
case TRIAL_SPAWNER_SPAWN:
|
|
case TRIAL_SPAWNER_SPAWN_MOB_AT:
|
|
case VAULT_ACTIVATE:
|
|
case VAULT_DEACTIVATE:
|
|
case TRIAL_SPAWNER_BECOME_OMINOUS:
|
|
case TRIAL_SPAWNER_SPAWN_ITEM:
|
|
// Paper end - add missing effects
|
|
datavalue = ((Boolean) data) ? 1 : 0;
|
|
break;
|
|
case BONE_MEAL_USE:
|
|
datavalue = (Integer) data;
|
|
break;
|
|
case ELECTRIC_SPARK:
|
|
if (data == null) {
|
|
datavalue = -1;
|
|
} else {
|
|
switch ((Axis) data) {
|
|
case X:
|
|
datavalue = 0;
|
|
break;
|
|
case Y:
|
|
datavalue = 1;
|
|
break;
|
|
case Z:
|
|
datavalue = 2;
|
|
break;
|
|
default:
|
|
throw new IllegalArgumentException("Bad electric spark axis!");
|
|
}
|
|
}
|
|
break;
|
|
default:
|
|
datavalue = 0;
|
|
}
|
|
return datavalue;
|
|
}
|
|
}
|