Add compact material weight notation for layers.yml

1 files changed, 132 insertions, 181 deletions

diff --git a/src/main/resources/layers.yml b/src/main/resources/layers.yml
index ff0f353..d388759 100644
--- a/src/main/resources/layers.yml
+++ b/src/main/resources/layers.yml
@@ -2,231 +2,182 @@ layers:
   ores:
     weight: 5
     materials:
-      - material: COBBLESTONE
-        weight: 5
-      - material: COAL_ORE
-        weight: 3
-      - material: GRASS_BLOCK
-        weight: 2
-      - material: IRON_ORE
-      - material: GOLD_ORE
-      - material: REDSTONE_ORE
-      - material: EMERALD_ORE
-      - material: LAPIS_ORE
-      - material: DIAMOND_ORE
-      - material: COBWEB
+      - COBBLESTONE 5
+      - COAL_ORE 3
+      - GRASS_BLOCK 2
+      - IRON_ORE
+      - GOLD_ORE
+      - REDSTONE_ORE
+      - EMERALD_ORE
+      - LAPIS_ORE
+      - DIAMOND_ORE
+      - COBWEB
   ore_blocks:
     weight: 5
     materials:
-      - material: COAL_BLOCK
-        weight: 4
-      - material: IRON_BLOCK
-        weight: 3
-      - material: GOLD_BLOCK
-        weight: 2
-      - material: REDSTONE_BLOCK
-        weight: 2
-      - material: LAPIS_BLOCK
-      - material: DIAMOND_BLOCK
+      - COAL_BLOCK 4
+      - IRON_BLOCK 3
+      - GOLD_BLOCK 2
+      - REDSTONE_BLOCK 2
+      - LAPIS_BLOCK
+      - DIAMOND_BLOCK
   nether:
     weight: 5
     materials:
-      - material: NETHERRACK
-        weight: 6
-      - material: NETHER_BRICKS
-        weight: 4
-      - material: NETHER_GOLD_ORE
-        weight: 2
-      - material: NETHER_QUARTZ_ORE
-        weight: 2
-      - material: CRIMSON_NYLIUM
-      - material: WARPED_NYLIUM
-      - material: CRACKED_NETHER_BRICKS
-      - material: RED_NETHER_BRICKS
-      - material: NETHER_WART_BLOCK
-      - material: CRYING_OBSIDIAN
-      - material: SHROOMLIGHT
-      - material: BLACKSTONE
-      - material: BASALT
-      - material: SOUL_SAND
+      - NETHERRACK 6
+      - NETHER_BRICKS 4
+      - NETHER_GOLD_ORE 2
+      - NETHER_QUARTZ_ORE 2
+      - CRIMSON_NYLIUM
+      - WARPED_NYLIUM
+      - CRACKED_NETHER_BRICKS
+      - RED_NETHER_BRICKS
+      - NETHER_WART_BLOCK
+      - CRYING_OBSIDIAN
+      - SHROOMLIGHT
+      - BLACKSTONE
+      - BASALT
+      - SOUL_SAND
   end:
     weight: 5
     materials:
-      - material: END_STONE
-        weight: 4
-      - material: END_STONE_BRICKS
-        weight: 2
-      - material: PURPUR_BLOCK
-        weight: 2
-      - material: PURPUR_PILLAR
-      - material: OBSIDIAN
-      - material: COBBLESTONE
+      - END_STONE 4
+      - END_STONE_BRICKS 2
+      - PURPUR_BLOCK 2
+      - PURPUR_PILLAR
+      - OBSIDIAN
+      - COBBLESTONE
   redstone:
     weight: 4
     materials:
-      - material: REDSTONE_BLOCK
-        weight: 2
-      - material: REDSTONE_LAMP
-      - material: TARGET
-      - material: SLIME_BLOCK
-      - material: OBSERVER
-      - material: DAYLIGHT_DETECTOR
+      - REDSTONE_BLOCK 2
+      - REDSTONE_LAMP
+      - TARGET
+      - SLIME_BLOCK
+      - OBSERVER
+      - DAYLIGHT_DETECTOR
   ocean:
     weight: 4
     materials:
