CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
okx-code
2024-11-17 23:31:18 +00:00
parent 9bfab3a1e1
commit 5b9d00b430
7 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/heliodor-paper/src/main/java/net/civmc/heliodor/HeliodorRecipeGiver.java
View File

@@ -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<Recipe> recipes) {
for (Recipe recipe : recipes) {
private void register(List<CraftingRecipe> recipes) {
for (CraftingRecipe recipe : recipes) {
Bukkit.getServer().addRecipe(recipe);
this.heliodorRecipes.add(((Keyed) recipe).getKey());
this.heliodorRecipes.add(recipe.getKey());
}
}
}

3
plugins/heliodor-paper/src/main/java/net/civmc/heliodor/backpack/Backpack.java
View File

@@ -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<ShapedRecipe> getRecipes(Plugin plugin) {
static List<CraftingRecipe> getRecipes(Plugin plugin) {
ShapedRecipe recipe = new ShapedRecipe(new NamespacedKey(plugin, "backpack"), Backpack.createBackpack())
.shape("xxx", "xex", "xxx")
.setIngredient('x', MeteoricIron.createIngot())

3
plugins/heliodor-paper/src/main/java/net/civmc/heliodor/heliodor/HeliodorPickaxe.java
View File

@@ -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<ShapedRecipe> getRecipes(Plugin plugin) {
static List<CraftingRecipe> getRecipes(Plugin plugin) {
ShapedRecipe recipe = new ShapedRecipe(new NamespacedKey(plugin, "heliodor_pickaxe"), HeliodorPickaxe.getItem())
.shape("xxx", " s ", " s ")
.setIngredient('x', HeliodorGem.createFinishedHeliodorGem())

3
plugins/heliodor-paper/src/main/java/net/civmc/heliodor/meteoriciron/FactoryUpgrade.java
View File

@@ -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<ShapedRecipe> getRecipes(Plugin plugin) {
static List<CraftingRecipe> getRecipes(Plugin plugin) {
ItemStack upgrade = FactoryUpgrade.createUpgrade();
upgrade.setAmount(3);
return List.of(

4
plugins/heliodor-paper/src/main/java/net/civmc/heliodor/meteoriciron/MeteoricIron.java
View File

@@ -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<ShapedRecipe> getRecipes(Plugin plugin) {
static List<CraftingRecipe> getRecipes(Plugin plugin) {
ShapedRecipe recipe = new ShapedRecipe(new NamespacedKey(plugin, "meteoric_iron_ingot"), MeteoricIron.createIngot())
.shape("xxx", "xxx", "xxx")
.setIngredient('x', MeteoricIron.createMeteoricIronNugget());

3
plugins/heliodor-paper/src/main/java/net/civmc/heliodor/meteoriciron/MeteoricIronArmour.java
View File

@@ -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<Recipe> getRecipes(Plugin plugin) {
static List<CraftingRecipe> getRecipes(Plugin plugin) {
return List.of(
categoryEquipment(new ShapedRecipe(new NamespacedKey(plugin, "meteoric_iron_helmet"), MeteoricIronArmour.createHelmet(false))
.shape("xxx", "x x")

3
plugins/heliodor-paper/src/main/java/net/civmc/heliodor/meteoriciron/MeteoricIronTools.java
View File

@@ -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<ShapedRecipe> getRecipes(Plugin plugin) {
static List<CraftingRecipe> getRecipes(Plugin plugin) {
return List.of(
categoryEquipment(new ShapedRecipe(new NamespacedKey(plugin, "meteoric_iron_pickaxe_silk_touch"), MeteoricIronTools.createPickaxe(true))
.shape("xxx", "asa", " s ")