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

移除interface AerialBombEntity

Browse source
This commit is contained in:
Light_Quanta 2025-06-12 22:02:08 +08:00
parent 406486817f
commit 5a00b40865
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
13 changed files with 35 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/atsuishio/superbwarfare/entity/projectile/AerialBombEntity.java
View file

@ -1,4 +0,0 @@
package com.atsuishio.superbwarfare.entity.projectile;
public interface AerialBombEntity extends ExplosiveProjectile {
}

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

@ -4,7 +4,6 @@ import com.atsuishio.superbwarfare.Mod;
import com.atsuishio.superbwarfare.component.ModDataComponents;
import com.atsuishio.superbwarfare.config.server.ExplosionConfig;
import com.atsuishio.superbwarfare.config.server.VehicleConfig;
import com.atsuishio.superbwarfare.entity.projectile.AerialBombEntity;
import com.atsuishio.superbwarfare.entity.vehicle.base.CannonEntity;
import com.atsuishio.superbwarfare.entity.vehicle.base.EnergyVehicleEntity;
import com.atsuishio.superbwarfare.entity.vehicle.base.ThirdPersonCameraPosition;
@ -198,13 +197,7 @@ public class AnnihilatorEntity extends EnergyVehicleEntity implements GeoEntity,
@Override
public DamageModifier getDamageModifier() {
return super.getDamageModifier()
.custom((source, damage) -> getSourceAngle(source, 3) * damage)
.custom((source, damage) -> {
if (source.getDirectEntity() instanceof AerialBombEntity) {
return 8f * damage;
}
return damage;
});
.custom((source, damage) -> getSourceAngle(source, 3) * damage);
}
@Override

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

@ -3,7 +3,6 @@ package com.atsuishio.superbwarfare.entity.vehicle;
import com.atsuishio.superbwarfare.Mod;
import com.atsuishio.superbwarfare.config.server.ExplosionConfig;
import com.atsuishio.superbwarfare.config.server.VehicleConfig;
import com.atsuishio.superbwarfare.entity.projectile.AerialBombEntity;
import com.atsuishio.superbwarfare.entity.vehicle.base.ContainerMobileVehicleEntity;
import com.atsuishio.superbwarfare.entity.vehicle.base.LandArmorEntity;
import com.atsuishio.superbwarfare.entity.vehicle.base.ThirdPersonCameraPosition;
@ -145,13 +144,7 @@ public class Bmp2Entity extends ContainerMobileVehicleEntity implements GeoEntit
@Override
public DamageModifier getDamageModifier() {
return super.getDamageModifier()
.custom((source, damage) -> getSourceAngle(source, 0.4f) * damage)
.custom((source, damage) -> {
if (source.getDirectEntity() instanceof AerialBombEntity) {
return 2f * damage;
}
return damage;
});
.custom((source, damage) -> getSourceAngle(source, 0.4f) * damage);
}
@Override

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

@ -3,7 +3,6 @@ package com.atsuishio.superbwarfare.entity.vehicle;
import com.atsuishio.superbwarfare.Mod;
import com.atsuishio.superbwarfare.config.server.ExplosionConfig;
import com.atsuishio.superbwarfare.config.server.VehicleConfig;
import com.atsuishio.superbwarfare.entity.projectile.AerialBombEntity;
import com.atsuishio.superbwarfare.entity.vehicle.base.ContainerMobileVehicleEntity;
import com.atsuishio.superbwarfare.entity.vehicle.base.LandArmorEntity;
import com.atsuishio.superbwarfare.entity.vehicle.base.ThirdPersonCameraPosition;
@ -122,13 +121,7 @@ public class Lav150Entity extends ContainerMobileVehicleEntity implements GeoEnt
@Override
public DamageModifier getDamageModifier() {
return super.getDamageModifier()
.custom((source, damage) -> getSourceAngle(source, 0.25f) * damage)
.custom((source, damage) -> {
if (source.getDirectEntity() instanceof AerialBombEntity) {
return 3f * damage;
}
return damage;
});
.custom((source, damage) -> getSourceAngle(source, 0.25f) * damage);
}
@Override

9
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/PrismTankEntity.java
View file

@ -3,7 +3,6 @@ package com.atsuishio.superbwarfare.entity.vehicle;
import com.atsuishio.superbwarfare.Mod;
import com.atsuishio.superbwarfare.config.server.ExplosionConfig;
import com.atsuishio.superbwarfare.config.server.VehicleConfig;
import com.atsuishio.superbwarfare.entity.projectile.AerialBombEntity;
import com.atsuishio.superbwarfare.entity.vehicle.base.ContainerMobileVehicleEntity;
import com.atsuishio.superbwarfare.entity.vehicle.base.LandArmorEntity;
import com.atsuishio.superbwarfare.entity.vehicle.base.ThirdPersonCameraPosition;
@ -126,13 +125,7 @@ public class PrismTankEntity extends ContainerMobileVehicleEntity implements Geo
@Override
public DamageModifier getDamageModifier() {
return super.getDamageModifier()
.custom((source, damage) -> getSourceAngle(source, 0.4f) * damage)
.custom((source, damage) -> {
if (source.getDirectEntity() instanceof AerialBombEntity) {
return 2f * damage;
}
return damage;
});
.custom((source, damage) -> getSourceAngle(source, 0.4f) * damage);
}
@Override

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

