Add boundary markers

src/client/java/su/a71/new_soviet/NewSovietClient.java

@@ -4,18 +4,12 @@ import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
-import net.fabricmc.fabric.api.client.rendering.v1.BlockEntityRendererRegistry;
 import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
-import net.minecraft.block.TallPlantBlock;
-import net.minecraft.block.enums.DoubleBlockHalf;
-import net.minecraft.client.color.world.BiomeColors;
-import net.minecraft.client.color.world.GrassColors;
 import net.minecraft.client.render.RenderLayer;
+import su.a71.new_soviet.blocks.BoundaryMarkerBlock;
 import su.a71.new_soviet.registration.NSE_Blocks;
 import su.a71.new_soviet.registration.NSE_Custom;
 
-import net.minecraft.client.color.block.BlockColors;
-
 @Environment(EnvType.CLIENT)
 public class NewSovietClient implements ClientModInitializer {
 
@@ -47,6 +41,28 @@ public class NewSovietClient implements ClientModInitializer {
 
 //        BlockEntityRendererRegistry.register(NSE_Custom.TV_BLOCK_ENTITY, TVBlockEntityRenderer::new);
 
-        ColorProviderRegistry.BLOCK.register((state, view, pos, tintIndex) -> 0xeb4034, NSE_Blocks.BLUE_BOUNDARY_MARKER);
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.WHITE_BOUNDARY_MARKER, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.LIGHT_GRAY_BOUNDARY_MARKER, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.GRAY_BOUNDARY_MARKER, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.BLACK_BOUNDARY_MARKER, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.BLUE_BOUNDARY_MARKER, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.LIGHT_BLUE_BOUNDARY_MARKER, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.GREEN_BOUNDARY_MARKER, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.LIME_BOUNDARY_MARKER, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.BROWN_BOUNDARY_MARKER, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.CYAN_BOUNDARY_MARKER, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.RED_BOUNDARY_MARKER, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.ORANGE_BOUNDARY_MARKER, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.YELLOW_BOUNDARY_MARKER, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.PINK_BOUNDARY_MARKER, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.MAGENTA_BOUNDARY_MARKER, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.PURPLE_BOUNDARY_MARKER, RenderLayer.getCutout());
+
+        ColorProviderRegistry.BLOCK.register((state, view, pos, tintIndex) -> BoundaryMarkerBlock.getColour(state.get(BoundaryMarkerBlock.COLOUR)), NSE_Blocks.LIGHT_BLUE_BOUNDARY_MARKER, NSE_Blocks.WHITE_BOUNDARY_MARKER, NSE_Blocks.LIGHT_GRAY_BOUNDARY_MARKER,
+                NSE_Blocks.GRAY_BOUNDARY_MARKER, NSE_Blocks.BLACK_BOUNDARY_MARKER, NSE_Blocks.BLUE_BOUNDARY_MARKER,
+                NSE_Blocks.GREEN_BOUNDARY_MARKER, NSE_Blocks.LIME_BOUNDARY_MARKER, NSE_Blocks.BROWN_BOUNDARY_MARKER,
+                NSE_Blocks.CYAN_BOUNDARY_MARKER, NSE_Blocks.RED_BOUNDARY_MARKER, NSE_Blocks.ORANGE_BOUNDARY_MARKER,
+                NSE_Blocks.YELLOW_BOUNDARY_MARKER, NSE_Blocks.PINK_BOUNDARY_MARKER, NSE_Blocks.MAGENTA_BOUNDARY_MARKER,
+                NSE_Blocks.PURPLE_BOUNDARY_MARKER);
     }
 }

src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -272,6 +272,22 @@
     "new_soviet:light_bulb_lamp",
     "new_soviet:blue_iron_bars",
     "new_soviet:rusty_blue_iron_bars",
-    "new_soviet:vintage_iron_bars"
+    "new_soviet:vintage_iron_bars",
+    "new_soviet:blue_boundary_marker",
+    "new_soviet:white_boundary_marker",
+    "new_soviet:light_blue_boundary_marker",
+    "new_soviet:black_boundary_marker",
+    "new_soviet:purple_boundary_marker",
+    "new_soviet:magenta_boundary_marker",
+    "new_soviet:pink_boundary_marker",
+    "new_soviet:cyan_boundary_marker",
+    "new_soviet:light_gray_boundary_marker",
+    "new_soviet:gray_boundary_marker",
+    "new_soviet:brown_boundary_marker",
+    "new_soviet:green_boundary_marker",
+    "new_soviet:lime_boundary_marker",
+    "new_soviet:yellow_boundary_marker",
+    "new_soviet:red_boundary_marker",
+    "new_soviet:orange_boundary_marker"
   ]
 }

