diff --git a/src/main/java/su/a71/new_soviet/DataGeneration.java b/src/main/java/su/a71/new_soviet/DataGeneration.java index a605f49..90c3ef8 100644 --- a/src/main/java/su/a71/new_soviet/DataGeneration.java +++ b/src/main/java/su/a71/new_soviet/DataGeneration.java @@ -237,7 +237,7 @@ public class DataGeneration implements DataGeneratorEntrypoint { addDrop(NSE_Custom.TV); addDrop(NSE_Custom.RED_TV); addDrop(NSE_Custom.BROWN_TV); - addDrop(NSE_Custom.RADIO); + addDrop(NSE_Custom.RADIO_RECEIVER); addDrop(NSE_Custom.SIREN); addDrop(NSE_Custom.LAMP); addDrop(NSE_Custom.CEILING_FAN); @@ -602,7 +602,7 @@ public class DataGeneration implements DataGeneratorEntrypoint { tvRecipe(exporter, NSE_Custom.TV, Items.ORANGE_DYE); tvRecipe(exporter, NSE_Custom.BROWN_TV, Items.BROWN_DYE); tvRecipe(exporter, NSE_Custom.RED_TV, Items.RED_DYE); - radioRecipe(exporter, NSE_Custom.RADIO); + radioRecipe(exporter, NSE_Custom.RADIO_RECEIVER); ceilingFanRecipe(exporter, NSE_Custom.CEILING_FAN); lampRecipe(exporter, NSE_Custom.LAMP); sickleRecipe(exporter, NSE_Items.SICKLE); diff --git a/src/main/java/su/a71/new_soviet/blocks/FUNC_IDEAS b/src/main/java/su/a71/new_soviet/blocks/FUNC_IDEAS deleted file mode 100644 index 43672b2..0000000 --- a/src/main/java/su/a71/new_soviet/blocks/FUNC_IDEAS +++ /dev/null @@ -1,5 +0,0 @@ -Ideas for block functionality - -Radio: Like a jukebox on steroids. Maybe container for disks, maybe a way to connect to real radio. Who knows. -TV: CC compatible peripheral which combines a speaker and an 8x8 monitor -Crate: Like a shulker box but much smaller (but cheaper!) \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/blocks/RadioBlock.java b/src/main/java/su/a71/new_soviet/blocks/RadioReceiverBlock.java similarity index 94% rename from src/main/java/su/a71/new_soviet/blocks/RadioBlock.java rename to src/main/java/su/a71/new_soviet/blocks/RadioReceiverBlock.java index 0ab24be..40827b3 100644 --- a/src/main/java/su/a71/new_soviet/blocks/RadioBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/RadioReceiverBlock.java @@ -13,8 +13,8 @@ import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; -public class RadioBlock extends HorizontalFacingBlock { - public RadioBlock() { +public class RadioReceiverBlock extends HorizontalFacingBlock { + public RadioReceiverBlock() { super(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).notSolid().pistonBehavior(PistonBehavior.DESTROY).strength(1f, 2f).mapColor(MapColor.PALE_YELLOW)); setDefaultState(getDefaultState().with(Properties.HORIZONTAL_FACING, Direction.NORTH)); } 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 bc531ef..2215919 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 @@ -18,7 +18,6 @@ import net.minecraft.text.Text; import net.minecraft.util.DyeColor; import net.minecraft.util.Identifier; -import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import su.a71.new_soviet.NewSoviet; import su.a71.new_soviet.blocks.*; @@ -30,7 +29,7 @@ public class NSE_Custom extends NSE_BaseRegistration { public static final TVBlock BROWN_TV = new TVBlock(FabricBlockSettings.create().mapColor(MapColor.TERRACOTTA_BROWN)); public static final BlockEntityType TV_BLOCK_ENTITY = registerBlockEntity("tv_block_entity", TVBlockEntity::new, TV, RED_TV, BROWN_TV); - public static final RadioBlock RADIO = new RadioBlock(); + public static final RadioReceiverBlock RADIO_RECEIVER = new RadioReceiverBlock(); public static final SwitchBlock SWITCH = new SwitchBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).notSolid().pistonBehavior(PistonBehavior.DESTROY).strength(1f, 2f).mapColor(MapColor.TERRACOTTA_WHITE)); public static final LampBlock LAMP = new LampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.LANTERN).strength(1f, 1.5f).mapColor(MapColor.WHITE)); @@ -72,7 +71,7 @@ public class NSE_Custom extends NSE_BaseRegistration { registerBlock("tv", () -> TV, NSE_CUSTOM_TAB); registerBlock("red_tv", () -> RED_TV, NSE_CUSTOM_TAB); registerBlock("brown_tv", () -> BROWN_TV, NSE_CUSTOM_TAB); - registerBlock("radio", () -> RADIO, NSE_CUSTOM_TAB); + registerBlock("radio_receiver", () -> RADIO_RECEIVER, NSE_CUSTOM_TAB); registerBlock("lamp", () -> LAMP, NSE_CUSTOM_TAB); registerBlock("light_bulb", () -> LIGHT_BULB, NSE_CUSTOM_TAB); registerBlock("ceiling_fan", () -> CEILING_FAN, NSE_CUSTOM_TAB); diff --git a/src/main/resources/assets/new_soviet/textures/block/industrial/industrial lamps/lamp_off.json b/src/main/resources/assets/new_soviet/textures/block/industrial/lamps/lamp_off.json similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/industrial/industrial lamps/lamp_off.json rename to src/main/resources/assets/new_soviet/textures/block/industrial/lamps/lamp_off.json