From be4d1b5af86ec5c7cfaca59cd47e8320108685dc Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Mon, 4 Sep 2023 09:49:47 +0300 Subject: [PATCH] Minor datagen fix and lamp package --- src/main/generated/data/minecraft/tags/blocks/slabs.json | 3 ++- src/main/generated/data/minecraft/tags/blocks/stairs.json | 3 ++- src/main/java/su/a71/new_soviet/DataGeneration.java | 8 ++++++-- .../su/a71/new_soviet/blocks/{ => lamps}/LampBlock.java | 2 +- .../new_soviet/blocks/{ => lamps}/LightBulbLampBlock.java | 4 ++-- .../a71/new_soviet/blocks/{ => lamps}/TableLampBlock.java | 3 ++- .../new_soviet/blocks/{ => lamps}/VintageLampBlock.java | 3 ++- .../java/su/a71/new_soviet/registration/NSE_Custom.java | 3 +++ 8 files changed, 20 insertions(+), 9 deletions(-) rename src/main/java/su/a71/new_soviet/blocks/{ => lamps}/LampBlock.java (99%) rename src/main/java/su/a71/new_soviet/blocks/{ => lamps}/LightBulbLampBlock.java (98%) rename src/main/java/su/a71/new_soviet/blocks/{ => lamps}/TableLampBlock.java (94%) rename src/main/java/su/a71/new_soviet/blocks/{ => lamps}/VintageLampBlock.java (90%) diff --git a/src/main/generated/data/minecraft/tags/blocks/slabs.json b/src/main/generated/data/minecraft/tags/blocks/slabs.json index 010ff19..c86206c 100644 --- a/src/main/generated/data/minecraft/tags/blocks/slabs.json +++ b/src/main/generated/data/minecraft/tags/blocks/slabs.json @@ -101,6 +101,7 @@ "new_soviet:gray_linoleum_slab", "new_soviet:orange_linoleum_slab", "new_soviet:brown_linoleum_slab", - "new_soviet:cyan_linoleum_slab" + "new_soviet:cyan_linoleum_slab", + "new_soviet:metal_plating_slab" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/blocks/stairs.json b/src/main/generated/data/minecraft/tags/blocks/stairs.json index f3f722f..67a5621 100644 --- a/src/main/generated/data/minecraft/tags/blocks/stairs.json +++ b/src/main/generated/data/minecraft/tags/blocks/stairs.json @@ -101,6 +101,7 @@ "new_soviet:gray_linoleum_stairs", "new_soviet:orange_linoleum_stairs", "new_soviet:brown_linoleum_stairs", - "new_soviet:cyan_linoleum_stairs" + "new_soviet:cyan_linoleum_stairs", + "new_soviet:metal_plating_stairs" ] } \ 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 5c69398..5533ab5 100644 --- a/src/main/java/su/a71/new_soviet/DataGeneration.java +++ b/src/main/java/su/a71/new_soviet/DataGeneration.java @@ -953,7 +953,8 @@ public class DataGeneration implements DataGeneratorEntrypoint { .add(NSE_Blocks.GRAY_LINOLEUM_STAIRS) .add(NSE_Blocks.ORANGE_LINOLEUM_STAIRS) .add(NSE_Blocks.BROWN_LINOLEUM_STAIRS) - .add(NSE_Blocks.CYAN_LINOLEUM_STAIRS); + .add(NSE_Blocks.CYAN_LINOLEUM_STAIRS) + .add(NSE_Blocks.METAL_PLATING_STAIRS); getOrCreateTagBuilder(BlockTags.SLABS) .add(NSE_Blocks.SAND_TILES_SLAB) @@ -1056,7 +1057,8 @@ public class DataGeneration implements DataGeneratorEntrypoint { .add(NSE_Blocks.GRAY_LINOLEUM_SLAB) .add(NSE_Blocks.ORANGE_LINOLEUM_SLAB) .add(NSE_Blocks.BROWN_LINOLEUM_SLAB) - .add(NSE_Blocks.CYAN_LINOLEUM_SLAB); + .add(NSE_Blocks.CYAN_LINOLEUM_SLAB) + .add(NSE_Blocks.METAL_PLATING_SLAB); getOrCreateTagBuilder(BlockTags.WOODEN_STAIRS) .add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_STAIRS) @@ -1140,6 +1142,7 @@ public class DataGeneration implements DataGeneratorEntrypoint { } private void diceRecipe(Consumer exporter, ItemConvertible dice) { + // why can't we use BlockTags.WOODEN_BUTTONS var buttons = Util.make(Lists.newArrayList(), list -> { list.add(Blocks.OAK_BUTTON); list.add(Blocks.BAMBOO_BUTTON); @@ -1778,6 +1781,7 @@ public class DataGeneration implements DataGeneratorEntrypoint { @Override public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) { +// BlockStateModelGenerator.createWallBlockState() // BlockStateModelGenerator.createStairsBlockState(NSE_Blocks.SAND_TILES_STAIRS, new Identifier(NewSoviet.MOD_ID, "sand_tiles_stairs")); } diff --git a/src/main/java/su/a71/new_soviet/blocks/LampBlock.java b/src/main/java/su/a71/new_soviet/blocks/lamps/LampBlock.java similarity index 99% rename from src/main/java/su/a71/new_soviet/blocks/LampBlock.java rename to src/main/java/su/a71/new_soviet/blocks/lamps/LampBlock.java index 0e4ed38..7d00e96 100644 --- a/src/main/java/su/a71/new_soviet/blocks/LampBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/lamps/LampBlock.java @@ -1,4 +1,4 @@ -package su.a71.new_soviet.blocks; +package su.a71.new_soviet.blocks.lamps; import net.minecraft.block.*; import net.minecraft.entity.ai.pathing.NavigationType; diff --git a/src/main/java/su/a71/new_soviet/blocks/LightBulbLampBlock.java b/src/main/java/su/a71/new_soviet/blocks/lamps/LightBulbLampBlock.java similarity index 98% rename from src/main/java/su/a71/new_soviet/blocks/LightBulbLampBlock.java rename to src/main/java/su/a71/new_soviet/blocks/lamps/LightBulbLampBlock.java index d51ef5a..a286962 100644 --- a/src/main/java/su/a71/new_soviet/blocks/LightBulbLampBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/lamps/LightBulbLampBlock.java @@ -1,4 +1,4 @@ -package su.a71.new_soviet.blocks; +package su.a71.new_soviet.blocks.lamps; import net.minecraft.block.*; import net.minecraft.text.Text; @@ -23,7 +23,7 @@ import net.minecraft.world.WorldView; import org.jetbrains.annotations.Nullable; import su.a71.new_soviet.NewSoviet; -import su.a71.new_soviet.registration.NSE_Custom; +import su.a71.new_soviet.blocks.lamps.LampBlock; import su.a71.new_soviet.registration.NSE_Items; import su.a71.new_soviet.registration.NSE_Sounds; diff --git a/src/main/java/su/a71/new_soviet/blocks/TableLampBlock.java b/src/main/java/su/a71/new_soviet/blocks/lamps/TableLampBlock.java similarity index 94% rename from src/main/java/su/a71/new_soviet/blocks/TableLampBlock.java rename to src/main/java/su/a71/new_soviet/blocks/lamps/TableLampBlock.java index 2068aee..7f215fe 100644 --- a/src/main/java/su/a71/new_soviet/blocks/TableLampBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/lamps/TableLampBlock.java @@ -1,4 +1,4 @@ -package su.a71.new_soviet.blocks; +package su.a71.new_soviet.blocks.lamps; import net.minecraft.block.*; import net.minecraft.util.math.BlockPos; @@ -7,6 +7,7 @@ import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; import net.minecraft.world.WorldView; +import su.a71.new_soviet.blocks.lamps.LampBlock; public class TableLampBlock extends LampBlock { protected final VoxelShape SHAPE = getStandingShape();; diff --git a/src/main/java/su/a71/new_soviet/blocks/VintageLampBlock.java b/src/main/java/su/a71/new_soviet/blocks/lamps/VintageLampBlock.java similarity index 90% rename from src/main/java/su/a71/new_soviet/blocks/VintageLampBlock.java rename to src/main/java/su/a71/new_soviet/blocks/lamps/VintageLampBlock.java index 3ff4ea7..71bf48f 100644 --- a/src/main/java/su/a71/new_soviet/blocks/VintageLampBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/lamps/VintageLampBlock.java @@ -1,7 +1,8 @@ -package su.a71.new_soviet.blocks; +package su.a71.new_soviet.blocks.lamps; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; +import su.a71.new_soviet.blocks.lamps.TableLampBlock; public class VintageLampBlock extends TableLampBlock { public VintageLampBlock(Settings settings) { 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 905fa86..0297d87 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 @@ -19,6 +19,9 @@ import net.minecraft.util.Identifier; import net.minecraft.util.shape.VoxelShapes; import su.a71.new_soviet.NewSoviet; import su.a71.new_soviet.blocks.*; +import su.a71.new_soviet.blocks.lamps.LightBulbLampBlock; +import su.a71.new_soviet.blocks.lamps.TableLampBlock; +import su.a71.new_soviet.blocks.lamps.VintageLampBlock; import su.a71.new_soviet.entity.TVBlockEntity; public class NSE_Custom extends NSE_BaseRegistration {