Merge pull request #2109

anointments can now be applied in the smithing table

Author: wrincewind

src/main/java/wayoftime/bloodmagic/common/item/ItemAnointmentProvider.java

@@ -27,8 +27,8 @@ public class ItemAnointmentProvider extends Item
 //	public Anointment anointment;
 	public ResourceLocation anointRL;
 	private int colour;
-	private int level;
-	private int maxDamage;
+	public int level;
+	public int maxDamage;
 
 	public ItemAnointmentProvider(ResourceLocation anointRL, int colour, int level, int maxDamage)
 	{

src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicRecipeSerializers.java

@@ -59,6 +59,8 @@ private BloodMagicRecipeSerializers()
 
 	public static final IRecipeSerializerRegistryObject<RecipeFilterCopy> FILTER_COPY = RECIPE_SERIALIZERS.register("filter_copy", () -> new SimpleCraftingRecipeSerializer<>(RecipeFilterCopy::new));
 
+    public static final IRecipeSerializerRegistryObject<RecipeAnointmentApply> ANOINTMENT_APPLY = RECIPE_SERIALIZERS.register("anointment_apply", RecipeAnointmentApply.Serializer::new);
+
 //	public static final DeferredRegister<IRecipeSerializer<?>> RECIPE_SERIALIZERS = DeferredRegister.create(ForgeRegistries.RECIPE_SERIALIZERS, BloodMagic.MODID);
 
 //	public static final DeferredObject<RecipeBloodAltar> REC = RECIPE_SERIALIZERS.register("test", () -> new BloodAltarRecipeSerializer<>(IRecipeBloodAltar::new));

src/main/java/wayoftime/bloodmagic/recipe/RecipeAnointmentApply.java

@@ -0,0 +1,100 @@
+package wayoftime.bloodmagic.recipe;
+
+
+import com.google.gson.JsonObject;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.GsonHelper;
+import net.minecraft.world.Container;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.crafting.*;
+import net.minecraft.world.level.Level;
+import wayoftime.bloodmagic.BloodMagic;
+import wayoftime.bloodmagic.anointment.AnointmentData;
+import wayoftime.bloodmagic.anointment.AnointmentHolder;
+import wayoftime.bloodmagic.common.item.ItemAnointmentProvider;
+import wayoftime.bloodmagic.common.item.ItemBowAnointmentProvider;
+import wayoftime.bloodmagic.core.AnointmentRegistrar;
+
+public class RecipeAnointmentApply implements SmithingRecipe {
+    @Override
+    public boolean isTemplateIngredient(ItemStack stack) {
+        return stack.getItem() instanceof ItemAnointmentProvider;
+    }
+
+    @Override
+    public boolean isBaseIngredient(ItemStack stack) {
+        return ItemAnointmentProvider.isItemSword(stack)
+                || ItemAnointmentProvider.isItemTool(stack)
+                || ItemBowAnointmentProvider.isItemBow(stack)
+                || ItemBowAnointmentProvider.isItemCrossbow(stack);
+    }
+
+    @Override
+    public boolean isAdditionIngredient(ItemStack stack) {
+        return false;
+    }
+
+    @Override
+    public boolean matches(Container container, Level level) {
+        // 0 Template, 1 Base, 2 Extra
+        ItemStack anointmentStack = container.getItem(0);
+        ItemStack toolStack = container.getItem(1);
+        if (anointmentStack.getItem() instanceof ItemAnointmentProvider toolProvider) {
+            return toolProvider.isItemValidForApplication(toolStack);
+        }
+
+        return false;
+    }
+
+    @Override
+    public ItemStack assemble(Container container, RegistryAccess registries) {
+        // 0 Template, 1 Base, 2 Extra
+        ItemAnointmentProvider anointmentStack = (ItemAnointmentProvider) container.getItem(0).getItem();
+        ItemStack weaponStack = container.getItem(1).copy();
+
+        AnointmentHolder holder = AnointmentHolder.fromItemStack(weaponStack);
+        if (holder == null)
+        {
+            holder = new AnointmentHolder();
+        }
+
+        if (holder.applyAnointment(weaponStack, AnointmentRegistrar.ANOINTMENT_MAP.get(anointmentStack.anointRL), new AnointmentData(anointmentStack.level, 0, anointmentStack.maxDamage)))
+        {
+            holder.toItemStack(weaponStack);
+            return weaponStack;
+        }
+
+        return ItemStack.EMPTY;
+    }
+
+    @Override
+    public ItemStack getResultItem(RegistryAccess registries) {
+        return ItemStack.EMPTY;
+    }
+
+    @Override
+    public ResourceLocation getId() {
+        return BloodMagic.rl("anointment_apply");
+    }
+
+    @Override
+    public RecipeSerializer<?> getSerializer() {
+        return null;
+    }
+
+    public static class Serializer implements RecipeSerializer<RecipeAnointmentApply> {
+        public RecipeAnointmentApply fromJson(ResourceLocation p_266953_, JsonObject p_266720_) {
+            return new RecipeAnointmentApply();
+        }
+
+        public RecipeAnointmentApply fromNetwork(ResourceLocation p_267117_, FriendlyByteBuf p_267316_) {
+            return new RecipeAnointmentApply();
+        }
+
+        @Override
+        public void toNetwork(FriendlyByteBuf p_44101_, RecipeAnointmentApply p_44102_) {
+        }
+    }
+}

src/main/resources/assets/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments.json

@@ -12,6 +12,10 @@
       "heading": "Slate-infused Vial",
       "recipe": "bloodmagic:alchemytable/slate_vial",
       "text": "A sturdy Vial that can contain otherwise uncontainable mixtures."
+    },
+    {
+      "type": "patchouli:text",
+      "text": "Its also possible to apply an $(item)anointment$() to an applicable item using a smithing table. This is particularly useful for two-handed weapons or $(l:bloodmagic:alchemy_array/living_equipment/armour_downgrades/crippled_arm)other situations where you might find yourself not having enough hands$(). The $(item)anointment$() takes the role of a smithing template in this process."
     }
   ]
 }

src/main/resources/data/bloodmagic/recipes/anointment_apply.json

@@ -0,0 +1,3 @@
+{
+  "type": "bloodmagic:anointment_apply"
+}