Rename typewriter and military radio

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

@@ -77,9 +77,9 @@ public class NewSovietClient implements ClientModInitializer {
         BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.MAGENTA_BOUNDARY_MARKER, RenderLayer.getCutout());
         BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.PURPLE_BOUNDARY_MARKER, RenderLayer.getCutout());
 
-        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.W_MACHINE, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.TYPEWRITER, RenderLayer.getCutout());
         BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.TELEPHONE, RenderLayer.getCutout());
-        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.RADIO_WAR, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.MILITARY_RADIO, 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,

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

@@ -2,7 +2,7 @@
   "replace": false,
   "values": [
     "new_soviet:telephone",
-    "new_soviet:radio_war",
+    "new_soviet:military_radio",
     "new_soviet:white_tiles",
     "new_soviet:cracked_white_tiles",
     "new_soviet:mossy_white_tiles",

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

@@ -51,7 +51,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "new_soviet:radio_war"
+        "recipe": "new_soviet:military_radio"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -67,7 +67,7 @@
   ],
   "rewards": {
     "recipes": [
-      "new_soviet:radio_war"
+      "new_soviet:military_radio"
     ]
   },
   "sends_telemetry_event": false

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

@@ -39,7 +39,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "new_soviet:w_machine"
+        "recipe": "new_soviet:typewriter"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -54,7 +54,7 @@
   ],
   "rewards": {
     "recipes": [
-      "new_soviet:w_machine"
+      "new_soviet:typewriter"
     ]
   },
   "sends_telemetry_event": false

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

@@ -11,7 +11,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "new_soviet:radio_war"
+          "name": "new_soviet:military_radio"
         }
       ],
       "rolls": 1.0

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

@@ -24,7 +24,7 @@
     "NRN"
   ],
   "result": {
-    "item": "new_soviet:radio_war"
+    "item": "new_soviet:military_radio"
   },
   "show_notification": true
 }

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

@@ -21,7 +21,7 @@
     "NNN"
   ],
   "result": {
-    "item": "new_soviet:w_machine"
+    "item": "new_soviet:typewriter"
   },
   "show_notification": true
 }

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

@@ -1,12 +1,9 @@
 package su.a71.new_soviet.blocks;
 
-import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
-import net.minecraft.block.piston.PistonBehavior;
 import net.minecraft.fluid.FluidState;
 import net.minecraft.fluid.Fluids;
 import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.Properties;

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

@@ -2,19 +2,9 @@ package su.a71.new_soviet.blocks;
 
 import net.minecraft.block.*;
 import net.minecraft.block.piston.PistonBehavior;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.particle.ParticleTypes;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.math.random.Random;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.BlockView;
-import net.minecraft.world.GameRules;
-import net.minecraft.world.World;
-import su.a71.new_soviet.registration.NSE_Blocks;
 import su.a71.new_soviet.registration.NSE_Sounds;
 
 
