Skip to content

Refactor ShadowSteelSword by removing air consumption #68

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
Gytube wants to merge 1 commit into
base: 1.21.1
Choose a base branch
from
Open

Refactor ShadowSteelSword by removing air consumption #68

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
21 changes: 1 addition & 20 deletions src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelSword.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,7 @@ public int getUseDuration(ItemStack p_41454_, LivingEntity p_344979_) {
public void releaseUsing(ItemStack stack, Level level, LivingEntity lvEntity, int remainingTime) {
if (!(lvEntity instanceof Player player)) return;
if (!CreateQOLConfigs.server().equipments.tools.swordsAbilities.get()) return;
if (CreateQOLConfigs.server().equipments.tools.swordsAirConsumption.get() > 0 && !player.isCreative()) {
ItemStack backtank = BacktankUtil.getAllWithAir(player).stream().filter(i -> BacktankUtil.getAir(i) >= CreateQOLConfigs.server().equipments.tools.swordsAirConsumption.get()).findFirst().orElse(ItemStack.EMPTY);
if (backtank.isEmpty()) return;
BacktankUtil.consumeAir(player,backtank,CreateQOLConfigs.server().equipments.tools.swordsAirConsumption.get());
}

int usedTime = getUseDuration(stack,lvEntity) - remainingTime;
float timeRatio = (float) usedTime / getUseDuration(stack,lvEntity);
if (!level.isClientSide) {
Expand Down Expand Up @@ -145,21 +141,6 @@ public <T extends LivingEntity> int damageItem(ItemStack stack, int amount, @Nul
return super.damageItem(stack, amount, entity, onBroken);
}

@Override
public boolean isBarVisible(ItemStack stack) {
return BacktankUtil.isBarVisible(stack, getMaxDamage(stack));
}

@Override
public int getBarWidth(ItemStack stack) {
return BacktankUtil.getBarWidth(stack, getMaxDamage(stack));
}

@Override
public int getBarColor(ItemStack stack) {
return BacktankUtil.getBarColor(stack, getMaxDamage(stack));
}

@Override
public ReachType reachType(ItemStack stack) {
return ReachType.ENTITY;
Expand Down
Loading