src/main/generated/data/new_soviet/loot_tables/blocks/black_boundary_marker.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "new_soviet:black_boundary_marker"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/new_soviet/loot_tables/blocks/blue_boundary_marker.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "new_soviet:blue_boundary_marker"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/new_soviet/loot_tables/blocks/brown_boundary_marker.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "new_soviet:brown_boundary_marker"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/new_soviet/loot_tables/blocks/cyan_boundary_marker.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "new_soviet:cyan_boundary_marker"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/new_soviet/loot_tables/blocks/gray_boundary_marker.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "new_soviet:gray_boundary_marker"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/new_soviet/loot_tables/blocks/green_boundary_marker.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "new_soviet:green_boundary_marker"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/new_soviet/loot_tables/blocks/light_blue_boundary_marker.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "new_soviet:light_blue_boundary_marker"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/new_soviet/loot_tables/blocks/light_gray_boundary_marker.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "new_soviet:light_gray_boundary_marker"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/new_soviet/loot_tables/blocks/lime_boundary_marker.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "new_soviet:lime_boundary_marker"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/new_soviet/loot_tables/blocks/magenta_boundary_marker.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "new_soviet:magenta_boundary_marker"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/new_soviet/loot_tables/blocks/orange_boundary_marker.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "new_soviet:orange_boundary_marker"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/new_soviet/loot_tables/blocks/pink_boundary_marker.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "new_soviet:pink_boundary_marker"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/new_soviet/loot_tables/blocks/purple_boundary_marker.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "new_soviet:purple_boundary_marker"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/new_soviet/loot_tables/blocks/red_boundary_marker.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "new_soviet:red_boundary_marker"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/new_soviet/loot_tables/blocks/white_boundary_marker.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "new_soviet:white_boundary_marker"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/new_soviet/loot_tables/blocks/yellow_boundary_marker.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "new_soviet:yellow_boundary_marker"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/new_soviet/tags/blocks/boundary_markers.json

@@ -0,0 +1,21 @@
+{
+  "replace": false,
+  "values": [
+    "new_soviet:blue_boundary_marker",
+    "new_soviet:white_boundary_marker",
+    "new_soviet:light_blue_boundary_marker",
+    "new_soviet:black_boundary_marker",
+    "new_soviet:purple_boundary_marker",
+    "new_soviet:magenta_boundary_marker",
+    "new_soviet:pink_boundary_marker",
+    "new_soviet:cyan_boundary_marker",
+    "new_soviet:light_gray_boundary_marker",
+    "new_soviet:gray_boundary_marker",
+    "new_soviet:brown_boundary_marker",
+    "new_soviet:green_boundary_marker",
+    "new_soviet:lime_boundary_marker",
+    "new_soviet:yellow_boundary_marker",
+    "new_soviet:red_boundary_marker",
+    "new_soviet:orange_boundary_marker"
+  ]
+}

src/main/java/su/a71/new_soviet/blocks/BoundaryMarkerBlock.java

@@ -1,20 +1,19 @@
 package su.a71.new_soviet.blocks;
 
 import net.minecraft.block.*;
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.fluid.FluidState;
 import net.minecraft.fluid.Fluids;
+import net.minecraft.item.BucketItem;
 import net.minecraft.item.DyeItem;
-import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
-import net.minecraft.state.property.DirectionProperty;
 import net.minecraft.state.property.IntProperty;
 import net.minecraft.state.property.Properties;
 import net.minecraft.util.ActionResult;
