Merge pull request #2122 from stellanera98/1.20-anointment-charges

Explosive charges n olonger lose their Anointments if held in hand when breaking a block.

Author: wrincewind

src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_stairs.json

@@ -0,0 +1,3 @@
+{
+  "parent": "bloodmagic:block/dungeon_brick_stairs"
+}

src/generated/resources/data/bloodmagic/tags/items/charges.json

@@ -0,0 +1,13 @@
+{
+  "values": [
+    "bloodmagic:shaped_charge",
+    "bloodmagic:shaped_charge_deep",
+    "bloodmagic:aug_shaped_charge",
+    "bloodmagic:deforester_charge",
+    "bloodmagic:deforester_charge_2",
+    "bloodmagic:fungal_charge",
+    "bloodmagic:fungal_charge_2",
+    "bloodmagic:veinmine_charge",
+    "bloodmagic:veinmine_charge_2"
+  ]
+}

src/generated/resources/data/minecraft/tags/items/cluster_max_harvestables.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "bloodmagic:soulpickaxe"
+  ]
+}

src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java

@@ -53,6 +53,7 @@ protected void registerModels() {
         for (RegistryObject<Block> block : BloodMagicBlocks.DECORATIVE_STAIR.getEntries()) {
             registerBlockModel(block.get());
         }
+        registerBlockModel(BloodMagicBlocks.DUNGEON_BRICK_STAIRS.get());
 
         for (RegistryObject<Block> block : BloodMagicBlocks.DECORATIVE_GATE.getEntries()) {
             registerBlockModel(block.get());

src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemTags.java

@@ -56,6 +56,12 @@ public void addTags(HolderLookup.Provider provider)
 		this.tag(BloodMagicTags.ARC_TOOL).addTag(BloodMagicTags.ARC_TOOL_CUTTINGFLUID);
 		this.tag(BloodMagicTags.ARC_TOOL).add(BloodMagicItems.ALCHEMY_FLASK_LINGERING.get());
 
+        this.tag(BloodMagicTags.CHARGES)
+                .add(BloodMagicItems.SHAPED_CHARGE_ITEM.get(), BloodMagicItems.SHAPED_CHARGE_DEEP_ITEM.get(), BloodMagicItems.AUG_SHAPED_CHARGE_ITEM.get())
+                .add(BloodMagicItems.DEFORESTER_CHARGE_ITEM.get(), BloodMagicItems.DEFORESTER_CHARGE_2_ITEM.get())
+                .add(BloodMagicItems.FUNGAL_CHARGE_ITEM.get(), BloodMagicItems.FUNGAL_CHARGE_2_ITEM.get())
+                .add(BloodMagicItems.VEINMINE_CHARGE_ITEM.get(), BloodMagicItems.VEINMINE_CHARGE_2_ITEM.get());
+
 		this.tag(BloodMagicTags.CRYSTAL_DEMON).add(BloodMagicItems.RAW_CRYSTAL.get());
 		this.tag(BloodMagicTags.CRYSTAL_DEMON).add(BloodMagicItems.CORROSIVE_CRYSTAL.get());
 		this.tag(BloodMagicTags.CRYSTAL_DEMON).add(BloodMagicItems.DESTRUCTIVE_CRYSTAL.get());
@@ -205,6 +211,7 @@ private void registerVanillaTools()
 		tag(BloodMagicTags.PICKAXES).add(Items.DIAMOND_PICKAXE, Items.GOLDEN_PICKAXE, Items.IRON_PICKAXE, Items.NETHERITE_PICKAXE, Items.STONE_PICKAXE, Items.WOODEN_PICKAXE, BloodMagicItems.SENTIENT_PICKAXE.get());
 		tag(BloodMagicTags.HOES).add(Items.DIAMOND_HOE, Items.GOLDEN_HOE, Items.IRON_HOE, Items.NETHERITE_HOE, Items.STONE_HOE, Items.WOODEN_HOE, BloodMagicItems.SENTIENT_SCYTHE.get());
         tag(BloodMagicTags.SCYTHES).add(BloodMagicItems.SENTIENT_SCYTHE.get());
+        tag(ItemTags.CLUSTER_MAX_HARVESTABLES).add(BloodMagicItems.SENTIENT_PICKAXE.get());
 
         tag(Tags.Items.ARMORS_HELMETS).add(BloodMagicItems.LIVING_HELMET.get());
         tag(Tags.Items.ARMORS_CHESTPLATES).add(BloodMagicItems.LIVING_PLATE.get());

src/main/java/wayoftime/bloodmagic/common/tags/BloodMagicTags.java

@@ -137,8 +137,9 @@ public class BloodMagicTags
 	// Modded (for meteor rituals)
 	public static final TagKey<Item> ADVANCED_ALLOY = getForgeAlloyTag("advanced");
 	public static final TagKey<Item> DRAGON_BONE = ItemTags.create(new ResourceLocation("forge:bones"));
+    public static final TagKey<Item> CHARGES = ItemTags.create(BloodMagic.rl("charges"));
 
-	public static class Blocks
+    public static class Blocks
 	{
 		public static final TagKey<Block> MUSHROOM_STEM = BlockTags.create(new ResourceLocation("minecraft:mushroom_stem"));
 		public static final TagKey<Block> MUSHROOM_HYPHAE = BlockTags.create(new ResourceLocation("minecraft:mushroom_hyphae"));

src/main/java/wayoftime/bloodmagic/loot/GlobalLootModifier.java

@@ -29,6 +29,7 @@
 import net.minecraftforge.registries.RegistryObject;
 import org.jetbrains.annotations.NotNull;
 import wayoftime.bloodmagic.BloodMagic;
+import wayoftime.bloodmagic.anointment.AnointmentData;
 import wayoftime.bloodmagic.anointment.AnointmentHolder;
 import wayoftime.bloodmagic.common.tags.BloodMagicTags;
 import wayoftime.bloodmagic.core.AnointmentRegistrar;
@@ -60,6 +61,9 @@ public SilkTouchTestModifier(LootItemCondition[] conditionsIn)
 		@Override
 		protected @NotNull ObjectArrayList<ItemStack> doApply(ObjectArrayList<ItemStack> generatedLoot, LootContext context) {
 			ItemStack ctxTool = context.getParamOrNull(LootContextParams.TOOL);
+            if (ctxTool.is(BloodMagicTags.CHARGES)) {
+                return generatedLoot;
+            }
 			// return early if silk-touch is already applied (otherwise we'll get stuck in
 			// an infinite loop).
 			if (EnchantmentHelper.getEnchantments(ctxTool).containsKey(Enchantments.SILK_TOUCH))
@@ -69,6 +73,7 @@ public SilkTouchTestModifier(LootItemCondition[] conditionsIn)
 			{
 				return generatedLoot;
 			}
+
 			ItemStack fakeTool = ctxTool.copy();
 			fakeTool.enchant(Enchantments.SILK_TOUCH, 1);
 			LootParams.Builder builder = new LootParams.Builder(context.getLevel());
@@ -115,6 +120,9 @@ public FortuneModifier(LootItemCondition[] conditionsIn)
 			{
 				return generatedLoot;
 			}
+            if (ctxTool.is(BloodMagicTags.CHARGES)) {
+                return generatedLoot;
+            }
 
 			if (EnchantmentHelper.getEnchantments(ctxTool).containsKey(Enchantments.SILK_TOUCH))
 				return generatedLoot;
@@ -252,6 +260,9 @@ public SmeltingModifier(LootItemCondition[] conditionsIn)
 			{
 				return generatedLoot;
 			}
+            if (ctxTool.is(BloodMagicTags.CHARGES)) {
+                return generatedLoot;
+            }
 
 			AnointmentHolder holder = AnointmentHolder.fromItemStack(ctxTool);
 			if (holder == null)
@@ -314,6 +325,9 @@ public VoidingModifier(LootItemCondition[] conditionsIn)
 			{
 				return generatedLoot;
 			}
+            if (ctxTool.is(BloodMagicTags.CHARGES)) {
+                return generatedLoot;
+            }
 
 			AnointmentHolder holder = AnointmentHolder.fromItemStack(ctxTool);
 			if (holder == null)

src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java

@@ -35,8 +35,11 @@
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import wayoftime.bloodmagic.BloodMagic;
+import wayoftime.bloodmagic.anointment.Anointment;
+import wayoftime.bloodmagic.anointment.AnointmentData;
 import wayoftime.bloodmagic.anointment.AnointmentHolder;
 import wayoftime.bloodmagic.common.item.*;
+import wayoftime.bloodmagic.common.tags.BloodMagicTags;
 import wayoftime.bloodmagic.core.AnointmentRegistrar;
 import wayoftime.bloodmagic.core.LivingArmorRegistrar;
 import wayoftime.bloodmagic.core.data.Binding;
@@ -917,8 +920,12 @@ public void onBreakBlock(BlockEvent.BreakEvent event)
 					}
 				}
 
-				if (holder.consumeAnointmentDurabilityOnHarvest(heldStack, EquipmentSlot.MAINHAND, player) || hasAnointmentChanged)
-					holder.toItemStack(heldStack);
+                if (heldStack.is(BloodMagicTags.CHARGES)) {
+                    return;
+                }
+				if (holder.consumeAnointmentDurabilityOnHarvest(heldStack, EquipmentSlot.MAINHAND, player) || hasAnointmentChanged) {
+                    holder.toItemStack(heldStack);
+                }
 			}
 		}
 	}