-      - material: PRISMARINE
-        weight: 2
-      - material: DARK_PRISMARINE
-      - material: PRISMARINE_BRICKS
-      - material: PRISMARINE_BRICK_SLAB
-      - material: BLUE_STAINED_GLASS
-      - material: SEA_LANTERN
-      - material: SPONGE
-      - material: TUBE_CORAL_BLOCK
-      - material: BRAIN_CORAL_BLOCK
-      - material: BUBBLE_CORAL_BLOCK
+      - PRISMARINE 2
+      - DARK_PRISMARINE
+      - PRISMARINE_BRICKS
+      - PRISMARINE_BRICK_SLAB
+      - BLUE_STAINED_GLASS
+      - SEA_LANTERN
+      - SPONGE
+      - TUBE_CORAL_BLOCK
+      - BRAIN_CORAL_BLOCK
+      - BUBBLE_CORAL_BLOCK
   desert:
     weight: 4
     materials:
-      - material: SANDSTONE
-        weight: 2
-      - material: RED_SANDSTONE
-        weight: 2
-      - material: CHISELED_SANDSTONE
-      - material: SMOOTH_SANDSTONE
-      - material: CUT_SANDSTONE
-      - material: SANDSTONE_SLAB
-      - material: RED_SANDSTONE_SLAB
-      - material: RED_TERRACOTTA
-      - material: ORANGE_TERRACOTTA
-      - material: YELLOW_TERRACOTTA
-      - material: TERRACOTTA
+      - SANDSTONE 2
+      - RED_SANDSTONE 2
+      - CHISELED_SANDSTONE
+      - SMOOTH_SANDSTONE
+      - CUT_SANDSTONE
+      - SANDSTONE_SLAB
+      - RED_SANDSTONE_SLAB
+      - RED_TERRACOTTA
+      - ORANGE_TERRACOTTA
+      - YELLOW_TERRACOTTA
+      - TERRACOTTA
   forest:
     weight: 4
     materials:
-      - material: OAK_LEAVES
-        weight: 2
-      - material: SPRUCE_LEAVES
-        weight: 2
-      - material: ACACIA_LEAVES
-        weight: 2
-      - material: OAK_LOG
-      - material: SPRUCE_LOG
-      - material: ACACIA_LOG
-      - material: STRIPPED_OAK_LOG
-      - material: STRIPPED_SPRUCE_LOG
-      - material: STRIPPED_ACACIA_LOG
-      - material: OAK_WOOD
-      - material: SPRUCE_WOOD
-      - material: ACACIA_WOOD
+      - OAK_LEAVES 2
+      - SPRUCE_LEAVES 2
+      - ACACIA_LEAVES 2
+      - OAK_LOG
+      - SPRUCE_LOG
+      - ACACIA_LOG
+      - STRIPPED_OAK_LOG
+      - STRIPPED_SPRUCE_LOG
+      - STRIPPED_ACACIA_LOG
+      - OAK_WOOD
+      - SPRUCE_WOOD
+      - ACACIA_WOOD
   jungle:
     weight: 3
     materials:
-      - material: MOSSY_COBBLESTONE
-        weight: 3
-      - material: COBBLESTONE
-        weight: 2
-      - material: JUNGLE_LEAVES
-        weight: 2
-      - material: JUNGLE_LOG
-        weight: 2
-      - material: STRIPPED_JUNGLE_LOG
-      - material: JUNGLE_WOOD
-      - material: STRIPPED_JUNGLE_WOOD
-      - material: JUNGLE_PLANKS
-      - material: JUNGLE_SLAB
+      - MOSSY_COBBLESTONE 3
+      - COBBLESTONE 2
+      - JUNGLE_LEAVES 2
+      - JUNGLE_LOG 2
+      - STRIPPED_JUNGLE_LOG
+      - JUNGLE_WOOD
+      - STRIPPED_JUNGLE_WOOD
+      - JUNGLE_PLANKS
+      - JUNGLE_SLAB
   overworld:
     weight: 3
     materials:
-      - material: DIRT
-      - material: COARSE_DIRT
-      - material: GRASS_BLOCK
-      - material: DIRT_PATH
-      - material: MYCELIUM
-      - material: PODZOL
-      - material: OAK_SLAB
-      - material: BRICK_WALL
-      - material: BRICK_STAIRS
+      - DIRT
+      - COARSE_DIRT
+      - GRASS_BLOCK
+      - GRASS_PATH
+      - MYCELIUM
+      - PODZOL
+      - OAK_SLAB
+      - BRICK_WALL
+      - BRICK_STAIRS
   terracotta:
     weight: 3
     materials:
-      - material: PINK_TERRACOTTA
-        weight: 2
-      - material: PURPLE_TERRACOTTA
-        weight: 2
-      - material: GRAY_TERRACOTTA
-        weight: 2
-      - material: BLUE_TERRACOTTA
-        weight: 2
-      - material: LIGHT_BLUE_TERRACOTTA
-        weight: 2
-      - material: WHITE_TERRACOTTA
-        weight: 2
-      - material: BROWN_TERRACOTTA
-        weight: 2
-      - material: GREEN_TERRACOTTA
-        weight: 2
-      - material: YELLOW_TERRACOTTA
-        weight: 2
-      - material: HONEYCOMB_BLOCK
-        weight: 2
-      - material: WHITE_STAINED_GLASS
+      - PINK_TERRACOTTA 2
+      - PURPLE_TERRACOTTA 2
+      - GRAY_TERRACOTTA 2
+      - BLUE_TERRACOTTA 2
+      - LIGHT_BLUE_TERRACOTTA 2
+      - WHITE_TERRACOTTA 2
+      - BROWN_TERRACOTTA 2
+      - GREEN_TERRACOTTA 2
+      - YELLOW_TERRACOTTA 2
+      - HONEYCOMB_BLOCK 2
+      - WHITE_STAINED_GLASS
   glazed_terracotta:
     weight: 3
     materials:
-      - material: PODZOL
-        weight: 3
-      - material: YELLOW_GLAZED_TERRACOTTA
-      - material: LIGHT_BLUE_GLAZED_TERRACOTTA
-      - material: GRAY_GLAZED_TERRACOTTA
+      - PODZOL 3
+      - YELLOW_GLAZED_TERRACOTTA
+      - LIGHT_BLUE_GLAZED_TERRACOTTA
+      - GRAY_GLAZED_TERRACOTTA
   sticky:
     weight: 3
     materials:
-      - material: WHITE_TERRACOTTA
-        weight: 3
-      - material: BLUE_ICE
-        weight: 3
-      - material: STONE_SLAB
-        weight: 3
-      - material: SOUL_SOIL
-        weight: 2
-      - material: GLOWSTONE
-        weight: 2
-      - material: SLIME_BLOCK
-      - material: HONEY_BLOCK
+      - WHITE_TERRACOTTA 3
+      - BLUE_ICE 3
+      - STONE_SLAB 3
+      - SOUL_SOIL 2
+      - GLOWSTONE 2
+      - SLIME_BLOCK
+      - HONEY_BLOCK
   annoying_movement:
     weight: 2
     materials:
-      - material: PACKED_ICE
-        weight: 4
-      - material: JUKEBOX
-        weight: 2
-      - material: TNT
-        weight: 2
-      - material: LIGHT_BLUE_CONCRETE
-        weight: 2
-      - material: GLASS
-        weight: 2
-      - material: SMOOTH_STONE_SLAB
-        weight: 2
-      - material: SOUL_SAND
+      - PACKED_ICE 4
+      - JUKEBOX 2
+      - TNT 2
+      - LIGHT_BLUE_CONCRETE 2
+      - GLASS 2
+      - SMOOTH_STONE_SLAB 2
+      - SOUL_SAND
   insanity:
     weight: 2
     materials:
-      - material: OAK_PLANKS
-      - material: OBSIDIAN
-      - material: SPONGE
-      - material: BEEHIVE
-      - material: DRIED_KELP_BLOCK
+      - OAK_PLANKS
+      - OBSIDIAN
+      - SPONGE
+      - BEEHIVE
+      - DRIED_KELP_BLOCK
   glass:
     weight: 1
     materials:
-      - material: GLASS
-        weight: 30
-      - material: WHITE_STAINED_GLASS
+      - GLASS 30
+      - WHITE_STAINED_GLASS
 
-#  <NAME>:
-#    weight:
+#  <LAYER_NAME>:
+#    weight: <LAYER_WEIGHT>
 #    materials:
-#      - material:
-#        weight:
+#      - <MATERIAL> <MATERIAL_WEIGHT>