+import net.minecraft.util.DyeColor;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
@@ -50,11 +49,14 @@ public class BoundaryMarkerBlock extends Block implements Waterloggable {
     public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
         if (player.getInventory().getMainHandStack().getItem() instanceof DyeItem) {
             if (!world.isClient()) {
+                int id = ((DyeItem) player.getInventory().getMainHandStack().getItem()).getColor().getId();
+                if (id == state.get(COLOUR))
+                    return ActionResult.CONSUME;
                 if (!player.isCreative()) {
                     player.getInventory().getMainHandStack().decrement(1);
                 }
+                world.setBlockState(pos, state.with(COLOUR, id));
                 world.playSound((PlayerEntity)null, pos, SoundEvents.ITEM_DYE_USE, SoundCategory.BLOCKS, 1.0F, 1.0F);
-//                world.setBlockState(pos, state.with(COLOUR, player.getInventory().getMainHandStack().getItem()))
             }
             return ActionResult.SUCCESS;
         }
@@ -76,6 +78,29 @@ public class BoundaryMarkerBlock extends Block implements Waterloggable {
     static {
         WATERLOGGED = Properties.WATERLOGGED;
         SHAPE = Block.createCuboidShape(5, 0, 5, 11, 16, 11);
-        COLOUR = IntProperty.of("border_colour", 0, 16);  // 0 - undyed, 1-16 = dyes
+        COLOUR = IntProperty.of("border_colour", 0, 15);  // 0-16 = dyes
+    }
+
+    // DyeColor IDs with better colours
+    public static int getColour(int id) {
+        return switch (id) {
+            case 0 -> 0xffffff;
+            case 1 -> 0xb67134;
+            case 2 -> 0xab4d8b;
+            case 3 -> 0x398b9c;
+            case 4 -> 0xb08732;
+            case 5 -> 0x489d1b;
+            case 6 -> 0xcf7a92;
+            case 7 -> 0x353e42;
+            case 8 -> 0x777771;
+            case 9 -> 0x18797e;
+            case 10 -> 0x813995;
+            case 11 -> 0x354a85;
+            case 12 -> 0x614332;
+            case 13 -> 0x1b6031;
+            case 14 -> 0x8b2030;
+            case 15 -> 0x272228;
+            default -> 0xffffff;
+        };
     }
 }

src/main/java/su/a71/new_soviet/datagen/Advancements.java

@@ -11,6 +11,7 @@ import net.minecraft.predicate.entity.DamageSourcePredicate;
 import net.minecraft.predicate.entity.EntityEquipmentPredicate;
 import net.minecraft.predicate.entity.EntityPredicate;
 import net.minecraft.predicate.item.ItemPredicate;
+import net.minecraft.registry.tag.ItemTags;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import su.a71.new_soviet.NewSoviet;

src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java

@@ -181,6 +181,22 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
         addDrop(NSE_Blocks.BLUE_IRON_BARS);
         addDrop(NSE_Blocks.RUSTY_BLUE_IRON_BARS);
         addDrop(NSE_Blocks.VINTAGE_IRON_BARS);
+        addDrop(NSE_Blocks.BLUE_BOUNDARY_MARKER);
+        addDrop(NSE_Blocks.WHITE_BOUNDARY_MARKER);
+        addDrop(NSE_Blocks.LIGHT_BLUE_BOUNDARY_MARKER);
+        addDrop(NSE_Blocks.BLACK_BOUNDARY_MARKER);
+        addDrop(NSE_Blocks.PURPLE_BOUNDARY_MARKER);
+        addDrop(NSE_Blocks.MAGENTA_BOUNDARY_MARKER);
+        addDrop(NSE_Blocks.PINK_BOUNDARY_MARKER);
+        addDrop(NSE_Blocks.CYAN_BOUNDARY_MARKER);
+        addDrop(NSE_Blocks.LIGHT_GRAY_BOUNDARY_MARKER);
+        addDrop(NSE_Blocks.GRAY_BOUNDARY_MARKER);
+        addDrop(NSE_Blocks.BROWN_BOUNDARY_MARKER);
+        addDrop(NSE_Blocks.GREEN_BOUNDARY_MARKER);
+        addDrop(NSE_Blocks.LIME_BOUNDARY_MARKER);
+        addDrop(NSE_Blocks.YELLOW_BOUNDARY_MARKER);
+        addDrop(NSE_Blocks.RED_BOUNDARY_MARKER);
+        addDrop(NSE_Blocks.ORANGE_BOUNDARY_MARKER);
 
         // Drops for furniture/electronics/appliances
         addDrop(NSE_Custom.WHITE_PAWN);

src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java

@@ -292,7 +292,23 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
                 .add(NSE_Custom.LIGHT_BULB_LAMP)
                 .add(NSE_Blocks.BLUE_IRON_BARS)
                 .add(NSE_Blocks.RUSTY_BLUE_IRON_BARS)
-                .add(NSE_Blocks.VINTAGE_IRON_BARS);
+                .add(NSE_Blocks.VINTAGE_IRON_BARS)
+                .add(NSE_Blocks.BLUE_BOUNDARY_MARKER)
+                .add(NSE_Blocks.WHITE_BOUNDARY_MARKER)
+                .add(NSE_Blocks.LIGHT_BLUE_BOUNDARY_MARKER)
+                .add(NSE_Blocks.BLACK_BOUNDARY_MARKER)
+                .add(NSE_Blocks.PURPLE_BOUNDARY_MARKER)
+                .add(NSE_Blocks.MAGENTA_BOUNDARY_MARKER)
+                .add(NSE_Blocks.PINK_BOUNDARY_MARKER)
+                .add(NSE_Blocks.CYAN_BOUNDARY_MARKER)
+                .add(NSE_Blocks.LIGHT_GRAY_BOUNDARY_MARKER)
+                .add(NSE_Blocks.GRAY_BOUNDARY_MARKER)
+                .add(NSE_Blocks.BROWN_BOUNDARY_MARKER)
+                .add(NSE_Blocks.GREEN_BOUNDARY_MARKER)
+                .add(NSE_Blocks.LIME_BOUNDARY_MARKER)
+                .add(NSE_Blocks.YELLOW_BOUNDARY_MARKER)
+                .add(NSE_Blocks.RED_BOUNDARY_MARKER)
+                .add(NSE_Blocks.ORANGE_BOUNDARY_MARKER);
 
         // Blocks mined with an axe
         getOrCreateTagBuilder(BlockTags.AXE_MINEABLE)
@@ -683,5 +699,23 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
                 .add(NSE_Blocks.CROSS_MANGROVE_PLANKS_SLAB)
                 .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB)
                 .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB);
