diff --git a/src/main/java/top/penowl/quidproquo/rituals/FillerRitual.java b/src/main/java/top/penowl/quidproquo/rituals/FillerRitual.java index 5ee1c06..5172355 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/FillerRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/FillerRitual.java @@ -1,13 +1,11 @@ package top.penowl.quidproquo.rituals; -import java.util.ArrayList; -import java.util.List; - import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import java.util.Random; import top.penowl.quidproquo.Ritual; @@ -28,17 +26,22 @@ public class FillerRitual extends Ritual { int items = target.getInventory().getSize(); for (int i = 0; i < items; i++) { Material typeMaterial; - double random = Math.random(); - if (random < 0.20) { - typeMaterial = Material.WOOD_AXE; - } else if (random < 0.40) { - typeMaterial = Material.WOOD_SPADE; - } else if (random < 0.60) { - typeMaterial = Material.WOOD_SWORD; - } else if (random < 0.80) { - typeMaterial = Material.WOOD_PICKAXE; - } else { - typeMaterial = Material.WOOD_HOE; + int random = new Random().nextInt(5); + switch(random) { + case 0: + typeMaterial = Material.WOOD_AXE; + break; + case 1: + typeMaterial = Material.WOOD_SPADE; + break; + case 2: + typeMaterial = Material.WOOD_SWORD; + break; + case 3: + typeMaterial = Material.WOOD_PICKAXE; + default: + typeMaterial=Material.WOOD_HOE; + break; } ItemStack tool = new ItemStack(typeMaterial, 1); tool.setDurability((short) (Material.WOOD_PICKAXE.getMaxDurability() - 1)); diff --git a/src/main/java/top/penowl/quidproquo/rituals/SoundRitual.java b/src/main/java/top/penowl/quidproquo/rituals/SoundRitual.java new file mode 100644 index 0000000..bf460aa --- /dev/null +++ b/src/main/java/top/penowl/quidproquo/rituals/SoundRitual.java @@ -0,0 +1,68 @@ +package top.penowl.quidproquo.rituals; + +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.Sound; +import org.bukkit.entity.Player; +import java.util.Random; + +import top.penowl.quidproquo.Ritual; + +public class SoundRitual extends Ritual { + @Override + public void setup() { + addIngredient(Material.NOTE_BLOCK, 1); + addIngredient(Material.WHEAT, 4); + name = "shadow sound"; + health = 1; + } + + @Override + public void execute(Player caster, Player target, Location location) { + Sound randomSound; + int randomInt = new Random().nextInt(13); + switch (randomInt) { + case 0: + randomSound = Sound.STEP_STONE; + break; + case 1: + randomSound = Sound.CLICK; + break; + case 2: + randomSound = Sound.CREEPER_HISS; + break; + case 3: + randomSound = Sound.DIG_GRAVEL; + break; + case 4: + randomSound = Sound.DIG_STONE; + break; + case 5: + randomSound = Sound.DIG_WOOD; + break; + case 6: + randomSound = Sound.EXPLODE; + break; + case 7: + randomSound = Sound.FIZZ; + break; + case 8: + randomSound = Sound.GHAST_SCREAM; + break; + case 9: + randomSound = Sound.SKELETON_HURT; + break; + case 10: + randomSound = Sound.STEP_GRAVEL; + break; + case 11: + randomSound = Sound.STEP_GRASS; + break; + default: + randomSound = Sound.ZOMBIE_HURT; + break; + } + target.playSound(target.getLocation(), randomSound, 1, 1); + } + +}