@ -3,9 +3,7 @@ package com.atsuishio.superbwarfare.entity.vehicle;
import com.atsuishio.superbwarfare.Mod;
import com.atsuishio.superbwarfare.config.server.ExplosionConfig;
import com.atsuishio.superbwarfare.config.server.VehicleConfig;
import com.atsuishio.superbwarfare.entity.projectile.AerialBombEntity;
import com.atsuishio.superbwarfare.entity.vehicle.base.*;
import com.atsuishio.superbwarfare.entity.vehicle.damage.DamageModifier;
import com.atsuishio.superbwarfare.entity.vehicle.weapon.ProjectileWeapon;
import com.atsuishio.superbwarfare.entity.vehicle.weapon.VehicleWeapon;
import com.atsuishio.superbwarfare.event.ClientMouseHandler;
@ -99,17 +97,6 @@ public class SpeedboatEntity extends ContainerMobileVehicleEntity implements Geo
return super.getPassengerRidingPosition(entity).add(0, -0.8, 0);
}
@Override
public DamageModifier getDamageModifier() {
return super.getDamageModifier()
.custom((source, damage) -> {
if (source.getDirectEntity() instanceof AerialBombEntity) {
return 2f * damage;
}
return damage;
});
}
@Override
public void baseTick() {
super.baseTick();

9
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Yx100Entity.java
View file

@ -3,7 +3,6 @@ package com.atsuishio.superbwarfare.entity.vehicle;
import com.atsuishio.superbwarfare.Mod;
import com.atsuishio.superbwarfare.config.server.ExplosionConfig;
import com.atsuishio.superbwarfare.config.server.VehicleConfig;
import com.atsuishio.superbwarfare.entity.projectile.AerialBombEntity;
import com.atsuishio.superbwarfare.entity.projectile.SwarmDroneEntity;
import com.atsuishio.superbwarfare.entity.vehicle.base.ContainerMobileVehicleEntity;
import com.atsuishio.superbwarfare.entity.vehicle.base.LandArmorEntity;
@ -216,13 +215,7 @@ public class Yx100Entity extends ContainerMobileVehicleEntity implements GeoEnti
@Override
public DamageModifier getDamageModifier() {
return super.getDamageModifier()
.custom((source, damage) -> getSourceAngle(source, 0.5f) * damage)
.custom((source, damage) -> {
if (source.getDirectEntity() instanceof AerialBombEntity) {
return 3f * damage;
}
return damage;
});
.custom((source, damage) -> getSourceAngle(source, 0.5f) * damage);
}
@Override

5
src/main/resources/data/superbwarfare/vehicles/annihilator.json
View file

@ -70,6 +70,11 @@
"Value": 0.3,
"Source": "superbwarfare:cannon_fire"
},
{
"Type": "Multiply",
"Value": 8,
"Source": "#superbwarfare:aerial_bomb"
},
{
"Type": "Multiply",
"Value": 0.04,

5
src/main/resources/data/superbwarfare/vehicles/bmp_2.json
View file

@ -74,6 +74,11 @@
"Value": 1.5,
"Source": "superbwarfare:cannon_fire"
},
{
"Type": "Multiply",
"Value": 2,
"Source": "#superbwarfare:aerial_bomb"
},
{
"Type": "Multiply",
"Value": 0.1,

5
src/main/resources/data/superbwarfare/vehicles/lav_150.json
View file

@ -69,6 +69,11 @@
"Value": 1.5,
"Source": "superbwarfare:cannon_fire"
},
{
"Type": "Multiply",
"Value": 3,
"Source": "#superbwarfare:aerial_bomb"
},
{
"Type": "Multiply",
"Value": 0.25,

5
src/main/resources/data/superbwarfare/vehicles/prism_tank.json
View file

@ -74,6 +74,11 @@
"Value": 1.5,
"Source": "superbwarfare:cannon_fire"
},
{
"Type": "Multiply",
"Value": 2,
"Source": "#superbwarfare:aerial_bomb"
},
{
"Type": "Multiply",
"Value": 0.1,

5
src/main/resources/data/superbwarfare/vehicles/speedboat.json
View file

@ -58,6 +58,11 @@
"Value": 0.8,
"Source": "superbwarfare:cannon_fire"
},
{
"Type": "Multiply",
"Value": 2,
"Source": "#superbwarfare:aerial_bomb"
},
{
"Type": "Multiply",
"Value": 0.16,

5
src/main/resources/data/superbwarfare/vehicles/yx_100.json
View file

@ -29,6 +29,11 @@
"Type": "Immunity",
"Source": "minecraft:player_attack"
},
{
"Type": "Multiply",
"Value": 3,
"Source": "#superbwarfare:aerial_bomb"
},
{
"Type": "Immunity",
"Source": "#superbwarfare:projectile"