+
+        getOrCreateTagBuilder(NSE_Tags.Blocks.BOUNDARY_MARKERS)
+                .add(NSE_Blocks.BLUE_BOUNDARY_MARKER)
+                .add(NSE_Blocks.WHITE_BOUNDARY_MARKER)
+                .add(NSE_Blocks.LIGHT_BLUE_BOUNDARY_MARKER)
+                .add(NSE_Blocks.BLACK_BOUNDARY_MARKER)
+                .add(NSE_Blocks.PURPLE_BOUNDARY_MARKER)
+                .add(NSE_Blocks.MAGENTA_BOUNDARY_MARKER)
+                .add(NSE_Blocks.PINK_BOUNDARY_MARKER)
+                .add(NSE_Blocks.CYAN_BOUNDARY_MARKER)
+                .add(NSE_Blocks.LIGHT_GRAY_BOUNDARY_MARKER)
+                .add(NSE_Blocks.GRAY_BOUNDARY_MARKER)
+                .add(NSE_Blocks.BROWN_BOUNDARY_MARKER)
+                .add(NSE_Blocks.GREEN_BOUNDARY_MARKER)
+                .add(NSE_Blocks.LIME_BOUNDARY_MARKER)
+                .add(NSE_Blocks.YELLOW_BOUNDARY_MARKER)
+                .add(NSE_Blocks.RED_BOUNDARY_MARKER)
+                .add(NSE_Blocks.ORANGE_BOUNDARY_MARKER);
     }
 }

src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java

@@ -404,7 +404,22 @@ public class NSE_Blocks extends NSE_BaseRegistration {
     public static final StairsBlock NII_FLOOR_STAIRS = new StairsBlock(NII_FLOOR.getDefaultState(), FabricBlockSettings.copy(NII_FLOOR));
     public static final SlabBlock NII_FLOOR_SLAB = new SlabBlock(FabricBlockSettings.copy(NII_FLOOR));
 
-    public static final Block BLUE_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).hardness(1.5f).resistance(4f).requiresTool().mapColor(MapColor.TERRACOTTA_BLUE));
+    public static final Block WHITE_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).hardness(1.5f).resistance(4f).requiresTool().mapColor(MapColor.WHITE));
+    public static final Block LIGHT_GRAY_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.LIGHT_GRAY));
+    public static final Block GRAY_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.GRAY));
+    public static final Block BLACK_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.BLACK));
+    public static final Block BLUE_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.WHITE));
+    public static final Block LIGHT_BLUE_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.LIGHT_BLUE));
+    public static final Block GREEN_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.GREEN));
+    public static final Block LIME_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.LIME));
+    public static final Block BROWN_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.BROWN));
+    public static final Block CYAN_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.CYAN));
+    public static final Block RED_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.RED));
+    public static final Block ORANGE_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.ORANGE));
+    public static final Block YELLOW_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.YELLOW));
+    public static final Block PINK_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.PINK));
+    public static final Block MAGENTA_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.MAGENTA));
+    public static final Block PURPLE_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.PURPLE));
 
     // Industrial ==========
     public static final Block INDUSTRIAL_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.BLACK));
