From 60c97afe50e84fbdfd74c14797347c8aeb209fc4 Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Sun, 3 Sep 2023 16:38:31 +0300 Subject: [PATCH] Improve lamp UX --- TODO.md | 1 + .../generated/data/minecraft/tags/blocks/mineable/axe.json | 3 ++- .../data/minecraft/tags/blocks/mineable/pickaxe.json | 4 +++- src/main/java/su/a71/new_soviet/DataGeneration.java | 7 +++++-- .../java/su/a71/new_soviet/registration/NSE_Custom.java | 7 +++---- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/TODO.md b/TODO.md index 4d247c1..f96eaff 100644 --- a/TODO.md +++ b/TODO.md @@ -12,6 +12,7 @@ * Add achievement criterion for dice and advancements * PO2 wall (fix) * What's switch type 2? +* Populate blocktags e.g. PLANKS === ACHIEVEMENTS === Kolkhoz warrior - kill a zombie, skeleton, creeper and spider with a sickle \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json b/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json index c4385b3..3a380e4 100644 --- a/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json @@ -89,6 +89,7 @@ "new_soviet:brown_linoleum_stairs", "new_soviet:brown_linoleum_slab", "new_soviet:cyan_linoleum_stairs", - "new_soviet:cyan_linoleum_slab" + "new_soviet:cyan_linoleum_slab", + "new_soviet:table_lamp" ] } \ No newline at end of file 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 3d4896d..6ac3d2f 100644 --- a/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -267,6 +267,8 @@ "new_soviet:nii_floor_stairs", "new_soviet:nii_floor_slab", "new_soviet:metal_plating_stairs", - "new_soviet:metal_plating_slab" + "new_soviet:metal_plating_slab", + "new_soviet:vintage_lamp", + "new_soviet:light_bulb_lamp" ] } \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/DataGeneration.java b/src/main/java/su/a71/new_soviet/DataGeneration.java index 2131c86..224e0c6 100644 --- a/src/main/java/su/a71/new_soviet/DataGeneration.java +++ b/src/main/java/su/a71/new_soviet/DataGeneration.java @@ -715,7 +715,9 @@ public class DataGeneration implements DataGeneratorEntrypoint { .add(NSE_Blocks.NII_FLOOR_STAIRS) .add(NSE_Blocks.NII_FLOOR_SLAB) .add(NSE_Blocks.METAL_PLATING_STAIRS) - .add(NSE_Blocks.METAL_PLATING_SLAB); + .add(NSE_Blocks.METAL_PLATING_SLAB) + .add(NSE_Custom.VINTAGE_LAMP) + .add(NSE_Custom.LIGHT_BULB_LAMP); // Blocks mined with an axe getOrCreateTagBuilder(BlockTags.AXE_MINEABLE) @@ -807,7 +809,8 @@ public class DataGeneration implements DataGeneratorEntrypoint { .add(NSE_Blocks.BROWN_LINOLEUM_STAIRS) .add(NSE_Blocks.BROWN_LINOLEUM_SLAB) .add(NSE_Blocks.CYAN_LINOLEUM_STAIRS) - .add(NSE_Blocks.CYAN_LINOLEUM_SLAB); + .add(NSE_Blocks.CYAN_LINOLEUM_SLAB) + .add(NSE_Custom.TABLE_LAMP); getOrCreateTagBuilder(NSE_Tags.Blocks.RAKE_MINEABLE) .add(NSE_Blocks.MEAT) 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 34f9ffb..905fa86 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 @@ -12,7 +12,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.sound.BlockSoundGroup; -import net.minecraft.sound.SoundEvent; import net.minecraft.text.Text; import net.minecraft.util.DyeColor; import net.minecraft.util.Identifier; @@ -31,9 +30,9 @@ public class NSE_Custom extends NSE_BaseRegistration { 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 TableLampBlock TABLE_LAMP = new TableLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.LANTERN).strength(1f, 1.5f).mapColor(MapColor.WHITE)); - public static final TableLampBlock VINTAGE_LAMP = new VintageLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.LANTERN).strength(1f, 1.5f).mapColor(MapColor.WHITE)); - public static final LightBulbLampBlock LIGHT_BULB_LAMP = new LightBulbLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.GLASS).strength(1f, 1.5f).mapColor(MapColor.WHITE)); + public static final TableLampBlock TABLE_LAMP = new TableLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD).strength(0.9f, 1.5f).mapColor(MapColor.WHITE)); + public static final TableLampBlock VINTAGE_LAMP = new VintageLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).strength(0.9f, 1.5f).mapColor(MapColor.WHITE)); + public static final LightBulbLampBlock LIGHT_BULB_LAMP = new LightBulbLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.GLASS).strength(0.9f, 1.5f).mapColor(MapColor.WHITE).requiresTool()); public static final CeilingFanBlock CEILING_FAN = new CeilingFanBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).strength(1f, 1.5f).mapColor(MapColor.WHITE));