@@ -23,7 +13,7 @@ public class GooBlock extends SnowBlock {
     public GooBlock(Settings settings, double entity_speed) {
         super(settings.sounds(NSE_Sounds.GOO_SOUNDS).pistonBehavior(PistonBehavior.DESTROY));
         this.entity_speed = entity_speed;
-        this.setDefaultState((BlockState)((BlockState)this.stateManager.getDefaultState()).with(LAYERS, 1));
+        this.setDefaultState(this.stateManager.getDefaultState().with(LAYERS, 1));
     }
 
     public VoxelShape getCollisionShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {

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

@@ -5,16 +5,13 @@ import net.minecraft.block.piston.PistonBehavior;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.AirBlockItem;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 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.Properties;
-import net.minecraft.text.Text;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
@@ -29,12 +26,12 @@ import su.a71.new_soviet.NewSoviet;
 import su.a71.new_soviet.registration.NSE_Sounds;
 import su.a71.new_soviet.util.Shapes;
 
-public class WMachineBlock extends HorizontalFacingBlock {
+public class TypewriterBlock extends HorizontalFacingBlock {
 
     private final Shapes.HorizontalShape blockShape;
     public static final BooleanProperty PAPER = BooleanProperty.of("paper");
 
-    public WMachineBlock(Settings settings, Shapes.HorizontalShape blockShape) {
+    public TypewriterBlock(Settings settings, Shapes.HorizontalShape blockShape) {
         super(settings.notSolid().nonOpaque().noBlockBreakParticles().pistonBehavior(PistonBehavior.DESTROY).strength(0.1f, 2f));
         setDefaultState(getDefaultState().with(PAPER, false).with(Properties.HORIZONTAL_FACING, Direction.NORTH));
         this.blockShape = blockShape;
@@ -92,7 +89,7 @@ public class WMachineBlock extends HorizontalFacingBlock {
         else {
             float pitch = (float) NewSoviet.RANDOM.nextBetween(8, 12) / 10;
             float volume = (float) NewSoviet.RANDOM.nextBetween(5, 7) / 10;
-            world.playSound(null, pos, NSE_Sounds.W_MACHINE_BUTTON_PRESS, SoundCategory.BLOCKS, volume, pitch);
+            world.playSound(null, pos, NSE_Sounds.TYPEWRITER_BUTTON_PRESS, SoundCategory.BLOCKS, volume, pitch);
         }
         return ActionResult.SUCCESS;
     }

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

@@ -2,14 +2,10 @@ package su.a71.new_soviet.blocks;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.DoorBlock;
-import net.minecraft.block.TrapdoorBlock;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldAccess;
 

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

@@ -582,7 +582,7 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
         addDrop(NSE_Blocks.DIRT_ROAD, dropSilkAndNot(Blocks.DIRT, NSE_Blocks.DIRT_ROAD));
 
         addDrop(NSE_Custom.TELEPHONE);
-        addDrop(NSE_Custom.RADIO_WAR);
+        addDrop(NSE_Custom.MILITARY_RADIO);
 
         addDropWithSilkTouch(NSE_Custom.LIGHT_BULB_LAMP);
     }

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

@@ -22,7 +22,7 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
         // Blocks mined with a pickaxe
         getOrCreateTagBuilder(BlockTags.PICKAXE_MINEABLE)
                 .add(NSE_Custom.TELEPHONE)
-                .add(NSE_Custom.RADIO_WAR)
+                .add(NSE_Custom.MILITARY_RADIO)
                 .add(NSE_Blocks.WHITE_TILES)
                 .add(NSE_Blocks.CRACKED_WHITE_TILES)
                 .add(NSE_Blocks.MOSSY_WHITE_TILES)

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

@@ -11,7 +11,6 @@ import net.minecraft.item.Items;
 import net.minecraft.recipe.Ingredient;
 import net.minecraft.recipe.book.RecipeCategory;
 import net.minecraft.registry.Registries;
-import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.registry.tag.ItemTags;
 import net.minecraft.util.Util;
 import su.a71.new_soviet.registration.NSE_Blocks;
@@ -659,7 +658,7 @@ public class RecipeGenerator extends FabricRecipeProvider {
                 .criterion(hasItem(Blocks.GREEN_WOOL), conditionsFromItem(Blocks.GREEN_WOOL))
                 .offerTo(exporter);
 
-        ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.RADIO_WAR, 1)
+        ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.MILITARY_RADIO, 1)
                 .input('A', NSE_Items.ANTENNA).input('N', Items.IRON_NUGGET).input('I', Items.IRON_INGOT)
                 .input('R', Items.REDSTONE).input('#', Blocks.NOTE_BLOCK)
                 .pattern(" A ")
@@ -684,7 +683,7 @@ public class RecipeGenerator extends FabricRecipeProvider {
                 .criterion(hasItem(Items.REDSTONE), conditionsFromItem(Items.REDSTONE))
                 .offerTo(exporter);
 
-        ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.W_MACHINE, 1)
+        ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.TYPEWRITER, 1)
                 .input('N', Items.IRON_NUGGET).input('I', Items.IRON_INGOT)
                 .input('D', Blocks.POLISHED_DEEPSLATE_SLAB).input('#', Items.INK_SAC)
                 .pattern(" # ")

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

@@ -46,7 +46,7 @@ public class NSE_Custom extends NSE_BaseRegistration {
             List.of(4.0, 0.0, 4.0, 12.0, 3.0, 12.0),
             List.of(5.0, 3.0, 7.0, 11.0, 5.0, 12.0),
             List.of(2.0, 5.0, 7.5, 14.0, 8.0, 10.5))));
-    public static final CustomModelBlock RADIO_WAR = new CustomModelBlock(FabricBlockSettings.copy(RADIO_RECEIVER).mapColor(MapColor.TERRACOTTA_GREEN).strength(0.9f, 1.5f), new Shapes.HorizontalShape(List.of(
+    public static final CustomModelBlock MILITARY_RADIO = new CustomModelBlock(FabricBlockSettings.copy(RADIO_RECEIVER).mapColor(MapColor.TERRACOTTA_GREEN).strength(0.9f, 1.5f), new Shapes.HorizontalShape(List.of(
             List.of(0.0, 1.0, 4.0, 16.0, 12.0, 14.0))));
 
     public static final SwitchBlock SWITCH = new SwitchBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).notSolid().pistonBehavior(PistonBehavior.DESTROY).strength(1f, 2f).mapColor(MapColor.TERRACOTTA_WHITE));
@@ -78,7 +78,7 @@ public class NSE_Custom extends NSE_BaseRegistration {
                     List.of(6.5, 7.0, 6.5, 9.5, 9.0, 9.5),
                     List.of(7.0, 9.0, 7.0, 9.0, 12.0, 9.0))));
 