@@ -834,7 +849,22 @@ public class NSE_Blocks extends NSE_BaseRegistration {
         registerBlock("chiseled_spruce_door", () -> CHISELED_SPRUCE_DOOR, NSE_BUILDING_TAB);
         registerBlock("chiseled_birch_door", () -> CHISELED_BIRCH_DOOR, NSE_BUILDING_TAB);
 
+        registerBlock("white_boundary_marker", () -> WHITE_BOUNDARY_MARKER, NSE_BUILDING_TAB);
+        registerBlock("light_gray_boundary_marker", () -> LIGHT_GRAY_BOUNDARY_MARKER, NSE_BUILDING_TAB);
+        registerBlock("gray_boundary_marker", () -> GRAY_BOUNDARY_MARKER, NSE_BUILDING_TAB);
+        registerBlock("black_boundary_marker", () -> BLACK_BOUNDARY_MARKER, NSE_BUILDING_TAB);
         registerBlock("blue_boundary_marker", () -> BLUE_BOUNDARY_MARKER, NSE_BUILDING_TAB);
+        registerBlock("light_blue_boundary_marker", () -> LIGHT_BLUE_BOUNDARY_MARKER, NSE_BUILDING_TAB);
+        registerBlock("green_boundary_marker", () -> GREEN_BOUNDARY_MARKER, NSE_BUILDING_TAB);
+        registerBlock("lime_boundary_marker", () -> LIME_BOUNDARY_MARKER, NSE_BUILDING_TAB);
+        registerBlock("brown_boundary_marker", () -> BROWN_BOUNDARY_MARKER, NSE_BUILDING_TAB);
+        registerBlock("cyan_boundary_marker", () -> CYAN_BOUNDARY_MARKER, NSE_BUILDING_TAB);
+        registerBlock("red_boundary_marker", () -> RED_BOUNDARY_MARKER, NSE_BUILDING_TAB);
+        registerBlock("orange_boundary_marker", () -> ORANGE_BOUNDARY_MARKER, NSE_BUILDING_TAB);
+        registerBlock("yellow_boundary_marker", () -> YELLOW_BOUNDARY_MARKER, NSE_BUILDING_TAB);
+        registerBlock("pink_boundary_marker", () -> PINK_BOUNDARY_MARKER, NSE_BUILDING_TAB);
+        registerBlock("magenta_boundary_marker", () -> MAGENTA_BOUNDARY_MARKER, NSE_BUILDING_TAB);
+        registerBlock("purple_boundary_marker", () -> PURPLE_BOUNDARY_MARKER, NSE_BUILDING_TAB);
 
         registerBlock("industrial_warning", () -> INDUSTRIAL_WARNING, NSE_BUILDING_TAB);
         registerBlock("gray_warning", () -> GRAY_WARNING, NSE_BUILDING_TAB);

src/main/java/su/a71/new_soviet/registration/NSE_Tags.java

@@ -11,6 +11,7 @@ public class NSE_Tags extends NSE_BaseRegistration{
         public static final TagKey<Block> TV = createBlockTag("tv");
         public static final TagKey<Block> POST_LAMPS = createBlockTag("post_lamps");
         public static final TagKey<Block> SWITCHES = createBlockTag("switches");
+        public static final TagKey<Block> BOUNDARY_MARKERS = createBlockTag("boundary_markers");
     }
 
     public static class Items {

src/main/resources/assets/new_soviet/blockstates/black_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "new_soviet:block/boundary/black_boundary_marker"
+    }
+  }
+}

src/main/resources/assets/new_soviet/blockstates/brown_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "new_soviet:block/boundary/brown_boundary_marker"
+    }
+  }
+}

