Skip to content

Refactor Puff Circlet fall negation logic. #601

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
DaFuqs merged 3 commits into from
Nov 24, 2024
Merged

Refactor Puff Circlet fall negation logic. #601

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3adf80a
me when knee surgery is tomorrow
imreallybadatnames Nov 24, 2024
2a7c742
actually i should probably do this
imreallybadatnames Nov 24, 2024
e711952
what???
imreallybadatnames Nov 24, 2024
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
57 changes: 28 additions & 29 deletions src/main/java/de/dafuqs/spectrum/mixin/LivingEntityMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import de.dafuqs.spectrum.status_effects.*;
import dev.emi.trinkets.api.*;
import net.fabricmc.fabric.api.tag.convention.v1.*;
import net.minecraft.block.*;
import net.minecraft.enchantment.*;
import net.minecraft.entity.*;
import net.minecraft.entity.attribute.*;
Expand Down Expand Up @@ -334,7 +333,7 @@ else if (source.isIn(SpectrumDamageTypeTags.INCREASED_ARMOR_DAMAGE)) {
return protection;
}

@ModifyVariable(method = "applyArmorToDamage", at = @At("STORE"), ordinal = 0)
@ModifyVariable(method = "applyArmorToDamage", at = @At("STORE"), ordinal = 0, argsOnly = true)
private float spectrum$applyArmorToDamage(float amount, DamageSource source) {
float defense = getArmor();
float toughness = getToughness();
Expand Down Expand Up @@ -386,34 +385,34 @@ private float getToughness() {
return (float) this.getAttributeValue(EntityAttributes.GENERIC_ARMOR_TOUGHNESS);
}

@Inject(at = @At("HEAD"), method = "fall(DZLnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;)V")
private void spectrum$fall(double heightDifference, boolean onGround, BlockState landedState, BlockPos landedPosition, CallbackInfo ci) {
if (onGround) {
LivingEntity thisEntity = (LivingEntity) (Object) this;
if (!thisEntity.isInvulnerableTo(thisEntity.getDamageSources().fall()) && thisEntity.fallDistance > thisEntity.getSafeFallDistance()) {
Optional<TrinketComponent> component = TrinketsApi.getTrinketComponent(thisEntity);
if (component.isPresent()) {
if (!component.get().getEquipped(SpectrumItems.PUFF_CIRCLET).isEmpty()) {
var charges = AzureDikeProvider.getAzureDikeCharges(thisEntity);
if (charges > 0) {
AzureDikeProvider.absorbDamage(thisEntity, PuffCircletItem.FALL_DAMAGE_NEGATING_COST);

thisEntity.fallDistance = 0;
thisEntity.setVelocity(thisEntity.getVelocity().x, 0.5, thisEntity.getVelocity().z);
World world = thisEntity.getWorld();
if (world.isClient) { // it is split here so the particles spawn immediately, without network lag
ParticleHelper.playParticleWithPatternAndVelocityClient(thisEntity.getWorld(), thisEntity.getPos(), SpectrumParticleTypes.WHITE_CRAFTING, VectorPattern.EIGHT, 0.4);
ParticleHelper.playParticleWithPatternAndVelocityClient(thisEntity.getWorld(), thisEntity.getPos(), SpectrumParticleTypes.BLUE_CRAFTING, VectorPattern.EIGHT_OFFSET, 0.5);
} else if (thisEntity instanceof ServerPlayerEntity serverPlayerEntity) {
SpectrumS2CPacketSender.playParticleWithPatternAndVelocity(serverPlayerEntity, (ServerWorld) thisEntity.getWorld(), thisEntity.getPos(), SpectrumParticleTypes.WHITE_CRAFTING, VectorPattern.EIGHT, 0.4);
SpectrumS2CPacketSender.playParticleWithPatternAndVelocity(serverPlayerEntity, (ServerWorld) thisEntity.getWorld(), thisEntity.getPos(), SpectrumParticleTypes.BLUE_CRAFTING, VectorPattern.EIGHT_OFFSET, 0.5);
}
thisEntity.getWorld().playSound(null, thisEntity.getBlockPos(), SpectrumSoundEvents.PUFF_CIRCLET_PFFT, SoundCategory.PLAYERS, 1.0F, 1.0F);
}
}
}
}
@Inject(method = "handleFallDamage", at = @At("HEAD"), cancellable = true)
private void spectrum$puffCircletDamageNegation(float fallDistance, float damageMultiplier, DamageSource damageSource, CallbackInfoReturnable<Boolean> cir) {
LivingEntity thisEntity = (LivingEntity) (Object) this;
// check if damage reduction is applicable to this entity
if (thisEntity.isInvulnerableTo(thisEntity.getDamageSources().fall()) || AzureDikeProvider.getAzureDikeCharges(thisEntity) <= 0) return;

// check if this entity is protected by puff circlet
Optional<TrinketComponent> component = TrinketsApi.getTrinketComponent(thisEntity);
if (component.isEmpty() || component.get().getEquipped(SpectrumItems.PUFF_CIRCLET).isEmpty()) return;

// do damage reduction
AzureDikeProvider.absorbDamage(thisEntity, PuffCircletItem.FALL_DAMAGE_NEGATING_COST);

// yoink
Vec3d velocity = thisEntity.getVelocity();
thisEntity.setVelocity(velocity.getX(), 0.5, velocity.getZ());
World world = thisEntity.getWorld();
if (world.isClient) { // it is split here so the particles spawn immediately, without network lag
ParticleHelper.playParticleWithPatternAndVelocityClient(thisEntity.getWorld(), thisEntity.getPos(), SpectrumParticleTypes.WHITE_CRAFTING, VectorPattern.EIGHT, 0.4);
ParticleHelper.playParticleWithPatternAndVelocityClient(thisEntity.getWorld(), thisEntity.getPos(), SpectrumParticleTypes.BLUE_CRAFTING, VectorPattern.EIGHT_OFFSET, 0.5);
} else if (thisEntity instanceof ServerPlayerEntity serverPlayerEntity) {
SpectrumS2CPacketSender.playParticleWithPatternAndVelocity(serverPlayerEntity, (ServerWorld) thisEntity.getWorld(), thisEntity.getPos(), SpectrumParticleTypes.WHITE_CRAFTING, VectorPattern.EIGHT, 0.4);
SpectrumS2CPacketSender.playParticleWithPatternAndVelocity(serverPlayerEntity, (ServerWorld) thisEntity.getWorld(), thisEntity.getPos(), SpectrumParticleTypes.BLUE_CRAFTING, VectorPattern.EIGHT_OFFSET, 0.5);
}
thisEntity.getWorld().playSound(null, thisEntity.getBlockPos(), SpectrumSoundEvents.PUFF_CIRCLET_PFFT, SoundCategory.PLAYERS, 1.0F, 1.0F);

// at last, cancel the function
cir.setReturnValue(false);
}

@ModifyVariable(at = @At("HEAD"), method = "damage(Lnet/minecraft/entity/damage/DamageSource;F)Z", argsOnly = true)
Expand Down
Loading