diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java index 818bfdcfe..609f5f558 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java @@ -77,8 +77,6 @@ public class ModItemTagProvider extends ItemTagsProvider { this.tag(cTag("tools/crowbar")).add(ModItems.CROWBAR.get()); - this.tag(ModTags.Items.MEDIUM_ROCKET).add(ModItems.MEDIUM_ROCKET_AP.get(), ModItems.MEDIUM_ROCKET_HE.get(), ModItems.MEDIUM_ROCKET_CM.get()); - // TODO 清理枪械Tag ModItems.GUNS.getEntries().forEach(registryObject -> this.tag(ModTags.Items.GUN).add(registryObject.get())); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Type63Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Type63Entity.java index b9c4fa129..40f68c5d8 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Type63Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Type63Entity.java @@ -189,14 +189,23 @@ public class Type63Entity extends ContainerMobileVehicleEntity implements GeoEnt } setChanged(); - if (player.isShiftKeyDown() && stack.is(ModTags.Items.CROWBAR) && this.getPassengers().isEmpty()) { - ItemStack container = ContainerBlockItem.createInstance(this); - if (!player.addItem(container)) { - player.drop(container, false); + if (stack.is(ModTags.Items.CROWBAR)) { + if (player.isShiftKeyDown() && this.getPassengers().isEmpty()) { + ItemStack container = ContainerBlockItem.createInstance(this); + if (!player.addItem(container)) { + player.drop(container, false); + } + this.remove(RemovalReason.DISCARDED); + this.discard(); + return InteractionResult.SUCCESS; + } + + for (int i = 0; i < 12; i++) { + if (!items.get(i).isEmpty()) { + items.remove(i); + break; + } } - this.remove(RemovalReason.DISCARDED); - this.discard(); - return InteractionResult.SUCCESS; } return InteractionResult.FAIL; diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModTags.java b/src/main/java/com/atsuishio/superbwarfare/init/ModTags.java index 45452d054..f58954c50 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModTags.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModTags.java @@ -42,7 +42,6 @@ public class ModTags { public static final TagKey EPIC_BLUEPRINT = tag("blueprint/epic"); public static final TagKey LEGENDARY_BLUEPRINT = tag("blueprint/legendary"); public static final TagKey CANNON_BLUEPRINT = tag("blueprint/cannon"); - public static final TagKey MEDIUM_ROCKET = tag("medium_rocket"); public static final TagKey WRENCHES = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "wrenches")); public static final TagKey WRENCH = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "tools/wrench"));