src/main/resources/assets/new_soviet/blockstates/cyan_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "new_soviet:block/boundary/cyan_boundary_marker"
+    }
+  }
+}

src/main/resources/assets/new_soviet/blockstates/gray_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "new_soviet:block/boundary/gray_boundary_marker"
+    }
+  }
+}

src/main/resources/assets/new_soviet/blockstates/green_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "new_soviet:block/boundary/green_boundary_marker"
+    }
+  }
+}

src/main/resources/assets/new_soviet/blockstates/light_blue_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "new_soviet:block/boundary/light_blue_boundary_marker"
+    }
+  }
+}

src/main/resources/assets/new_soviet/blockstates/light_gray_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "new_soviet:block/boundary/light_gray_boundary_marker"
+    }
+  }
+}

src/main/resources/assets/new_soviet/blockstates/lime_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "new_soviet:block/boundary/lime_boundary_marker"
+    }
+  }
+}

src/main/resources/assets/new_soviet/blockstates/magenta_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "new_soviet:block/boundary/magenta_boundary_marker"
+    }
+  }
+}

src/main/resources/assets/new_soviet/blockstates/orange_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "new_soviet:block/boundary/orange_boundary_marker"
+    }
+  }
+}

src/main/resources/assets/new_soviet/blockstates/pink_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "new_soviet:block/boundary/pink_boundary_marker"
+    }
+  }
+}

src/main/resources/assets/new_soviet/blockstates/purple_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "new_soviet:block/boundary/purple_boundary_marker"
+    }
+  }
+}

src/main/resources/assets/new_soviet/blockstates/red_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "new_soviet:block/boundary/red_boundary_marker"
+    }
+  }
+}

src/main/resources/assets/new_soviet/blockstates/white_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "new_soviet:block/boundary/white_boundary_marker"
+    }
+  }
+}

src/main/resources/assets/new_soviet/blockstates/yellow_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "new_soviet:block/boundary/yellow_boundary_marker"
+    }
+  }
+}

src/main/resources/assets/new_soviet/lang/en_us.json

@@ -451,7 +451,21 @@
   "block.new_soviet.rusty_blue_iron_bars": "Rusty Blue Iron Bars",
   "block.new_soviet.vintage_iron_bars": "Vintage Iron Bars",
   "block.new_soviet.blue_boundary_marker": "Blue Boundary Marker",
-
+  "block.new_soviet.black_boundary_marker": "Black Boundary Marker",
+  "block.new_soviet.brown_boundary_marker": "Brown Boundary Marker",
+  "block.new_soviet.red_boundary_marker": "Red Boundary Marker",
+  "block.new_soviet.purple_boundary_marker": "Purple Boundary Marker",
+  "block.new_soviet.magenta_boundary_marker": "Magenta Boundary Marker",
+  "block.new_soviet.pink_boundary_marker": "Pink Boundary Marker",
+  "block.new_soviet.light_blue_boundary_marker": "Light Blue Boundary Marker",
+  "block.new_soviet.green_boundary_marker": "Green Boundary Marker",
+  "block.new_soviet.white_boundary_marker": "White Boundary Marker",
+  "block.new_soviet.light_gray_boundary_marker": "Light Gray Boundary Marker",
+  "block.new_soviet.gray_boundary_marker": "Gray Boundary Marker",
+  "block.new_soviet.lime_boundary_marker": "Lime Boundary Marker",
+  "block.new_soviet.yellow_boundary_marker": "Yellow Boundary Marker",
+  "block.new_soviet.orange_boundary_marker": "Orange Boundary Marker",
+  "block.new_soviet.cyan_boundary_marker": "Cyan Boundary Marker",
 
   "advancement.new_soviet.root.name": "A New Era",
   "advancement.new_soviet.root.desc": "Time to create something great"

src/main/resources/assets/new_soviet/models/block/boundary/black_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+	"parent": "new_soviet:block/boundary/blue_boundary_marker",
+	"textures": {
+		"0": "new_soviet:block/boundary_marker/boundary_black",
+		"particle": "new_soviet:block/boundary_marker/boundary_black"
+	}
+}

src/main/resources/assets/new_soviet/models/block/boundary/blue_boundary_marker.json

