Ethyl/New-Soviet-Era
Ethyl/New-Soviet-Era
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve lamp UX

Browse source
This commit is contained in:
Andrew-71 2023-09-03 16:38:31 +03:00
parent 37e3a8c2db
commit 60c97afe50
5 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
TODO.md
View file

@ -12,6 +12,7 @@
* Add achievement criterion for dice and advancements * Add achievement criterion for dice and advancements
* PO2 wall (fix) * PO2 wall (fix)
* What's switch type 2? * What's switch type 2?
* Populate blocktags e.g. PLANKS
=== ACHIEVEMENTS === === ACHIEVEMENTS ===
Kolkhoz warrior - kill a zombie, skeleton, creeper and spider with a sickle Kolkhoz warrior - kill a zombie, skeleton, creeper and spider with a sickle

3
src/main/generated/data/minecraft/tags/blocks/mineable/axe.json
View file

@ -89,6 +89,7 @@
"new_soviet:brown_linoleum_stairs", "new_soviet:brown_linoleum_stairs",
"new_soviet:brown_linoleum_slab", "new_soviet:brown_linoleum_slab",
"new_soviet:cyan_linoleum_stairs", "new_soviet:cyan_linoleum_stairs",
"new_soviet:cyan_linoleum_slab" "new_soviet:cyan_linoleum_slab",
"new_soviet:table_lamp"
] ]
} }

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

@ -267,6 +267,8 @@
"new_soviet:nii_floor_stairs", "new_soviet:nii_floor_stairs",
"new_soviet:nii_floor_slab", "new_soviet:nii_floor_slab",
"new_soviet:metal_plating_stairs", "new_soviet:metal_plating_stairs",
"new_soviet:metal_plating_slab" "new_soviet:metal_plating_slab",
"new_soviet:vintage_lamp",
"new_soviet:light_bulb_lamp"
] ]
} }

7
src/main/java/su/a71/new_soviet/DataGeneration.java
View file

@ -715,7 +715,9 @@ public class DataGeneration implements DataGeneratorEntrypoint {
.add(NSE_Blocks.NII_FLOOR_STAIRS) .add(NSE_Blocks.NII_FLOOR_STAIRS)
.add(NSE_Blocks.NII_FLOOR_SLAB) .add(NSE_Blocks.NII_FLOOR_SLAB)
.add(NSE_Blocks.METAL_PLATING_STAIRS) .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 // Blocks mined with an axe
getOrCreateTagBuilder(BlockTags.AXE_MINEABLE) getOrCreateTagBuilder(BlockTags.AXE_MINEABLE)
@ -807,7 +809,8 @@ public class DataGeneration implements DataGeneratorEntrypoint {
.add(NSE_Blocks.BROWN_LINOLEUM_STAIRS) .add(NSE_Blocks.BROWN_LINOLEUM_STAIRS)
.add(NSE_Blocks.BROWN_LINOLEUM_SLAB) .add(NSE_Blocks.BROWN_LINOLEUM_SLAB)
.add(NSE_Blocks.CYAN_LINOLEUM_STAIRS) .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) getOrCreateTagBuilder(NSE_Tags.Blocks.RAKE_MINEABLE)
.add(NSE_Blocks.MEAT) .add(NSE_Blocks.MEAT)

7
src/main/java/su/a71/new_soviet/registration/NSE_Custom.java
View file

@ -12,7 +12,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.registry.Registries; import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry; import net.minecraft.registry.Registry;
import net.minecraft.sound.BlockSoundGroup; import net.minecraft.sound.BlockSoundGroup;
import net.minecraft.sound.SoundEvent;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.util.DyeColor; import net.minecraft.util.DyeColor;
import net.minecraft.util.Identifier; 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 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 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 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.LANTERN).strength(1f, 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(1f, 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)); public static final CeilingFanBlock CEILING_FAN = new CeilingFanBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).strength(1f, 1.5f).mapColor(MapColor.WHITE));