Minor housekeeping

src/main/generated/data/new_soviet/advancements/recipes/decorations/radio_receiver.json

@@ -1,24 +1,24 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_iron_ingot": {
+    "has_antenna": {
       "conditions": {
         "items": [
           {
             "items": [
-              "minecraft:iron_ingot"
+              "new_soviet:antenna"
             ]
           }
         ]
       },
       "trigger": "minecraft:inventory_changed"
     },
-    "has_iron_nugget": {
+    "has_iron_ingot": {
       "conditions": {
         "items": [
           {
             "items": [
-              "minecraft:iron_nugget"
+              "minecraft:iron_ingot"
             ]
           }
         ]
@@ -46,7 +46,7 @@
   },
   "requirements": [
     [
-      "has_iron_nugget",
+      "has_antenna",
       "has_note_block",
       "has_iron_ingot",
       "has_the_recipe"

src/main/generated/data/new_soviet/recipes/radio_receiver.json

@@ -2,18 +2,18 @@
   "type": "minecraft:crafting_shaped",
   "category": "misc",
   "key": {
+    "A": {
+      "item": "new_soviet:antenna"
+    },
     "I": {
       "item": "minecraft:iron_ingot"
     },
     "M": {
       "item": "minecraft:note_block"
-    },
-    "N": {
-      "item": "minecraft:iron_nugget"
     }
   },
   "pattern": [
-    "  N",
+    "  A",
     "MMM",
     "III"
   ],

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

@@ -21,7 +21,7 @@ import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldAccess;
 
-// TODO: BLOCKTAGS! LOOTABLES!
+// TODO: Keep dye on broken
 public class BoundaryMarkerBlock extends Block implements Waterloggable {
     public static final BooleanProperty WATERLOGGED;
     public static final IntProperty COLOUR;

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

@@ -29,9 +29,6 @@ public class WallpaperBlock extends Block {
     @Override
     public BlockState getPlacementState(ItemPlacementContext ctx) {
         BlockPos pos = ctx.getBlockPos();
-        BlockState blockBelow = ctx.getWorld().getBlockState(pos);
-        Block block = blockBelow.getBlock();
-
         boolean hasBaseboard = isFullBlock(ctx.getWorld(), pos);
         return this.getDefaultState().with(HAS_BASEBOARD, hasBaseboard);
     }

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

@@ -381,18 +381,12 @@ public class WindowBlock extends HorizontalFacingBlock {
 
     public boolean bottom_connected(BlockState state) {
         int type = state.get(WINDOW_TYPE);
-        if (type == 0 || type == 3) {
-            return false;
-        }
-        return true;
+        return type != 0 && type != 3;
     }
 
     public boolean top_connected(BlockState state) {
         int type = state.get(WINDOW_TYPE);
-        if (type == 0 || type == 1) {
-            return false;
-        }
-        return true;
+        return type != 0 && type != 1;
     }
 
     public boolean can_be_connected(BlockState state) {

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

@@ -1,4 +1,5 @@
 package su.a71.new_soviet.datagen;
+// === ABANDON HOPE, YE WHO ENTER HERE ===
 
 import net.minecraft.advancement.Advancement;
 import net.minecraft.advancement.AdvancementFrame;

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

@@ -466,14 +466,14 @@ public class RecipeGenerator extends FabricRecipeProvider {
         offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_BIRCH_DOOR, Blocks.BIRCH_DOOR);
 
         ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.RADIO_RECEIVER, 1)
-                .pattern("  N")
+                .pattern("  A")
                 .pattern("MMM")
                 .pattern("III")
                 .input('M', Blocks.NOTE_BLOCK)
-                .input('N', Items.IRON_NUGGET)
+                .input('A', NSE_Items.ANTENNA)
                 .input('I', Items.IRON_INGOT)
-                .criterion(RecipeProvider.hasItem(Items.IRON_NUGGET),
-                        RecipeProvider.conditionsFromItem(Items.IRON_NUGGET))
+                .criterion(RecipeProvider.hasItem(NSE_Items.ANTENNA),
+                        RecipeProvider.conditionsFromItem(NSE_Items.ANTENNA))
                 .criterion(RecipeProvider.hasItem(Items.NOTE_BLOCK),
                         RecipeProvider.conditionsFromItem(Items.NOTE_BLOCK))
                 .criterion(RecipeProvider.hasItem(Items.IRON_INGOT),

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

@@ -518,13 +518,19 @@
   "block.new_soviet.herringbone_bamboo_planks": "Herringbone Bamboo Planks",
   "block.new_soviet.herringbone_bamboo_planks_stairs": "Herringbone Bamboo Planks Stairs",
   "block.new_soviet.herringbone_bamboo_planks_slab": "Herringbone Bamboo Planks Slab",
-  "block.new_soviet.window.fixed": "The window was fixed",
-  "block.new_soviet.window.unfixed": "The window was unfixed",
+  "block.new_soviet.window.fixed": "Window blockstate frozen",
+  "block.new_soviet.window.unfixed": "Window blockstate unfrozen",
   "subtitles.new_soviet.tv_on": "TV turned on",
   "subtitles.new_soviet.tv_off": "TV turned off",
   "subtitles.new_soviet.tv_break": "TV screen shattered",
   "item.new_soviet.antenna": "Antenna",
   "item.new_soviet.screwdriver": "Screwdriver",
+  "item.new_soviet.sickle_pattern": "Banner Pattern",
+  "item.new_soviet.sickle_pattern.desc": "Hammer and Sickle",
+  "item.new_soviet.star_pattern": "Banner Pattern",
+  "item.new_soviet.star_pattern.desc": "Star",
+  "item.new_soviet.grain_pattern": "Banner Pattern",
+  "item.new_soviet.grain_pattern.desc": "Wreaths of Grain",
 
   "item.new_soviet.music_disc_ussr_anthem": "Music Disc",
   "item.new_soviet.music_disc_ussr_anthem.desc": "Alexander Alexandrov - USSR anthem",