1.1.0

Starexify · Jan 21, 2025 · e568a33 · e568a33
1 parent 24efd2c
commit e568a33
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 44 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -21,7 +21,7 @@ loader_version_range=[4,)
 mod_id=big_swords
 mod_name=Big Swords R
 mod_license=MIT
-mod_version=1.0.1
+mod_version=1.1.0
 mod_group_id=net.nova.big_swords
 mod_authors=ImVeryBad, Foxirion
 mod_description=Big Swords R is trying to bring back the nostalgia of the Asgard Shield mod for modern Minecraft, adding BIG swords, scythes, glaives and shields to the game with special stuff.
diff --git a/src/main/java/net/nova/big_swords/BigSwordsR.java b/src/main/java/net/nova/big_swords/BigSwordsR.java
@@ -61,7 +61,7 @@ public static Holder<Enchantment> getEnchantment(Level level, ResourceKey<Enchan
 
     public static double getModifierValue(List<ItemAttributeModifiers.Entry> modifiers, ResourceLocation modifierId) {
         return modifiers.stream()
-                .filter(entry -> entry.modifier().id(modifierId))
+                .filter(entry -> entry.modifier().is(modifierId))
                 .mapToDouble(entry -> entry.modifier().amount())
                 .findFirst().orElse(0.0);
     }

diff --git a/src/main/java/net/nova/big_swords/event/BigSwordsRGame.java b/src/main/java/net/nova/big_swords/event/BigSwordsRGame.java
@@ -1,27 +1,24 @@
 package net.nova.big_swords.event;
 
-import com.google.common.collect.Multimap;
 import net.minecraft.ChatFormatting;
-import net.minecraft.core.Holder;
+import net.minecraft.core.component.DataComponents;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.world.entity.EquipmentSlotGroup;
 import net.minecraft.world.entity.Mob;
-import net.minecraft.world.entity.ai.attributes.Attribute;
-import net.minecraft.world.entity.ai.attributes.AttributeModifier;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.component.ItemAttributeModifiers;
 import net.minecraft.world.level.Level;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.neoforge.client.event.AddAttributeTooltipsEvent;
 import net.neoforged.neoforge.client.event.GatherSkippedAttributeTooltipsEvent;
 import net.neoforged.neoforge.common.extensions.IAttributeExtension;
-import net.neoforged.neoforge.common.util.AttributeUtil;
 import net.neoforged.neoforge.event.entity.EntityJoinLevelEvent;
-import net.nova.big_swords.init.BSAttributes;
+import net.nova.big_swords.BigSwordsR;
 import net.nova.big_swords.init.BSItems;
 import net.nova.big_swords.init.BSToolMaterial;
 import net.nova.big_swords.init.Tags;
@@ -30,7 +27,7 @@
 
 import java.time.LocalDate;
 import java.time.temporal.ChronoField;
-import java.util.Collection;
+import java.util.List;
 
 import static net.nova.big_swords.BigSwordsR.MODID;
 
@@ -65,30 +62,22 @@ public static void removeAttributesFromTooltip(GatherSkippedAttributeTooltipsEve
     @SubscribeEvent
     public static void addAttributeItemTooltips(AddAttributeTooltipsEvent event) {
         if (!event.shouldShow()) return;
-
-        ItemStack stack = event.getStack();
-        Item item = stack.getItem();
+        Item item = event.getStack().getItem();
         if (item instanceof ScytheItem || item instanceof GlaiveItem) {
-            Multimap<Holder<Attribute>, AttributeModifier> modifiers = AttributeUtil.getSortedModifiers(stack, EquipmentSlotGroup.MAINHAND);
-            double minChargedDamage = modifiers.entries().stream()
-                    .filter(e -> e.getValue().is(BSToolMaterial.MIN_CHARGED_DAMAGE_ID))
-                    .mapToDouble(e -> e.getValue().amount())
-                    .findFirst().orElse(0.0);
-            double maxChargedDamage = modifiers.entries().stream()
-                    .filter(e -> e.getValue().is(BSToolMaterial.MAX_CHARGED_DAMAGE_ID))
-                    .mapToDouble(e -> e.getValue().amount())
-                    .findFirst().orElse(0.0);
+            List<ItemAttributeModifiers.Entry> modifiers = item.components().get(DataComponents.ATTRIBUTE_MODIFIERS).modifiers();
+            double minChargedDamage = BigSwordsR.getModifierValue(modifiers, BSToolMaterial.MIN_CHARGED_DAMAGE_ID);
+            double maxChargedDamage = BigSwordsR.getModifierValue(modifiers, BSToolMaterial.MAX_CHARGED_DAMAGE_ID);
 
             event.addTooltipLines(
-                    Component.literal(" " + IAttributeExtension.FORMAT.format(minChargedDamage) + "-" + IAttributeExtension.FORMAT.format(maxChargedDamage) + " ")
-                            .append(Component.translatable("attribute.name.charged_damage"))
-                            .withStyle(ChatFormatting.DARK_GREEN)
-            );
+                    CommonComponents.space().append(Component.literal(
+                                    IAttributeExtension.FORMAT.format(minChargedDamage) + "-" + IAttributeExtension.FORMAT.format(maxChargedDamage) + " ")
+                            .append(Component.translatable("attribute.name.charged_damage")).withStyle(ChatFormatting.DARK_GREEN)
+                    ));
         }
 
         if (item instanceof GlaiveItem glaiveItem) {
             event.addTooltipLines(
-                    Component.literal(" " + IAttributeExtension.FORMAT.format(glaiveItem.range) + " Range").withStyle(ChatFormatting.DARK_GREEN)
+                    Component.literal(" " + IAttributeExtension.FORMAT.format(glaiveItem.range) + " Charged Range").withStyle(ChatFormatting.DARK_GREEN)
             );
         }
     }

diff --git a/src/main/java/net/nova/big_swords/event/BigSwordsRMod.java b/src/main/java/net/nova/big_swords/event/BigSwordsRMod.java