-    public static final Block W_MACHINE = new WMachineBlock(FabricBlockSettings.copy(Blocks.IRON_BLOCK).strength(0.9f, 1.5f), new Shapes.HorizontalShape(List.of(
+    public static final Block TYPEWRITER = new TypewriterBlock(FabricBlockSettings.copy(Blocks.IRON_BLOCK).strength(0.9f, 1.5f), new Shapes.HorizontalShape(List.of(
             List.of(2.0, 0.0, 2.0, 14.0, 2.0, 14.0),
             List.of(2.0, 2.0, 7.0, 14.0, 6.0, 14.0),
             List.of(1.0, 5.0, 12.0, 15.0, 7.0, 14.0),
@@ -123,9 +123,9 @@ public class NSE_Custom extends NSE_BaseRegistration {
         registerBlock("green_tv", () -> GREEN_TV, NSE_CUSTOM_TAB);
 
         registerBlock("radio_receiver", () -> RADIO_RECEIVER, NSE_CUSTOM_TAB);
-        registerBlock("w_machine", () -> W_MACHINE, NSE_CUSTOM_TAB);
+        registerBlock("military_radio", () -> MILITARY_RADIO, NSE_CUSTOM_TAB);
+        registerBlock("typewriter", () -> TYPEWRITER, NSE_CUSTOM_TAB);
         registerBlock("telephone", () -> TELEPHONE, NSE_CUSTOM_TAB);
-        registerBlock("radio_war", () -> RADIO_WAR, NSE_CUSTOM_TAB);
         registerBlock("table_lamp", () -> TABLE_LAMP, NSE_CUSTOM_TAB);
         registerBlock("golden_table_lamp", () -> GOLDEN_LAMP, NSE_CUSTOM_TAB);
         registerBlock("vintage_lamp", () -> VINTAGE_LAMP, NSE_CUSTOM_TAB);

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

@@ -8,7 +8,7 @@ import su.a71.new_soviet.NewSoviet;
 public class NSE_Sounds extends NSE_BaseRegistration {
     public static SoundEvent DICE_SOUND = registerSoundEvent("dice_sound");
 
-    public static SoundEvent W_MACHINE_BUTTON_PRESS = registerSoundEvent("w_machine_button_press_sound");
+    public static SoundEvent TYPEWRITER_BUTTON_PRESS = registerSoundEvent("typewriter_button_press_sound");
 
     public static SoundEvent SCREWDRIVER_SOUND = registerSoundEvent("screwdriver_sound");
 

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

@@ -0,0 +1,8 @@
+{
+  "variants": {
+    "facing=north": { "model": "new_soviet:block/military_radio", "uvlock": true },
+    "facing=east":  { "model": "new_soviet:block/military_radio", "y":  90, "uvlock": false },
+    "facing=south": { "model": "new_soviet:block/military_radio", "y": 180, "uvlock": false },
+    "facing=west":  { "model": "new_soviet:block/military_radio", "y": 270, "uvlock": false }
+  }
+}

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

@@ -1,8 +0,0 @@
-{
-  "variants": {
-    "facing=north": { "model": "new_soviet:block/radio_war", "uvlock": true },
-    "facing=east":  { "model": "new_soviet:block/radio_war", "y":  90, "uvlock": false },
-    "facing=south": { "model": "new_soviet:block/radio_war", "y": 180, "uvlock": false },
-    "facing=west":  { "model": "new_soviet:block/radio_war", "y": 270, "uvlock": false }
-  }
-}

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

@@ -0,0 +1,13 @@
+{
+  "variants": {
+    "facing=north,paper=false": { "model": "new_soviet:block/typewriter", "uvlock": true },
+    "facing=east,paper=false":  { "model": "new_soviet:block/typewriter", "y":  90, "uvlock": false },
+    "facing=south,paper=false": { "model": "new_soviet:block/typewriter", "y": 180, "uvlock": false },
+    "facing=west,paper=false":  { "model": "new_soviet:block/typewriter", "y": 270, "uvlock": false },
+
+    "facing=north,paper=true": { "model": "new_soviet:block/typewriter_with_paper", "uvlock": true },
+    "facing=east,paper=true":  { "model": "new_soviet:block/typewriter_with_paper", "y":  90, "uvlock": false },
+    "facing=south,paper=true": { "model": "new_soviet:block/typewriter_with_paper", "y": 180, "uvlock": false },
+    "facing=west,paper=true":  { "model": "new_soviet:block/typewriter_with_paper", "y": 270, "uvlock": false }
+  }
+}

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

@@ -1,13 +0,0 @@
-{
-  "variants": {
-    "facing=north,paper=false": { "model": "new_soviet:block/w_machine", "uvlock": true },
-    "facing=east,paper=false":  { "model": "new_soviet:block/w_machine", "y":  90, "uvlock": false },
-    "facing=south,paper=false": { "model": "new_soviet:block/w_machine", "y": 180, "uvlock": false },
-    "facing=west,paper=false":  { "model": "new_soviet:block/w_machine", "y": 270, "uvlock": false },
-
-    "facing=north,paper=true": { "model": "new_soviet:block/w_machine_with_paper", "uvlock": true },
-    "facing=east,paper=true":  { "model": "new_soviet:block/w_machine_with_paper", "y":  90, "uvlock": false },
-    "facing=south,paper=true": { "model": "new_soviet:block/w_machine_with_paper", "y": 180, "uvlock": false },
-    "facing=west,paper=true":  { "model": "new_soviet:block/w_machine_with_paper", "y": 270, "uvlock": false }
-  }
-}

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

@@ -637,9 +637,9 @@
   "block.new_soviet.chiseled_acacia_door": "Chiseled Acacia Door",
   "block.new_soviet.leather_lined_chiseled_acacia_door": "Leather Lined Chiseled Acacia Door",
   "block.new_soviet.white_chiseled_birch_door": "Whitewashed Chiseled Birch Door",
-  "block.new_soviet.w_machine": "Typewriter",
+  "block.new_soviet.typewriter": "Typewriter",
   "block.new_soviet.telephone": "Telephone",
-  "block.new_soviet.radio_war": "Military Radio",
+  "block.new_soviet.military_radio": "Military Radio",
   "item.new_soviet.window.tooltip": "Broken",
   "block.new_soviet.window.fixed": "Window blockstate frozen",
   "block.new_soviet.window.unfixed": "Window blockstate unfrozen",

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

@@ -616,9 +616,9 @@
  "block.new_soviet.chiseled_acacia_door": "Рѣзныя акацiявыя двѣрь",
  "block.new_soviet.leather_lined_chiseled_acacia_door": "Обшитыя кожѣй рѣзныя акацiявыя двѣрь",
  "block.new_soviet.white_chiseled_birch_door": "Побѣлённыя рѣзныя бѣрѣзовыя двѣрь",
- "block.new_soviet.w_machine": "Пѣчатныя машинка",
+ "block.new_soviet.typewriter": "Пѣчатныя машинка",
  "block.new_soviet.telephone": "Тѣлѣфон",
- "block.new_soviet.radio_war": "Военное радiо",
+ "block.new_soviet.military_radio": "Военное радiо",
  "item.new_soviet.window.tooltip": "Разбито",
  "block.new_soviet.window.fixed": "Окно зафиксировано",
  "block.new_soviet.window.unfixed": "Окно не зафиксировано",

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

@@ -637,9 +637,9 @@
   "block.new_soviet.chiseled_acacia_door": "Резная акациевая дверь",
   "block.new_soviet.leather_lined_chiseled_acacia_door": "Обшитая кожей резная акациевая дверь",
   "block.new_soviet.white_chiseled_birch_door": "Побелённая резная берёзовая дверь",
-  "block.new_soviet.w_machine": "Печатная машинка",
+  "block.new_soviet.typewriter": "Печатная машинка",
   "block.new_soviet.telephone": "Телефон",
-  "block.new_soviet.radio_war": "Военное радио",
+  "block.new_soviet.military_radio": "Военное радио",
   "item.new_soviet.window.tooltip": "Разбито",
   "block.new_soviet.window.fixed": "Окно зафиксировано",
   "block.new_soviet.window.unfixed": "Окно не зафиксировано",

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

@@ -3,8 +3,8 @@
 	"render_type": "cutout",
 	"texture_size": [48, 32],
 	"textures": {
-		"0": "new_soviet:block/custom/electronics/radio_war",
+		"0": "new_soviet:block/custom/electronics/military_radio",
-		"particle": "new_soviet:block/custom/electronics/radio_war"
+		"particle": "new_soviet:block/custom/electronics/military_radio"
 	},
 	"elements": [
 		{

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

@@ -2,8 +2,8 @@
 	"credit": "Made with Blockbench",
 	"texture_size": [32, 32],
 	"textures": {
-		"0": "new_soviet:block/custom/electronics/w_machine",
+		"0": "new_soviet:block/custom/electronics/typewriter",
-		"particle": "new_soviet:block/custom/electronics/w_machine"
+		"particle": "new_soviet:block/custom/electronics/typewriter"
 	},
 	"elements": [
 		{

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

@@ -0,0 +1,7 @@
+{
+  "parent": "new_soviet:block/typewriter",
+  "textures": {
+    "0": "new_soviet:block/custom/electronics/typewriter_with_paper",
+    "particle": "new_soviet:block/custom/electronics/typewriter_with_paper"
+  }
+}

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

@@ -1,7 +0,0 @@
-{
-  "parent": "new_soviet:block/w_machine",
-  "textures": {
-    "0": "new_soviet:block/custom/electronics/w_machine_with_paper",
-    "particle": "new_soviet:block/custom/electronics/w_machine_with_paper"
-  }
-}

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

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

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

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

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

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

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

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

src/main/resources/assets/new_soviet/sounds.json

@@ -34,9 +34,9 @@
       "new_soviet:woop_siren"
     ]
   },
-  "w_machine_button_press_sound": {
+  "typewriter_button_press_sound": {
     "sounds": [
-      "new_soviet:w_machine_button_press_sound"
+      "new_soviet:typewriter_button_press_sound"
     ]
   },
   "cloister_siren_sound": {