Skip to content

Commit

Permalink
🎨 调整代码
Browse files Browse the repository at this point in the history
  • Loading branch information
@1024-byteeeee
1024-byteeeee committed May 8, 2024
1 parent ae0e3c8 commit 17a9448
Show file tree
Hide file tree
Showing 2 changed files with 134 additions and 126 deletions.
4 changes: 2 additions & 2 deletions src/main/java/club/mcams/carpet/AmsServer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
256 changes: 132 additions & 124 deletions src/main/java/club/mcams/carpet/AmsServerSettings.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down

0 comments on commit 17a9448

Please sign in to comment.