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:
Atsuishio 2025-07-08 21:45:34 +08:00 • committed by Light_Quanta
parent e825990c63
commit 813bd7eeb8
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java
View file

@ -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));
}

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

@ -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);

2
src/main/java/com/atsuishio/superbwarfare/init/ModItems.java
View file

@ -142,7 +142,7 @@ public class ModItems {
public static final DeferredHolder<Item, Drone> DRONE = ITEMS.register("drone", Drone::new);
public static final DeferredHolder<Item, Monitor> MONITOR = ITEMS.register("monitor", Monitor::new);
public static final DeferredHolder<Item, CannonMonitor> CANNON_MONITOR = ITEMS.register("cannon_monitor", CannonMonitor::new);
public static final DeferredHolder<Item, ArtilleryIndicator> ARTILLERY_INDICATOR = ITEMS.register("artillery_indicator", ArtilleryIndicator::new);
public static final DeferredHolder<Item, Detonator> DETONATOR = ITEMS.register("detonator", Detonator::new);
public static final DeferredHolder<Item, TargetDeployer> TARGET_DEPLOYER = ITEMS.register("target_deployer", TargetDeployer::new);

4
src/main/java/com/atsuishio/superbwarfare/item/CannonMonitor.java → src/main/java/com/atsuishio/superbwarfare/item/ArtilleryIndicator.java
View file

@ -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));
}

2
src/main/java/com/atsuishio/superbwarfare/network/message/send/SetFiringParametersMessage.java
View file

@ -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()) {