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:
17146 2024-12-20 14:15:05 +08:00
parent 8910859785
commit 6ebd1be672
9 changed files with 31 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -386,7 +386,7 @@ public class AnnihilatorEntity extends Entity implements GeoEntity, ICannonEntit
}
@Override
public void cannonShoot(Player player) {
public void vehicleShoot(Player player) {
if (this.entityData.get(COOL_DOWN) > 0) {
return;
}
@ -538,12 +538,7 @@ public class AnnihilatorEntity extends Entity implements GeoEntity, ICannonEntit
@Override
public int getMaxEnergy() {
return (int)MAX_ENERGY;
}
@Override
public void vehicleShoot(Player player) {
return (int) MAX_ENERGY;
}
@Override
@ -553,7 +548,7 @@ public class AnnihilatorEntity extends Entity implements GeoEntity, ICannonEntit
@Override
public float getMaxHealth() {
return (int)MAX_HEALTH;
return (int) MAX_HEALTH;
}
@Override

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

@ -1,7 +1,5 @@
package com.atsuishio.superbwarfare.entity;
import net.minecraft.world.entity.player.Player;
public interface ICannonEntity extends IVehicleEntity {
void cannonShoot(Player player);
}

7
src/main/java/com/atsuishio/superbwarfare/entity/IVehicleEntity.java
View file

@ -3,11 +3,18 @@ package com.atsuishio.superbwarfare.entity;
import net.minecraft.world.entity.player.Player;
public interface IVehicleEntity {
void vehicleShoot(Player player);
float getHealth();
float getMaxHealth();
boolean isDriver(Player player);
int mainGunRpm();
boolean canShoot(Player player);
int getAmmoCount();
}

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

@ -263,7 +263,7 @@ public class Mk42Entity extends Entity implements GeoEntity, ICannonEntity {
}
@Override
public void cannonShoot(Player player) {
public void vehicleShoot(Player player) {
if (this.entityData.get(COOL_DOWN) > 0) {
return;
}
@ -421,11 +421,6 @@ public class Mk42Entity extends Entity implements GeoEntity, ICannonEntity {
return this.cache;
}
@Override
public void vehicleShoot(Player player) {
}
@Override
public float getHealth() {
return this.entityData.get(HEALTH).intValue();
@ -433,7 +428,7 @@ public class Mk42Entity extends Entity implements GeoEntity, ICannonEntity {
@Override
public float getMaxHealth() {
return (int)MAX_HEALTH;
return (int) MAX_HEALTH;
}
@Override

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

@ -277,7 +277,7 @@ public class Mle1934Entity extends Entity implements GeoEntity, ICannonEntity {
}
@Override
public void cannonShoot(Player player) {
public void vehicleShoot(Player player) {
if (this.entityData.get(COOL_DOWN) > 0) {
return;
}
@ -443,7 +443,7 @@ public class Mle1934Entity extends Entity implements GeoEntity, ICannonEntity {
for (Entity target : level.getEntitiesOfClass(Entity.class, new AABB(center, center).inflate(20), e -> true).stream().sorted(Comparator.comparingDouble(e -> e.distanceToSqr(center))).toList()) {
if (target instanceof ServerPlayer serverPlayer) {
ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> serverPlayer), new ShakeClientMessage(15,15,45, this.getX(), this.getEyeY(), this.getZ()));
ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> serverPlayer), new ShakeClientMessage(15, 15, 45, this.getX(), this.getEyeY(), this.getZ()));
}
}
}
@ -516,11 +516,6 @@ public class Mle1934Entity extends Entity implements GeoEntity, ICannonEntity {
return this.cache;
}
@Override
public void vehicleShoot(Player player) {
}
@Override
public float getHealth() {
return this.entityData.get(HEALTH).intValue();
@ -528,7 +523,7 @@ public class Mle1934Entity extends Entity implements GeoEntity, ICannonEntity {
@Override
public float getMaxHealth() {
return (int)MAX_HEALTH;
return (int) MAX_HEALTH;
}
@Override

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

@ -84,6 +84,7 @@ import java.util.Comparator;
import java.util.List;
public class SpeedboatEntity extends Entity implements GeoEntity, IChargeEntity, IVehicleEntity, HasCustomInventoryScreen, ContainerEntity {
public static final EntityDataAccessor<Integer> FIRE_ANIM = SynchedEntityData.defineId(SpeedboatEntity.class, EntityDataSerializers.INT);
public static final EntityDataAccessor<Float> HEALTH = SynchedEntityData.defineId(SpeedboatEntity.class, EntityDataSerializers.FLOAT);
public static final EntityDataAccessor<Float> ENERGY = SynchedEntityData.defineId(SpeedboatEntity.class, EntityDataSerializers.FLOAT);
@ -310,9 +311,7 @@ public class SpeedboatEntity extends Entity implements GeoEntity, IChargeEntity,
cannotFire = false;
}
// TODO 获取弹药数量
this.entityData.set(AMMO, this.getItemStacks().stream().filter(stack -> stack.is(ModItems.HEAVY_AMMO.get())).count());
this.entityData.set(AMMO, this.getItemStacks().stream().filter(stack -> stack.is(ModItems.HEAVY_AMMO.get())).mapToInt(ItemStack::getCount).sum());
turretYRotO = this.getTurretYRot();
turretXRotO = this.getTurretXRot();

20
src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java
View file

@ -64,14 +64,7 @@ public class LivingEventHandler {
return;
}
if (event.getEntity().getVehicle() != null && event.getEntity().getVehicle() instanceof IVehicleEntity) {
event.setAmount(0.3f * event.getAmount());
}
if (event.getEntity().getVehicle() != null && event.getEntity().getVehicle() instanceof ICannonEntity) {
event.setCanceled(true);
}
handleVehicleHurt(event);
handleGunPerksWhenHurt(event);
renderDamageIndicator(event);
reduceBulletDamage(event);
@ -96,6 +89,17 @@ public class LivingEventHandler {
}
}
private static void handleVehicleHurt(LivingHurtEvent event) {
var vehicle = event.getEntity().getVehicle();
if (vehicle != null) {
if (vehicle instanceof ICannonEntity) {
event.setCanceled(true);
} else if (vehicle instanceof IVehicleEntity) {
event.setAmount(0.3f * event.getAmount());
}
}
}
/**
* 计算子弹伤害衰减
*/

1
src/main/java/com/atsuishio/superbwarfare/mixins/MouseHandlerMixin.java
View file

@ -63,7 +63,6 @@ public class MouseHandlerMixin {
double zoom = 1.25 + stack.getOrCreateTag().getDouble("CustomZoom");
float customSens = (float) stack.getOrCreateTag().getInt("sensitivity");
if (!player.getMainHandItem().isEmpty() && mc.options.getCameraType() == CameraType.FIRST_PERSON) {
return original / Math.max((1 + (0.2 * (zoom - (0.3 * customSens)) * ClientEventHandler.zoomTime)), 0.1);
}

7
src/main/java/com/atsuishio/superbwarfare/network/message/VehicleFireMessage.java
View file

@ -1,6 +1,5 @@
package com.atsuishio.superbwarfare.network.message;
import com.atsuishio.superbwarfare.entity.ICannonEntity;
import com.atsuishio.superbwarfare.entity.IVehicleEntity;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.level.Level;
@ -35,11 +34,7 @@ public class VehicleFireMessage {
return;
}
if (player.getVehicle() instanceof ICannonEntity entity) {
entity.cannonShoot(player);
}
if (player.getVehicle() instanceof IVehicleEntity iVehicle && !(player.getVehicle() instanceof ICannonEntity)) {
if (player.getVehicle() instanceof IVehicleEntity iVehicle) {
iVehicle.vehicleShoot(player);
}
}