diff --git a/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/HeliodorRecipeGiver.java b/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/HeliodorRecipeGiver.java index d617b91b5..19e1500dd 100644 --- a/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/HeliodorRecipeGiver.java +++ b/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/HeliodorRecipeGiver.java @@ -11,6 +11,7 @@ import org.bukkit.Bukkit; import org.bukkit.Keyed; import org.bukkit.NamespacedKey; import org.bukkit.entity.Player; +import org.bukkit.inventory.CraftingRecipe; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; import org.bukkit.inventory.ShapedRecipe; @@ -58,10 +59,10 @@ public class HeliodorRecipeGiver implements Runnable { } } - private void register(List recipes) { - for (Recipe recipe : recipes) { + private void register(List recipes) { + for (CraftingRecipe recipe : recipes) { Bukkit.getServer().addRecipe(recipe); - this.heliodorRecipes.add(((Keyed) recipe).getKey()); + this.heliodorRecipes.add(recipe.getKey()); } } } diff --git a/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/backpack/Backpack.java b/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/backpack/Backpack.java index 822fca1de..32ce12007 100644 --- a/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/backpack/Backpack.java +++ b/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/backpack/Backpack.java @@ -6,6 +6,7 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Material; import org.bukkit.NamespacedKey; +import org.bukkit.inventory.CraftingRecipe; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ShapedRecipe; import org.bukkit.inventory.meta.ItemMeta; @@ -33,7 +34,7 @@ public interface Backpack { return CustomItem.isCustomItem(item, "backpack"); } - static List getRecipes(Plugin plugin) { + static List getRecipes(Plugin plugin) { ShapedRecipe recipe = new ShapedRecipe(new NamespacedKey(plugin, "backpack"), Backpack.createBackpack()) .shape("xxx", "xex", "xxx") .setIngredient('x', MeteoricIron.createIngot()) diff --git a/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/heliodor/HeliodorPickaxe.java b/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/heliodor/HeliodorPickaxe.java index fe0ece7d8..8cf2e0c10 100644 --- a/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/heliodor/HeliodorPickaxe.java +++ b/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/heliodor/HeliodorPickaxe.java @@ -9,6 +9,7 @@ import net.kyori.adventure.text.format.TextDecoration; import org.bukkit.Material; import org.bukkit.NamespacedKey; import org.bukkit.Tag; +import org.bukkit.inventory.CraftingRecipe; import org.bukkit.inventory.ItemRarity; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ShapedRecipe; @@ -55,7 +56,7 @@ public interface HeliodorPickaxe { return item.getPersistentDataContainer().has(PICKAXE_KEY); } - static List getRecipes(Plugin plugin) { + static List getRecipes(Plugin plugin) { ShapedRecipe recipe = new ShapedRecipe(new NamespacedKey(plugin, "heliodor_pickaxe"), HeliodorPickaxe.getItem()) .shape("xxx", " s ", " s ") .setIngredient('x', HeliodorGem.createFinishedHeliodorGem()) diff --git a/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/meteoriciron/FactoryUpgrade.java b/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/meteoriciron/FactoryUpgrade.java index 42aff0bcd..2da2acf8e 100644 --- a/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/meteoriciron/FactoryUpgrade.java +++ b/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/meteoriciron/FactoryUpgrade.java @@ -7,6 +7,7 @@ import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.TextDecoration; import org.bukkit.Material; import org.bukkit.NamespacedKey; +import org.bukkit.inventory.CraftingRecipe; import org.bukkit.inventory.ItemRarity; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ShapedRecipe; @@ -39,7 +40,7 @@ public interface FactoryUpgrade { } - static List getRecipes(Plugin plugin) { + static List getRecipes(Plugin plugin) { ItemStack upgrade = FactoryUpgrade.createUpgrade(); upgrade.setAmount(3); return List.of( diff --git a/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/meteoriciron/MeteoricIron.java b/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/meteoriciron/MeteoricIron.java index 08299a48b..169902be0 100644 --- a/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/meteoriciron/MeteoricIron.java +++ b/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/meteoriciron/MeteoricIron.java @@ -5,7 +5,9 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Material; import org.bukkit.NamespacedKey; +import org.bukkit.inventory.CraftingRecipe; import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.Recipe; import org.bukkit.inventory.ShapedRecipe; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.recipe.CraftingBookCategory; @@ -55,7 +57,7 @@ public interface MeteoricIron { return CustomItem.isCustomItem(item, "meteoric_iron_ingot"); } - static List getRecipes(Plugin plugin) { + static List getRecipes(Plugin plugin) { ShapedRecipe recipe = new ShapedRecipe(new NamespacedKey(plugin, "meteoric_iron_ingot"), MeteoricIron.createIngot()) .shape("xxx", "xxx", "xxx") .setIngredient('x', MeteoricIron.createMeteoricIronNugget()); diff --git a/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/meteoriciron/MeteoricIronArmour.java b/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/meteoriciron/MeteoricIronArmour.java index 487afc51d..c535a81a6 100644 --- a/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/meteoriciron/MeteoricIronArmour.java +++ b/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/meteoriciron/MeteoricIronArmour.java @@ -14,6 +14,7 @@ import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeModifier; import org.bukkit.craftbukkit.inventory.CraftComplexRecipe; import org.bukkit.enchantments.Enchantment; +import org.bukkit.inventory.CraftingRecipe; import org.bukkit.inventory.EquipmentSlotGroup; import org.bukkit.inventory.ItemRarity; import org.bukkit.inventory.ItemStack; @@ -135,7 +136,7 @@ public interface MeteoricIronArmour { meta.setAttributeModifiers(ams); } - static List getRecipes(Plugin plugin) { + static List getRecipes(Plugin plugin) { return List.of( categoryEquipment(new ShapedRecipe(new NamespacedKey(plugin, "meteoric_iron_helmet"), MeteoricIronArmour.createHelmet(false)) .shape("xxx", "x x") diff --git a/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/meteoriciron/MeteoricIronTools.java b/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/meteoriciron/MeteoricIronTools.java index 9df03d2d5..12b1a67dc 100644 --- a/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/meteoriciron/MeteoricIronTools.java +++ b/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/meteoriciron/MeteoricIronTools.java @@ -11,6 +11,7 @@ import org.bukkit.Tag; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeModifier; import org.bukkit.enchantments.Enchantment; +import org.bukkit.inventory.CraftingRecipe; import org.bukkit.inventory.EquipmentSlotGroup; import org.bukkit.inventory.ItemRarity; import org.bukkit.inventory.ItemStack; @@ -160,7 +161,7 @@ public interface MeteoricIronTools { return sword; } - static List getRecipes(Plugin plugin) { + static List getRecipes(Plugin plugin) { return List.of( categoryEquipment(new ShapedRecipe(new NamespacedKey(plugin, "meteoric_iron_pickaxe_silk_touch"), MeteoricIronTools.createPickaxe(true)) .shape("xxx", "asa", " s ")