From 500125b80788433bbf070bfb06e67f07f2de60ad Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Sat, 4 Jan 2025 22:09:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9E=82=E7=9B=B4=E7=A2=B0?= =?UTF-8?q?=E6=92=9Ebug=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../superbwarfare/block/ContainerBlock.java | 3 +- .../superbwarfare/block/JumpPadBlock.java | 2 +- .../entity/ChargingStationBlockEntity.java | 2 +- .../superbwarfare/client/ClickHandler.java | 3 +- .../client/layer/AnnihilatorGlowLayer.java | 2 +- .../client/layer/AnnihilatorLayer.java | 2 +- .../client/layer/AnnihilatorLedLayer.java | 2 +- .../layer/AnnihilatorLedLightLayer.java | 2 +- .../client/layer/AnnihilatorPowerLayer.java | 2 +- .../layer/AnnihilatorPowerLightLayer.java | 2 +- .../client/layer/Mk42DamageLayer.java | 2 +- .../superbwarfare/client/layer/Mk42Layer.java | 2 +- .../client/layer/Mle1934DamageLayer.java | 2 +- .../client/layer/Mle1934Layer.java | 2 +- .../client/layer/SpeedBoatHeatLayer.java | 4 +-- .../client/layer/SpeedBoatLayer.java | 2 +- .../client/layer/SpeedBoatPowerLayer.java | 2 +- .../client/model/entity/Ah6Model.java | 2 +- .../client/model/entity/AnnihilatorModel.java | 4 +-- .../client/model/entity/Mk42Model.java | 2 +- .../client/model/entity/Mle1934Model.java | 2 +- .../model/entity/ProjectileEntityModel.java | 2 +- .../client/model/entity/SpeedboatModel.java | 2 +- .../client/model/entity/WheelChairModel.java | 2 +- .../client/overlay/CannonHudOverlay.java | 8 +++--- .../client/overlay/CrossHairOverlay.java | 2 +- .../client/overlay/HelicopterHudOverlay.java | 6 ++-- .../client/overlay/M79UIOverlay.java | 2 +- .../client/overlay/VehicleHudOverlay.java | 2 +- .../client/overlay/VehicleMgHudOverlay.java | 2 +- .../client/renderer/entity/Ah6Renderer.java | 2 +- .../renderer/entity/AnnihilatorRenderer.java | 2 +- .../client/renderer/entity/Mk42Renderer.java | 2 +- .../renderer/entity/Mle1934Renderer.java | 2 +- .../renderer/entity/SpeedboatRenderer.java | 2 +- .../renderer/entity/WheelChairRenderer.java | 2 +- .../client/screens/FuMO25Screen.java | 2 +- .../entity/projectile/ProjectileEntity.java | 1 + .../entity/{ => vehicle}/Ah6Entity.java | 4 +-- .../{ => vehicle}/AnnihilatorEntity.java | 2 +- .../{ => vehicle}/EnergyVehicleEntity.java | 2 +- .../{ => vehicle}/IArmedVehicleEntity.java | 2 +- .../entity/{ => vehicle}/ICannonEntity.java | 2 +- .../entity/{ => vehicle}/IChargeEntity.java | 2 +- .../{ => vehicle}/IHelicopterEntity.java | 2 +- .../entity/{ => vehicle}/Mk42Entity.java | 2 +- .../entity/{ => vehicle}/Mle1934Entity.java | 2 +- .../{ => vehicle}/MobileVehicleEntity.java | 28 +++++++++---------- .../MultiWeaponVehicleEntity.java | 2 +- .../entity/{ => vehicle}/SpeedboatEntity.java | 4 +-- .../entity/{ => vehicle}/VehicleEntity.java | 2 +- .../{ => vehicle}/WheelChairEntity.java | 7 ++--- .../event/ClientEventHandler.java | 7 +++-- .../event/ClientSoundHandler.java | 6 ++-- .../event/LivingEventHandler.java | 6 +++- .../superbwarfare/init/ModEntities.java | 1 + .../superbwarfare/mixins/CameraMixin.java | 3 +- .../mixins/ClientPacketListenerMixin.java | 2 +- .../mixins/ClientPlayerEntityMixin.java | 2 +- .../mixins/GameRendererMixin.java | 2 +- .../mixins/LivingEntityRendererMixin.java | 2 +- .../mixins/MouseHandlerMixin.java | 6 ++-- .../mixins/PlayerEntityMixin.java | 2 +- .../network/message/FireModeMessage.java | 4 +-- .../message/PlayerStopRidingMessage.java | 2 +- .../network/message/VehicleFireMessage.java | 2 +- .../message/VehicleMovementMessage.java | 2 +- .../network/message/ZoomMessage.java | 4 +-- .../superbwarfare/tools/SeekTool.java | 4 +-- 69 files changed, 109 insertions(+), 102 deletions(-) rename src/main/java/com/atsuishio/superbwarfare/entity/{ => vehicle}/Ah6Entity.java (99%) rename src/main/java/com/atsuishio/superbwarfare/entity/{ => vehicle}/AnnihilatorEntity.java (99%) rename src/main/java/com/atsuishio/superbwarfare/entity/{ => vehicle}/EnergyVehicleEntity.java (97%) rename src/main/java/com/atsuishio/superbwarfare/entity/{ => vehicle}/IArmedVehicleEntity.java (83%) rename src/main/java/com/atsuishio/superbwarfare/entity/{ => vehicle}/ICannonEntity.java (55%) rename src/main/java/com/atsuishio/superbwarfare/entity/{ => vehicle}/IChargeEntity.java (63%) rename src/main/java/com/atsuishio/superbwarfare/entity/{ => vehicle}/IHelicopterEntity.java (79%) rename src/main/java/com/atsuishio/superbwarfare/entity/{ => vehicle}/Mk42Entity.java (99%) rename src/main/java/com/atsuishio/superbwarfare/entity/{ => vehicle}/Mle1934Entity.java (99%) rename src/main/java/com/atsuishio/superbwarfare/entity/{ => vehicle}/MobileVehicleEntity.java (91%) rename src/main/java/com/atsuishio/superbwarfare/entity/{ => vehicle}/MultiWeaponVehicleEntity.java (65%) rename src/main/java/com/atsuishio/superbwarfare/entity/{ => vehicle}/SpeedboatEntity.java (99%) rename src/main/java/com/atsuishio/superbwarfare/entity/{ => vehicle}/VehicleEntity.java (99%) rename src/main/java/com/atsuishio/superbwarfare/entity/{ => vehicle}/WheelChairEntity.java (98%) diff --git a/src/main/java/com/atsuishio/superbwarfare/block/ContainerBlock.java b/src/main/java/com/atsuishio/superbwarfare/block/ContainerBlock.java index bf5d63116..c9ea40585 100644 --- a/src/main/java/com/atsuishio/superbwarfare/block/ContainerBlock.java +++ b/src/main/java/com/atsuishio/superbwarfare/block/ContainerBlock.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.block; import com.atsuishio.superbwarfare.block.entity.ContainerBlockEntity; -import com.atsuishio.superbwarfare.entity.ICannonEntity; +import com.atsuishio.superbwarfare.entity.vehicle.ICannonEntity; import com.atsuishio.superbwarfare.init.ModBlockEntities; import com.atsuishio.superbwarfare.init.ModEntities; import com.atsuishio.superbwarfare.init.ModItems; @@ -111,6 +111,7 @@ public class ContainerBlock extends BaseEntityBlock { if (i == 0 && j == 0 && k == 0) { continue; } + //TODO 修改开箱 if (!pLevel.getBlockState(pPos.offset(i, j, k)).isAir()) { flag = false; } diff --git a/src/main/java/com/atsuishio/superbwarfare/block/JumpPadBlock.java b/src/main/java/com/atsuishio/superbwarfare/block/JumpPadBlock.java index 2409a2b1a..96711e53e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/block/JumpPadBlock.java +++ b/src/main/java/com/atsuishio/superbwarfare/block/JumpPadBlock.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.block; -import com.atsuishio.superbwarfare.entity.ICannonEntity; import com.atsuishio.superbwarfare.entity.TargetEntity; +import com.atsuishio.superbwarfare.entity.vehicle.ICannonEntity; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.network.ModVariables; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/atsuishio/superbwarfare/block/entity/ChargingStationBlockEntity.java b/src/main/java/com/atsuishio/superbwarfare/block/entity/ChargingStationBlockEntity.java index f8146803e..605825d11 100644 --- a/src/main/java/com/atsuishio/superbwarfare/block/entity/ChargingStationBlockEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/block/entity/ChargingStationBlockEntity.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.block.entity; -import com.atsuishio.superbwarfare.entity.IChargeEntity; +import com.atsuishio.superbwarfare.entity.vehicle.IChargeEntity; import com.atsuishio.superbwarfare.init.ModBlockEntities; import com.atsuishio.superbwarfare.menu.ChargingStationMenu; import com.atsuishio.superbwarfare.network.dataslot.ContainerEnergyData; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java b/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java index 5a2e3ec6e..c45ec2dc0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java @@ -4,7 +4,8 @@ import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.compat.CompatHolder; import com.atsuishio.superbwarfare.compat.clothconfig.ClothConfigHelper; import com.atsuishio.superbwarfare.config.client.ReloadConfig; -import com.atsuishio.superbwarfare.entity.*; +import com.atsuishio.superbwarfare.entity.MortarEntity; +import com.atsuishio.superbwarfare.entity.vehicle.*; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.*; import com.atsuishio.superbwarfare.item.gun.GunItem; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorGlowLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorGlowLayer.java index 4c018c970..1d549d90d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorGlowLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorGlowLayer.java @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.layer; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.ModRenderTypes; -import com.atsuishio.superbwarfare.entity.AnnihilatorEntity; +import com.atsuishio.superbwarfare.entity.vehicle.AnnihilatorEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorLayer.java index 8c955be8f..1be2c45bb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorLayer.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.layer; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.AnnihilatorEntity; +import com.atsuishio.superbwarfare.entity.vehicle.AnnihilatorEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorLedLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorLedLayer.java index cead86000..5a974105a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorLedLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorLedLayer.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.layer; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.AnnihilatorEntity; +import com.atsuishio.superbwarfare.entity.vehicle.AnnihilatorEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorLedLightLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorLedLightLayer.java index 616ba8044..e454e1a42 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorLedLightLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorLedLightLayer.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.layer; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.AnnihilatorEntity; +import com.atsuishio.superbwarfare.entity.vehicle.AnnihilatorEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorPowerLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorPowerLayer.java index bf7cabca7..4c27a3dfa 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorPowerLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorPowerLayer.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.layer; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.AnnihilatorEntity; +import com.atsuishio.superbwarfare.entity.vehicle.AnnihilatorEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorPowerLightLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorPowerLightLayer.java index 3371d3668..d9ea79bcd 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorPowerLightLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/AnnihilatorPowerLightLayer.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.layer; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.AnnihilatorEntity; +import com.atsuishio.superbwarfare.entity.vehicle.AnnihilatorEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/Mk42DamageLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/Mk42DamageLayer.java index f5a97c6cc..649d3994f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/Mk42DamageLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/Mk42DamageLayer.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.layer; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.Mk42Entity; +import com.atsuishio.superbwarfare.entity.vehicle.Mk42Entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/Mk42Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/Mk42Layer.java index f93cc84d3..3680dab73 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/Mk42Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/Mk42Layer.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.layer; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.Mk42Entity; +import com.atsuishio.superbwarfare.entity.vehicle.Mk42Entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/Mle1934DamageLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/Mle1934DamageLayer.java index 52bce5391..cb57091a4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/Mle1934DamageLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/Mle1934DamageLayer.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.layer; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.Mle1934Entity; +import com.atsuishio.superbwarfare.entity.vehicle.Mle1934Entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/Mle1934Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/Mle1934Layer.java index aad8b881f..80500bc46 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/Mle1934Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/Mle1934Layer.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.layer; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.Mle1934Entity; +import com.atsuishio.superbwarfare.entity.vehicle.Mle1934Entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/SpeedBoatHeatLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/SpeedBoatHeatLayer.java index 4c5aa312f..440a31bac 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/SpeedBoatHeatLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/SpeedBoatHeatLayer.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.layer; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.SpeedboatEntity; +import com.atsuishio.superbwarfare.entity.vehicle.SpeedboatEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; @@ -12,7 +12,7 @@ import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.renderer.GeoRenderer; import software.bernie.geckolib.renderer.layer.GeoRenderLayer; -import static com.atsuishio.superbwarfare.entity.SpeedboatEntity.HEAT; +import static com.atsuishio.superbwarfare.entity.vehicle.SpeedboatEntity.HEAT; public class SpeedBoatHeatLayer extends GeoRenderLayer { private static final ResourceLocation LAYER = ModUtils.loc("textures/entity/speedboat_heat.png"); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/SpeedBoatLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/SpeedBoatLayer.java index 18fe23f42..4608dabdb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/SpeedBoatLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/SpeedBoatLayer.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.layer; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.SpeedboatEntity; +import com.atsuishio.superbwarfare.entity.vehicle.SpeedboatEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/SpeedBoatPowerLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/SpeedBoatPowerLayer.java index 403b2556b..08b8a0cdb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/SpeedBoatPowerLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/SpeedBoatPowerLayer.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.layer; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.SpeedboatEntity; +import com.atsuishio.superbwarfare.entity.vehicle.SpeedboatEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Ah6Model.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Ah6Model.java index d8a350fd4..c8b6b3f09 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Ah6Model.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Ah6Model.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.model.entity; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.Ah6Entity; +import com.atsuishio.superbwarfare.entity.vehicle.Ah6Entity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/AnnihilatorModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/AnnihilatorModel.java index 930c180b2..c8778c5d5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/AnnihilatorModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/AnnihilatorModel.java @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.model.entity; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.config.server.CannonConfig; -import com.atsuishio.superbwarfare.entity.AnnihilatorEntity; +import com.atsuishio.superbwarfare.entity.vehicle.AnnihilatorEntity; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import software.bernie.geckolib.constant.DataTickets; @@ -11,7 +11,7 @@ import software.bernie.geckolib.core.animation.AnimationState; import software.bernie.geckolib.model.GeoModel; import software.bernie.geckolib.model.data.EntityModelData; -import static com.atsuishio.superbwarfare.entity.AnnihilatorEntity.*; +import static com.atsuishio.superbwarfare.entity.vehicle.AnnihilatorEntity.*; public class AnnihilatorModel extends GeoModel { diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mk42Model.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mk42Model.java index e384867f8..04983e5b5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mk42Model.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mk42Model.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.model.entity; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.Mk42Entity; +import com.atsuishio.superbwarfare.entity.vehicle.Mk42Entity; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mle1934Model.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mle1934Model.java index cc4151a2a..ebf6fc986 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mle1934Model.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mle1934Model.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.model.entity; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.Mle1934Entity; +import com.atsuishio.superbwarfare.entity.vehicle.Mle1934Entity; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/ProjectileEntityModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/ProjectileEntityModel.java index a2c363f87..07851f12e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/ProjectileEntityModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/ProjectileEntityModel.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.client.model.entity; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.IArmedVehicleEntity; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; +import com.atsuishio.superbwarfare.entity.vehicle.IArmedVehicleEntity; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModTags; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/SpeedboatModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/SpeedboatModel.java index d5e7eef0e..2ca639914 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/SpeedboatModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/SpeedboatModel.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.model.entity; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.SpeedboatEntity; +import com.atsuishio.superbwarfare.entity.vehicle.SpeedboatEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/WheelChairModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/WheelChairModel.java index ae38a6830..343a7b719 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/WheelChairModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/WheelChairModel.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.model.entity; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.WheelChairEntity; +import com.atsuishio.superbwarfare.entity.vehicle.WheelChairEntity; import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.model.GeoModel; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/CannonHudOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/CannonHudOverlay.java index fa66172a8..3186f0e04 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/CannonHudOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/CannonHudOverlay.java @@ -2,10 +2,10 @@ package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.RenderHelper; -import com.atsuishio.superbwarfare.entity.AnnihilatorEntity; -import com.atsuishio.superbwarfare.entity.ICannonEntity; -import com.atsuishio.superbwarfare.entity.Mk42Entity; -import com.atsuishio.superbwarfare.entity.Mle1934Entity; +import com.atsuishio.superbwarfare.entity.vehicle.AnnihilatorEntity; +import com.atsuishio.superbwarfare.entity.vehicle.ICannonEntity; +import com.atsuishio.superbwarfare.entity.vehicle.Mk42Entity; +import com.atsuishio.superbwarfare.entity.vehicle.Mle1934Entity; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.tools.TraceTool; import com.mojang.blaze3d.platform.GlStateManager; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/CrossHairOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/CrossHairOverlay.java index fe2688825..8a32be419 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/CrossHairOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/CrossHairOverlay.java @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.config.client.DisplayConfig; -import com.atsuishio.superbwarfare.entity.ICannonEntity; +import com.atsuishio.superbwarfare.entity.vehicle.ICannonEntity; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModTags; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/HelicopterHudOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/HelicopterHudOverlay.java index 6f61cd890..1c465f339 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/HelicopterHudOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/HelicopterHudOverlay.java @@ -2,9 +2,9 @@ package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.RenderHelper; -import com.atsuishio.superbwarfare.entity.IHelicopterEntity; -import com.atsuishio.superbwarfare.entity.MobileVehicleEntity; -import com.atsuishio.superbwarfare.entity.VehicleEntity; +import com.atsuishio.superbwarfare.entity.vehicle.IHelicopterEntity; +import com.atsuishio.superbwarfare.entity.vehicle.MobileVehicleEntity; +import com.atsuishio.superbwarfare.entity.vehicle.VehicleEntity; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.network.ModVariables; import com.mojang.blaze3d.platform.GlStateManager; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/M79UIOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/M79UIOverlay.java index fa50f51f9..5c58be6fc 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/M79UIOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/M79UIOverlay.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.ICannonEntity; +import com.atsuishio.superbwarfare.entity.vehicle.ICannonEntity; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.network.ModVariables; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleHudOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleHudOverlay.java index 8f8441720..b03523497 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleHudOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleHudOverlay.java @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.config.client.DisplayConfig; -import com.atsuishio.superbwarfare.entity.*; +import com.atsuishio.superbwarfare.entity.vehicle.*; import com.atsuishio.superbwarfare.init.ModItems; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleMgHudOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleMgHudOverlay.java index 860aa5451..3ea671ba3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleMgHudOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleMgHudOverlay.java @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.overlay; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.RenderHelper; -import com.atsuishio.superbwarfare.entity.SpeedboatEntity; +import com.atsuishio.superbwarfare.entity.vehicle.SpeedboatEntity; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; import com.mojang.blaze3d.platform.GlStateManager; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/Ah6Renderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/Ah6Renderer.java index 3c3be9b37..dbf89ea7b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/Ah6Renderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/Ah6Renderer.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.entity; import com.atsuishio.superbwarfare.client.model.entity.Ah6Model; -import com.atsuishio.superbwarfare.entity.Ah6Entity; +import com.atsuishio.superbwarfare.entity.vehicle.Ah6Entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/AnnihilatorRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/AnnihilatorRenderer.java index 8b0a667af..6dafe9675 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/AnnihilatorRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/AnnihilatorRenderer.java @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.renderer.entity; import com.atsuishio.superbwarfare.client.layer.*; import com.atsuishio.superbwarfare.client.model.entity.AnnihilatorModel; -import com.atsuishio.superbwarfare.entity.AnnihilatorEntity; +import com.atsuishio.superbwarfare.entity.vehicle.AnnihilatorEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/Mk42Renderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/Mk42Renderer.java index 2b3274f2d..82e64622d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/Mk42Renderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/Mk42Renderer.java @@ -3,7 +3,7 @@ package com.atsuishio.superbwarfare.client.renderer.entity; import com.atsuishio.superbwarfare.client.layer.Mk42DamageLayer; import com.atsuishio.superbwarfare.client.layer.Mk42Layer; import com.atsuishio.superbwarfare.client.model.entity.Mk42Model; -import com.atsuishio.superbwarfare.entity.Mk42Entity; +import com.atsuishio.superbwarfare.entity.vehicle.Mk42Entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/Mle1934Renderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/Mle1934Renderer.java index f4ae2b95b..54ce70f77 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/Mle1934Renderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/Mle1934Renderer.java @@ -3,7 +3,7 @@ package com.atsuishio.superbwarfare.client.renderer.entity; import com.atsuishio.superbwarfare.client.layer.Mle1934DamageLayer; import com.atsuishio.superbwarfare.client.layer.Mle1934Layer; import com.atsuishio.superbwarfare.client.model.entity.Mle1934Model; -import com.atsuishio.superbwarfare.entity.Mle1934Entity; +import com.atsuishio.superbwarfare.entity.vehicle.Mle1934Entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/SpeedboatRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/SpeedboatRenderer.java index 8352c6c62..e53400d48 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/SpeedboatRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/SpeedboatRenderer.java @@ -4,7 +4,7 @@ import com.atsuishio.superbwarfare.client.layer.SpeedBoatHeatLayer; import com.atsuishio.superbwarfare.client.layer.SpeedBoatLayer; import com.atsuishio.superbwarfare.client.layer.SpeedBoatPowerLayer; import com.atsuishio.superbwarfare.client.model.entity.SpeedboatModel; -import com.atsuishio.superbwarfare.entity.SpeedboatEntity; +import com.atsuishio.superbwarfare.entity.vehicle.SpeedboatEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/WheelChairRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/WheelChairRenderer.java index a57414bab..4325e9cc9 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/WheelChairRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/WheelChairRenderer.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.entity; import com.atsuishio.superbwarfare.client.model.entity.WheelChairModel; -import com.atsuishio.superbwarfare.entity.WheelChairEntity; +import com.atsuishio.superbwarfare.entity.vehicle.WheelChairEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/FuMO25Screen.java b/src/main/java/com/atsuishio/superbwarfare/client/screens/FuMO25Screen.java index 8ac7e8965..cfdda866e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/FuMO25Screen.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/screens/FuMO25Screen.java @@ -3,7 +3,7 @@ package com.atsuishio.superbwarfare.client.screens; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.block.entity.FuMO25BlockEntity; import com.atsuishio.superbwarfare.client.RenderHelper; -import com.atsuishio.superbwarfare.entity.VehicleEntity; +import com.atsuishio.superbwarfare.entity.vehicle.VehicleEntity; import com.atsuishio.superbwarfare.menu.FuMO25Menu; import com.atsuishio.superbwarfare.network.message.RadarChangeModeMessage; import com.atsuishio.superbwarfare.network.message.RadarSetParametersMessage; diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/ProjectileEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/ProjectileEntity.java index 945cd69fe..32b8dd9e0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/ProjectileEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/ProjectileEntity.java @@ -3,6 +3,7 @@ package com.atsuishio.superbwarfare.entity.projectile; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.block.BarbedWireBlock; import com.atsuishio.superbwarfare.entity.*; +import com.atsuishio.superbwarfare.entity.vehicle.IArmedVehicleEntity; import com.atsuishio.superbwarfare.init.*; import com.atsuishio.superbwarfare.item.Transcript; import com.atsuishio.superbwarfare.network.message.ClientIndicatorMessage; diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/Ah6Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java similarity index 99% rename from src/main/java/com/atsuishio/superbwarfare/entity/Ah6Entity.java rename to src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java index 472b5579f..e7dd3a509 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/Ah6Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.entity; +package com.atsuishio.superbwarfare.entity.vehicle; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.config.server.ExplosionDestroyConfig; @@ -132,10 +132,8 @@ public class Ah6Entity extends MobileVehicleEntity implements GeoEntity, IHelico @Override public void baseTick() { propellerRotO = this.getPropellerRot(); - super.baseTick(); - this.setDeltaMovement(this.getDeltaMovement().add(0.0, -0.06, 0.0)); if (this.onGround()) { this.setDeltaMovement(this.getDeltaMovement().multiply(0.8, 0.95, 0.8)); this.setZRot(this.roll * 0.9f); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/AnnihilatorEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/AnnihilatorEntity.java similarity index 99% rename from src/main/java/com/atsuishio/superbwarfare/entity/AnnihilatorEntity.java rename to src/main/java/com/atsuishio/superbwarfare/entity/vehicle/AnnihilatorEntity.java index c6e337a4d..5778ea37c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/AnnihilatorEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/AnnihilatorEntity.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.entity; +package com.atsuishio.superbwarfare.entity.vehicle; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.config.server.CannonConfig; diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/EnergyVehicleEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/EnergyVehicleEntity.java similarity index 97% rename from src/main/java/com/atsuishio/superbwarfare/entity/EnergyVehicleEntity.java rename to src/main/java/com/atsuishio/superbwarfare/entity/vehicle/EnergyVehicleEntity.java index a97ade4f0..510e62370 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/EnergyVehicleEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/EnergyVehicleEntity.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.entity; +package com.atsuishio.superbwarfare.entity.vehicle; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/IArmedVehicleEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/IArmedVehicleEntity.java similarity index 83% rename from src/main/java/com/atsuishio/superbwarfare/entity/IArmedVehicleEntity.java rename to src/main/java/com/atsuishio/superbwarfare/entity/vehicle/IArmedVehicleEntity.java index fa10e7fff..adb01fcaf 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/IArmedVehicleEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/IArmedVehicleEntity.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.entity; +package com.atsuishio.superbwarfare.entity.vehicle; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/ICannonEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/ICannonEntity.java similarity index 55% rename from src/main/java/com/atsuishio/superbwarfare/entity/ICannonEntity.java rename to src/main/java/com/atsuishio/superbwarfare/entity/vehicle/ICannonEntity.java index 082e5b2d0..83cdf0c4f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/ICannonEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/ICannonEntity.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.entity; +package com.atsuishio.superbwarfare.entity.vehicle; public interface ICannonEntity extends IArmedVehicleEntity { diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/IChargeEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/IChargeEntity.java similarity index 63% rename from src/main/java/com/atsuishio/superbwarfare/entity/IChargeEntity.java rename to src/main/java/com/atsuishio/superbwarfare/entity/vehicle/IChargeEntity.java index 526aff3ea..93762b049 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/IChargeEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/IChargeEntity.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.entity; +package com.atsuishio.superbwarfare.entity.vehicle; public interface IChargeEntity { diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/IHelicopterEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/IHelicopterEntity.java similarity index 79% rename from src/main/java/com/atsuishio/superbwarfare/entity/IHelicopterEntity.java rename to src/main/java/com/atsuishio/superbwarfare/entity/vehicle/IHelicopterEntity.java index 1457065ad..3d3488d67 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/IHelicopterEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/IHelicopterEntity.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.entity; +package com.atsuishio.superbwarfare.entity.vehicle; public interface IHelicopterEntity extends IArmedVehicleEntity { diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/Mk42Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java similarity index 99% rename from src/main/java/com/atsuishio/superbwarfare/entity/Mk42Entity.java rename to src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java index ab793083d..8efb7f776 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/Mk42Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.entity; +package com.atsuishio.superbwarfare.entity.vehicle; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.config.server.CannonConfig; diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/Mle1934Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java similarity index 99% rename from src/main/java/com/atsuishio/superbwarfare/entity/Mle1934Entity.java rename to src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java index 109170c1e..f4873d02f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/Mle1934Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.entity; +package com.atsuishio.superbwarfare.entity.vehicle; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.config.server.CannonConfig; diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/MobileVehicleEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/MobileVehicleEntity.java similarity index 91% rename from src/main/java/com/atsuishio/superbwarfare/entity/MobileVehicleEntity.java rename to src/main/java/com/atsuishio/superbwarfare/entity/vehicle/MobileVehicleEntity.java index c8626a5a7..54d14060c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/MobileVehicleEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/MobileVehicleEntity.java @@ -1,5 +1,6 @@ -package com.atsuishio.superbwarfare.entity; +package com.atsuishio.superbwarfare.entity.vehicle; +import com.atsuishio.superbwarfare.entity.TargetEntity; import com.atsuishio.superbwarfare.entity.projectile.LaserEntity; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; import com.atsuishio.superbwarfare.init.ModDamageTypes; @@ -36,6 +37,7 @@ public class MobileVehicleEntity extends EnergyVehicleEntity { public boolean upInputDown; public boolean downInputDown; public double lastTickSpeed; + public double lastTickVerticalSpeed; public int collisionCoolDown; public MobileVehicleEntity(EntityType pEntityType, Level pLevel) { @@ -57,11 +59,13 @@ public class MobileVehicleEntity extends EnergyVehicleEntity { @Override public void baseTick() { lastTickSpeed = new Vec3(this.getDeltaMovement().x, this.getDeltaMovement().y + 0.06, this.getDeltaMovement().z).length(); + lastTickVerticalSpeed = this.getDeltaMovement().y + 0.06; if (collisionCoolDown > 0) { collisionCoolDown--; } super.baseTick(); crushEntities(this.getDeltaMovement()); + this.setDeltaMovement(this.getDeltaMovement().add(0.0, -0.06, 0.0)); this.move(MoverType.SELF, this.getDeltaMovement()); this.refreshDimensions(); } @@ -69,28 +73,24 @@ public class MobileVehicleEntity extends EnergyVehicleEntity { @Override public void move(@NotNull MoverType movementType, @NotNull Vec3 movement) { super.move(movementType, movement); - if (lastTickSpeed < 0.4 || collisionCoolDown > 0) return; + if (lastTickSpeed < 0.3 || collisionCoolDown > 0) return; - if (horizontalCollision || verticalCollision) { + if ((verticalCollision) && Mth.abs((float) lastTickVerticalSpeed) > 0.6) { + this.hurt(ModDamageTypes.causeVehicleStrikeDamage(this.level().registryAccess(), this, this.getFirstPassenger() == null ? this : this.getFirstPassenger()), (float) (240 * ((Mth.abs((float) lastTickVerticalSpeed) - 0.6) * (lastTickSpeed - 0.4) * (lastTickSpeed - 0.4)))); + this.bounceVertical(Direction.getNearest(this.getDeltaMovement().x(), this.getDeltaMovement().y(), this.getDeltaMovement().z()).getOpposite()); + if (!this.level().isClientSide) { + this.level().playSound(null, this, ModSounds.VEHICLE_STRIKE.get(), this.getSoundSource(), 1, 1); + } collisionCoolDown = 4; } if (this.horizontalCollision) { + this.hurt(ModDamageTypes.causeVehicleStrikeDamage(this.level().registryAccess(), this, this.getFirstPassenger() == null ? this : this.getFirstPassenger()), (float) (180 * ((lastTickSpeed - 0.4) * (lastTickSpeed - 0.4)))); this.bounceHorizontal(Direction.getNearest(this.getDeltaMovement().x(), this.getDeltaMovement().y(), this.getDeltaMovement().z()).getOpposite()); - this.hurt(ModDamageTypes.causeVehicleStrikeDamage(this.level().registryAccess(), this, this.getFirstPassenger() == null ? this : this.getFirstPassenger()), (float) (160 * ((lastTickSpeed - 0.4) * (lastTickSpeed - 0.4)))); - if (!this.level().isClientSide) { - this.level().playSound(null, this, ModSounds.VEHICLE_STRIKE.get(), this.getSoundSource(), 1, 1); - } - } - - // TODO bug修复：本方法会在速度到达一定程度且乘客不为空时，持续对自身造成伤害 - if (this.verticalCollision) { - this.bounceVertical(Direction.getNearest(this.getDeltaMovement().x(), this.getDeltaMovement().y(), this.getDeltaMovement().z()).getOpposite()); - this.hurt(ModDamageTypes.causeVehicleStrikeDamage(this.level().registryAccess(), this, - this.getFirstPassenger() == null ? this : this.getFirstPassenger()), (float) (100 * ((lastTickSpeed - 0.4) * (lastTickSpeed - 0.4)))); if (!this.level().isClientSide) { this.level().playSound(null, this, ModSounds.VEHICLE_STRIKE.get(), this.getSoundSource(), 1, 1); } + collisionCoolDown = 4; } } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/MultiWeaponVehicleEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/MultiWeaponVehicleEntity.java similarity index 65% rename from src/main/java/com/atsuishio/superbwarfare/entity/MultiWeaponVehicleEntity.java rename to src/main/java/com/atsuishio/superbwarfare/entity/vehicle/MultiWeaponVehicleEntity.java index 71f13f3d2..2938516d7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/MultiWeaponVehicleEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/MultiWeaponVehicleEntity.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.entity; +package com.atsuishio.superbwarfare.entity.vehicle; public interface MultiWeaponVehicleEntity { void changeWeapon(); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/SpeedboatEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java similarity index 99% rename from src/main/java/com/atsuishio/superbwarfare/entity/SpeedboatEntity.java rename to src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java index 1369b5c90..334c43ef6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/SpeedboatEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.entity; +package com.atsuishio.superbwarfare.entity.vehicle; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.config.server.CannonConfig; @@ -221,7 +221,7 @@ public class SpeedboatEntity extends MobileVehicleEntity implements GeoEntity, I } double fluidFloat; - fluidFloat = -0.05 + 0.1 * getSubmergedHeight(this); + fluidFloat = -0.06 + 0.12 * getSubmergedHeight(this); this.setDeltaMovement(this.getDeltaMovement().add(0.0, fluidFloat, 0.0)); if (this.onGround()) { diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/VehicleEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/VehicleEntity.java similarity index 99% rename from src/main/java/com/atsuishio/superbwarfare/entity/VehicleEntity.java rename to src/main/java/com/atsuishio/superbwarfare/entity/vehicle/VehicleEntity.java index 563bdffa1..e5873096b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/VehicleEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/VehicleEntity.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.entity; +package com.atsuishio.superbwarfare.entity.vehicle; import com.atsuishio.superbwarfare.init.ModDamageTypes; import com.atsuishio.superbwarfare.init.ModItems; diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/WheelChairEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/WheelChairEntity.java similarity index 98% rename from src/main/java/com/atsuishio/superbwarfare/entity/WheelChairEntity.java rename to src/main/java/com/atsuishio/superbwarfare/entity/vehicle/WheelChairEntity.java index ad86d63f0..bba57df92 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/WheelChairEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/WheelChairEntity.java @@ -1,5 +1,6 @@ -package com.atsuishio.superbwarfare.entity; +package com.atsuishio.superbwarfare.entity.vehicle; +import com.atsuishio.superbwarfare.entity.MortarEntity; import com.atsuishio.superbwarfare.init.ModEntities; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.ContainerBlockItem; @@ -114,8 +115,6 @@ public class WheelChairEntity extends MobileVehicleEntity implements GeoEntity { } super.baseTick(); - - this.setDeltaMovement(this.getDeltaMovement().add(0.0, -0.048, 0.0)); if (this.onGround()) { float f = (float) Mth.clamp(0.85f + 0.05f * Mth.abs(90 - (float) calculateAngle(this.getDeltaMovement(), this.getViewVector(1))) / 90, 0.01, 0.99); this.setDeltaMovement(this.getDeltaMovement().multiply(f, 0.95, f)); @@ -182,7 +181,7 @@ public class WheelChairEntity extends MobileVehicleEntity implements GeoEntity { serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.WHEEL_CHAIR_JUMP.get(), SoundSource.PLAYERS, 1, 1); } this.extraEnergy(400); - this.setDeltaMovement(this.getDeltaMovement().add(0, 0.48, 0)); + this.setDeltaMovement(this.getDeltaMovement().add(0, 0.6, 0)); jumpCoolDown = 3; } diff --git a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java index 92a928230..07da5b6db 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java @@ -3,7 +3,8 @@ package com.atsuishio.superbwarfare.event; import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.client.ClickHandler; import com.atsuishio.superbwarfare.config.client.DisplayConfig; -import com.atsuishio.superbwarfare.entity.*; +import com.atsuishio.superbwarfare.entity.DroneEntity; +import com.atsuishio.superbwarfare.entity.vehicle.*; import com.atsuishio.superbwarfare.init.*; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.network.ModVariables; @@ -55,8 +56,8 @@ import software.bernie.geckolib.core.animatable.model.CoreGeoBone; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; -import static com.atsuishio.superbwarfare.entity.Ah6Entity.WEAPON_TYPE; -import static com.atsuishio.superbwarfare.entity.SpeedboatEntity.HEAT; +import static com.atsuishio.superbwarfare.entity.vehicle.Ah6Entity.WEAPON_TYPE; +import static com.atsuishio.superbwarfare.entity.vehicle.SpeedboatEntity.HEAT; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT) public class ClientEventHandler { diff --git a/src/main/java/com/atsuishio/superbwarfare/event/ClientSoundHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/ClientSoundHandler.java index b4a285711..8624980d2 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/ClientSoundHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/ClientSoundHandler.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.event; -import com.atsuishio.superbwarfare.entity.Ah6Entity; -import com.atsuishio.superbwarfare.entity.MobileVehicleEntity; +import com.atsuishio.superbwarfare.entity.vehicle.Ah6Entity; +import com.atsuishio.superbwarfare.entity.vehicle.MobileVehicleEntity; import com.atsuishio.superbwarfare.tools.SeekTool; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; @@ -17,7 +17,7 @@ import org.joml.Math; import java.util.List; -import static com.atsuishio.superbwarfare.entity.MobileVehicleEntity.POWER; +import static com.atsuishio.superbwarfare.entity.vehicle.MobileVehicleEntity.POWER; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT) public class ClientSoundHandler { diff --git a/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java index 1890cca6a..4a551eaae 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java @@ -4,8 +4,12 @@ import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.capability.LaserCapability; import com.atsuishio.superbwarfare.capability.ModCapabilities; import com.atsuishio.superbwarfare.config.common.GameplayConfig; -import com.atsuishio.superbwarfare.entity.*; +import com.atsuishio.superbwarfare.entity.ICustomKnockback; +import com.atsuishio.superbwarfare.entity.TargetEntity; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; +import com.atsuishio.superbwarfare.entity.vehicle.IArmedVehicleEntity; +import com.atsuishio.superbwarfare.entity.vehicle.ICannonEntity; +import com.atsuishio.superbwarfare.entity.vehicle.VehicleEntity; import com.atsuishio.superbwarfare.init.*; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.network.ModVariables; diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModEntities.java b/src/main/java/com/atsuishio/superbwarfare/init/ModEntities.java index 4e233415a..a6991db6f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModEntities.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModEntities.java @@ -4,6 +4,7 @@ import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.config.server.SpawnConfig; import com.atsuishio.superbwarfare.entity.*; import com.atsuishio.superbwarfare.entity.projectile.*; +import com.atsuishio.superbwarfare.entity.vehicle.*; import net.minecraft.world.Difficulty; import net.minecraft.world.entity.*; import net.minecraft.world.entity.monster.Monster; diff --git a/src/main/java/com/atsuishio/superbwarfare/mixins/CameraMixin.java b/src/main/java/com/atsuishio/superbwarfare/mixins/CameraMixin.java index 5aff52ced..c718760ee 100644 --- a/src/main/java/com/atsuishio/superbwarfare/mixins/CameraMixin.java +++ b/src/main/java/com/atsuishio/superbwarfare/mixins/CameraMixin.java @@ -1,6 +1,7 @@ package com.atsuishio.superbwarfare.mixins; -import com.atsuishio.superbwarfare.entity.*; +import com.atsuishio.superbwarfare.entity.DroneEntity; +import com.atsuishio.superbwarfare.entity.vehicle.*; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModTags; diff --git a/src/main/java/com/atsuishio/superbwarfare/mixins/ClientPacketListenerMixin.java b/src/main/java/com/atsuishio/superbwarfare/mixins/ClientPacketListenerMixin.java index 3895e7e63..c1b30e2c7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/mixins/ClientPacketListenerMixin.java +++ b/src/main/java/com/atsuishio/superbwarfare/mixins/ClientPacketListenerMixin.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.mixins; -import com.atsuishio.superbwarfare.entity.VehicleEntity; +import com.atsuishio.superbwarfare.entity.vehicle.VehicleEntity; import com.atsuishio.superbwarfare.init.ModKeyMappings; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; diff --git a/src/main/java/com/atsuishio/superbwarfare/mixins/ClientPlayerEntityMixin.java b/src/main/java/com/atsuishio/superbwarfare/mixins/ClientPlayerEntityMixin.java index 1ded1a556..4f01a73c4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/mixins/ClientPlayerEntityMixin.java +++ b/src/main/java/com/atsuishio/superbwarfare/mixins/ClientPlayerEntityMixin.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.mixins; -import com.atsuishio.superbwarfare.entity.VehicleEntity; +import com.atsuishio.superbwarfare.entity.vehicle.VehicleEntity; import com.mojang.authlib.GameProfile; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.player.AbstractClientPlayer; diff --git a/src/main/java/com/atsuishio/superbwarfare/mixins/GameRendererMixin.java b/src/main/java/com/atsuishio/superbwarfare/mixins/GameRendererMixin.java index f01f8a6d6..8a049a3d8 100644 --- a/src/main/java/com/atsuishio/superbwarfare/mixins/GameRendererMixin.java +++ b/src/main/java/com/atsuishio/superbwarfare/mixins/GameRendererMixin.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.mixins; -import com.atsuishio.superbwarfare.entity.Ah6Entity; +import com.atsuishio.superbwarfare.entity.vehicle.Ah6Entity; import com.atsuishio.superbwarfare.init.ModTags; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; diff --git a/src/main/java/com/atsuishio/superbwarfare/mixins/LivingEntityRendererMixin.java b/src/main/java/com/atsuishio/superbwarfare/mixins/LivingEntityRendererMixin.java index fad1f90e1..33331bcfd 100644 --- a/src/main/java/com/atsuishio/superbwarfare/mixins/LivingEntityRendererMixin.java +++ b/src/main/java/com/atsuishio/superbwarfare/mixins/LivingEntityRendererMixin.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.mixins; -import com.atsuishio.superbwarfare.entity.Ah6Entity; +import com.atsuishio.superbwarfare.entity.vehicle.Ah6Entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import net.minecraft.client.renderer.entity.LivingEntityRenderer; diff --git a/src/main/java/com/atsuishio/superbwarfare/mixins/MouseHandlerMixin.java b/src/main/java/com/atsuishio/superbwarfare/mixins/MouseHandlerMixin.java index 9b2d78d27..fb9ddd781 100644 --- a/src/main/java/com/atsuishio/superbwarfare/mixins/MouseHandlerMixin.java +++ b/src/main/java/com/atsuishio/superbwarfare/mixins/MouseHandlerMixin.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.mixins; -import com.atsuishio.superbwarfare.entity.Ah6Entity; -import com.atsuishio.superbwarfare.entity.IArmedVehicleEntity; -import com.atsuishio.superbwarfare.entity.ICannonEntity; +import com.atsuishio.superbwarfare.entity.vehicle.Ah6Entity; +import com.atsuishio.superbwarfare.entity.vehicle.IArmedVehicleEntity; +import com.atsuishio.superbwarfare.entity.vehicle.ICannonEntity; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModMobEffects; diff --git a/src/main/java/com/atsuishio/superbwarfare/mixins/PlayerEntityMixin.java b/src/main/java/com/atsuishio/superbwarfare/mixins/PlayerEntityMixin.java index ec40e3848..389cc646a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/mixins/PlayerEntityMixin.java +++ b/src/main/java/com/atsuishio/superbwarfare/mixins/PlayerEntityMixin.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.mixins; -import com.atsuishio.superbwarfare.entity.VehicleEntity; +import com.atsuishio.superbwarfare.entity.vehicle.VehicleEntity; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.Pose; diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/FireModeMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/FireModeMessage.java index f023ff940..c06d6b8f6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/FireModeMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/FireModeMessage.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.network.message; -import com.atsuishio.superbwarfare.entity.IArmedVehicleEntity; -import com.atsuishio.superbwarfare.entity.MultiWeaponVehicleEntity; +import com.atsuishio.superbwarfare.entity.vehicle.IArmedVehicleEntity; +import com.atsuishio.superbwarfare.entity.vehicle.MultiWeaponVehicleEntity; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.gun.GunItem; diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/PlayerStopRidingMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/PlayerStopRidingMessage.java index a67e8d871..76f886610 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/PlayerStopRidingMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/PlayerStopRidingMessage.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.network.message; -import com.atsuishio.superbwarfare.entity.VehicleEntity; +import com.atsuishio.superbwarfare.entity.vehicle.VehicleEntity; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/VehicleFireMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/VehicleFireMessage.java index 1c397aa61..c74ffa1e4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/VehicleFireMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/VehicleFireMessage.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.network.message; -import com.atsuishio.superbwarfare.entity.IArmedVehicleEntity; +import com.atsuishio.superbwarfare.entity.vehicle.IArmedVehicleEntity; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/VehicleMovementMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/VehicleMovementMessage.java index fc23b7f4c..e8b4a98f8 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/VehicleMovementMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/VehicleMovementMessage.java @@ -1,6 +1,6 @@ package com.atsuishio.superbwarfare.network.message; -import com.atsuishio.superbwarfare.entity.MobileVehicleEntity; +import com.atsuishio.superbwarfare.entity.vehicle.MobileVehicleEntity; import com.atsuishio.superbwarfare.init.ModItems; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/ZoomMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/ZoomMessage.java index 24c3aabd0..2a7598a4e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/ZoomMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/ZoomMessage.java @@ -1,8 +1,8 @@ package com.atsuishio.superbwarfare.network.message; import com.atsuishio.superbwarfare.ModUtils; -import com.atsuishio.superbwarfare.entity.IArmedVehicleEntity; -import com.atsuishio.superbwarfare.entity.WheelChairEntity; +import com.atsuishio.superbwarfare.entity.vehicle.IArmedVehicleEntity; +import com.atsuishio.superbwarfare.entity.vehicle.WheelChairEntity; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.network.ModVariables; diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/SeekTool.java b/src/main/java/com/atsuishio/superbwarfare/tools/SeekTool.java index 3c0b16d7b..20e4afc59 100644 --- a/src/main/java/com/atsuishio/superbwarfare/tools/SeekTool.java +++ b/src/main/java/com/atsuishio/superbwarfare/tools/SeekTool.java @@ -1,9 +1,9 @@ package com.atsuishio.superbwarfare.tools; import com.atsuishio.superbwarfare.entity.ClaymoreEntity; -import com.atsuishio.superbwarfare.entity.MobileVehicleEntity; -import com.atsuishio.superbwarfare.entity.VehicleEntity; import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity; +import com.atsuishio.superbwarfare.entity.vehicle.MobileVehicleEntity; +import com.atsuishio.superbwarfare.entity.vehicle.VehicleEntity; import net.minecraft.core.BlockPos; import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity;