kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

重写载具伤害免疫机制

Browse source
This commit is contained in:
Light_Quanta 2025-02-22 23:59:35 +08:00
parent 7a5dc14ab2
commit ad5a50e451
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
15 changed files with 499 additions and 475 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/com/atsuishio/superbwarfare/entity/MortarEntity.java
View file

@ -93,9 +93,12 @@ public class MortarEntity extends VehicleEntity implements GeoEntity, AnimatedEn
@Override
public boolean hurt(DamageSource source, float amount) {
super.hurt(source, amount);
this.level().playSound(null, this.getOnPos(), ModSounds.HIT.get(), SoundSource.PLAYERS, 1, 1);
amount = damageModifier.compute(source, amount);
super.hurt(source, amount);
this.hurt(amount, source.getEntity(), true);
return true;
}

84
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java
View file

@ -6,6 +6,7 @@ import com.atsuishio.superbwarfare.config.server.VehicleConfig;
import com.atsuishio.superbwarfare.entity.projectile.FlareDecoyEntity;
import com.atsuishio.superbwarfare.entity.projectile.HeliRocketEntity;
import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity;
import com.atsuishio.superbwarfare.entity.vehicle.damage.DamageModifier;
import com.atsuishio.superbwarfare.init.*;
import com.atsuishio.superbwarfare.network.message.ShakeClientMessage;
import com.atsuishio.superbwarfare.tools.CustomExplosion;
@ -132,69 +133,39 @@ public class Ah6Entity extends ContainerMobileEntity implements GeoEntity, IHeli
@Override
public boolean hurt(DamageSource source, float amount) {
super.hurt(source, amount);
if (this.level() instanceof ServerLevel serverLevel) {
sendParticle(serverLevel, ModParticleTypes.FIRE_STAR.get(), this.getX(), this.getY() + 2.5, this.getZ(), 4, 0.2, 0.2, 0.2, 0.2, false);
}
if (source.is(DamageTypes.ARROW)) {
amount *= 0.1f;
}
if (source.is(DamageTypes.TRIDENT)) {
amount *= 0.2f;
}
if (source.is(DamageTypes.MOB_ATTACK)) {
amount *= 0.2f;
}
if (source.is(DamageTypes.MOB_ATTACK_NO_AGGRO)) {
amount *= 0.2f;
}
if (source.is(DamageTypes.MOB_PROJECTILE)) {
amount *= 0.2f;
}
if (source.is(DamageTypes.PLAYER_ATTACK)) {
amount *= 0.2f;
}
if (source.is(DamageTypes.LAVA)) {
amount *= 2f;
}
if (source.is(DamageTypes.EXPLOSION)) {
amount *= 2f;
}
if (source.is(DamageTypes.PLAYER_EXPLOSION)) {
amount *= 2f;
}
if (source.is(ModDamageTypes.CUSTOM_EXPLOSION)) {
amount *= 1f;
}
if (source.is(ModDamageTypes.PROJECTILE_BOOM)) {
amount *= 1f;
}
if (source.is(ModDamageTypes.MINE)) {
amount *= 0.5f;
}
if (source.is(ModDamageTypes.LUNGE_MINE)) {
amount *= 0.5f;
}
if (source.is(ModDamageTypes.CANNON_FIRE)) {
amount *= 0.4f;
}
if (source.is(ModTags.DamageTypes.PROJECTILE)) {
amount *= 0.08f;
}
if (source.is(ModTags.DamageTypes.PROJECTILE_ABSOLUTE)) {
amount *= 0.5f;
}
if (source.is(ModDamageTypes.VEHICLE_STRIKE)) {
amount *= 5f;
}
this.level().playSound(null, this.getOnPos(), ModSounds.HIT.get(), SoundSource.PLAYERS, 1, 1);
this.hurt(Math.max(amount - 2, 0), source.getEntity(), true);
amount = getDamageModifier().compute(source, amount);
super.hurt(source, amount);
this.hurt(amount, source.getEntity(), true);
return true;
}
@Override
public DamageModifier getDamageModifier() {
return super.getDamageModifier()
.multiply(0.1f, DamageTypes.ARROW)
.multiply(0.2f, DamageTypes.TRIDENT)
.multiply(0.2f, DamageTypes.MOB_ATTACK)
.multiply(0.2f, DamageTypes.MOB_ATTACK_NO_AGGRO)
.multiply(0.2f, DamageTypes.MOB_PROJECTILE)
.multiply(0.2f, DamageTypes.PLAYER_ATTACK)
.multiply(2, DamageTypes.LAVA)
.multiply(2, DamageTypes.EXPLOSION)
.multiply(2, DamageTypes.PLAYER_EXPLOSION)
.multiply(0.5f, ModDamageTypes.MINE)
.multiply(0.5f, ModDamageTypes.LUNGE_MINE)
.multiply(0.4f, ModDamageTypes.CANNON_FIRE)
.multiply(0.08f, ModTags.DamageTypes.PROJECTILE)
.multiply(0.5f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE)
.multiply(5, ModDamageTypes.VEHICLE_STRIKE)
.reduce(2);
}
@Override
public void baseTick() {
propellerRotO = this.getPropellerRot();
@ -809,6 +780,7 @@ public class Ah6Entity extends ContainerMobileEntity implements GeoEntity, IHeli
public ResourceLocation getVehicleIcon() {
return ModUtils.loc("textures/vehicle_icon/ah_6_icon.png");
}
@Override
public boolean allowFreeCam() {
return true;

80
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/AnnihilatorEntity.java
View file

@ -3,6 +3,7 @@ package com.atsuishio.superbwarfare.entity.vehicle;
import com.atsuishio.superbwarfare.ModUtils;
import com.atsuishio.superbwarfare.config.server.ExplosionConfig;
import com.atsuishio.superbwarfare.config.server.VehicleConfig;
import com.atsuishio.superbwarfare.entity.vehicle.damage.DamageModifier;
import com.atsuishio.superbwarfare.init.*;
import com.atsuishio.superbwarfare.network.message.ShakeClientMessage;
import com.atsuishio.superbwarfare.tools.*;
@ -117,66 +118,39 @@ public class AnnihilatorEntity extends EnergyVehicleEntity implements GeoEntity,
@Override
public boolean hurt(DamageSource source, float amount) {
super.hurt(source, amount);
if (this.level() instanceof ServerLevel serverLevel) {
sendParticle(serverLevel, ModParticleTypes.FIRE_STAR.get(), this.getX(), this.getY() + 2.5, this.getZ(), 4, 0.2, 0.2, 0.2, 0.2, false);
}
if (source.is(DamageTypes.ARROW)) {
amount *= 0f;
}
if (source.is(DamageTypes.TRIDENT)) {
amount *= 0f;
}
if (source.is(DamageTypes.MOB_ATTACK)) {
amount *= 0f;
}
if (source.is(DamageTypes.MOB_ATTACK_NO_AGGRO)) {
amount *= 0f;
}
if (source.is(DamageTypes.MOB_PROJECTILE)) {
amount *= 0f;
}
if (source.is(DamageTypes.PLAYER_ATTACK)) {
amount *= 0f;
}
if (source.is(DamageTypes.EXPLOSION)) {
amount *= 0.75f;
}
if (source.is(DamageTypes.PLAYER_EXPLOSION)) {
amount *= 0.75f;
}
if (source.is(ModDamageTypes.CUSTOM_EXPLOSION)) {
amount *= 0.2f;
}
if (source.is(ModDamageTypes.PROJECTILE_BOOM)) {
amount *= 0.2f;
}
if (source.is(ModDamageTypes.MINE)) {
amount *= 0.1f;
}
if (source.is(ModDamageTypes.LUNGE_MINE)) {
amount *= 0.12f;
}
if (source.is(ModDamageTypes.CANNON_FIRE)) {
amount *= 0.22f;
}
if (source.is(ModTags.DamageTypes.PROJECTILE)) {
amount *= 0f;
}
if (source.is(ModTags.DamageTypes.PROJECTILE_ABSOLUTE)) {
amount *= 0.15f;
}
if (source.is(ModDamageTypes.VEHICLE_STRIKE)) {
amount *= 0f;
}
this.level().playSound(null, this.getOnPos(), ModSounds.HIT.get(), SoundSource.PLAYERS, 1, 1);
this.hurt(Math.max(amount - 10, 0), source.getEntity(), true);
amount = damageModifier.compute(source, amount);
super.hurt(source, amount);
this.hurt(amount, source.getEntity(), true);
return true;
}
@Override
public DamageModifier getDamageModifier() {
return super.getDamageModifier()
.immuneTo(DamageTypes.ARROW)
.immuneTo(DamageTypes.TRIDENT)
.immuneTo(DamageTypes.MOB_ATTACK)
.immuneTo(DamageTypes.MOB_ATTACK_NO_AGGRO)
.immuneTo(DamageTypes.MOB_PROJECTILE)
.immuneTo(DamageTypes.PLAYER_ATTACK)
.immuneTo(ModTags.DamageTypes.PROJECTILE)
.immuneTo(ModDamageTypes.VEHICLE_STRIKE)
.multiply(0.75f, DamageTypes.EXPLOSION)
.multiply(0.2f, ModDamageTypes.CUSTOM_EXPLOSION)
.multiply(0.2f, ModDamageTypes.PROJECTILE_BOOM)
.multiply(0.1f, ModDamageTypes.MINE)
.multiply(0.12f, ModDamageTypes.LUNGE_MINE)
.multiply(0.22f, ModDamageTypes.CANNON_FIRE)
.multiply(0.15f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE)
.reduce(10);
}
@Override
public Vec3 getDeltaMovement() {
return new Vec3(0, Math.min(super.getDeltaMovement().y, 0), 0);

85
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java
View file

@ -6,6 +6,7 @@ import com.atsuishio.superbwarfare.config.server.VehicleConfig;
import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity;
import com.atsuishio.superbwarfare.entity.projectile.SmallCannonShellEntity;
import com.atsuishio.superbwarfare.entity.projectile.WgMissileEntity;
import com.atsuishio.superbwarfare.entity.vehicle.damage.DamageModifier;
import com.atsuishio.superbwarfare.init.*;
import com.atsuishio.superbwarfare.network.ModVariables;
import com.atsuishio.superbwarfare.network.message.ShakeClientMessage;
@ -138,69 +139,41 @@ public class Bmp2Entity extends ContainerMobileEntity implements GeoEntity, ILan
@Override
public boolean hurt(DamageSource source, float amount) {
super.hurt(source, amount);
if (this.level() instanceof ServerLevel serverLevel) {
sendParticle(serverLevel, ModParticleTypes.FIRE_STAR.get(), this.getX(), this.getY() + 2.5, this.getZ(), 4, 0.2, 0.2, 0.2, 0.2, false);
}
if (source.is(DamageTypes.ARROW)) {
amount *= 0.3f;
}
if (source.is(DamageTypes.TRIDENT)) {
amount *= 0.3f;
}
if (source.is(DamageTypes.MOB_ATTACK)) {
amount *= 0.5f;
}
if (source.is(DamageTypes.MOB_ATTACK_NO_AGGRO)) {
amount *= 0.4f;
}
if (source.is(DamageTypes.MOB_PROJECTILE)) {
amount *= 0.3f;
}
if (source.is(DamageTypes.PLAYER_ATTACK)) {
amount *= 0.2f;
}
if (source.is(DamageTypes.LAVA)) {
amount *= 2.5f;
}
if (source.is(DamageTypes.EXPLOSION)) {
amount *= 1.2f;
}
if (source.is(DamageTypes.PLAYER_EXPLOSION)) {
amount *= 1.2f;
}
if (source.is(ModDamageTypes.CUSTOM_EXPLOSION)) {
amount *= 0.4f;
}
if (source.is(ModDamageTypes.PROJECTILE_BOOM)) {
amount *= 0.4f;
}
if (source.is(ModDamageTypes.MINE)) {
amount *= 0.14f;
}
if (source.is(ModDamageTypes.LUNGE_MINE)) {
amount *= 0.18f;
}
if (source.is(ModDamageTypes.CANNON_FIRE)) {
amount *= 0.3f;
}
if (source.is(ModTags.DamageTypes.PROJECTILE)) {
amount *= 0.02f;
}
if (source.is(ModTags.DamageTypes.PROJECTILE_ABSOLUTE)) {
amount *= 0.14f;
}
if (source.is(ModDamageTypes.VEHICLE_STRIKE)) {
amount *= 1.7f;
}
this.level().playSound(null, this.getOnPos(), ModSounds.HIT.get(), SoundSource.PLAYERS, 1, 1);
this.hurt(Math.max(amount - 8, 0), source.getEntity(), true);
amount = damageModifier.compute(source, amount);
super.hurt(source, amount);
this.hurt(amount, source.getEntity(), true);
return true;
}
@Override
public DamageModifier getDamageModifier() {
return super.getDamageModifier()
.multiply(0.3f, DamageTypes.ARROW)
.multiply(0.3f, DamageTypes.TRIDENT)
.multiply(0.5f, DamageTypes.MOB_ATTACK)
.multiply(0.4f, DamageTypes.MOB_ATTACK_NO_AGGRO)
.multiply(0.3f, DamageTypes.MOB_PROJECTILE)
.multiply(0.2f, DamageTypes.PLAYER_ATTACK)
.multiply(2.5f, DamageTypes.LAVA)
.multiply(1.2f, DamageTypes.EXPLOSION)
.multiply(1.2f, DamageTypes.PLAYER_EXPLOSION)
.multiply(0.4f, ModDamageTypes.CUSTOM_EXPLOSION)
.multiply(0.4f, ModDamageTypes.PROJECTILE_BOOM)
.multiply(0.14f, ModDamageTypes.MINE)
.multiply(0.18f, ModDamageTypes.LUNGE_MINE)
.multiply(0.3f, ModDamageTypes.CANNON_FIRE)
.multiply(0.02f, ModTags.DamageTypes.PROJECTILE)
.multiply(0.14f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE)
.multiply(1.7f, ModDamageTypes.VEHICLE_STRIKE)
.reduce(8);
}
@Override
protected void playStepSound(BlockPos pPos, BlockState pState) {
this.playSound(ModSounds.BMP_STEP.get(), Mth.abs(this.entityData.get(POWER)) * 8, random.nextFloat() * 0.15f + 1f);

2
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/DroneEntity.java
View file

@ -107,8 +107,10 @@ public class DroneEntity extends MobileVehicleEntity implements GeoEntity {
@Override
public boolean hurt(DamageSource source, float amount) {
amount = damageModifier.compute(source, amount);
super.hurt(source, amount);
this.hurt(amount, source.getEntity(), false);
return true;
}

84
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/LaserTowerEntity.java
View file

@ -1,5 +1,6 @@
package com.atsuishio.superbwarfare.entity.vehicle;
import com.atsuishio.superbwarfare.entity.vehicle.damage.DamageModifier;
import com.atsuishio.superbwarfare.init.*;
import com.atsuishio.superbwarfare.item.ContainerBlockItem;
import com.atsuishio.superbwarfare.tools.CustomExplosion;
@ -142,69 +143,40 @@ public class LaserTowerEntity extends EnergyVehicleEntity implements GeoEntity,
@Override
public boolean hurt(DamageSource source, float amount) {
super.hurt(source, amount);
if (this.level() instanceof ServerLevel serverLevel) {
sendParticle(serverLevel, ModParticleTypes.FIRE_STAR.get(), this.getX(), this.getY() + 0.8, this.getZ(), 4, 0.1, 0.1, 0.1, 0.2, false);
}
if (source.is(DamageTypes.ARROW)) {
amount *= 0.1f;
}
if (source.is(DamageTypes.TRIDENT)) {
amount *= 0.2f;
}
if (source.is(DamageTypes.MOB_ATTACK)) {
amount *= 0.2f;
}
if (source.is(DamageTypes.MOB_ATTACK_NO_AGGRO)) {
amount *= 0.2f;
}
if (source.is(DamageTypes.MOB_PROJECTILE)) {
amount *= 0.4f;
}
if (source.is(DamageTypes.PLAYER_ATTACK)) {
amount *= 0.4f;
}
if (source.is(DamageTypes.LAVA)) {
amount *= 1f;
}
if (source.is(DamageTypes.EXPLOSION)) {
amount *= 1.5f;
}
if (source.is(DamageTypes.PLAYER_EXPLOSION)) {
amount *= 1.5f;
}
if (source.is(ModDamageTypes.CUSTOM_EXPLOSION)) {
amount *= 0.5f;
}
if (source.is(ModDamageTypes.PROJECTILE_BOOM)) {
amount *= 0.5f;
}
if (source.is(ModDamageTypes.MINE)) {
amount *= 0.5f;
}
if (source.is(ModDamageTypes.LUNGE_MINE)) {
amount *= 0.5f;
}
if (source.is(ModDamageTypes.CANNON_FIRE)) {
amount *= 0.6f;
}
if (source.is(ModTags.DamageTypes.PROJECTILE)) {
amount *= 0.5f;
}
if (source.is(ModTags.DamageTypes.PROJECTILE_ABSOLUTE)) {
amount *= 0.8f;
}
if (source.is(ModDamageTypes.VEHICLE_STRIKE)) {
amount *= 2f;
}
this.level().playSound(null, this.getOnPos(), ModSounds.HIT.get(), SoundSource.PLAYERS, 1, 1);
this.hurt(Math.max(amount - 1, 0), source.getEntity(), true);
amount = damageModifier.compute(source, amount);
super.hurt(source, amount);
this.hurt(amount, source.getEntity(), true);
return true;
}
@Override
public DamageModifier getDamageModifier() {
return super.getDamageModifier()
.multiply(0.1f, DamageTypes.ARROW)
.multiply(0.2f, DamageTypes.TRIDENT)
.multiply(0.2f, DamageTypes.MOB_ATTACK)
.multiply(0.2f, DamageTypes.MOB_ATTACK_NO_AGGRO)
.multiply(0.4f, DamageTypes.MOB_PROJECTILE)
.multiply(0.4f, DamageTypes.PLAYER_ATTACK)
.multiply(1.5f, DamageTypes.EXPLOSION)
.multiply(1.5f, DamageTypes.PLAYER_EXPLOSION)
.multiply(0.5f, ModDamageTypes.CUSTOM_EXPLOSION)
.multiply(0.5f, ModDamageTypes.PROJECTILE_BOOM)
.multiply(0.5f, ModDamageTypes.MINE)
.multiply(0.5f, ModDamageTypes.LUNGE_MINE)
.multiply(0.6f, ModDamageTypes.CANNON_FIRE)
.multiply(0.5f, ModTags.DamageTypes.PROJECTILE)
.multiply(0.8f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE)
.multiply(2f, ModDamageTypes.VEHICLE_STRIKE)
.reduce(1);
}
@Override
public InteractionResult interact(Player player, InteractionHand hand) {
ItemStack stack = player.getMainHandItem();

85
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java
View file

@ -5,6 +5,7 @@ import com.atsuishio.superbwarfare.config.server.ExplosionConfig;
import com.atsuishio.superbwarfare.config.server.VehicleConfig;
import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity;
import com.atsuishio.superbwarfare.entity.projectile.SmallCannonShellEntity;
import com.atsuishio.superbwarfare.entity.vehicle.damage.DamageModifier;
import com.atsuishio.superbwarfare.init.*;
import com.atsuishio.superbwarfare.network.ModVariables;
import com.atsuishio.superbwarfare.network.message.ShakeClientMessage;
@ -135,69 +136,41 @@ public class Lav150Entity extends ContainerMobileEntity implements GeoEntity, IL
@Override
public boolean hurt(DamageSource source, float amount) {
super.hurt(source, amount);
if (this.level() instanceof ServerLevel serverLevel) {
sendParticle(serverLevel, ModParticleTypes.FIRE_STAR.get(), this.getX(), this.getY() + 2.5, this.getZ(), 4, 0.2, 0.2, 0.2, 0.2, false);
}
if (source.is(DamageTypes.ARROW)) {
amount *= 0.3f;
}
if (source.is(DamageTypes.TRIDENT)) {
amount *= 0.3f;
}
if (source.is(DamageTypes.MOB_ATTACK)) {
amount *= 0.5f;
}
if (source.is(DamageTypes.MOB_ATTACK_NO_AGGRO)) {
amount *= 0.4f;
}
if (source.is(DamageTypes.MOB_PROJECTILE)) {
amount *= 0.3f;
}
if (source.is(DamageTypes.PLAYER_ATTACK)) {
amount *= 0.2f;
}
if (source.is(DamageTypes.LAVA)) {
amount *= 2.5f;
}
if (source.is(DamageTypes.EXPLOSION)) {
amount *= 1.2f;
}
if (source.is(DamageTypes.PLAYER_EXPLOSION)) {
amount *= 1.2f;
}
if (source.is(ModDamageTypes.CUSTOM_EXPLOSION)) {
amount *= 0.4f;
}
if (source.is(ModDamageTypes.PROJECTILE_BOOM)) {
amount *= 0.4f;
}
if (source.is(ModDamageTypes.MINE)) {
amount *= 0.15f;
}
if (source.is(ModDamageTypes.LUNGE_MINE)) {
amount *= 0.2f;
}
if (source.is(ModDamageTypes.CANNON_FIRE)) {
amount *= 0.3f;
}
if (source.is(ModTags.DamageTypes.PROJECTILE)) {
amount *= 0.05f;
}
if (source.is(ModTags.DamageTypes.PROJECTILE_ABSOLUTE)) {
amount *= 0.17f;
}
if (source.is(ModDamageTypes.VEHICLE_STRIKE)) {
amount *= 2f;
}
this.level().playSound(null, this.getOnPos(), ModSounds.HIT.get(), SoundSource.PLAYERS, 1, 1);
this.hurt(Math.max(amount - 7, 0), source.getEntity(), true);
amount = damageModifier.compute(source, amount);
super.hurt(source, amount);
this.hurt(amount, source.getEntity(), true);
return true;
}
@Override
public DamageModifier getDamageModifier() {
return super.getDamageModifier()
.multiply(0.3f, DamageTypes.ARROW)
.multiply(0.3f, DamageTypes.TRIDENT)
.multiply(0.5f, DamageTypes.MOB_ATTACK)
.multiply(0.4f, DamageTypes.MOB_ATTACK_NO_AGGRO)
.multiply(0.3f, DamageTypes.MOB_PROJECTILE)
.multiply(0.2f, DamageTypes.PLAYER_ATTACK)
.multiply(2.5f, DamageTypes.LAVA)
.multiply(1.2f, DamageTypes.EXPLOSION)
.multiply(1.2f, DamageTypes.PLAYER_EXPLOSION)
.multiply(0.4f, ModDamageTypes.CUSTOM_EXPLOSION)
.multiply(0.4f, ModDamageTypes.PROJECTILE_BOOM)
.multiply(0.15f, ModDamageTypes.MINE)
.multiply(0.2f, ModDamageTypes.LUNGE_MINE)
.multiply(0.3f, ModDamageTypes.CANNON_FIRE)
.multiply(0.05f, ModTags.DamageTypes.PROJECTILE)
.multiply(0.17f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE)
.multiply(2f, ModDamageTypes.VEHICLE_STRIKE)
.reduce(7);
}
public double getSubmergedHeight(Entity entity) {
for (FluidType fluidType : ForgeRegistries.FLUID_TYPES.get().getValues()) {
if (entity.level().getFluidState(entity.blockPosition()).getFluidType() == fluidType)

84
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java
View file

@ -4,6 +4,7 @@ import com.atsuishio.superbwarfare.ModUtils;
import com.atsuishio.superbwarfare.config.server.ExplosionConfig;
import com.atsuishio.superbwarfare.config.server.VehicleConfig;
import com.atsuishio.superbwarfare.entity.projectile.CannonShellEntity;
import com.atsuishio.superbwarfare.entity.vehicle.damage.DamageModifier;
import com.atsuishio.superbwarfare.init.*;
import com.atsuishio.superbwarfare.item.common.ammo.CannonShellItem;
import com.atsuishio.superbwarfare.network.message.ShakeClientMessage;
@ -103,70 +104,39 @@ public class Mk42Entity extends VehicleEntity implements GeoEntity, ICannonEntit
@Override
public boolean hurt(DamageSource source, float amount) {
super.hurt(source, amount);
if (this.level() instanceof ServerLevel serverLevel) {
sendParticle(serverLevel, ModParticleTypes.FIRE_STAR.get(), this.getX(), this.getY() + 2.5, this.getZ(), 4, 0.2, 0.2, 0.2, 0.2, false);
}
if (source.is(DamageTypes.ARROW)) {
amount *= 0.1f;
}
if (source.is(DamageTypes.TRIDENT)) {
amount *= 0.1f;
}
if (source.is(DamageTypes.MOB_ATTACK)) {
amount *= 0.3f;
}
if (source.is(DamageTypes.MOB_ATTACK_NO_AGGRO)) {
amount *= 0.15f;
}
if (source.is(DamageTypes.MOB_PROJECTILE)) {
amount *= 0.15f;
}
if (source.is(DamageTypes.PLAYER_ATTACK)) {
amount *= 0.1f;
}
if (source.is(DamageTypes.LAVA)) {
amount *= 2.5f;
}
if (source.is(DamageTypes.EXPLOSION)) {
amount *= 1f;
}
if (source.is(DamageTypes.PLAYER_EXPLOSION)) {
amount *= 1f;
}
if (source.is(ModDamageTypes.CUSTOM_EXPLOSION)) {
amount *= 0.4f;
}
if (source.is(ModDamageTypes.PROJECTILE_BOOM)) {
amount *= 0.4f;
}
if (source.is(ModDamageTypes.MINE)) {
amount *= 0.14f;
}
if (source.is(ModDamageTypes.LUNGE_MINE)) {
amount *= 0.14f;
}
if (source.is(ModDamageTypes.CANNON_FIRE)) {
amount *= 0.3f;
}
if (source.is(ModTags.DamageTypes.PROJECTILE)) {
amount *= 0.02f;
}
if (source.is(ModTags.DamageTypes.PROJECTILE_ABSOLUTE)) {
amount *= 0.14f;
}
if (source.is(ModDamageTypes.VEHICLE_STRIKE)) {
amount *= 1.7f;
}
this.level().playSound(null, this.getOnPos(), ModSounds.HIT.get(), SoundSource.PLAYERS, 1, 1);
this.hurt(Math.max(amount - 8, 0), source.getEntity(), true);
amount = damageModifier.compute(source, amount);
super.hurt(source, amount);
this.hurt(amount, source.getEntity(), true);
return true;
}
@Override
public DamageModifier getDamageModifier() {
return super.getDamageModifier()
.multiply(0.1f, DamageTypes.ARROW)
.multiply(0.1f, DamageTypes.TRIDENT)
.multiply(0.3f, DamageTypes.MOB_ATTACK)
.multiply(0.15f, DamageTypes.MOB_ATTACK_NO_AGGRO)
.multiply(0.15f, DamageTypes.MOB_PROJECTILE)
.multiply(0.1f, DamageTypes.PLAYER_ATTACK)
.multiply(2.5f, DamageTypes.LAVA)
.multiply(0.4f, ModDamageTypes.CUSTOM_EXPLOSION)
.multiply(0.4f, ModDamageTypes.PROJECTILE_BOOM)
.multiply(0.14f, ModDamageTypes.MINE)
.multiply(0.14f, ModDamageTypes.LUNGE_MINE)
.multiply(0.3f, ModDamageTypes.CANNON_FIRE)
.multiply(0.02f, ModTags.DamageTypes.PROJECTILE)
.multiply(0.14f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE)
.multiply(1.7f, ModDamageTypes.VEHICLE_STRIKE)
.reduce(8);
}
@Override
public Vec3 getDeltaMovement() {
return new Vec3(0, Math.min(super.getDeltaMovement().y, 0), 0);

84
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java
View file

@ -4,6 +4,7 @@ import com.atsuishio.superbwarfare.ModUtils;
import com.atsuishio.superbwarfare.config.server.ExplosionConfig;
import com.atsuishio.superbwarfare.config.server.VehicleConfig;
import com.atsuishio.superbwarfare.entity.projectile.CannonShellEntity;
import com.atsuishio.superbwarfare.entity.vehicle.damage.DamageModifier;
import com.atsuishio.superbwarfare.init.*;
import com.atsuishio.superbwarfare.item.common.ammo.CannonShellItem;
import com.atsuishio.superbwarfare.network.message.ShakeClientMessage;
@ -113,70 +114,39 @@ public class Mle1934Entity extends VehicleEntity implements GeoEntity, ICannonEn
@Override
public boolean hurt(DamageSource source, float amount) {
super.hurt(source, amount);
if (this.level() instanceof ServerLevel serverLevel) {
sendParticle(serverLevel, ModParticleTypes.FIRE_STAR.get(), this.getX(), this.getY() + 2.5, this.getZ(), 4, 0.2, 0.2, 0.2, 0.2, false);
}
if (source.is(DamageTypes.ARROW)) {
amount *= 0.1f;
}
if (source.is(DamageTypes.TRIDENT)) {
amount *= 0.1f;
}
if (source.is(DamageTypes.MOB_ATTACK)) {
amount *= 0.3f;
}
if (source.is(DamageTypes.MOB_ATTACK_NO_AGGRO)) {
amount *= 0.15f;
}
if (source.is(DamageTypes.MOB_PROJECTILE)) {
amount *= 0.15f;
}
if (source.is(DamageTypes.PLAYER_ATTACK)) {
amount *= 0.1f;
}
if (source.is(DamageTypes.LAVA)) {
amount *= 2.5f;
}
if (source.is(DamageTypes.EXPLOSION)) {
amount *= 1f;
}
if (source.is(DamageTypes.PLAYER_EXPLOSION)) {
amount *= 1f;
}
if (source.is(ModDamageTypes.CUSTOM_EXPLOSION)) {
amount *= 0.4f;
}
if (source.is(ModDamageTypes.PROJECTILE_BOOM)) {
amount *= 0.4f;
}
if (source.is(ModDamageTypes.MINE)) {
amount *= 0.14f;
}
if (source.is(ModDamageTypes.LUNGE_MINE)) {
amount *= 0.14f;
}
if (source.is(ModDamageTypes.CANNON_FIRE)) {
amount *= 0.3f;
}
if (source.is(ModTags.DamageTypes.PROJECTILE)) {
amount *= 0.02f;
}
if (source.is(ModTags.DamageTypes.PROJECTILE_ABSOLUTE)) {
amount *= 0.14f;
}
if (source.is(ModDamageTypes.VEHICLE_STRIKE)) {
amount *= 1.7f;
}
this.level().playSound(null, this.getOnPos(), ModSounds.HIT.get(), SoundSource.PLAYERS, 1, 1);
this.hurt(Math.max(amount - 8, 0), source.getEntity(), true);
amount = damageModifier.compute(source, amount);
super.hurt(source, amount);
this.hurt(amount, source.getEntity(), true);
return true;
}
@Override
public DamageModifier getDamageModifier() {
return super.getDamageModifier()
.multiply(0.1f, DamageTypes.ARROW)
.multiply(0.1f, DamageTypes.TRIDENT)
.multiply(0.3f, DamageTypes.MOB_ATTACK)
.multiply(0.15f, DamageTypes.MOB_ATTACK_NO_AGGRO)
.multiply(0.15f, DamageTypes.MOB_PROJECTILE)
.multiply(0.1f, DamageTypes.PLAYER_ATTACK)
.multiply(2.5f, DamageTypes.LAVA)
.multiply(0.4f, ModDamageTypes.CUSTOM_EXPLOSION)
.multiply(0.4f, ModDamageTypes.PROJECTILE_BOOM)
.multiply(0.14f, ModDamageTypes.MINE)
.multiply(0.14f, ModDamageTypes.LUNGE_MINE)
.multiply(0.3f, ModDamageTypes.CANNON_FIRE)
.multiply(0.02f, ModTags.DamageTypes.PROJECTILE)
.multiply(0.14f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE)
.multiply(1.7f, ModDamageTypes.VEHICLE_STRIKE)
.reduce(8);
}
@Override
public Vec3 getDeltaMovement() {
return new Vec3(0, Math.min(super.getDeltaMovement().y, 0), 0);

85
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java
View file

@ -4,6 +4,7 @@ import com.atsuishio.superbwarfare.ModUtils;
import com.atsuishio.superbwarfare.config.server.ExplosionConfig;
import com.atsuishio.superbwarfare.config.server.VehicleConfig;
import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity;
import com.atsuishio.superbwarfare.entity.vehicle.damage.DamageModifier;
import com.atsuishio.superbwarfare.init.*;
import com.atsuishio.superbwarfare.network.ModVariables;
import com.atsuishio.superbwarfare.network.message.ShakeClientMessage;
@ -114,69 +115,41 @@ public class SpeedboatEntity extends ContainerMobileEntity implements GeoEntity,
@Override
public boolean hurt(DamageSource source, float amount) {
super.hurt(source, amount);
if (this.level() instanceof ServerLevel serverLevel) {
sendParticle(serverLevel, ModParticleTypes.FIRE_STAR.get(), this.getX(), this.getY() + 2.5, this.getZ(), 4, 0.2, 0.2, 0.2, 0.2, false);
}
if (source.is(DamageTypes.ARROW)) {
amount *= 0.1f;
}
if (source.is(DamageTypes.TRIDENT)) {
amount *= 0.2f;
}
if (source.is(DamageTypes.MOB_ATTACK)) {
amount *= 0.2f;
}
if (source.is(DamageTypes.MOB_ATTACK_NO_AGGRO)) {
amount *= 0.2f;
}
if (source.is(DamageTypes.MOB_PROJECTILE)) {
amount *= 0.2f;
}
if (source.is(DamageTypes.PLAYER_ATTACK)) {
amount *= 0.2f;
}
if (source.is(DamageTypes.LAVA)) {
amount *= 2f;
}
if (source.is(DamageTypes.EXPLOSION)) {
amount *= 2f;
}
if (source.is(DamageTypes.PLAYER_EXPLOSION)) {
amount *= 2f;
}
if (source.is(ModDamageTypes.CUSTOM_EXPLOSION)) {
amount *= 0.5f;
}
if (source.is(ModDamageTypes.PROJECTILE_BOOM)) {
amount *= 0.5f;
}
if (source.is(ModDamageTypes.MINE)) {
amount *= 0.5f;
}
if (source.is(ModDamageTypes.LUNGE_MINE)) {
amount *= 0.5f;
}
if (source.is(ModDamageTypes.CANNON_FIRE)) {
amount *= 0.6f;
}
if (source.is(ModTags.DamageTypes.PROJECTILE)) {
amount *= 0.08f;
}
if (source.is(ModTags.DamageTypes.PROJECTILE_ABSOLUTE)) {
amount *= 0.5f;
}
if (source.is(ModDamageTypes.VEHICLE_STRIKE)) {
amount *= 5f;
}
this.level().playSound(null, this.getOnPos(), ModSounds.HIT.get(), SoundSource.PLAYERS, 1, 1);
this.hurt(Math.max(amount - 2, 0), source.getEntity(), true);
amount = damageModifier.compute(source, amount);
super.hurt(source, amount);
this.hurt(amount, source.getEntity(), true);
return true;
}
@Override
public DamageModifier getDamageModifier() {
return super.getDamageModifier()
.multiply(0.1f, DamageTypes.ARROW)
.multiply(0.2f, DamageTypes.TRIDENT)
.multiply(0.2f, DamageTypes.MOB_ATTACK)
.multiply(0.2f, DamageTypes.MOB_ATTACK_NO_AGGRO)
.multiply(0.2f, DamageTypes.MOB_PROJECTILE)
.multiply(0.2f, DamageTypes.PLAYER_ATTACK)
.multiply(2f, DamageTypes.LAVA)
.multiply(2f, DamageTypes.EXPLOSION)
.multiply(2f, DamageTypes.PLAYER_EXPLOSION)
.multiply(0.5f, ModDamageTypes.CUSTOM_EXPLOSION)
.multiply(0.5f, ModDamageTypes.PROJECTILE_BOOM)
.multiply(0.5f, ModDamageTypes.MINE)
.multiply(0.5f, ModDamageTypes.LUNGE_MINE)
.multiply(0.6f, ModDamageTypes.CANNON_FIRE)
.multiply(0.08f, ModTags.DamageTypes.PROJECTILE)
.multiply(0.5f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE)
.multiply(5f, ModDamageTypes.VEHICLE_STRIKE)
.reduce(2);
}
@Override
public void baseTick() {
turretYRotO = this.getTurretYRot();

15
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Tom6Entity.java
View file

@ -4,6 +4,7 @@ import com.atsuishio.superbwarfare.ModUtils;
import com.atsuishio.superbwarfare.config.server.ExplosionConfig;
import com.atsuishio.superbwarfare.config.server.VehicleConfig;
import com.atsuishio.superbwarfare.entity.projectile.MelonBombEntity;
import com.atsuishio.superbwarfare.entity.vehicle.damage.DamageModifier;
import com.atsuishio.superbwarfare.init.ModDamageTypes;
import com.atsuishio.superbwarfare.init.ModEntities;
import com.atsuishio.superbwarfare.init.ModSounds;
@ -97,15 +98,21 @@ public class Tom6Entity extends MobileVehicleEntity implements GeoEntity {
@Override
public boolean hurt(DamageSource source, float amount) {
super.hurt(source, amount);
if (source.is(ModDamageTypes.VEHICLE_STRIKE)) {
amount *= 2f;
}
this.level().playSound(null, this.getOnPos(), ModSounds.HIT.get(), SoundSource.PLAYERS, 1, 1);
amount = damageModifier.compute(source, amount);
this.hurt(amount, source.getEntity(), true);
super.hurt(source, amount);
return true;
}
@Override
public DamageModifier getDamageModifier() {
return super.getDamageModifier()
.multiply(2, ModDamageTypes.VEHICLE_STRIKE);
}
@Override
public InteractionResult interact(Player player, InteractionHand hand) {
if (player.getMainHandItem().is(Items.MELON) && !entityData.get(MELON)) {

42
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/VehicleEntity.java
View file

@ -1,6 +1,7 @@
package com.atsuishio.superbwarfare.entity.vehicle;
import com.atsuishio.superbwarfare.ModUtils;
import com.atsuishio.superbwarfare.entity.vehicle.damage.DamageModifier;
import com.atsuishio.superbwarfare.init.ModDamageTypes;
import com.atsuishio.superbwarfare.init.ModItems;
import com.atsuishio.superbwarfare.init.ModParticleTypes;
@ -154,35 +155,36 @@ public class VehicleEntity extends Entity {
@Override
public boolean hurt(DamageSource source, float amount) {
if (source.getDirectEntity() instanceof ThrownPotion || source.getDirectEntity() instanceof AreaEffectCloud)
return false;
if (source.is(DamageTypes.FALL))
return false;
if (source.is(DamageTypes.CACTUS))
return false;
if (source.is(DamageTypes.DROWN))
return false;
if (source.is(DamageTypes.DRAGON_BREATH))
return false;
if (source.is(DamageTypes.WITHER))
return false;
if (source.is(DamageTypes.WITHER_SKULL))
return false;
if (source.is(ModDamageTypes.VEHICLE_STRIKE)) {
amount -= 8;
crash = true;
} else {
crash = false;
}
if (source.getEntity() != null) {
this.entityData.set(LAST_ATTACKER_UUID, source.getEntity().getStringUUID());
}
if (amount > 0) {
lastHurtTick = 0;
repairCoolDown = 200;
}
return super.hurt(source, amount);
}
protected final DamageModifier damageModifier = this.getDamageModifier();
/**
* 控制载具伤害免疫
*
* @return DamageModifier
*/
public DamageModifier getDamageModifier() {
return new DamageModifier()
.immuneTo(source -> source.getDirectEntity() instanceof ThrownPotion || source.getDirectEntity() instanceof AreaEffectCloud)
.immuneTo(DamageTypes.FALL)
.immuneTo(DamageTypes.CACTUS)
.immuneTo(DamageTypes.DROWN)
.immuneTo(DamageTypes.DRAGON_BREATH)
.immuneTo(DamageTypes.WITHER)
.immuneTo(DamageTypes.WITHER_SKULL)
.reduce(8, ModDamageTypes.VEHICLE_STRIKE);
}
public void heal(float pHealAmount) {
if (this.level() instanceof ServerLevel) {
this.setHealth(this.getHealth() + pHealAmount);

5
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/WheelChairEntity.java
View file

@ -104,9 +104,12 @@ public class WheelChairEntity extends MobileVehicleEntity implements GeoEntity {
@Override
public boolean hurt(DamageSource source, float amount) {
super.hurt(source, amount);
this.level().playSound(null, this.getOnPos(), ModSounds.HIT.get(), SoundSource.PLAYERS, 1, 1);
amount = damageModifier.compute(source, amount);
super.hurt(source, amount);
this.hurt(amount, source.getEntity(), true);
return true;
}

157
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/damage/DamageModifier.java Normal file
View file

@ -0,0 +1,157 @@
package com.atsuishio.superbwarfare.entity.vehicle.damage;
import net.minecraft.resources.ResourceKey;
import net.minecraft.tags.TagKey;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.damagesource.DamageType;
import org.apache.commons.compress.utils.Lists;
import java.util.List;
import java.util.function.Function;
public class DamageModifier {
private final List<DamageModify> list = Lists.newArrayList();
/**
* 免疫所有伤害
*/
public DamageModifier immuneTo() {
list.add(new DamageModify(DamageModify.ReduceType.IMMUNITY, 0, (TagKey<DamageType>) null));
return this;
}
/**
* 免疫指定类型的伤害
*
* @param sourceTagKey 伤害类型
*/
public DamageModifier immuneTo(TagKey<DamageType> sourceTagKey) {
list.add(new DamageModify(DamageModify.ReduceType.IMMUNITY, 0, sourceTagKey));
return this;
}
/**
* 免疫指定类型的伤害
*
* @param sourceKey 伤害类型
*/
public DamageModifier immuneTo(ResourceKey<DamageType> sourceKey) {
list.add(new DamageModify(DamageModify.ReduceType.IMMUNITY, 0, sourceKey));
return this;
}
/**
* 免疫指定类型的伤害
*
* @param condition 伤害来源判定条件
*/
public DamageModifier immuneTo(Function<DamageSource, Boolean> condition) {
list.add(new DamageModify(DamageModify.ReduceType.IMMUNITY, 0, condition));
return this;
}
/**
* 固定减少所有伤害一定数值
*
* @param value 要减少的数值
*/
public DamageModifier reduce(float value) {
list.add(new DamageModify(DamageModify.ReduceType.REDUCE, value, (TagKey<DamageType>) null));
return this;
}
/**
* 固定减少指定类型的伤害一定数值
*
* @param value 要减少的数值
* @param sourceTagKey 伤害类型
*/
public DamageModifier reduce(float value, TagKey<DamageType> sourceTagKey) {
list.add(new DamageModify(DamageModify.ReduceType.REDUCE, value, sourceTagKey));
return this;
}
/**
* 固定减少指定类型的伤害一定数值
*
* @param value 要减少的数值
* @param sourceKey 伤害类型
*/
public DamageModifier reduce(float value, ResourceKey<DamageType> sourceKey) {
list.add(new DamageModify(DamageModify.ReduceType.REDUCE, value, sourceKey));
return this;
}
/**
* 固定减少指定类型的伤害一定数值
*
* @param value 要减少的数值
* @param condition 伤害来源判定条件
*/
public DamageModifier reduce(float value, Function<DamageSource, Boolean> condition) {
list.add(new DamageModify(DamageModify.ReduceType.REDUCE, value, condition));
return this;
}
/**
* 将所有类型的伤害乘以指定数值
*
* @param value 要乘以的数值
*/
public DamageModifier multiply(float value) {
list.add(new DamageModify(DamageModify.ReduceType.MULTIPLY, value, (TagKey<DamageType>) null));
return this;
}
/**
* 将指定类型的伤害乘以指定数值
*
* @param value 要乘以的数值
* @param sourceTagKey 伤害类型
*/
public DamageModifier multiply(float value, TagKey<DamageType> sourceTagKey) {
list.add(new DamageModify(DamageModify.ReduceType.MULTIPLY, value, sourceTagKey));
return this;
}
/**
* 将指定类型的伤害乘以指定数值
*
* @param value 要乘以的数值
* @param sourceKey 伤害类型
*/
public DamageModifier multiply(float value, ResourceKey<DamageType> sourceKey) {
list.add(new DamageModify(DamageModify.ReduceType.MULTIPLY, value, sourceKey));
return this;
}
/**
* 将指定类型的伤害乘以指定数值
*
* @param value 要乘以的数值
* @param condition 伤害来源判定条件
*/
public DamageModifier multiply(float value, Function<DamageSource, Boolean> condition) {
list.add(new DamageModify(DamageModify.ReduceType.MULTIPLY, value, condition));
return this;
}
/**
* 计算减伤后的伤害值
*
* @param source 伤害来源
* @param damage 原伤害值
* @return 减伤后的伤害值
*/
public float compute(DamageSource source, float damage) {
for (DamageModify damageModify : list) {
if (damageModify.match(source)) {
damage = damageModify.compute(damage);
if (damage <= 0) return 0;
}
}
return damage;
}
}

73
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/damage/DamageModify.java Normal file
View file

@ -0,0 +1,73 @@
package com.atsuishio.superbwarfare.entity.vehicle.damage;
import net.minecraft.resources.ResourceKey;
import net.minecraft.tags.TagKey;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.damagesource.DamageType;
import java.util.function.Function;
public class DamageModify {
public enum ReduceType {
IMMUNITY, // 完全免疫
REDUCE, // 固定数值减伤
MULTIPLY, // 乘以指定倍数
}
private final float value;
private final ReduceType type;
private TagKey<DamageType> sourceTagKey = null;
private ResourceKey<DamageType> sourceKey = null;
private Function<DamageSource, Boolean> condition = null;
public DamageModify(ReduceType type, float value, TagKey<DamageType> sourceTagKey) {
this.type = type;
this.value = value;
this.sourceTagKey = sourceTagKey;
}
public DamageModify(ReduceType type, float value, ResourceKey<DamageType> sourceKey) {
this.type = type;
this.value = value;
this.sourceKey = sourceKey;
}
public DamageModify(ReduceType type, float value, Function<DamageSource, Boolean> condition) {
this.type = type;
this.value = value;
this.condition = condition;
}
/**
* 判断指定伤害来源是否符合指定条件，若未指定条件则默认符合
*
* @param source 伤害来源
* @return 伤害来源是否符合条件
*/
public boolean match(DamageSource source) {
if (condition != null) {
return condition.apply(source);
} else if (sourceTagKey != null) {
return source.is(sourceTagKey);
} else if (sourceKey != null) {
return source.is(sourceKey);
} else {
return true;
}
}
/**
* 计算减伤后的伤害值
*
* @param damage 原伤害值
* @return 计算后的伤害值
*/
public float compute(float damage) {
return switch (type) {
case IMMUNITY -> 0;
case REDUCE -> Math.max(damage - value, 0);
case MULTIPLY -> damage * value;
};
}
}