From 6192661fcb794348d1e6ca7f473acef9f6e6b8b6 Mon Sep 17 00:00:00 2001 From: warior456 Date: Mon, 5 Feb 2024 20:44:53 +0100 Subject: [PATCH] added all model and blockstates files needed for penebrium blocks (at least I hope) bug: penebrium shroom stem invisible --- .../blockstates/penebrium_shroom_block.json | 121 +++++++++++++++++- .../blockstates/penebrium_spore_block.json | 121 +++++++++++++++++- .../models/block/penebrium_shroom_block.json | 4 +- .../penebrium_shroom_block_inventory.json | 6 + .../models/block/penebrium_spore_block.json | 4 +- .../penebrium_spore_block_inventory.json | 6 + .../models/item/penebrium_shroom_block.json | 2 +- .../models/item/penebrium_spore_block.json | 2 +- .../net/ugi/sculk_depths/block/ModBlocks.java | 6 +- .../sculk_depths/block/custom/SporeBlock.java | 3 +- .../datagen/ModModelProvider.java | 6 +- .../blockstates/penebrium_shroom.json | 7 + .../models/block/penebrium_shroom.json | 6 + .../models/block/penebrium_stem.json | 6 + .../block/penebrium_stem_inventory.json | 6 + .../models/item/penebrium_shroom.json | 6 + .../models/item/penebrium_shroom_stem.json | 3 + 17 files changed, 294 insertions(+), 21 deletions(-) create mode 100644 src/main/generated/assets/sculk_depths/models/block/penebrium_shroom_block_inventory.json create mode 100644 src/main/generated/assets/sculk_depths/models/block/penebrium_spore_block_inventory.json create mode 100644 src/main/resources/assets/sculk_depths/blockstates/penebrium_shroom.json create mode 100644 src/main/resources/assets/sculk_depths/models/block/penebrium_shroom.json create mode 100644 src/main/resources/assets/sculk_depths/models/block/penebrium_stem.json create mode 100644 src/main/resources/assets/sculk_depths/models/block/penebrium_stem_inventory.json create mode 100644 src/main/resources/assets/sculk_depths/models/item/penebrium_shroom.json create mode 100644 src/main/resources/assets/sculk_depths/models/item/penebrium_shroom_stem.json diff --git a/src/main/generated/assets/sculk_depths/blockstates/penebrium_shroom_block.json b/src/main/generated/assets/sculk_depths/blockstates/penebrium_shroom_block.json index 7224744f..c32e5b70 100644 --- a/src/main/generated/assets/sculk_depths/blockstates/penebrium_shroom_block.json +++ b/src/main/generated/assets/sculk_depths/blockstates/penebrium_shroom_block.json @@ -1,7 +1,120 @@ { - "variants": { - "": { - "model": "sculk_depths:block/penebrium_shroom_block" + "multipart": [ + { + "apply": { + "model": "sculk_depths:block/penebrium_shroom_block" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "sculk_depths:block/penebrium_shroom_block", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "sculk_depths:block/penebrium_shroom_block", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "sculk_depths:block/penebrium_shroom_block", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "sculk_depths:block/penebrium_shroom_block", + "uvlock": true, + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "sculk_depths:block/penebrium_shroom_block", + "uvlock": true, + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "minecraft:block/mushroom_block_inside" + }, + "when": { + "north": "false" + } + }, + { + "apply": { + "model": "minecraft:block/mushroom_block_inside", + "uvlock": false, + "y": 90 + }, + "when": { + "east": "false" + } + }, + { + "apply": { + "model": "minecraft:block/mushroom_block_inside", + "uvlock": false, + "y": 180 + }, + "when": { + "south": "false" + } + }, + { + "apply": { + "model": "minecraft:block/mushroom_block_inside", + "uvlock": false, + "y": 270 + }, + "when": { + "west": "false" + } + }, + { + "apply": { + "model": "minecraft:block/mushroom_block_inside", + "uvlock": false, + "x": 270 + }, + "when": { + "up": "false" + } + }, + { + "apply": { + "model": "minecraft:block/mushroom_block_inside", + "uvlock": false, + "x": 90 + }, + "when": { + "down": "false" + } } - } + ] } \ No newline at end of file diff --git a/src/main/generated/assets/sculk_depths/blockstates/penebrium_spore_block.json b/src/main/generated/assets/sculk_depths/blockstates/penebrium_spore_block.json index f477b3fc..49e111cd 100644 --- a/src/main/generated/assets/sculk_depths/blockstates/penebrium_spore_block.json +++ b/src/main/generated/assets/sculk_depths/blockstates/penebrium_spore_block.json @@ -1,7 +1,120 @@ { - "variants": { - "": { - "model": "sculk_depths:block/penebrium_spore_block" + "multipart": [ + { + "apply": { + "model": "sculk_depths:block/penebrium_spore_block" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "sculk_depths:block/penebrium_spore_block", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "sculk_depths:block/penebrium_spore_block", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "sculk_depths:block/penebrium_spore_block", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "sculk_depths:block/penebrium_spore_block", + "uvlock": true, + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "sculk_depths:block/penebrium_spore_block", + "uvlock": true, + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "minecraft:block/mushroom_block_inside" + }, + "when": { + "north": "false" + } + }, + { + "apply": { + "model": "minecraft:block/mushroom_block_inside", + "uvlock": false, + "y": 90 + }, + "when": { + "east": "false" + } + }, + { + "apply": { + "model": "minecraft:block/mushroom_block_inside", + "uvlock": false, + "y": 180 + }, + "when": { + "south": "false" + } + }, + { + "apply": { + "model": "minecraft:block/mushroom_block_inside", + "uvlock": false, + "y": 270 + }, + "when": { + "west": "false" + } + }, + { + "apply": { + "model": "minecraft:block/mushroom_block_inside", + "uvlock": false, + "x": 270 + }, + "when": { + "up": "false" + } + }, + { + "apply": { + "model": "minecraft:block/mushroom_block_inside", + "uvlock": false, + "x": 90 + }, + "when": { + "down": "false" + } } - } + ] } \ No newline at end of file diff --git a/src/main/generated/assets/sculk_depths/models/block/penebrium_shroom_block.json b/src/main/generated/assets/sculk_depths/models/block/penebrium_shroom_block.json index c8e41f8c..71596eb9 100644 --- a/src/main/generated/assets/sculk_depths/models/block/penebrium_shroom_block.json +++ b/src/main/generated/assets/sculk_depths/models/block/penebrium_shroom_block.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "minecraft:block/template_single_face", "textures": { - "all": "sculk_depths:block/penebrium_shroom_block" + "texture": "sculk_depths:block/penebrium_shroom_block" } } \ No newline at end of file diff --git a/src/main/generated/assets/sculk_depths/models/block/penebrium_shroom_block_inventory.json b/src/main/generated/assets/sculk_depths/models/block/penebrium_shroom_block_inventory.json new file mode 100644 index 00000000..c8e41f8c --- /dev/null +++ b/src/main/generated/assets/sculk_depths/models/block/penebrium_shroom_block_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "sculk_depths:block/penebrium_shroom_block" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/sculk_depths/models/block/penebrium_spore_block.json b/src/main/generated/assets/sculk_depths/models/block/penebrium_spore_block.json index f80dfa44..b7503eea 100644 --- a/src/main/generated/assets/sculk_depths/models/block/penebrium_spore_block.json +++ b/src/main/generated/assets/sculk_depths/models/block/penebrium_spore_block.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "minecraft:block/template_single_face", "textures": { - "all": "sculk_depths:block/penebrium_spore_block" + "texture": "sculk_depths:block/penebrium_spore_block" } } \ No newline at end of file diff --git a/src/main/generated/assets/sculk_depths/models/block/penebrium_spore_block_inventory.json b/src/main/generated/assets/sculk_depths/models/block/penebrium_spore_block_inventory.json new file mode 100644 index 00000000..f80dfa44 --- /dev/null +++ b/src/main/generated/assets/sculk_depths/models/block/penebrium_spore_block_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "sculk_depths:block/penebrium_spore_block" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/sculk_depths/models/item/penebrium_shroom_block.json b/src/main/generated/assets/sculk_depths/models/item/penebrium_shroom_block.json index 276dcb83..60b1ac6f 100644 --- a/src/main/generated/assets/sculk_depths/models/item/penebrium_shroom_block.json +++ b/src/main/generated/assets/sculk_depths/models/item/penebrium_shroom_block.json @@ -1,3 +1,3 @@ { - "parent": "sculk_depths:block/penebrium_shroom_block" + "parent": "sculk_depths:block/penebrium_shroom_block_inventory" } \ No newline at end of file diff --git a/src/main/generated/assets/sculk_depths/models/item/penebrium_spore_block.json b/src/main/generated/assets/sculk_depths/models/item/penebrium_spore_block.json index 0ce32924..959b4d5a 100644 --- a/src/main/generated/assets/sculk_depths/models/item/penebrium_spore_block.json +++ b/src/main/generated/assets/sculk_depths/models/item/penebrium_spore_block.json @@ -1,3 +1,3 @@ { - "parent": "sculk_depths:block/penebrium_spore_block" + "parent": "sculk_depths:block/penebrium_spore_block_inventory" } \ No newline at end of file diff --git a/src/main/java/net/ugi/sculk_depths/block/ModBlocks.java b/src/main/java/net/ugi/sculk_depths/block/ModBlocks.java index 83ca0504..782e9922 100644 --- a/src/main/java/net/ugi/sculk_depths/block/ModBlocks.java +++ b/src/main/java/net/ugi/sculk_depths/block/ModBlocks.java @@ -368,16 +368,16 @@ public class ModBlocks { new MushroomPlantBlock(FabricBlockSettings.copyOf(Blocks.MUSHROOM_STEM).luminance(5).emissiveLighting(AbstractBlock.AbstractBlockState::isFullCube).noCollision(), ModConfiguredFeatures.PENEBRIUM_SHROOM), ModItemGroup.SCULK_DEPTHS); public static final Block PENEBRIUM_SHROOM_BLOCK = registerBlock("penebrium_shroom_block", - new CrystalBlock(DyeColor.WHITE, FabricBlockSettings.copyOf(Blocks.MUSHROOM_STEM).luminance(5).emissiveLighting(AbstractBlock.AbstractBlockState::isFullCube)), ModItemGroup.SCULK_DEPTHS); + new MushroomBlock( FabricBlockSettings.copyOf(Blocks.MUSHROOM_STEM).luminance(5).emissiveLighting(AbstractBlock.AbstractBlockState::isFullCube)), ModItemGroup.SCULK_DEPTHS); public static final Block PENEBRIUM_SHROOM_STEM = registerBlock("penebrium_shroom_stem", - new MushroomBlock(FabricBlockSettings.copyOf(Blocks.MUSHROOM_STEM).nonOpaque()), ModItemGroup.SCULK_DEPTHS); + new PillarBlock(FabricBlockSettings.copyOf(Blocks.MUSHROOM_STEM).nonOpaque()), ModItemGroup.SCULK_DEPTHS); public static final Block PENEBRIUM_SPORE_BLOCK = registerBlock("penebrium_spore_block", new SporeBlock(FabricBlockSettings.copyOf(Blocks.MUSHROOM_STEM).luminance(5).emissiveLighting(AbstractBlock.AbstractBlockState::isFullCube)), ModItemGroup.SCULK_DEPTHS); //misc - public static final CustomPortalBlock SCULK_DEPTHS_PORTAL = (CustomPortalBlock) registerBlock("sculk_depths_portal", + public static final CustomPortalBlock SCULK_DEPTHS_PORTAL = (CustomPortalBlock) registerBlockWithoutBlockItem("sculk_depths_portal", new CustomPortalBlock(FabricBlockSettings.copyOf(Blocks.NETHER_PORTAL).luminance(6).dropsNothing().noCollision().strength(-1.0f,3600000.0f)),ModItemGroup.SCULK_DEPTHS ); //fluids diff --git a/src/main/java/net/ugi/sculk_depths/block/custom/SporeBlock.java b/src/main/java/net/ugi/sculk_depths/block/custom/SporeBlock.java index 6bef1dbc..1b016acf 100644 --- a/src/main/java/net/ugi/sculk_depths/block/custom/SporeBlock.java +++ b/src/main/java/net/ugi/sculk_depths/block/custom/SporeBlock.java @@ -2,6 +2,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.MushroomBlock; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.function.BooleanBiFunction; import net.minecraft.util.math.BlockPos; @@ -24,7 +25,7 @@ import java.util.function.BiPredicate; -public class SporeBlock extends Block { +public class SporeBlock extends MushroomBlock { private static final VoxelShape DRIP_COLLISION_SHAPE = Block.createCuboidShape(6.0, 0.0, 6.0, 10.0, 16.0, 10.0); diff --git a/src/main/java/net/ugi/sculk_depths/datagen/ModModelProvider.java b/src/main/java/net/ugi/sculk_depths/datagen/ModModelProvider.java index 29d39204..315de4e6 100644 --- a/src/main/java/net/ugi/sculk_depths/datagen/ModModelProvider.java +++ b/src/main/java/net/ugi/sculk_depths/datagen/ModModelProvider.java @@ -23,10 +23,10 @@ public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGen BlockStateModelGenerator.BlockTexturePool driedValtroxPlankPool = blockStateModelGenerator.registerCubeAllModelTexturePool(ModBlocks.DRIED_VALTROX_PLANKS); BlockStateModelGenerator.BlockTexturePool petrifiedValtroxPlankPool = blockStateModelGenerator.registerCubeAllModelTexturePool(ModBlocks.PETRIFIED_VALTROX_SLATES); - blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.PENEBRIUM_SHROOM_BLOCK); - blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.PENEBRIUM_SPORE_BLOCK); - blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.QUAZARITH_BLOCK); + blockStateModelGenerator.registerMushroomBlock(ModBlocks.PENEBRIUM_SHROOM_BLOCK); + blockStateModelGenerator.registerMushroomBlock(ModBlocks.PENEBRIUM_SPORE_BLOCK); + valtroxPlankPool.fenceGate(ModBlocks.VALTROX_FENCE_GATE); valtroxPlankPool.family(BlockFamilies.register(ModBlocks.VALTROX_PLANKS).sign(ModBlocks.VALTROX_SIGN, ModBlocks.VALTROX_WALL_SIGN).build()); diff --git a/src/main/resources/assets/sculk_depths/blockstates/penebrium_shroom.json b/src/main/resources/assets/sculk_depths/blockstates/penebrium_shroom.json new file mode 100644 index 00000000..b828864d --- /dev/null +++ b/src/main/resources/assets/sculk_depths/blockstates/penebrium_shroom.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "sculk_depths:block/penebrium_shroom" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/penebrium_shroom.json b/src/main/resources/assets/sculk_depths/models/block/penebrium_shroom.json new file mode 100644 index 00000000..e8601c65 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/penebrium_shroom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "sculk_depths:block/penebrium_shroom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/penebrium_stem.json b/src/main/resources/assets/sculk_depths/models/block/penebrium_stem.json new file mode 100644 index 00000000..0a6c052d --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/penebrium_stem.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_single_face", + "textures": { + "texture": "sculk_depths:block/penebrium_stem" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/penebrium_stem_inventory.json b/src/main/resources/assets/sculk_depths/models/block/penebrium_stem_inventory.json new file mode 100644 index 00000000..f7432a84 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/penebrium_stem_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "sculk_depths:block/penebrium_stem" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/item/penebrium_shroom.json b/src/main/resources/assets/sculk_depths/models/item/penebrium_shroom.json new file mode 100644 index 00000000..6a4a0153 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/item/penebrium_shroom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "sculk_depths:block/penebrium_shroom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/item/penebrium_shroom_stem.json b/src/main/resources/assets/sculk_depths/models/item/penebrium_shroom_stem.json new file mode 100644 index 00000000..ccc43979 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/item/penebrium_shroom_stem.json @@ -0,0 +1,3 @@ +{ + "parent": "sculk_depths:block/penebrium_shroom_stem_inventory" +} \ No newline at end of file