From 17a944846b3438d16555fd45f8cd61309d3f4de6 Mon Sep 17 00:00:00 2001 From: 1024_byteeeee <2270484921@qq.com> Date: Thu, 9 May 2024 05:01:06 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/club/mcams/carpet/AmsServer.java | 4 +- .../club/mcams/carpet/AmsServerSettings.java | 256 +++++++++--------- 2 files changed, 134 insertions(+), 126 deletions(-) diff --git a/src/main/java/club/mcams/carpet/AmsServer.java b/src/main/java/club/mcams/carpet/AmsServer.java index e9987bef..c6e72680 100644 --- a/src/main/java/club/mcams/carpet/AmsServer.java +++ b/src/main/java/club/mcams/carpet/AmsServer.java @@ -104,8 +104,8 @@ public void registerCommands( @Override public void onPlayerLoggedIn(ServerPlayerEntity player) { - //#if MC>=12005 - //$$ ServerNetworkHandler.onHello(player, "1.20.5"); + //#if MC==12005 + //$$ ServerNetworkHandler.onHello(player, "carpet ams addition"); //#endif if (AmsServerSettings.welcomeMessage) { diff --git a/src/main/java/club/mcams/carpet/AmsServerSettings.java b/src/main/java/club/mcams/carpet/AmsServerSettings.java index 427cc042..96e517d7 100644 --- a/src/main/java/club/mcams/carpet/AmsServerSettings.java +++ b/src/main/java/club/mcams/carpet/AmsServerSettings.java @@ -516,133 +516,141 @@ public class AmsServerSettings { //#endif //#if MC>=12003 - //$$ @GameVersion(version = "Minecraft 1.20.3 - 1.20.5") + //$$ @GameVersion(version = "Minecraft 1.20.3 - 1.20.6") //$$ @SuppressWarnings("unused") //$$ @CraftingRule( //$$ recipes = { - //$$ "chiseled_copper.json", - //$$ "chiseled_copper_from_copper_block_stonecutting.json", - //$$ "chiseled_copper_from_cut_copper_stonecutting.json", - //$$ "chiseled_tuff.json", - //$$ "chiseled_tuff_bricks.json", - //$$ "chiseled_tuff_bricks_from_polished_tuff_stonecutting.json", - //$$ "chiseled_tuff_bricks_from_tuff_bricks_stonecutting.json", - //$$ "chiseled_tuff_bricks_from_tuff_stonecutting.json", - //$$ "chiseled_tuff_from_tuff_stonecutting.json", - //$$ "copper_bulb.json", - //$$ "copper_door.json", - //$$ "copper_grate.json", - //$$ "copper_grate_from_copper_block_stonecutting.json", - //$$ "copper_trapdoor.json", - //$$ "crafter.json", - //$$ "exposed_chiseled_copper.json", - //$$ "exposed_chiseled_copper_from_exposed_copper_stonecutting.json", - //$$ "exposed_chiseled_copper_from_exposed_cut_copper_stonecutting.json", - //$$ "exposed_copper_bulb.json", - //$$ "exposed_copper_door.json", - //$$ "exposed_copper_grate.json", - //$$ "exposed_copper_grate_from_exposed_copper_stonecutting.json", - //$$ "exposed_copper_trapdoor.json", - //$$ "oxidized_chiseled_copper.json", - //$$ "oxidized_chiseled_copper_from_oxidized_copper_stonecutting.json", - //$$ "oxidized_chiseled_copper_from_oxidized_cut_copper_stonecutting.json", - //$$ "oxidized_copper_bulb.json", - //$$ "oxidized_copper_door.json", - //$$ "oxidized_copper_grate.json", - //$$ "oxidized_copper_grate_from_oxidized_copper_stonecutting.json", - //$$ "oxidized_copper_trapdoor.json", - //$$ "polished_tuff.json", - //$$ "polished_tuff_from_tuff_stonecutting.json", - //$$ "polished_tuff_slab.json", - //$$ "polished_tuff_slab_from_polished_tuff_stonecutting.json", - //$$ "polished_tuff_slab_from_tuff_stonecutting.json", - //$$ "polished_tuff_stairs.json", - //$$ "polished_tuff_stairs_from_polished_tuff_stonecutting.json", - //$$ "polished_tuff_stairs_from_tuff_stonecutting.json", - //$$ "polished_tuff_wall.json", - //$$ "polished_tuff_wall_from_polished_tuff_stonecutting.json", - //$$ "polished_tuff_wall_from_tuff_stonecutting.json", - //$$ "tuff_bricks.json", - //$$ "tuff_bricks_from_polished_tuff_stonecutting.json", - //$$ "tuff_bricks_from_tuff_stonecutting.json", - //$$ "tuff_brick_slab.json", - //$$ "tuff_brick_slab_from_polished_tuff_stonecutting.json", - //$$ "tuff_brick_slab_from_tuff_bricks_stonecutting.json", - //$$ "tuff_brick_slab_from_tuff_stonecutting.json", - //$$ "tuff_brick_stairs.json", - //$$ "tuff_brick_stairs_from_polished_tuff_stonecutting.json", - //$$ "tuff_brick_stairs_from_tuff_bricks_stonecutting.json", - //$$ "tuff_brick_stairs_from_tuff_stonecutting.json", - //$$ "tuff_brick_wall.json", - //$$ "tuff_brick_wall_from_polished_tuff_stonecutting.json", - //$$ "tuff_brick_wall_from_tuff_bricks_stonecutting.json", - //$$ "tuff_brick_wall_from_tuff_stonecutting.json", - //$$ "tuff_slab.json", - //$$ "tuff_slab_from_tuff_stonecutting.json", - //$$ "tuff_stairs.json", - //$$ "tuff_stairs_from_tuff_stonecutting.json", - //$$ "tuff_wall.json", - //$$ "tuff_wall_from_tuff_stonecutting.json", - //$$ "waxed_chiseled_copper.json", - //$$ "waxed_chiseled_copper_from_honeycomb.json", - //$$ "waxed_chiseled_copper_from_waxed_copper_block_stonecutting.json", - //$$ "waxed_chiseled_copper_from_waxed_cut_copper_stonecutting.json", - //$$ "waxed_copper_bulb.json", - //$$ "waxed_copper_bulb_from_honeycomb.json", - //$$ "waxed_copper_door.json", - //$$ "waxed_copper_door_from_honeycomb.json", - //$$ "waxed_copper_grate.json", - //$$ "waxed_copper_grate_from_honeycomb.json", - //$$ "waxed_copper_grate_from_waxed_copper_block_stonecutting.json", - //$$ "waxed_copper_trapdoor.json", - //$$ "waxed_copper_trapdoor_from_honeycomb.json", - //$$ "waxed_exposed_chiseled_copper.json", - //$$ "waxed_exposed_chiseled_copper_from_honeycomb.json", - //$$ "waxed_exposed_chiseled_copper_from_waxed_exposed_copper_stonecutting.json", - //$$ "waxed_exposed_chiseled_copper_from_waxed_exposed_cut_copper_stonecutting.json", - //$$ "waxed_exposed_copper_bulb.json", - //$$ "waxed_exposed_copper_bulb_from_honeycomb.json", - //$$ "waxed_exposed_copper_door.json", - //$$ "waxed_exposed_copper_door_from_honeycomb.json", - //$$ "waxed_exposed_copper_grate.json", - //$$ "waxed_exposed_copper_grate_from_honeycomb.json", - //$$ "waxed_exposed_copper_grate_from_waxed_exposed_copper_stonecutting.json", - //$$ "waxed_exposed_copper_trapdoor.json", - //$$ "waxed_exposed_copper_trapdoor_from_honeycomb.json", - //$$ "waxed_oxidized_chiseled_copper.json", - //$$ "waxed_oxidized_chiseled_copper_from_honeycomb.json", - //$$ "waxed_oxidized_chiseled_copper_from_waxed_oxidized_copper_stonecutting.json", - //$$ "waxed_oxidized_chiseled_copper_from_waxed_oxidized_cut_copper_stonecutting.json", - //$$ "waxed_oxidized_copper_bulb.json", - //$$ "waxed_oxidized_copper_bulb_from_honeycomb.json", - //$$ "waxed_oxidized_copper_door.json", - //$$ "waxed_oxidized_copper_door_from_honeycomb.json", - //$$ "waxed_oxidized_copper_grate.json", - //$$ "waxed_oxidized_copper_grate_from_honeycomb.json", - //$$ "waxed_oxidized_copper_grate_from_waxed_oxidized_copper_stonecutting.json", - //$$ "waxed_oxidized_copper_trapdoor.json", - //$$ "waxed_oxidized_copper_trapdoor_from_honeycomb.json", - //$$ "waxed_weathered_chiseled_copper.json", - //$$ "waxed_weathered_chiseled_copper_from_honeycomb.json", - //$$ "waxed_weathered_chiseled_copper_from_waxed_weathered_copper_stonecutting.json", - //$$ "waxed_weathered_chiseled_copper_from_waxed_weathered_cut_copper_stonecutting.json", - //$$ "waxed_weathered_copper_bulb.json", - //$$ "waxed_weathered_copper_bulb_from_honeycomb.json", - //$$ "waxed_weathered_copper_door.json", - //$$ "waxed_weathered_copper_door_from_honeycomb.json", - //$$ "waxed_weathered_copper_grate.json", - //$$ "waxed_weathered_copper_grate_from_honeycomb.json", - //$$ "waxed_weathered_copper_grate_from_waxed_weathered_copper_stonecutting.json", - //$$ "waxed_weathered_copper_trapdoor.json", - //$$ "waxed_weathered_copper_trapdoor_from_honeycomb.json", - //$$ "weathered_chiseled_copper.json", - //$$ "weathered_chiseled_copper_from_weathered_copper_stonecutting.json", - //$$ "weathered_chiseled_copper_from_weathered_cut_copper_stonecutting.json", - //$$ "weathered_copper_bulb.json", - //$$ "weathered_copper_door.json", - //$$ "weathered_copper_grate.json", - //$$ "weathered_copper_grate_from_weathered_copper_stonecutting.json", - //$$ "weathered_copper_trapdoor.json" + //$$ //#if MC>=12005 + //$$ "flow_armor_trim_smithing_template_smithing_trim.json", + //$$ "wind_charge.json", + //$$ "flow_armor_trim_smithing_template.json", + //$$ "bolt_armor_trim_smithing_template_smithing_trim.json", + //$$ "mace.json", + //$$ "bolt_armor_trim_smithing_template.json", + //$$ //#endif + //$$ "chiseled_copper.json", + //$$ "chiseled_copper_from_copper_block_stonecutting.json", + //$$ "chiseled_copper_from_cut_copper_stonecutting.json", + //$$ "chiseled_tuff.json", + //$$ "chiseled_tuff_bricks.json", + //$$ "chiseled_tuff_bricks_from_polished_tuff_stonecutting.json", + //$$ "chiseled_tuff_bricks_from_tuff_bricks_stonecutting.json", + //$$ "chiseled_tuff_bricks_from_tuff_stonecutting.json", + //$$ "chiseled_tuff_from_tuff_stonecutting.json", + //$$ "copper_bulb.json", + //$$ "copper_door.json", + //$$ "copper_grate.json", + //$$ "copper_grate_from_copper_block_stonecutting.json", + //$$ "copper_trapdoor.json", + //$$ "crafter.json", + //$$ "exposed_chiseled_copper.json", + //$$ "exposed_chiseled_copper_from_exposed_copper_stonecutting.json", + //$$ "exposed_chiseled_copper_from_exposed_cut_copper_stonecutting.json", + //$$ "exposed_copper_bulb.json", + //$$ "exposed_copper_door.json", + //$$ "exposed_copper_grate.json", + //$$ "exposed_copper_grate_from_exposed_copper_stonecutting.json", + //$$ "exposed_copper_trapdoor.json", + //$$ "oxidized_chiseled_copper.json", + //$$ "oxidized_chiseled_copper_from_oxidized_copper_stonecutting.json", + //$$ "oxidized_chiseled_copper_from_oxidized_cut_copper_stonecutting.json", + //$$ "oxidized_copper_bulb.json", + //$$ "oxidized_copper_door.json", + //$$ "oxidized_copper_grate.json", + //$$ "oxidized_copper_grate_from_oxidized_copper_stonecutting.json", + //$$ "oxidized_copper_trapdoor.json", + //$$ "polished_tuff.json", + //$$ "polished_tuff_from_tuff_stonecutting.json", + //$$ "polished_tuff_slab.json", + //$$ "polished_tuff_slab_from_polished_tuff_stonecutting.json", + //$$ "polished_tuff_slab_from_tuff_stonecutting.json", + //$$ "polished_tuff_stairs.json", + //$$ "polished_tuff_stairs_from_polished_tuff_stonecutting.json", + //$$ "polished_tuff_stairs_from_tuff_stonecutting.json", + //$$ "polished_tuff_wall.json", + //$$ "polished_tuff_wall_from_polished_tuff_stonecutting.json", + //$$ "polished_tuff_wall_from_tuff_stonecutting.json", + //$$ "tuff_bricks.json", + //$$ "tuff_bricks_from_polished_tuff_stonecutting.json", + //$$ "tuff_bricks_from_tuff_stonecutting.json", + //$$ "tuff_brick_slab.json", + //$$ "tuff_brick_slab_from_polished_tuff_stonecutting.json", + //$$ "tuff_brick_slab_from_tuff_bricks_stonecutting.json", + //$$ "tuff_brick_slab_from_tuff_stonecutting.json", + //$$ "tuff_brick_stairs.json", + //$$ "tuff_brick_stairs_from_polished_tuff_stonecutting.json", + //$$ "tuff_brick_stairs_from_tuff_bricks_stonecutting.json", + //$$ "tuff_brick_stairs_from_tuff_stonecutting.json", + //$$ "tuff_brick_wall.json", + //$$ "tuff_brick_wall_from_polished_tuff_stonecutting.json", + //$$ "tuff_brick_wall_from_tuff_bricks_stonecutting.json", + //$$ "tuff_brick_wall_from_tuff_stonecutting.json", + //$$ "tuff_slab.json", + //$$ "tuff_slab_from_tuff_stonecutting.json", + //$$ "tuff_stairs.json", + //$$ "tuff_stairs_from_tuff_stonecutting.json", + //$$ "tuff_wall.json", + //$$ "tuff_wall_from_tuff_stonecutting.json", + //$$ "waxed_chiseled_copper.json", + //$$ "waxed_chiseled_copper_from_honeycomb.json", + //$$ "waxed_chiseled_copper_from_waxed_copper_block_stonecutting.json", + //$$ "waxed_chiseled_copper_from_waxed_cut_copper_stonecutting.json", + //$$ "waxed_copper_bulb.json", + //$$ "waxed_copper_bulb_from_honeycomb.json", + //$$ "waxed_copper_door.json", + //$$ "waxed_copper_door_from_honeycomb.json", + //$$ "waxed_copper_grate.json", + //$$ "waxed_copper_grate_from_honeycomb.json", + //$$ "waxed_copper_grate_from_waxed_copper_block_stonecutting.json", + //$$ "waxed_copper_trapdoor.json", + //$$ "waxed_copper_trapdoor_from_honeycomb.json", + //$$ "waxed_exposed_chiseled_copper.json", + //$$ "waxed_exposed_chiseled_copper_from_honeycomb.json", + //$$ "waxed_exposed_chiseled_copper_from_waxed_exposed_copper_stonecutting.json", + //$$ "waxed_exposed_chiseled_copper_from_waxed_exposed_cut_copper_stonecutting.json", + //$$ "waxed_exposed_copper_bulb.json", + //$$ "waxed_exposed_copper_bulb_from_honeycomb.json", + //$$ "waxed_exposed_copper_door.json", + //$$ "waxed_exposed_copper_door_from_honeycomb.json", + //$$ "waxed_exposed_copper_grate.json", + //$$ "waxed_exposed_copper_grate_from_honeycomb.json", + //$$ "waxed_exposed_copper_grate_from_waxed_exposed_copper_stonecutting.json", + //$$ "waxed_exposed_copper_trapdoor.json", + //$$ "waxed_exposed_copper_trapdoor_from_honeycomb.json", + //$$ "waxed_oxidized_chiseled_copper.json", + //$$ "waxed_oxidized_chiseled_copper_from_honeycomb.json", + //$$ "waxed_oxidized_chiseled_copper_from_waxed_oxidized_copper_stonecutting.json", + //$$ "waxed_oxidized_chiseled_copper_from_waxed_oxidized_cut_copper_stonecutting.json", + //$$ "waxed_oxidized_copper_bulb.json", + //$$ "waxed_oxidized_copper_bulb_from_honeycomb.json", + //$$ "waxed_oxidized_copper_door.json", + //$$ "waxed_oxidized_copper_door_from_honeycomb.json", + //$$ "waxed_oxidized_copper_grate.json", + //$$ "waxed_oxidized_copper_grate_from_honeycomb.json", + //$$ "waxed_oxidized_copper_grate_from_waxed_oxidized_copper_stonecutting.json", + //$$ "waxed_oxidized_copper_trapdoor.json", + //$$ "waxed_oxidized_copper_trapdoor_from_honeycomb.json", + //$$ "waxed_weathered_chiseled_copper.json", + //$$ "waxed_weathered_chiseled_copper_from_honeycomb.json", + //$$ "waxed_weathered_chiseled_copper_from_waxed_weathered_copper_stonecutting.json", + //$$ "waxed_weathered_chiseled_copper_from_waxed_weathered_cut_copper_stonecutting.json", + //$$ "waxed_weathered_copper_bulb.json", + //$$ "waxed_weathered_copper_bulb_from_honeycomb.json", + //$$ "waxed_weathered_copper_door.json", + //$$ "waxed_weathered_copper_door_from_honeycomb.json", + //$$ "waxed_weathered_copper_grate.json", + //$$ "waxed_weathered_copper_grate_from_honeycomb.json", + //$$ "waxed_weathered_copper_grate_from_waxed_weathered_copper_stonecutting.json", + //$$ "waxed_weathered_copper_trapdoor.json", + //$$ "waxed_weathered_copper_trapdoor_from_honeycomb.json", + //$$ "weathered_chiseled_copper.json", + //$$ "weathered_chiseled_copper_from_weathered_copper_stonecutting.json", + //$$ "weathered_chiseled_copper_from_weathered_cut_copper_stonecutting.json", + //$$ "weathered_copper_bulb.json", + //$$ "weathered_copper_door.json", + //$$ "weathered_copper_grate.json", + //$$ "weathered_copper_grate_from_weathered_copper_stonecutting.json", + //$$ "weathered_copper_trapdoor.json" //$$ } //$$ ) //$$ @Rule(categories = {AMS, CRAFTING, SURVIVAL})