Skip to content

Changes for Epic Fight 20.11.2 #397

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

Merged
alRex-U merged 1 commit into from
Jun 2, 2025
Merged

Changes for Epic Fight 20.11.2 #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ patch=5
# A or B or R
forge_version=47.4.0
patchouli_version=1.20.1-81-FORGE
epicfight_version=5159623
epicfight_version=6602479
jei_version=15.20.0.105
6 changes: 3 additions & 3 deletions src/main/java/com/alrex/parcool/extern/epicfight/EpicFightManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ PlayerPatch<?> getPlayerPatch(Player player) {
return EpicFightCapabilities.getEntityPatch(player, PlayerPatch.class);
}

public boolean isBattleMode(Player player) {
public boolean isEpicFightMode(Player player) {
PlayerPatch<?> patch = getPlayerPatch(player);
if (patch == null) return false;
return patch.isBattleMode();
return patch.isEpicFightMode();
}

@OnlyIn(Dist.CLIENT)
public boolean canShowStaminaHUD(Player player) {
var stamina = IStamina.get(player);
if (stamina instanceof ParCoolStamina) return true;
return stamina instanceof EpicFightStamina && !isBattleMode(player);
return stamina instanceof EpicFightStamina && !isEpicFightMode(player);
}
}
24 changes: 12 additions & 12 deletions src/main/java/com/alrex/parcool/extern/epicfight/EpicFightStamina.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public EpicFightStamina(Player player) {

@Override
public int getActualMaxStamina() {
if (AdditionalMods.epicFight().isBattleMode(player)) {
if (AdditionalMods.epicFight().isEpicFightMode(player)) {
PlayerPatch<?> patch = AdditionalMods.epicFight().getPlayerPatch(player);
if (patch == null) return 0;
return (int) patch.getMaxStamina();
Expand All @@ -32,7 +32,7 @@ public int getActualMaxStamina() {

@Override
public int get() {
if (AdditionalMods.epicFight().isBattleMode(player)) {
if (AdditionalMods.epicFight().isEpicFightMode(player)) {
PlayerPatch<?> patch = AdditionalMods.epicFight().getPlayerPatch(player);
if (patch == null) return 0;
return (int) patch.getStamina();
Expand All @@ -43,7 +43,7 @@ public int get() {

@Override
public int getOldValue() {
if (AdditionalMods.epicFight().isBattleMode(player)) {
if (AdditionalMods.epicFight().isEpicFightMode(player)) {
return get();
} else {
return parcoolStamina.getOldValue();
Expand All @@ -58,7 +58,7 @@ public void consume(int value) {
|| parkourability.getActionInfo().isStaminaInfinite(player.isSpectator() || player.isCreative())
|| player.hasEffect(Effects.INEXHAUSTIBLE.get())
) return;
if (AdditionalMods.epicFight().isBattleMode(player)) {
if (AdditionalMods.epicFight().isEpicFightMode(player)) {
consumeBuffer += value / 60f;
} else {
parcoolStamina.consume(value);
Expand All @@ -67,7 +67,7 @@ public void consume(int value) {

@Override
public void recover(int value) {
if (!AdditionalMods.epicFight().isBattleMode(player)) {
if (!AdditionalMods.epicFight().isEpicFightMode(player)) {
parcoolStamina.recover(value);
}
}
Expand All @@ -79,7 +79,7 @@ public boolean isExhausted() {
if (parkourability.getActionInfo().isStaminaInfinite(player.isSpectator() || player.isCreative())
|| player.hasEffect(Effects.INEXHAUSTIBLE.get())
) return false;
if (AdditionalMods.epicFight().isBattleMode(player)) {
if (AdditionalMods.epicFight().isEpicFightMode(player)) {
PlayerPatch<?> patch = AdditionalMods.epicFight().getPlayerPatch(player);
if (patch == null) return false;
return patch.getStamina() < 0.1f;
Expand All @@ -89,35 +89,35 @@ public boolean isExhausted() {

@Override
public void setExhaustion(boolean value) {
if (!AdditionalMods.epicFight().isBattleMode(player)) {
if (!AdditionalMods.epicFight().isEpicFightMode(player)) {
parcoolStamina.setExhaustion(value);
}
}

@Override
public void tick() {
if (!AdditionalMods.epicFight().isBattleMode(player)) {
if (!AdditionalMods.epicFight().isEpicFightMode(player)) {
parcoolStamina.tick();
}
}

@Override
public void updateOldValue() {
if (!AdditionalMods.epicFight().isBattleMode(player)) {
if (!AdditionalMods.epicFight().isEpicFightMode(player)) {
parcoolStamina.updateOldValue();
}
}

@Override
public void set(int value) {
if (!AdditionalMods.epicFight().isBattleMode(player)) {
if (!AdditionalMods.epicFight().isEpicFightMode(player)) {
parcoolStamina.set(value);
}
}

@Override
public boolean wantToConsumeOnServer() {
return AdditionalMods.epicFight().isBattleMode(player) && consumeBuffer != 0f;
return AdditionalMods.epicFight().isEpicFightMode(player) && consumeBuffer != 0f;
}

@Override
Expand All @@ -129,7 +129,7 @@ public int getRequestedValueConsumedOnServer() {

@Override
public boolean isImposingExhaustionPenalty() {
return !AdditionalMods.epicFight().isBattleMode(player) && parcoolStamina.isImposingExhaustionPenalty();
return !AdditionalMods.epicFight().isEpicFightMode(player) && parcoolStamina.isImposingExhaustionPenalty();
}

public static void consumeOnServer(ServerPlayer player, int value) {
Expand Down