mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-03-04 14:54:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Compile error quick fix

Browse source
This commit is contained in:
simibubi 2024-10-16 14:10:54 +02:00
parent eb9e8ab59d
commit 58007c5f88
1 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/main/java/com/simibubi/create/content/equipment/tool/CardboardSwordItem.java
View file

@ -64,7 +64,7 @@ public class CardboardSwordItem extends SwordItem {
Entity attacker = event.getSource() Entity attacker = event.getSource()
.getEntity(); .getEntity();
LivingEntity target = event.getEntity(); LivingEntity target = event.getEntity();
if (target instanceof Spider) if (target == null || target instanceof Spider)
return; return;
if (!(attacker instanceof LivingEntity livingAttacker if (!(attacker instanceof LivingEntity livingAttacker
&& AllItems.CARDBOARD_SWORD.isIn(livingAttacker.getItemInHand(InteractionHand.MAIN_HAND)))) && AllItems.CARDBOARD_SWORD.isIn(livingAttacker.getItemInHand(InteractionHand.MAIN_HAND))))
@ -75,33 +75,26 @@ public class CardboardSwordItem extends SwordItem {
// Reference player.attack() // Reference player.attack()
// This section replicates knockback behaviour without hurting the target // This section replicates knockback behaviour without hurting the target
double i = livingAttacker.getAttributeValue(Attributes.ATTACK_KNOCKBACK) + 2; double knockbackStrength = livingAttacker.getAttributeValue(Attributes.ATTACK_KNOCKBACK) + 2;
i += EnchantmentHelper.getKnockbackBonus(livingAttacker); knockbackStrength += EnchantmentHelper.getKnockbackBonus(livingAttacker);
if (livingAttacker.isSprinting() if (livingAttacker.isSprinting()
&& (!(livingAttacker instanceof Player p) || p.getAttackStrengthScale(0.5f) > 0.9f)) && (!(livingAttacker instanceof Player p) || p.getAttackStrengthScale(0.5f) > 0.9f))
++i; ++knockbackStrength;
if (i <= 0) if (knockbackStrength <= 0)
return; return;
if (target instanceof LivingEntity livingTarget) { target.knockback(knockbackStrength * 0.5F, Mth.sin(livingAttacker.getYRot() * Mth.DEG_TO_RAD),
livingTarget.knockback(i * 0.5F, Mth.sin(livingAttacker.getYRot() * Mth.DEG_TO_RAD), -Mth.cos(livingAttacker.getYRot() * Mth.DEG_TO_RAD));
-Mth.cos(livingAttacker.getYRot() * Mth.DEG_TO_RAD)); if ((target.getClassification(false) == MobCategory.MISC
if ((livingTarget.getClassification(false) == MobCategory.MISC || target.getClassification(false) == MobCategory.CREATURE) && !(target instanceof Player))
|| livingTarget.getClassification(false) == MobCategory.CREATURE) && !(livingTarget instanceof Player)) target.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 60, 9, true, false, false));
livingTarget.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 60, 9, true, false, false));
} else {
event.getEntity()
.push(-Mth.sin(livingAttacker.getYRot() * Mth.DEG_TO_RAD) * i * 0.5F, 0.05D,
Mth.cos(livingAttacker.getYRot() * Mth.DEG_TO_RAD) * i * 0.5F);
}
livingAttacker.setDeltaMovement(livingAttacker.getDeltaMovement() livingAttacker.setDeltaMovement(livingAttacker.getDeltaMovement()
.multiply(0.6D, 1.0D, 0.6D)); .multiply(0.6D, 1.0D, 0.6D));
livingAttacker.setSprinting(false); livingAttacker.setSprinting(false);
} }
@Override @Override
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public void initializeClient(Consumer<IClientItemExtensions> consumer) { public void initializeClient(Consumer<IClientItemExtensions> consumer) {