@@ -1,5 +1,5 @@
 {
-	"credit": "Made with Blockbench",
+	"credit": "Made by Andrew_7_1 with BlockBench",
 	"textures": {
 		"0": "new_soviet:block/boundary_marker/boundary_blue",
 		"1": "new_soviet:block/boundary_marker/boundary_overlay",
@@ -7,7 +7,7 @@
 	},
 	"elements": [
 		{
-			"name": "overlay_cube",
+			"name": "overlay",
 			"from": [5, 0, 5],
 			"to": [11, 16, 11],
 			"faces": {

src/main/resources/assets/new_soviet/models/block/boundary/brown_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+	"parent": "new_soviet:block/boundary/blue_boundary_marker",
+	"textures": {
+		"0": "new_soviet:block/boundary_marker/boundary_brown",
+		"particle": "new_soviet:block/boundary_marker/boundary_brown"
+	}
+}

src/main/resources/assets/new_soviet/models/block/boundary/cyan_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+	"parent": "new_soviet:block/boundary/blue_boundary_marker",
+	"textures": {
+		"0": "new_soviet:block/boundary_marker/boundary_cyan",
+		"particle": "new_soviet:block/boundary_marker/boundary_cyan"
+	}
+}

src/main/resources/assets/new_soviet/models/block/boundary/gray_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+	"parent": "new_soviet:block/boundary/blue_boundary_marker",
+	"textures": {
+		"0": "new_soviet:block/boundary_marker/boundary_gray",
+		"particle": "new_soviet:block/boundary_marker/boundary_gray"
+	}
+}

src/main/resources/assets/new_soviet/models/block/boundary/green_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+	"parent": "new_soviet:block/boundary/blue_boundary_marker",
+	"textures": {
+		"0": "new_soviet:block/boundary_marker/boundary_green",
+		"particle": "new_soviet:block/boundary_marker/boundary_green"
+	}
+}

src/main/resources/assets/new_soviet/models/block/boundary/light_blue_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+	"parent": "new_soviet:block/boundary/blue_boundary_marker",
+	"textures": {
+		"0": "new_soviet:block/boundary_marker/boundary_light_blue",
+		"particle": "new_soviet:block/boundary_marker/boundary_light_blue"
+	}
+}

src/main/resources/assets/new_soviet/models/block/boundary/light_gray_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+	"parent": "new_soviet:block/boundary/blue_boundary_marker",
+	"textures": {
+		"0": "new_soviet:block/boundary_marker/boundary_light_gray",
+		"particle": "new_soviet:block/boundary_marker/boundary_light_gray"
+	}
+}

src/main/resources/assets/new_soviet/models/block/boundary/lime_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+	"parent": "new_soviet:block/boundary/blue_boundary_marker",
+	"textures": {
+		"0": "new_soviet:block/boundary_marker/boundary_lime",
+		"particle": "new_soviet:block/boundary_marker/boundary_lime"
+	}
+}

src/main/resources/assets/new_soviet/models/block/boundary/magenta_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+	"parent": "new_soviet:block/boundary/blue_boundary_marker",
+	"textures": {
+		"0": "new_soviet:block/boundary_marker/boundary_magenta",
+		"particle": "new_soviet:block/boundary_marker/boundary_magenta"
+	}
+}

src/main/resources/assets/new_soviet/models/block/boundary/orange_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+	"parent": "new_soviet:block/boundary/blue_boundary_marker",
+	"textures": {
+		"0": "new_soviet:block/boundary_marker/boundary_orange",
+		"particle": "new_soviet:block/boundary_marker/boundary_orange"
+	}
+}

src/main/resources/assets/new_soviet/models/block/boundary/pink_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+	"parent": "new_soviet:block/boundary/blue_boundary_marker",
+	"textures": {
+		"0": "new_soviet:block/boundary_marker/boundary_pink",
+		"particle": "new_soviet:block/boundary_marker/boundary_pink"
+	}
+}

src/main/resources/assets/new_soviet/models/block/boundary/purple_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+	"parent": "new_soviet:block/boundary/blue_boundary_marker",
+	"textures": {
+		"0": "new_soviet:block/boundary_marker/boundary_purple",
+		"particle": "new_soviet:block/boundary_marker/boundary_purple"
+	}
+}

src/main/resources/assets/new_soviet/models/block/boundary/red_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+	"parent": "new_soviet:block/boundary/blue_boundary_marker",
+	"textures": {
+		"0": "new_soviet:block/boundary_marker/boundary_red",
+		"particle": "new_soviet:block/boundary_marker/boundary_red"
+	}
+}

