From ba034dd12f5f348342a01d8c1232e9afe218812a Mon Sep 17 00:00:00 2001 From: Disy920 Date: Mon, 20 Mar 2023 21:03:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zly2006/carpetslsaddition/ServerMain.java | 49 ++++++++----------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/github/zly2006/carpetslsaddition/ServerMain.java b/src/main/java/com/github/zly2006/carpetslsaddition/ServerMain.java index b40d769..bcdf0c3 100644 --- a/src/main/java/com/github/zly2006/carpetslsaddition/ServerMain.java +++ b/src/main/java/com/github/zly2006/carpetslsaddition/ServerMain.java @@ -110,43 +110,34 @@ public class ServerMain implements ModInitializer, CarpetExtension { public void registerCommands(CommandDispatcher dispatcher, CommandRegistryAccess commandBuildContext) { dispatcher.register(CommandManager.literal("hat") .requires(ServerCommandSource::isExecutedByPlayer) + .requires((commandSource) -> SLSCarpetSettings.canUseHatCommand) .executes(context -> { - if(SLSCarpetSettings.canUseHatCommand){ - ServerPlayerEntity player = context.getSource().getPlayer(); - assert player != null; - ItemStack stack = player.getMainHandStack(); - ItemStack head = player.getEquippedStack(EquipmentSlot.HEAD); - player.equipStack(EquipmentSlot.HEAD, stack); - player.getInventory().setStack(player.getInventory().selectedSlot, head); - player.currentScreenHandler.syncState(); - return 1; - } - else { - context.getSource().sendMessage(Text.literal("服务器尚未启用本指令！").setStyle(Style.EMPTY.withColor(Formatting.RED))); - return 0; - } + ServerPlayerEntity player = context.getSource().getPlayer(); + assert player != null; + ItemStack stack = player.getMainHandStack(); + ItemStack head = player.getEquippedStack(EquipmentSlot.HEAD); + player.equipStack(EquipmentSlot.HEAD, stack); + player.getInventory().setStack(player.getInventory().selectedSlot, head); + player.currentScreenHandler.syncState(); + + return 1; })); dispatcher.register(CommandManager.literal("sit") .requires(ServerCommandSource::isExecutedByPlayer) + .requires((commandSource) -> SLSCarpetSettings.canUseSitCommand) .executes(context -> { - if(SLSCarpetSettings.canUseSitCommand){ - ServerPlayerEntity player = context.getSource().getPlayer(); - assert player != null; - World world = player.getWorld(); + ServerPlayerEntity player = context.getSource().getPlayer(); + assert player != null; + World world = player.getWorld(); - ArmorStandEntity armorStandEntity = new ArmorStandEntity(world, player.getX(), player.getY() - 0.16, player.getZ()); - ((SitEntity) armorStandEntity).setSitEntity(true); - world.spawnEntity(armorStandEntity); - player.setSneaking(false); - player.startRiding(armorStandEntity); + ArmorStandEntity armorStandEntity = new ArmorStandEntity(world, player.getX(), player.getY() - 0.16, player.getZ()); + ((SitEntity) armorStandEntity).setSitEntity(true); + world.spawnEntity(armorStandEntity); + player.setSneaking(false); + player.startRiding(armorStandEntity); - return 1; - } - else { - context.getSource().sendMessage(Text.literal("服务器尚未启用本指令！").setStyle(Style.EMPTY.withColor(Formatting.RED))); - return 0; - } + return 1; }) ); }