From 08548822d0eeb9e42807f1194d04598459cecdf2 Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Sat, 27 Apr 2024 16:29:12 +0300 Subject: [PATCH] Rename typewriter and military radio --- .../java/su/a71/new_soviet/NewSovietClient.java | 4 ++-- .../minecraft/tags/blocks/mineable/pickaxe.json | 2 +- .../{radio_war.json => military_radio.json} | 4 ++-- .../{w_machine.json => typewriter.json} | 4 ++-- .../blocks/{radio_war.json => military_radio.json} | 2 +- .../{radio_war.json => military_radio.json} | 2 +- .../recipes/{w_machine.json => typewriter.json} | 2 +- .../su/a71/new_soviet/blocks/CustomModelBlock.java | 3 --- .../java/su/a71/new_soviet/blocks/GooBlock.java | 12 +----------- .../{WMachineBlock.java => TypewriterBlock.java} | 9 +++------ .../su/a71/new_soviet/blocks/WallpaperBlock.java | 4 ---- .../su/a71/new_soviet/datagen/BlockLootTables.java | 2 +- .../a71/new_soviet/datagen/BlockTagGenerator.java | 2 +- .../su/a71/new_soviet/datagen/RecipeGenerator.java | 5 ++--- .../su/a71/new_soviet/registration/NSE_Custom.java | 8 ++++---- .../su/a71/new_soviet/registration/NSE_Sounds.java | 2 +- .../new_soviet/blockstates/military_radio.json | 8 ++++++++ .../assets/new_soviet/blockstates/radio_war.json | 8 -------- .../assets/new_soviet/blockstates/typewriter.json | 13 +++++++++++++ .../assets/new_soviet/blockstates/w_machine.json | 13 ------------- .../resources/assets/new_soviet/lang/en_us.json | 4 ++-- src/main/resources/assets/new_soviet/lang/rpr.json | 4 ++-- .../resources/assets/new_soviet/lang/ru_ru.json | 4 ++-- .../block/{radio_war.json => military_radio.json} | 4 ++-- .../block/{w_machine.json => typewriter.json} | 4 ++-- .../models/block/typewriter_with_paper.json | 7 +++++++ .../models/block/w_machine_with_paper.json | 7 ------- .../new_soviet/models/item/military_radio.json | 3 +++ .../assets/new_soviet/models/item/radio_war.json | 3 --- .../assets/new_soviet/models/item/typewriter.json | 3 +++ .../assets/new_soviet/models/item/w_machine.json | 3 --- src/main/resources/assets/new_soviet/sounds.json | 4 ++-- ...sound.ogg => typewriter_button_press_sound.ogg} | Bin .../{radio_war.png => military_radio.png} | Bin .../electronics/{w_machine.png => typewriter.png} | Bin ...ne_with_paper.png => typewriter_with_paper.png} | Bin 36 files changed, 69 insertions(+), 90 deletions(-) rename src/main/generated/data/new_soviet/advancements/recipes/decorations/{radio_war.json => military_radio.json} (94%) rename src/main/generated/data/new_soviet/advancements/recipes/decorations/{w_machine.json => typewriter.json} (93%) rename src/main/generated/data/new_soviet/loot_tables/blocks/{radio_war.json => military_radio.json} (86%) rename src/main/generated/data/new_soviet/recipes/{radio_war.json => military_radio.json} (91%) rename src/main/generated/data/new_soviet/recipes/{w_machine.json => typewriter.json} (91%) rename src/main/java/su/a71/new_soviet/blocks/{WMachineBlock.java => TypewriterBlock.java} (92%) create mode 100644 src/main/resources/assets/new_soviet/blockstates/military_radio.json delete mode 100644 src/main/resources/assets/new_soviet/blockstates/radio_war.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/typewriter.json delete mode 100644 src/main/resources/assets/new_soviet/blockstates/w_machine.json rename src/main/resources/assets/new_soviet/models/block/{radio_war.json => military_radio.json} (96%) rename src/main/resources/assets/new_soviet/models/block/{w_machine.json => typewriter.json} (98%) create mode 100644 src/main/resources/assets/new_soviet/models/block/typewriter_with_paper.json delete mode 100644 src/main/resources/assets/new_soviet/models/block/w_machine_with_paper.json create mode 100644 src/main/resources/assets/new_soviet/models/item/military_radio.json delete mode 100644 src/main/resources/assets/new_soviet/models/item/radio_war.json create mode 100644 src/main/resources/assets/new_soviet/models/item/typewriter.json delete mode 100644 src/main/resources/assets/new_soviet/models/item/w_machine.json rename src/main/resources/assets/new_soviet/sounds/{w_machine_button_press_sound.ogg => typewriter_button_press_sound.ogg} (100%) rename src/main/resources/assets/new_soviet/textures/block/custom/electronics/{radio_war.png => military_radio.png} (100%) rename src/main/resources/assets/new_soviet/textures/block/custom/electronics/{w_machine.png => typewriter.png} (100%) rename src/main/resources/assets/new_soviet/textures/block/custom/electronics/{w_machine_with_paper.png => typewriter_with_paper.png} (100%) diff --git a/src/client/java/su/a71/new_soviet/NewSovietClient.java b/src/client/java/su/a71/new_soviet/NewSovietClient.java index 86f75d9..c011ad4 100644 --- a/src/client/java/su/a71/new_soviet/NewSovietClient.java +++ b/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, diff --git a/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json index d0e8da1..4c631de 100644 --- a/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/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", diff --git a/src/main/generated/data/new_soviet/advancements/recipes/decorations/radio_war.json b/src/main/generated/data/new_soviet/advancements/recipes/decorations/military_radio.json similarity index 94% rename from src/main/generated/data/new_soviet/advancements/recipes/decorations/radio_war.json rename to src/main/generated/data/new_soviet/advancements/recipes/decorations/military_radio.json index 089b09d..215e75c 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/decorations/radio_war.json +++ b/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 diff --git a/src/main/generated/data/new_soviet/advancements/recipes/decorations/w_machine.json b/src/main/generated/data/new_soviet/advancements/recipes/decorations/typewriter.json similarity index 93% rename from src/main/generated/data/new_soviet/advancements/recipes/decorations/w_machine.json rename to src/main/generated/data/new_soviet/advancements/recipes/decorations/typewriter.json index a8111df..2c7cc9c 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/decorations/w_machine.json +++ b/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 diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/radio_war.json b/src/main/generated/data/new_soviet/loot_tables/blocks/military_radio.json similarity index 86% rename from src/main/generated/data/new_soviet/loot_tables/blocks/radio_war.json rename to src/main/generated/data/new_soviet/loot_tables/blocks/military_radio.json index df95935..f93601d 100644 --- a/src/main/generated/data/new_soviet/loot_tables/blocks/radio_war.json +++ b/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 diff --git a/src/main/generated/data/new_soviet/recipes/radio_war.json b/src/main/generated/data/new_soviet/recipes/military_radio.json similarity index 91% rename from src/main/generated/data/new_soviet/recipes/radio_war.json rename to src/main/generated/data/new_soviet/recipes/military_radio.json index c6f8963..3cda4ff 100644 --- a/src/main/generated/data/new_soviet/recipes/radio_war.json +++ b/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 } \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/w_machine.json b/src/main/generated/data/new_soviet/recipes/typewriter.json similarity index 91% rename from src/main/generated/data/new_soviet/recipes/w_machine.json rename to src/main/generated/data/new_soviet/recipes/typewriter.json index a848174..d4b38a2 100644 --- a/src/main/generated/data/new_soviet/recipes/w_machine.json +++ b/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 } \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/blocks/CustomModelBlock.java b/src/main/java/su/a71/new_soviet/blocks/CustomModelBlock.java index 42bb984..98ff570 100644 --- a/src/main/java/su/a71/new_soviet/blocks/CustomModelBlock.java +++ b/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; diff --git a/src/main/java/su/a71/new_soviet/blocks/GooBlock.java b/src/main/java/su/a71/new_soviet/blocks/GooBlock.java index dda19f3..858ffda 100644 --- a/src/main/java/su/a71/new_soviet/blocks/GooBlock.java +++ b/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) { diff --git a/src/main/java/su/a71/new_soviet/blocks/WMachineBlock.java b/src/main/java/su/a71/new_soviet/blocks/TypewriterBlock.java similarity index 92% rename from src/main/java/su/a71/new_soviet/blocks/WMachineBlock.java rename to src/main/java/su/a71/new_soviet/blocks/TypewriterBlock.java index 3a5134c..a24323a 100644 --- a/src/main/java/su/a71/new_soviet/blocks/WMachineBlock.java +++ b/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; } diff --git a/src/main/java/su/a71/new_soviet/blocks/WallpaperBlock.java b/src/main/java/su/a71/new_soviet/blocks/WallpaperBlock.java index c632484..3bedb8f 100644 --- a/src/main/java/su/a71/new_soviet/blocks/WallpaperBlock.java +++ b/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; diff --git a/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java b/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java index bd0b6d7..1207a79 100644 --- a/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java +++ b/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); } diff --git a/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java b/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java index 94d0dff..0de7c3a 100644 --- a/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java +++ b/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) diff --git a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java index 7f907e0..6cb2d33 100644 --- a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java +++ b/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(" # ") diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java b/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java index 632704e..7ab6ab9 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java +++ b/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); diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Sounds.java b/src/main/java/su/a71/new_soviet/registration/NSE_Sounds.java index 8b0b77f..31a6d85 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Sounds.java +++ b/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"); diff --git a/src/main/resources/assets/new_soviet/blockstates/military_radio.json b/src/main/resources/assets/new_soviet/blockstates/military_radio.json new file mode 100644 index 0000000..c7cd34e --- /dev/null +++ b/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 } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/radio_war.json b/src/main/resources/assets/new_soviet/blockstates/radio_war.json deleted file mode 100644 index 5fc6886..0000000 --- a/src/main/resources/assets/new_soviet/blockstates/radio_war.json +++ /dev/null @@ -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 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/typewriter.json b/src/main/resources/assets/new_soviet/blockstates/typewriter.json new file mode 100644 index 0000000..64a0cfa --- /dev/null +++ b/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 } + } +} diff --git a/src/main/resources/assets/new_soviet/blockstates/w_machine.json b/src/main/resources/assets/new_soviet/blockstates/w_machine.json deleted file mode 100644 index 9232adc..0000000 --- a/src/main/resources/assets/new_soviet/blockstates/w_machine.json +++ /dev/null @@ -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 } - } -} diff --git a/src/main/resources/assets/new_soviet/lang/en_us.json b/src/main/resources/assets/new_soviet/lang/en_us.json index e134e55..49f843e 100644 --- a/src/main/resources/assets/new_soviet/lang/en_us.json +++ b/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", diff --git a/src/main/resources/assets/new_soviet/lang/rpr.json b/src/main/resources/assets/new_soviet/lang/rpr.json index d76e1be..7abe7ea 100644 --- a/src/main/resources/assets/new_soviet/lang/rpr.json +++ b/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": "Окно не зафиксировано", diff --git a/src/main/resources/assets/new_soviet/lang/ru_ru.json b/src/main/resources/assets/new_soviet/lang/ru_ru.json index 4825fed..1bfc925 100644 --- a/src/main/resources/assets/new_soviet/lang/ru_ru.json +++ b/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": "Окно не зафиксировано", diff --git a/src/main/resources/assets/new_soviet/models/block/radio_war.json b/src/main/resources/assets/new_soviet/models/block/military_radio.json similarity index 96% rename from src/main/resources/assets/new_soviet/models/block/radio_war.json rename to src/main/resources/assets/new_soviet/models/block/military_radio.json index 7dd3f4a..980649c 100644 --- a/src/main/resources/assets/new_soviet/models/block/radio_war.json +++ b/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", - "particle": "new_soviet:block/custom/electronics/radio_war" + "0": "new_soviet:block/custom/electronics/military_radio", + "particle": "new_soviet:block/custom/electronics/military_radio" }, "elements": [ { diff --git a/src/main/resources/assets/new_soviet/models/block/w_machine.json b/src/main/resources/assets/new_soviet/models/block/typewriter.json similarity index 98% rename from src/main/resources/assets/new_soviet/models/block/w_machine.json rename to src/main/resources/assets/new_soviet/models/block/typewriter.json index e2fd210..07961e1 100644 --- a/src/main/resources/assets/new_soviet/models/block/w_machine.json +++ b/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", - "particle": "new_soviet:block/custom/electronics/w_machine" + "0": "new_soviet:block/custom/electronics/typewriter", + "particle": "new_soviet:block/custom/electronics/typewriter" }, "elements": [ { diff --git a/src/main/resources/assets/new_soviet/models/block/typewriter_with_paper.json b/src/main/resources/assets/new_soviet/models/block/typewriter_with_paper.json new file mode 100644 index 0000000..76395c9 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/w_machine_with_paper.json b/src/main/resources/assets/new_soviet/models/block/w_machine_with_paper.json deleted file mode 100644 index c464e09..0000000 --- a/src/main/resources/assets/new_soviet/models/block/w_machine_with_paper.json +++ /dev/null @@ -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" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/military_radio.json b/src/main/resources/assets/new_soviet/models/item/military_radio.json new file mode 100644 index 0000000..cbb3a18 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/military_radio.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/military_radio" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/radio_war.json b/src/main/resources/assets/new_soviet/models/item/radio_war.json deleted file mode 100644 index 3aaef58..0000000 --- a/src/main/resources/assets/new_soviet/models/item/radio_war.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "new_soviet:block/radio_war" -} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/typewriter.json b/src/main/resources/assets/new_soviet/models/item/typewriter.json new file mode 100644 index 0000000..00ad13a --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/typewriter.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/typewriter" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/w_machine.json b/src/main/resources/assets/new_soviet/models/item/w_machine.json deleted file mode 100644 index 467ccb0..0000000 --- a/src/main/resources/assets/new_soviet/models/item/w_machine.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "new_soviet:block/w_machine" -} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/sounds.json b/src/main/resources/assets/new_soviet/sounds.json index 5d90383..fd9a33a 100644 --- a/src/main/resources/assets/new_soviet/sounds.json +++ b/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": { diff --git a/src/main/resources/assets/new_soviet/sounds/w_machine_button_press_sound.ogg b/src/main/resources/assets/new_soviet/sounds/typewriter_button_press_sound.ogg similarity index 100% rename from src/main/resources/assets/new_soviet/sounds/w_machine_button_press_sound.ogg rename to src/main/resources/assets/new_soviet/sounds/typewriter_button_press_sound.ogg diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/radio_war.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/military_radio.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/custom/electronics/radio_war.png rename to src/main/resources/assets/new_soviet/textures/block/custom/electronics/military_radio.png diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/w_machine.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/typewriter.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/custom/electronics/w_machine.png rename to src/main/resources/assets/new_soviet/textures/block/custom/electronics/typewriter.png diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/w_machine_with_paper.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/typewriter_with_paper.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/custom/electronics/w_machine_with_paper.png rename to src/main/resources/assets/new_soviet/textures/block/custom/electronics/typewriter_with_paper.png