6.0.2

RobertSkalko · Jan 2, 2025 · ad6a454 · ad6a454
1 parent 5c1836f
commit ad6a454
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 14 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,4 +1,4 @@
 Changelog of recent updates: https://github.com/RobertSkalko/Mine-And-Slash-Rework/blob/1.20-Forge/changelogs/v.6.0.txt
 
-v.6.0.1
-- fixed 1 hp mobs
+v.6.0.2
+- fixed sweeping
diff --git a/UPDATE/v.6.0.txt - Shortcut.lnk b/UPDATE/v.6.0.txt - Shortcut.lnk
diff --git a/changelogs/v.6.0.txt b/changelogs/v.6.0.txt
@@ -37,3 +37,8 @@ Other:
 - loot chests can no longer be salvaged
 - merged clefal's PR to reduce talent tree lag
 
+v.6.0.1
+- fixed 1 hp mobs
+
+v.6.0.2
+- fixed sweeping
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx2G
 # --- COMMON GRADLE START ---
 # Mod Properties
-mod_version=6.0.1
+mod_version=6.0.2
 # Minecraft Versions
 minecraft_version=1.20.1
 forgeversion=47.1.43

diff --git a/...in/java/com/robertx22/mine_and_slash/event_hooks/damage_hooks/util/AttackInformation.java b/...in/java/com/robertx22/mine_and_slash/event_hooks/damage_hooks/util/AttackInformation.java
@@ -60,6 +60,12 @@ public void setAmount(float f) {
         }
     }
 
+    // setting it to super tiny number still allows the bit of damage to go through
+    // this makes sweeping edge work
+    public void setToMinimalNonZero() {
+        this.setAmount(0.0000001F);
+    }
+
     public LivingEntity getTargetEntity() {
         return targetEntity;
     }

diff --git a/src/main/java/com/robertx22/mine_and_slash/itemstack/CommonTooltips.java b/src/main/java/com/robertx22/mine_and_slash/itemstack/CommonTooltips.java
@@ -1,6 +1,5 @@
 package com.robertx22.mine_and_slash.itemstack;
 
-import com.google.common.collect.ImmutableList;
 import com.robertx22.mine_and_slash.gui.texts.textblocks.AdditionalBlock;
 import com.robertx22.mine_and_slash.uncommon.localization.Itemtips;
 import com.robertx22.mine_and_slash.uncommon.localization.Words;
@@ -14,14 +13,15 @@
 
 public class CommonTooltips {
 
-    public static AdditionalBlock potentialCorruptionAndQuality(ExileStack exStack) {
+    public static AdditionalBlock potentialCorruptionAndQuality(ExileStack exStack, boolean doQuality) {
 
-        return new AdditionalBlock(
-                ImmutableList.of(
-                        exStack.isCorrupted() ? Component.literal("").append(Itemtips.POTENTIAL.locName(exStack.get(StackKeys.POTENTIAL).getOrCreate().potential).withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.STRIKETHROUGH)).append(Component.literal(" ")).append(Words.Corrupted.locName().withStyle(ChatFormatting.RED)) : Itemtips.POTENTIAL.locName(exStack.get(StackKeys.POTENTIAL).getOrCreate().potential).withStyle(ChatFormatting.GOLD),
-                        Itemtips.QUALITY.locName(exStack.get(StackKeys.CUSTOM).getOrCreate().data.get(CustomItemData.KEYS.QUALITY)).withStyle(ChatFormatting.GOLD)
-                )
-        ).showWhen(() -> Screen.hasShiftDown());
+        List<MutableComponent> list = new ArrayList<>();
+        list.add(exStack.isCorrupted() ? Component.literal("").append(Itemtips.POTENTIAL.locName(exStack.get(StackKeys.POTENTIAL).getOrCreate().potential).withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.STRIKETHROUGH)).append(Component.literal(" ")).append(Words.Corrupted.locName().withStyle(ChatFormatting.RED)) : Itemtips.POTENTIAL.locName(exStack.get(StackKeys.POTENTIAL).getOrCreate().potential).withStyle(ChatFormatting.GOLD));
+
+        if (doQuality) {
+            Itemtips.QUALITY.locName(exStack.get(StackKeys.CUSTOM).getOrCreate().data.get(CustomItemData.KEYS.QUALITY)).withStyle(ChatFormatting.GOLD);
+        }
+        return new AdditionalBlock(list).showWhen(() -> Screen.hasShiftDown());
     }
 
     public static AdditionalBlock craftedItem(ExileStack exStack) {

diff --git a/src/main/java/com/robertx22/mine_and_slash/saveclasses/item_classes/GearTooltipUtils.java b/src/main/java/com/robertx22/mine_and_slash/saveclasses/item_classes/GearTooltipUtils.java
@@ -242,7 +242,7 @@ public List<? extends Component> getAvailableComponents() {
                         return list;
                     }
                 })
-                .accept(CommonTooltips.potentialCorruptionAndQuality(exStack))
+                .accept(CommonTooltips.potentialCorruptionAndQuality(exStack, true))
                 .accept(CommonTooltips.craftedItem(exStack))
                 .accept(new AdditionalBlock(() -> {
                             int cost = (int) Energy.getInstance().scale(ModType.FLAT, gear.GetBaseGearType().getGearSlot().weapon_data.energy_cost_per_swing, data.getLevel());

diff --git a/src/main/java/com/robertx22/mine_and_slash/saveclasses/jewel/JewelItemData.java b/src/main/java/com/robertx22/mine_and_slash/saveclasses/jewel/JewelItemData.java
@@ -164,7 +164,7 @@ public List<? extends Component> getAvailableComponents() {
 
                 .accept(new OperationTipBlock().setShift().setAlt());
 
-        tip.accept(CommonTooltips.potentialCorruptionAndQuality(ex));
+        tip.accept(CommonTooltips.potentialCorruptionAndQuality(ex, false));
 
         tip.accept(new ClickToOpenGuiBlock());
 

diff --git a/src/main/java/com/robertx22/mine_and_slash/uncommon/effectdatas/DamageEvent.java b/src/main/java/com/robertx22/mine_and_slash/uncommon/effectdatas/DamageEvent.java
@@ -529,7 +529,7 @@ protected void activate() {
         }
         if (attackInfo != null) {
             if (CompatConfig.get().DAMAGE_COMPATIBILITY().overridesDamage) {
-                attackInfo.setAmount(0);
+                attackInfo.setToMinimalNonZero();
             }
         }
         if (stopFriendlyFire()) {