Minor datagen fix and lamp package

src/main/generated/data/minecraft/tags/blocks/slabs.json

@@ -101,6 +101,7 @@
     "new_soviet:gray_linoleum_slab",
     "new_soviet:orange_linoleum_slab",
     "new_soviet:brown_linoleum_slab",
-    "new_soviet:cyan_linoleum_slab"
+    "new_soviet:cyan_linoleum_slab",
+    "new_soviet:metal_plating_slab"
   ]
 }

src/main/generated/data/minecraft/tags/blocks/stairs.json

@@ -101,6 +101,7 @@
     "new_soviet:gray_linoleum_stairs",
     "new_soviet:orange_linoleum_stairs",
     "new_soviet:brown_linoleum_stairs",
-    "new_soviet:cyan_linoleum_stairs"
+    "new_soviet:cyan_linoleum_stairs",
+    "new_soviet:metal_plating_stairs"
   ]
 }

src/main/java/su/a71/new_soviet/DataGeneration.java

@@ -953,7 +953,8 @@ public class DataGeneration implements DataGeneratorEntrypoint {
                     .add(NSE_Blocks.GRAY_LINOLEUM_STAIRS)
                     .add(NSE_Blocks.ORANGE_LINOLEUM_STAIRS)
                     .add(NSE_Blocks.BROWN_LINOLEUM_STAIRS)
-                    .add(NSE_Blocks.CYAN_LINOLEUM_STAIRS);
+                    .add(NSE_Blocks.CYAN_LINOLEUM_STAIRS)
+                    .add(NSE_Blocks.METAL_PLATING_STAIRS);
 
             getOrCreateTagBuilder(BlockTags.SLABS)
                     .add(NSE_Blocks.SAND_TILES_SLAB)
@@ -1056,7 +1057,8 @@ public class DataGeneration implements DataGeneratorEntrypoint {
                     .add(NSE_Blocks.GRAY_LINOLEUM_SLAB)
                     .add(NSE_Blocks.ORANGE_LINOLEUM_SLAB)
                     .add(NSE_Blocks.BROWN_LINOLEUM_SLAB)
-                    .add(NSE_Blocks.CYAN_LINOLEUM_SLAB);
+                    .add(NSE_Blocks.CYAN_LINOLEUM_SLAB)
+                    .add(NSE_Blocks.METAL_PLATING_SLAB);
 
             getOrCreateTagBuilder(BlockTags.WOODEN_STAIRS)
                     .add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_STAIRS)
@@ -1140,6 +1142,7 @@ public class DataGeneration implements DataGeneratorEntrypoint {
         }
 
         private void diceRecipe(Consumer<RecipeJsonProvider> exporter, ItemConvertible dice) {
+            // why can't we use BlockTags.WOODEN_BUTTONS
             var buttons = Util.make(Lists.newArrayList(), list -> {
                 list.add(Blocks.OAK_BUTTON);
                 list.add(Blocks.BAMBOO_BUTTON);
@@ -1778,6 +1781,7 @@ public class DataGeneration implements DataGeneratorEntrypoint {
 
         @Override
         public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) {
+//            BlockStateModelGenerator.createWallBlockState()
 //            BlockStateModelGenerator.createStairsBlockState(NSE_Blocks.SAND_TILES_STAIRS, new Identifier(NewSoviet.MOD_ID, "sand_tiles_stairs"));
         }
 

src/main/java/su/a71/new_soviet/blocks/lamps/LampBlock.java

@@ -1,4 +1,4 @@
-package su.a71.new_soviet.blocks;
+package su.a71.new_soviet.blocks.lamps;
 
 import net.minecraft.block.*;
 import net.minecraft.entity.ai.pathing.NavigationType;

src/main/java/su/a71/new_soviet/blocks/lamps/LightBulbLampBlock.java

@@ -1,4 +1,4 @@
-package su.a71.new_soviet.blocks;
+package su.a71.new_soviet.blocks.lamps;
 
 import net.minecraft.block.*;
 import net.minecraft.text.Text;
@@ -23,7 +23,7 @@ import net.minecraft.world.WorldView;
 
 import org.jetbrains.annotations.Nullable;
 import su.a71.new_soviet.NewSoviet;
-import su.a71.new_soviet.registration.NSE_Custom;
+import su.a71.new_soviet.blocks.lamps.LampBlock;
 import su.a71.new_soviet.registration.NSE_Items;
 import su.a71.new_soviet.registration.NSE_Sounds;
 

src/main/java/su/a71/new_soviet/blocks/lamps/TableLampBlock.java

@@ -1,4 +1,4 @@
-package su.a71.new_soviet.blocks;
+package su.a71.new_soviet.blocks.lamps;
 
 import net.minecraft.block.*;
 import net.minecraft.util.math.BlockPos;
@@ -7,6 +7,7 @@ import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.util.shape.VoxelShapes;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.WorldView;
+import su.a71.new_soviet.blocks.lamps.LampBlock;
 
 public class TableLampBlock extends LampBlock {
     protected final VoxelShape SHAPE = getStandingShape();;

src/main/java/su/a71/new_soviet/blocks/lamps/VintageLampBlock.java

@@ -1,7 +1,8 @@
-package su.a71.new_soviet.blocks;
+package su.a71.new_soviet.blocks.lamps;
 
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.util.shape.VoxelShapes;
+import su.a71.new_soviet.blocks.lamps.TableLampBlock;
 
 public class VintageLampBlock extends TableLampBlock {
     public VintageLampBlock(Settings settings) {

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

@@ -19,6 +19,9 @@ import net.minecraft.util.Identifier;
 import net.minecraft.util.shape.VoxelShapes;
 import su.a71.new_soviet.NewSoviet;
 import su.a71.new_soviet.blocks.*;
+import su.a71.new_soviet.blocks.lamps.LightBulbLampBlock;
+import su.a71.new_soviet.blocks.lamps.TableLampBlock;
+import su.a71.new_soviet.blocks.lamps.VintageLampBlock;
 import su.a71.new_soviet.entity.TVBlockEntity;
 
 public class NSE_Custom extends NSE_BaseRegistration {