diff --git a/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java b/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java index dff220adb..93f78c2e1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java @@ -408,15 +408,6 @@ public class ClickHandler { } } - // TODO do we need cloth config? -// private static void handleConfigScreen(Player player) { -// if (ModList.get().isLoaded(CompatHolder.CLOTH_CONFIG)) { -// CompatHolder.hasMod(CompatHolder.CLOTH_CONFIG, () -> Minecraft.getInstance().setScreen(ClothConfigHelper.getConfigScreen(null))); -// } else { -// player.displayClientMessage(Component.translatable("tips.superbwarfare.no_cloth_config").withStyle(ChatFormatting.RED), true); -// } -// } - private static void handleDismountPress(Player player) { var vehicle = player.getVehicle(); if (!(vehicle instanceof VehicleEntity)) return; diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/DroneEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/DroneEntity.java index 37a94f827..1f9de44d4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/DroneEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/DroneEntity.java @@ -136,7 +136,9 @@ public class DroneEntity extends MobileVehicleEntity implements GeoEntity { compound.putInt("KamikazeMode", this.entityData.get(KAMIKAZE_MODE)); CompoundTag item = new CompoundTag(); - this.currentItem.save(level().registryAccess(), item); + if (!item.isEmpty()) { + this.currentItem.save(level().registryAccess(), item); + } compound.put("Item", item); } diff --git a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java index 39b491167..a9f9b984f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java @@ -940,7 +940,8 @@ public class ClientEventHandler { if (drone != null && tag.getBoolean("Using")) { if (Minecraft.getInstance().gameRenderer.currentEffect() == null) { - Minecraft.getInstance().gameRenderer.loadEffect(Mod.loc("shaders/post/scan_pincushion.json")); + // TODO 无人机 shader +// Minecraft.getInstance().gameRenderer.loadEffect(Mod.loc("shaders/post/scan_pincushion.json")); } } }