1.0.1 - Added "blocking damage" tooltip on Shields

Author: Insane96

changelog.md

@@ -1,4 +1,8 @@
 # Changelog
 
+## 1.0.1
+* Added "blocking damage" tooltip on Shields
+* Raised mixin priority, should prevent IguanaTweaks from messing with the blocking delay (0.25 secs)
+
 ## 1.0.0
 * First Release with shields and a few small features

gradle.properties

@@ -3,7 +3,7 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 mc_version=1.18.2
-mod_version=1.0.0
+mod_version=1.0.1
 lib_version=1.5.1
 mixin_version=0.8.5
 forge_version=40.1.60

src/main/java/com/insane96mcp/shieldsplus/item/SPShieldItem.java

@@ -1,11 +1,21 @@
 package com.insane96mcp.shieldsplus.item;
 
 import com.insane96mcp.shieldsplus.render.ShieldBlockEntityWithoutLevelRenderer;
+import com.insane96mcp.shieldsplus.setup.Strings;
+import net.minecraft.ChatFormatting;
 import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.ShieldItem;
+import net.minecraft.world.item.TooltipFlag;
+import net.minecraft.world.level.Level;
 import net.minecraftforge.client.IItemRenderProperties;
+import org.jetbrains.annotations.Nullable;
 
+import java.text.DecimalFormat;
+import java.util.List;
 import java.util.function.Consumer;
 
 public class SPShieldItem extends ShieldItem {
@@ -32,4 +42,14 @@ public BlockEntityWithoutLevelRenderer getItemStackRenderer() {
             }
         });
     }
+
+    @Override
+    public void appendHoverText(ItemStack itemStack, @Nullable Level level, List<Component> components, TooltipFlag tooltipFlag) {
+        super.appendHoverText(itemStack, level, components, tooltipFlag);
+        addDamageBlockedText(components, this.getBlockedDamage());
+    }
+
+    public static void addDamageBlockedText(List<Component> components, double blockedDamage) {
+        components.add(new TranslatableComponent(Strings.Translatable.DAMAGE_BLOCKED, new DecimalFormat("#.#").format(blockedDamage)).withStyle(ChatFormatting.BLUE));
+    }
 }

src/main/java/com/insane96mcp/shieldsplus/mixin/LivingEntityMixin.java

@@ -9,7 +9,7 @@
 import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
-@Mixin(LivingEntity.class)
+@Mixin(value = LivingEntity.class, priority = 1001)
 public abstract class LivingEntityMixin extends Entity {
 
     public LivingEntityMixin(EntityType<?> p_19870_, Level p_19871_) {

src/main/java/com/insane96mcp/shieldsplus/module/base/feature/BaseFeature.java

@@ -8,6 +8,7 @@
 import net.minecraft.world.item.Items;
 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.event.entity.living.ShieldBlockEvent;
+import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 @Label(name = "Shields+")
@@ -63,6 +64,17 @@ else if (event.getEntityLiving().getUseItem().getItem() instanceof SPShieldItem)
         event.setBlockedDamage((float) blockedDamage);
     }
 
+    @SubscribeEvent
+    public void onTooltip(ItemTooltipEvent event) {
+        if (!this.isEnabled()
+                || !this.shieldBlockFixedDamageAmount)
+            return;
+
+        if (event.getItemStack().is(Items.SHIELD)) {
+            SPShieldItem.addDamageBlockedText(event.getToolTip(), 5d);
+        }
+    }
+
     public boolean shouldRemoveShieldWindup() {
         return this.isEnabled() && this.removeShieldWindup;
     }

src/main/java/com/insane96mcp/shieldsplus/setup/Strings.java

@@ -1,5 +1,7 @@
 package com.insane96mcp.shieldsplus.setup;
 
+import com.insane96mcp.shieldsplus.ShieldsPlus;
+
 public class Strings {
     public static class Items {
         public static final String WOODEN_SHIELD = "wooden_shield";
@@ -14,6 +16,6 @@ public static class Tags {
     }
 
     public static class Translatable {
-
+        public static final String DAMAGE_BLOCKED = ShieldsPlus.RESOURCE_PREFIX + "damage_blocked";
     }
 }

src/main/resources/assets/shieldsplus/lang/en_us.json

@@ -4,5 +4,6 @@
     "item.shieldsplus.golden_shield": "Golden shield",
     "item.minecraft.shield": "Iron shield",
     "item.shieldsplus.diamond_shield": "Diamond shield",
-    "item.shieldsplus.netherite_shield": "Netherite shield"
+    "item.shieldsplus.netherite_shield": "Netherite shield",
+    "shieldsplus:damage_blocked": "%s damage blocked"
 }