diff --git a/src/main/java/top/penowl/quidproquo/Commands.java b/src/main/java/top/penowl/quidproquo/Commands.java index e9855fe..06599d1 100644 --- a/src/main/java/top/penowl/quidproquo/Commands.java +++ b/src/main/java/top/penowl/quidproquo/Commands.java @@ -72,8 +72,8 @@ public class Commands implements CommandExecutor { builder.append(": " + ChatColor.AQUA + entry.getValue().toString()); builder.append("\n"); } - builder.append(" \n" + ChatColor.GOLD + "" + ChatColor.BOLD + "Blood: " + ChatColor.RESET + "" + ChatColor.AQUA + String.valueOf(ritual.health / 2.0) + ChatColor.RED + "♥\n"); - builder.append(ChatColor.GOLD + "" + ChatColor.BOLD + "Backfire: " + ChatColor.RESET + "" + ChatColor.AQUA + String.valueOf(Math.round(ritual.backfire * 100)) + ChatColor.GREEN + "%\n"); + builder.append(" \n" + ChatColor.GOLD + "" + ChatColor.BOLD + "Blood: " + ChatColor.RESET + "" + ChatColor.AQUA + String.valueOf(ritual.health / 2.0) + ChatColor.RED + " ♥\n"); + builder.append(ChatColor.GOLD + "" + ChatColor.BOLD + "Backfire: " + ChatColor.RESET + "" + ChatColor.AQUA + String.valueOf(Math.round(ritual.backfire * 100)) + "%\n"); sender.sendMessage(builder.toString()); return true; } diff --git a/src/main/java/top/penowl/quidproquo/QuidProQuo.java b/src/main/java/top/penowl/quidproquo/QuidProQuo.java index 4d0b8ad..d77bd4f 100644 --- a/src/main/java/top/penowl/quidproquo/QuidProQuo.java +++ b/src/main/java/top/penowl/quidproquo/QuidProQuo.java @@ -31,7 +31,6 @@ public class QuidProQuo extends JavaPlugin { getServer().getPluginManager().registerEvents(new Events(), this); // register all rituals - rituals.add(new HealRitual()); rituals.add(new WoolingRitual()); rituals.add(new FeedingRitual()); rituals.add(new SnowmanRitual()); @@ -45,6 +44,7 @@ public class QuidProQuo extends JavaPlugin { rituals.add(new ChugJugRitual()); rituals.add(new CreeperHissRitual()); rituals.add(new RotateRitual()); + rituals.add(new HealRitual()); // run ritual setup scripts for (Ritual ritual : rituals) { diff --git a/src/main/java/top/penowl/quidproquo/rituals/ChugJugRitual.java b/src/main/java/top/penowl/quidproquo/rituals/ChugJugRitual.java index 65c6385..3cdc3d5 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/ChugJugRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/ChugJugRitual.java @@ -17,7 +17,7 @@ public class ChugJugRitual extends Ritual { addIngredient(Material.BLAZE_ROD, 1); addIngredient(Material.GLASS_BOTTLE, 1); addIngredient(Material.REDSTONE, 1); - addIngredient(Material.GLOWSTONE, 1); + addIngredient(Material.GLOWSTONE_DUST, 1); addIngredient(Material.WHEAT, 64*8); addSacrifice(EntityType.WITCH, 1); health = 10; diff --git a/src/main/java/top/penowl/quidproquo/rituals/HerobrineRitual.java b/src/main/java/top/penowl/quidproquo/rituals/HerobrineRitual.java index b8b4a9d..dc65031 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/HerobrineRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/HerobrineRitual.java @@ -21,11 +21,15 @@ public class HerobrineRitual extends Ritual { @Override public void setup() { - addIngredient(Material.WHEAT, 64); - addIngredient(Material.DIAMOND, 2); + addIngredient(Material.WHEAT, 64*9); + addIngredient(Material.DIAMOND, 9); + addIngredient(Material.ROTTEN_FLESH, 64); + addIngredient(Material.REDSTONE_BLOCK, 9); + addIngredient(Material.SUGAR, 32); + addSacrifice(EntityType.ZOMBIE, 3); health = 10; name = "herobrine"; - backfire = 0.5; + backfire = 0.1; } @Override public void execute(Player caster, Player target, Location location) { @@ -59,11 +63,11 @@ public class HerobrineRitual extends Ritual { heroBine.addPotionEffect(fireResistance); heroBine.addPotionEffect(speed); EntityEquipment equipment = heroBine.getEquipment(); - ItemStack headStack = new ItemStack(Material.SKULL); - ItemMeta headMeta = headStack.getItemMeta(); - SkullMeta skullMeta = (SkullMeta)headMeta; - skullMeta.setOwner("Herobrine"); - equipment.setHelmet(headStack); + ItemStack skull = new ItemStack(Material.SKULL_ITEM, 1, (short) 3); + SkullMeta meta = (SkullMeta) skull.getItemMeta(); + meta.setOwner("MHF_Herobrine"); + skull.setItemMeta(meta); + equipment.setHelmet(skull); equipment.setChestplate(new ItemStack(Material.DIAMOND_CHESTPLATE)); equipment.setLeggings(new ItemStack(Material.DIAMOND_LEGGINGS)); equipment.setBoots(new ItemStack(Material.DIAMOND_BOOTS));