src/main/resources/assets/new_soviet/models/block/boundary/white_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+	"parent": "new_soviet:block/boundary/blue_boundary_marker",
+	"textures": {
+		"0": "new_soviet:block/boundary_marker/boundary_white",
+		"particle": "new_soviet:block/boundary_marker/boundary_white"
+	}
+}

src/main/resources/assets/new_soviet/models/block/boundary/yellow_boundary_marker.json

@@ -0,0 +1,7 @@
+{
+	"parent": "new_soviet:block/boundary/blue_boundary_marker",
+	"textures": {
+		"0": "new_soviet:block/boundary_marker/boundary_yellow",
+		"particle": "new_soviet:block/boundary_marker/boundary_yellow"
+	}
+}

src/main/resources/assets/new_soviet/models/block/light_bulb_on.json

@@ -112,7 +112,6 @@
 			"name": "group",
 			"origin": [16, 8, 16],
 			"color": 0,
-			"nbt": "{}",
 			"children": [0, 1, 2, 3, 4]
 		}
 	]

src/main/resources/assets/new_soviet/models/item/black_boundary_marker.json

@@ -0,0 +1,3 @@
+{
+  "parent": "new_soviet:block/boundary/black_boundary_marker"
+}

src/main/resources/assets/new_soviet/models/item/brown_boundary_marker.json

@@ -0,0 +1,3 @@
+{
+  "parent": "new_soviet:block/boundary/brown_boundary_marker"
+}

src/main/resources/assets/new_soviet/models/item/cyan_boundary_marker.json

@@ -0,0 +1,3 @@
+{
+  "parent": "new_soviet:block/boundary/cyan_boundary_marker"
+}

src/main/resources/assets/new_soviet/models/item/gray_boundary_marker.json

@@ -0,0 +1,3 @@
+{
+  "parent": "new_soviet:block/boundary/gray_boundary_marker"
+}

src/main/resources/assets/new_soviet/models/item/green_boundary_marker.json

@@ -0,0 +1,3 @@
+{
+  "parent": "new_soviet:block/boundary/green_boundary_marker"
+}

src/main/resources/assets/new_soviet/models/item/light_blue_boundary_marker.json

@@ -0,0 +1,3 @@
+{
+  "parent": "new_soviet:block/boundary/light_blue_boundary_marker"
+}

src/main/resources/assets/new_soviet/models/item/light_gray_boundary_marker.json

@@ -0,0 +1,3 @@
+{
+  "parent": "new_soviet:block/boundary/light_gray_boundary_marker"
+}

src/main/resources/assets/new_soviet/models/item/lime_boundary_marker.json

@@ -0,0 +1,3 @@
+{
+  "parent": "new_soviet:block/boundary/lime_boundary_marker"
+}

src/main/resources/assets/new_soviet/models/item/magenta_boundary_marker.json

@@ -0,0 +1,3 @@
+{
+  "parent": "new_soviet:block/boundary/magenta_boundary_marker"
+}

src/main/resources/assets/new_soviet/models/item/orange_boundary_marker.json

@@ -0,0 +1,3 @@
+{
+  "parent": "new_soviet:block/boundary/orange_boundary_marker"
+}

src/main/resources/assets/new_soviet/models/item/pink_boundary_marker.json

@@ -0,0 +1,3 @@
+{
+  "parent": "new_soviet:block/boundary/pink_boundary_marker"
+}

src/main/resources/assets/new_soviet/models/item/purple_boundary_marker.json

@@ -0,0 +1,3 @@
+{
+  "parent": "new_soviet:block/boundary/purple_boundary_marker"
+}

src/main/resources/assets/new_soviet/models/item/red_boundary_marker.json

@@ -0,0 +1,3 @@
+{
+  "parent": "new_soviet:block/boundary/red_boundary_marker"
+}

src/main/resources/assets/new_soviet/models/item/white_boundary_marker.json

@@ -0,0 +1,3 @@
+{
+  "parent": "new_soviet:block/boundary/white_boundary_marker"
+}

src/main/resources/assets/new_soviet/models/item/yellow_boundary_marker.json

@@ -0,0 +1,3 @@
+{
+  "parent": "new_soviet:block/boundary/yellow_boundary_marker"
+}