Skip to content

fix: remove Combatify support explicitly. #2819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Alexandra-Myers wants to merge 5 commits into
base: 1.21.1-develop
Choose a base branch
from
Open

fix: remove Combatify support explicitly. #2819

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a409daa
Add ability to detect Combatify config option to not make it impossib…
Alexandra-Myers Oct 31, 2025
91b3bf9
Remove unnecessary local variable
Alexandra-Myers Oct 31, 2025
cc9c05e
Add vanilla check to match expectation
Alexandra-Myers Oct 31, 2025
8ad0d60
Fails to compile due to missing Atlas Core
Alexandra-Myers Oct 31, 2025
f266d17
Remove Combatify support
Alexandra-Myers Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/main/java/com/aetherteam/aether/item/EquipmentUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.neoforged.fml.ModList;

import javax.annotation.Nullable;
import java.util.List;
Expand All @@ -26,8 +25,7 @@ public final class EquipmentUtil {
* @return Whether the attack was full strength, as a {@link Boolean}.
*/
public static boolean isFullStrength(LivingEntity attacker) {
boolean combatifyLoaded = ModList.get().isLoaded("combatify");
return !(attacker instanceof Player player) || (combatifyLoaded ? player.getAttackStrengthScale(1.0F) >= 1.95F : player.getAttackStrengthScale(1.0F) >= 1.0F);
return !(attacker instanceof Player player) || player.getAttackStrengthScale(1.0F) >= 1.0F;
}

/**
Expand Down