lens shields record

Author: Lounode

Fabric/src/generated/resources/data/c/tags/items/shields.json

@@ -0,0 +1,9 @@
+{
+  "replace": false,
+  "values": [
+    "extrabotany:manasteel_shield",
+    "extrabotany:elementium_shield",
+    "extrabotany:terrasteel_shield",
+    "extrabotany:achilles_shield"
+  ]
+}

Fabric/src/main/java/io/github/lounode/extrabotany/fabric/FabricCommonInitializer.java

@@ -163,6 +163,7 @@ private void registerCapabilities() {
 		BotaniaFabricCapabilities.RELIC.registerForItems((st, c) -> InfiniteWineItem.makeRelic(st), ExtraBotanyItems.infiniteWine);
 		BotaniaFabricCapabilities.RELIC.registerForItems((st, c) -> VoidArchivesItem.makeRelic(st), ExtraBotanyItems.voidArchives);
 		BotaniaFabricCapabilities.RELIC.registerForItems((st, c) -> RheinHammerItem.makeRelic(st), ExtraBotanyItems.rheinHammer);
+		BotaniaFabricCapabilities.RELIC.registerForItems((st, c) -> AchillesShieldItem.makeRelic(st), ExtraBotanyItems.achillesShield);
 	}
 
 	private void registerFuels() {

Fabric/src/main/java/io/github/lounode/extrabotany/fabric/data/FabricItemTagProvider.java

@@ -36,7 +36,7 @@ protected void addTags(HolderLookup.Provider provider) {
 
 	private void generateToolTags() {
 		this.tag(ConventionalItemTags.BOWS).add(BOWS);
-
+		this.tag(ConventionalItemTags.SHIELDS).add(SHIELDS);
 		this.tag(ConventionalItemTags.QUARTZ).add(gaiaQuartz, elementiumQuartz);
 	}
 

Fabric/src/main/java/io/github/lounode/extrabotany/fabric/mixin/CustomShieldBlockMixin.java

@@ -0,0 +1,23 @@
+package io.github.lounode.extrabotany.fabric.mixin;
+
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+
+import net.minecraft.world.entity.player.Player;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+import io.github.lounode.extrabotany.common.lib.ExtraBotanyTags;
+
+@Mixin(Player.class)
+public class CustomShieldBlockMixin {
+
+	@ModifyExpressionValue(
+		method = "hurtCurrentlyUsedShield",
+		at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;is(Lnet/minecraft/world/item/Item;)Z")
+	)
+	private boolean onHurtCurrentlyUsedShield(boolean original) {
+		Player player = (Player) (Object) this;
+		return original || player.getUseItem().is(ExtraBotanyTags.Items.SHIELDS);
+	}
+}

Fabric/src/main/resources/extrabotany_fabric.mixins.json

@@ -4,6 +4,7 @@
   "package": "io.github.lounode.extrabotany.fabric.mixin",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
+    "CustomShieldBlockMixin",
     "GetBlockEnchantLevelMixin",
     "ServerPlayerGameModeFabricMixin",
     "SimulateDestroyMixinFabric"

Forge/src/generated/resources/data/forge/tags/items/tools/shields.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    "extrabotany:manasteel_shield",
+    "extrabotany:elementium_shield",
+    "extrabotany:terrasteel_shield",
+    "extrabotany:achilles_shield"
+  ]
+}

Forge/src/main/java/io/github/lounode/extrabotany/api/ExtrabotanyForgeCapabilities.java

@@ -9,5 +9,5 @@
 public final class ExtrabotanyForgeCapabilities {
 	private ExtrabotanyForgeCapabilities() {}
 
-	public static final Capability<NatureEnergyItem> NATURE_ENERGY_ITEM = CapabilityManager.get(new CapabilityToken<NatureEnergyItem>() {});
+	public static final Capability<NatureEnergyItem> NATURE_ENERGY_ITEM = CapabilityManager.get(new CapabilityToken<>() {});
 }

Forge/src/main/java/io/github/lounode/extrabotany/forge/ForgeCommonInitializer.java

@@ -227,7 +227,8 @@ private void attachItemCaps(AttachCapabilitiesEvent<ItemStack> e) {
 			ExtraBotanyItems.pandorasBox, PandorasBoxItem::makeRelic,
 			ExtraBotanyItems.infiniteWine, InfiniteWineItem::makeRelic,
 			ExtraBotanyItems.voidArchives, VoidArchivesItem::makeRelic,
-			ExtraBotanyItems.rheinHammer, RheinHammerItem::makeRelic
+			ExtraBotanyItems.rheinHammer, RheinHammerItem::makeRelic,
+			ExtraBotanyItems.achillesShield, AchillesShieldItem::makeRelic
 	));
 
 	private static <T> void bind(IEventBus modEventBus, ResourceKey<Registry<T>> registry, Consumer<BiConsumer<T, ResourceLocation>> source) {

Forge/src/main/java/io/github/lounode/extrabotany/forge/data/ForgeItemTagProvider.java

@@ -78,6 +78,7 @@ private void generateToolTags() {
 		this.tag(Tags.Items.ARMORS_CHESTPLATES).add(starryIdolSuit, pleiadesCombatMaidSuit, sanguinePleiadesCombatMaidSuit, shadowWarriorChestplate, goblinSlayerChestplate);
 		this.tag(Tags.Items.ARMORS_LEGGINGS).add(starryIdolSkirt, pleiadesCombatMaidSkirt, shadowWarriorLeggings, goblinSlayerLeggings);
 		this.tag(Tags.Items.ARMORS_BOOTS).add(starryIdolBoots, pleiadesCombatMaidBoots, shadowWarriorBoots, goblinSlayerBoots);
+		this.tag(Items.TOOLS_SHIELDS).add(SHIELDS);
 	}
 
 	private static TagKey<Item> accessory(String name) {