-
-
Notifications
You must be signed in to change notification settings - Fork 213
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
46 changed files
with
1,973 additions
and
1,646 deletions.
There are no files selected for viewing
Submodule SpongeAPI
updated
15 files
82 changes: 82 additions & 0 deletions
82
.../java/org/spongepowered/forge/mixin/core/world/entity/LivingEntityMixin_Forge_Damage.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| * This file is part of Sponge, licensed under the MIT License (MIT). | ||
| * | ||
| * Copyright (c) SpongePowered <https://www.spongepowered.org> | ||
| * Copyright (c) contributors | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
| package org.spongepowered.forge.mixin.core.world.entity; | ||
|
|
||
| import net.minecraft.world.damagesource.DamageSource; | ||
| import net.minecraft.world.entity.LivingEntity; | ||
| import net.minecraftforge.event.ForgeEventFactory; | ||
| import net.minecraftforge.event.entity.living.ShieldBlockEvent; | ||
| import org.spongepowered.api.event.cause.entity.damage.DamageStepTypes; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Constant; | ||
| import org.spongepowered.asm.mixin.injection.ModifyArg; | ||
| import org.spongepowered.asm.mixin.injection.ModifyConstant; | ||
| import org.spongepowered.asm.mixin.injection.Redirect; | ||
| import org.spongepowered.asm.mixin.injection.Slice; | ||
| import org.spongepowered.common.bridge.world.entity.TrackedDamageBridge; | ||
| import org.spongepowered.common.event.cause.entity.damage.SpongeDamageStep; | ||
| import org.spongepowered.common.event.cause.entity.damage.SpongeDamageTracker; | ||
| import org.spongepowered.common.item.util.ItemStackUtil; | ||
|
|
||
| @Mixin(LivingEntity.class) | ||
| public abstract class LivingEntityMixin_Forge_Damage implements TrackedDamageBridge { | ||
|
|
||
| @ModifyConstant(method = "actuallyHurt", constant = @Constant(floatValue = 0), slice = @Slice( | ||
| from = @At(value = "INVOKE", target = "Lnet/minecraftforge/common/ForgeHooks;onLivingHurt(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/damagesource/DamageSource;F)F"), | ||
| to = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;getDamageAfterArmorAbsorb(Lnet/minecraft/world/damagesource/DamageSource;F)F"))) | ||
| private float damage$doNotReturnEarly(final float constant) { | ||
| return Float.NaN; | ||
| } | ||
|
|
||
| @SuppressWarnings("UnstableApiUsage") | ||
| @Redirect(method = "hurt", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/event/ForgeEventFactory;onShieldBlock(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/damagesource/DamageSource;F)Lnet/minecraftforge/event/entity/living/ShieldBlockEvent;")) | ||
| private ShieldBlockEvent damage$modifyBeforeAndAfterShield(final LivingEntity self, final DamageSource source, final float originalDamage) { | ||
| final SpongeDamageTracker tracker = this.damage$tracker(); | ||
| if (tracker == null) { | ||
| return ForgeEventFactory.onShieldBlock(self, source, originalDamage); | ||
| } | ||
|
|
||
| final SpongeDamageStep step = tracker.newStep(DamageStepTypes.SHIELD, originalDamage, ItemStackUtil.snapshotOf(self.getUseItem())); | ||
| float damage = (float) step.applyModifiersBefore(); | ||
| final ShieldBlockEvent event; | ||
| if (step.isSkipped()) { | ||
| event = new ShieldBlockEvent(self, source, damage); | ||
| event.setCanceled(true); | ||
| } else { | ||
| event = ForgeEventFactory.onShieldBlock(self, source, damage); | ||
| if (!event.isCanceled()) { | ||
| damage -= event.getBlockedDamage(); | ||
| } | ||
| } | ||
| step.applyModifiersAfter(damage); | ||
| return event; | ||
| } | ||
|
|
||
| @ModifyArg(method = "actuallyHurt", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/common/ForgeHooks;onLivingDamage(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/damagesource/DamageSource;F)F")) | ||
| private float damage$firePostEvent_Living(final float damage) { | ||
| return this.damage$firePostEvent(damage); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 0 additions & 62 deletions
62
...org/spongepowered/neoforge/mixin/core/world/entity/LivingEntityMixin_Neo_Attack_Impl.java
This file was deleted.
Oops, something went wrong.
113 changes: 113 additions & 0 deletions
113
...java/org/spongepowered/neoforge/mixin/core/world/entity/LivingEntityMixin_Neo_Damage.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| /* | ||
| * This file is part of Sponge, licensed under the MIT License (MIT). | ||
| * | ||
| * Copyright (c) SpongePowered <https://www.spongepowered.org> | ||
| * Copyright (c) contributors | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
| package org.spongepowered.neoforge.mixin.core.world.entity; | ||
|
|
||
| import net.minecraft.world.entity.LivingEntity; | ||
| import net.neoforged.neoforge.common.CommonHooks; | ||
| import net.neoforged.neoforge.common.damagesource.DamageContainer; | ||
| import net.neoforged.neoforge.event.entity.living.LivingShieldBlockEvent; | ||
| import org.spongepowered.api.event.cause.entity.damage.DamageStepTypes; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Shadow; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.ModifyVariable; | ||
| import org.spongepowered.asm.mixin.injection.Redirect; | ||
| import org.spongepowered.asm.mixin.injection.Slice; | ||
| import org.spongepowered.common.bridge.world.entity.TrackedDamageBridge; | ||
| import org.spongepowered.common.event.cause.entity.damage.SpongeDamageStep; | ||
| import org.spongepowered.common.event.cause.entity.damage.SpongeDamageTracker; | ||
| import org.spongepowered.common.item.util.ItemStackUtil; | ||
|
|
||
| import java.util.Stack; | ||
|
|
||
| @Mixin(LivingEntity.class) | ||
| public abstract class LivingEntityMixin_Neo_Damage implements TrackedDamageBridge { | ||
|
|
||
| @Shadow protected Stack<DamageContainer> damageContainers; | ||
|
|
||
| @Override | ||
| public float damage$getContainerDamage(final float damage) { | ||
| return this.damageContainers.peek().getNewDamage(); | ||
| } | ||
|
|
||
| @Override | ||
| public void damage$setContainerDamage(final float damage) { | ||
| this.damageContainers.peek().setNewDamage(damage); | ||
| } | ||
|
|
||
| @SuppressWarnings("UnstableApiUsage") | ||
| @Redirect(method = "hurt", at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/common/CommonHooks;onDamageBlock(Lnet/minecraft/world/entity/LivingEntity;Lnet/neoforged/neoforge/common/damagesource/DamageContainer;Z)Lnet/neoforged/neoforge/event/entity/living/LivingShieldBlockEvent;")) | ||
| private LivingShieldBlockEvent damage$modifyBeforeAndAfterShield(final LivingEntity self, final DamageContainer container, final boolean blocked) { | ||
| final SpongeDamageTracker tracker = this.damage$tracker(); | ||
| if (tracker == null || !blocked) { // don't capture when vanilla wouldn't block | ||
| return CommonHooks.onDamageBlock(self, container, false); | ||
| } | ||
|
|
||
| final float originalDamage = container.getNewDamage(); | ||
| final SpongeDamageStep step = tracker.newStep(DamageStepTypes.SHIELD, originalDamage, ItemStackUtil.snapshotOf(self.getUseItem())); | ||
| float damage = (float) step.applyModifiersBefore(); | ||
| container.setNewDamage(damage); | ||
| final LivingShieldBlockEvent event; | ||
| if (step.isSkipped()) { | ||
| event = new LivingShieldBlockEvent(self, container, true); | ||
| event.setBlocked(true); | ||
| } else { | ||
| event = CommonHooks.onDamageBlock(self, container, true); | ||
| container.setBlockedDamage(event); | ||
| damage = container.getNewDamage(); | ||
| } | ||
| step.applyModifiersAfter(damage); | ||
| return event; | ||
| } | ||
|
|
||
| @Redirect(method = "hurt", at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/common/damagesource/DamageContainer;setBlockedDamage(Lnet/neoforged/neoforge/event/entity/living/LivingShieldBlockEvent;)V")) | ||
| private void damage$cancelSetBlockedDamage(final DamageContainer container, final LivingShieldBlockEvent event) { | ||
| // We already did it above | ||
| } | ||
|
|
||
| @ModifyVariable(method = "actuallyHurt", ordinal = 1, | ||
| at = @At(value = "INVOKE_ASSIGN", target = "Lnet/neoforged/neoforge/common/CommonHooks;onLivingDamagePre(Lnet/minecraft/world/entity/LivingEntity;Lnet/neoforged/neoforge/common/damagesource/DamageContainer;)F")) | ||
| private float damage$modifyBeforeAbsorption(final float damage) { | ||
| final SpongeDamageTracker tracker = this.damage$tracker(); | ||
| return tracker == null ? damage : tracker.startStep(DamageStepTypes.ABSORPTION, damage, this); | ||
| } | ||
|
|
||
| @SuppressWarnings("UnstableApiUsage") | ||
| @Redirect(method = "actuallyHurt", at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/common/damagesource/DamageContainer;setReduction(Lnet/neoforged/neoforge/common/damagesource/DamageContainer$Reduction;F)V"), slice = @Slice( | ||
| from = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/common/CommonHooks;onLivingDamagePre(Lnet/minecraft/world/entity/LivingEntity;Lnet/neoforged/neoforge/common/damagesource/DamageContainer;)F"))) | ||
| private void damage$skipAbsorption(final DamageContainer container, final DamageContainer.Reduction reduction, final float absorbed) { | ||
| final SpongeDamageTracker tracker = this.damage$tracker(); | ||
| if (tracker == null || !tracker.isSkipped(DamageStepTypes.ABSORPTION)) { | ||
| container.setReduction(reduction, absorbed); | ||
| } | ||
| } | ||
|
|
||
| @ModifyVariable(method = "actuallyHurt", at = @At("LOAD"), ordinal = 3, slice = @Slice( | ||
| from = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayer;awardStat(Lnet/minecraft/resources/ResourceLocation;I)V"), | ||
| to = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;getCombatTracker()Lnet/minecraft/world/damagesource/CombatTracker;"))) | ||
| private float damage$firePostEvent_Living(final float damage) { | ||
| return this.damage$firePostEvent(damage); | ||
| } | ||
| } |
Oops, something went wrong.