diff --git a/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java b/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java index 741da2fef..d1f84da12 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java @@ -84,7 +84,7 @@ public class ClickHandler { } private static boolean cancelFireKey(Player player, ItemStack stack) { - return stack.getItem() instanceof GunItem || stack.is(ModItems.MONITOR.get()) || stack.is(ModItems.LUNGE_MINE.get()) || stack.is(ModItems.CANNON_MONITOR.get()) || player.hasEffect(ModMobEffects.SHOCK) + return stack.getItem() instanceof GunItem || stack.is(ModItems.MONITOR.get()) || stack.is(ModItems.LUNGE_MINE.get()) || stack.is(ModItems.ARTILLERY_INDICATOR.get()) || player.hasEffect(ModMobEffects.SHOCK) || (player.getVehicle() instanceof ArmedVehicleEntity iArmedVehicle && iArmedVehicle.banHand(player)); } @@ -136,7 +136,7 @@ public class ClickHandler { || stack.is(ModItems.LUNGE_MINE.get()) || (player.getVehicle() instanceof ArmedVehicleEntity) || (stack.is(Items.SPYGLASS) && player.isScoping() && player.getOffhandItem().is(ModItems.FIRING_PARAMETERS.get())) - || (stack.is(ModItems.CANNON_MONITOR.get())) + || (stack.is(ModItems.ARTILLERY_INDICATOR.get())) ) { if (button == ModKeyMappings.FIRE.getKey().getValue()) { handleWeaponFirePress(player, stack); @@ -310,7 +310,7 @@ public class ClickHandler { || stack.is(ModItems.MONITOR.get()) || (player.getVehicle() instanceof ArmedVehicleEntity iVehicle && iVehicle.isDriver(player)) || (stack.is(Items.SPYGLASS) && player.isScoping() && player.getOffhandItem().is(ModItems.FIRING_PARAMETERS.get())) - || (stack.is(ModItems.CANNON_MONITOR.get())) + || (stack.is(ModItems.ARTILLERY_INDICATOR.get())) ) { if (key == ModKeyMappings.FIRE.getKey().getValue()) { handleWeaponFirePress(player, stack); @@ -355,7 +355,7 @@ public class ClickHandler { isEditing = false; if (player.hasEffect(ModMobEffects.SHOCK)) return; - if (stack.is(ModItems.CANNON_MONITOR.get())) { + if (stack.is(ModItems.ARTILLERY_INDICATOR.get())) { PacketDistributor.sendToServer(new SetFiringParametersMessage(0)); } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/MortarEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/MortarEntity.java index a48d261ce..137e82933 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/MortarEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/MortarEntity.java @@ -6,7 +6,7 @@ import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity; import com.atsuishio.superbwarfare.init.ModEntities; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; -import com.atsuishio.superbwarfare.item.CannonMonitor; +import com.atsuishio.superbwarfare.item.ArtilleryIndicator; import com.atsuishio.superbwarfare.item.Monitor; import com.atsuishio.superbwarfare.item.common.ammo.MortarShell; import com.atsuishio.superbwarfare.tools.NBTTool; @@ -160,7 +160,7 @@ public class MortarEntity extends VehicleEntity implements GeoEntity, Container, public @NotNull InteractionResult interact(Player player, @NotNull InteractionHand hand) { ItemStack mainHandItem = player.getMainHandItem(); - if (mainHandItem.getItem() instanceof CannonMonitor && player == getOwner() && this.entityData.get(INTELLIGENT)) { + if (mainHandItem.getItem() instanceof ArtilleryIndicator && player == getOwner() && this.entityData.get(INTELLIGENT)) { var tag = NBTTool.getTag(mainHandItem); tag.putString("LinkedCannon", getStringUUID()); NBTTool.saveTag(mainHandItem, tag); diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java index 10181a567..ffbdb9fe3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java @@ -142,7 +142,7 @@ public class ModItems { public static final DeferredHolder DRONE = ITEMS.register("drone", Drone::new); public static final DeferredHolder MONITOR = ITEMS.register("monitor", Monitor::new); - public static final DeferredHolder CANNON_MONITOR = ITEMS.register("cannon_monitor", CannonMonitor::new); + public static final DeferredHolder ARTILLERY_INDICATOR = ITEMS.register("artillery_indicator", ArtilleryIndicator::new); public static final DeferredHolder DETONATOR = ITEMS.register("detonator", Detonator::new); public static final DeferredHolder TARGET_DEPLOYER = ITEMS.register("target_deployer", TargetDeployer::new); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/CannonMonitor.java b/src/main/java/com/atsuishio/superbwarfare/item/ArtilleryIndicator.java similarity index 96% rename from src/main/java/com/atsuishio/superbwarfare/item/CannonMonitor.java rename to src/main/java/com/atsuishio/superbwarfare/item/ArtilleryIndicator.java index ef6c92abf..4b9009a45 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/CannonMonitor.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/ArtilleryIndicator.java @@ -2,9 +2,9 @@ package com.atsuishio.superbwarfare.item; import net.minecraft.world.item.Item; -public class CannonMonitor extends Item { +public class ArtilleryIndicator extends Item { - public CannonMonitor() { + public ArtilleryIndicator() { super(new Properties().stacksTo(1)); } diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/send/SetFiringParametersMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/send/SetFiringParametersMessage.java index b9379a765..dc6151a18 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/send/SetFiringParametersMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/send/SetFiringParametersMessage.java @@ -76,7 +76,7 @@ public record SetFiringParametersMessage(int msgType) implements CustomPacketPay + "]")), true); } - if (mainStack.is(ModItems.CANNON_MONITOR.get())) { + if (mainStack.is(ModItems.ARTILLERY_INDICATOR.get())) { // TODO 这数据读写是一坨什么玩意 BlockPos pos; if (player.isShiftKeyDown()) {