Skip to content

Commit

Permalink
removed duplicate block model files
Browse files Browse the repository at this point in the history
  • Loading branch information
NewJumper committed Jul 17, 2024
1 parent 83e7ce9 commit 5027753
Show file tree
Hide file tree
Showing 20 changed files with 371 additions and 385 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-04-04T16:14:06.0700519 Block States: deeperdarker
// 1.20.1 2024-07-16T23:50:04.9233576 Block States: deeperdarker
4394f02c270408be611b2f3ba7abfbfd658cb0ff assets/deeperdarker/blockstates/ancient_vase.json
165980177c5adcf470b9a08fe401e3bb1a4966f0 assets/deeperdarker/blockstates/blooming_moss_block.json
c90869597c5f9312912c741c7edfc5974762efd9 assets/deeperdarker/blockstates/blooming_sculk_stone.json
Expand Down Expand Up @@ -85,6 +85,7 @@ e3a2b0ee80440e02561977fb683ed85c20c7213a assets/deeperdarker/blockstates/gloomsl
99c4c0123d3b835f9d50ca2d4edeedbc828b7d8c assets/deeperdarker/blockstates/glowing_vines_plant.json
8d04af6163b6c126405fc108d9cf9cb0139e4f6f assets/deeperdarker/blockstates/ice_lily.json
59b37cfc48b764ed52f057a40cda85004285aaee assets/deeperdarker/blockstates/infested_sculk.json
7e116fed1fb2fb97fce8997e660600c739716c64 assets/deeperdarker/blockstates/otherside_portal.json
6197329be084d0e4d3258707fbf338c36432af98 assets/deeperdarker/blockstates/polished_gloomslate.json
20951991cf554e2bc584faa8491c276f52468f82 assets/deeperdarker/blockstates/polished_gloomslate_slab.json
40a3d843e4538b7e65d6fa9938c60809832b2b07 assets/deeperdarker/blockstates/polished_gloomslate_stairs.json
Expand Down Expand Up @@ -137,7 +138,6 @@ d7f5127b333b891bbfa97cee4414876fef5429d5 assets/deeperdarker/blockstates/smooth_
cd77cf222b98c8be42c87fdb85d89b1d30f963b5 assets/deeperdarker/blockstates/stripped_blooming_stem.json
e94fc45e791c65302fcc908ab5d32adc564c5e88 assets/deeperdarker/blockstates/stripped_echo_log.json
1482ba18bb49fe90f1bb3d0b7aec7963e6c0ac9f assets/deeperdarker/blockstates/stripped_echo_wood.json
690d24d273d0514954cb5395b0a6220314038cfd assets/deeperdarker/models/block/ancient_vase.json
5f6d78b44fd7067c2670c9e989ce03e4e9aac70f assets/deeperdarker/models/block/blooming_moss_block.json
416d91b16ee3ac223bea2e60faef786f20eb1fa8 assets/deeperdarker/models/block/blooming_sculk_stone.json
0c90c3f2270980d69f3a46e4826ab53ce84ec3f4 assets/deeperdarker/models/block/blooming_stem.json
Expand Down Expand Up @@ -294,18 +294,15 @@ f238842b328abeca410989b554d21d4ec5f44df3 assets/deeperdarker/models/block/glooms
1cf969dccb2aa0a8453861d78967bccd039f92b9 assets/deeperdarker/models/block/gloomslate_wall_post.json
78677663c269153318c262f2109b85093601189c assets/deeperdarker/models/block/gloomslate_wall_side.json
44ee5d45462ef3717657c2bff9ecf24a50d837c5 assets/deeperdarker/models/block/gloomslate_wall_side_tall.json
3e3889782b76f5d3d2ce5f47ef2b7e7ce81dfa19 assets/deeperdarker/models/block/gloomy_cactus.json
272248edfd0507c5be61290c5086ee576c56eaf4 assets/deeperdarker/models/block/gloomy_geyser.json
a4fd82de7cea7b4d869c660fe963505bd1dbce11 assets/deeperdarker/models/block/gloomy_grass.json
62f9bfc451122ed1f36f07e0aaef8a00c1a98f7a assets/deeperdarker/models/block/gloomy_sculk.json
0642410e641f7e588bef0f3afe712ce23ce455d4 assets/deeperdarker/models/block/glowing_flowers.json
235d69d1208eebc1926f742f2a9aef3d8e9541bc assets/deeperdarker/models/block/glowing_grass.json
fbc8c2c19c6917fd79691ae0a115990c5939ff86 assets/deeperdarker/models/block/glowing_roots.json
65a5ddca9059b91ab836e6a62a0fc7aa603dc44b assets/deeperdarker/models/block/glowing_roots_plant.json
a247b355f294e030d5b6f4efa7156577660b5364 assets/deeperdarker/models/block/glowing_vines.json
7cc7abb0216eda8a5a839b4156e2a8ce70865420 assets/deeperdarker/models/block/glowing_vines_plant.json
e639060500e1d49a0d9a50f95fc67f24e706dd33 assets/deeperdarker/models/block/glowing_vines_plant_berries.json
c5897e10739d01f15a2c6343dd05717d62966086 assets/deeperdarker/models/block/ice_lily.json
b9d3122e7eb15851e9dc6d930601aff03629ce89 assets/deeperdarker/models/block/polished_gloomslate.json
fb8457ff93c35f23a65ae63a157ada04bbf08244 assets/deeperdarker/models/block/polished_gloomslate_slab.json
185ddb561f46d2b73feb370ef7faf2b6ac5ecd5a assets/deeperdarker/models/block/polished_gloomslate_slab_top.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"variants": {
"axis=x": {
"model":"deeperdarker:block/otherside_portal_ns"
"model": "deeperdarker:block/otherside_portal_ns"
},
"axis=z": {
"model": "deeperdarker:block/otherside_portal_ew"
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.kyanite.deeperdarker.DeeperDarker;
import com.kyanite.deeperdarker.content.DDBlocks;
import com.kyanite.deeperdarker.content.blocks.OthersidePortalBlock;
import com.kyanite.deeperdarker.content.blocks.SculkJawBlock;
import com.kyanite.deeperdarker.content.blocks.vegetation.GlowingVinesPlantBlock;
import net.minecraft.core.Direction;
Expand Down Expand Up @@ -149,10 +150,10 @@ protected void registerStatesAndModels() {
simpleBlock(DDBlocks.GLOOMSLATE_LAPIS_ORE.get());
simpleBlock(DDBlocks.GLOOMSLATE_DIAMOND_ORE.get());

horizontalBlock(DDBlocks.GLOWING_FLOWERS.get(), models().withExistingParent(DDBlocks.GLOWING_FLOWERS.getId().getPath(), modLoc("flowers")).texture("flowers", blockLoc(DDBlocks.GLOWING_FLOWERS)).texture("stem", blockLoc(DDBlocks.GLOWING_FLOWERS, "stem")).renderType("cutout"));
horizontalBlock(DDBlocks.GLOWING_FLOWERS.get(), models().getExistingFile(blockLoc(DDBlocks.GLOWING_FLOWERS)));
simpleBlock(DDBlocks.GLOWING_GRASS.get(), models().cross(DDBlocks.GLOWING_GRASS.getId().getPath(), blockLoc(DDBlocks.GLOWING_GRASS)).renderType("cutout"));
simpleBlock(DDBlocks.GLOOMY_GRASS.get(), models().cross(DDBlocks.GLOOMY_GRASS.getId().getPath(), blockLoc(DDBlocks.GLOOMY_GRASS)).renderType("cutout"));
simpleBlock(DDBlocks.GLOOMY_CACTUS.get(), models().withExistingParent(DDBlocks.GLOOMY_CACTUS.getId().getPath(), modLoc("block/cube_cactus")).texture("side", blockLoc(DDBlocks.GLOOMY_CACTUS, "side")).texture("top", blockLoc(DDBlocks.GLOOMY_CACTUS, "top")));
simpleBlock(DDBlocks.GLOOMY_CACTUS.get(), models().getExistingFile(blockLoc(DDBlocks.GLOOMY_CACTUS)));
simpleBlock(DDBlocks.SCULK_TENDRILS.get(), models().cross(DDBlocks.SCULK_TENDRILS.getId().getPath(), blockLoc(DDBlocks.SCULK_TENDRILS)).renderType("cutout"));
simpleBlock(DDBlocks.SCULK_TENDRILS_PLANT.get(), models().cross(DDBlocks.SCULK_TENDRILS_PLANT.getId().getPath(), blockLoc(DDBlocks.SCULK_TENDRILS_PLANT)).renderType("cutout"));
simpleBlock(DDBlocks.SCULK_VINES.get(), models().cross(DDBlocks.SCULK_VINES.getId().getPath(), blockLoc(DDBlocks.SCULK_VINES)).renderType("cutout"));
Expand All @@ -162,14 +163,22 @@ protected void registerStatesAndModels() {
simpleBlock(DDBlocks.GLOWING_ROOTS_PLANT.get(), models().cross(DDBlocks.GLOWING_ROOTS_PLANT.getId().getPath(), blockLoc(DDBlocks.GLOWING_ROOTS_PLANT)).renderType("cutout"));
ModelFile noBerries = models().cross(DDBlocks.GLOWING_VINES_PLANT.getId().getPath(), blockLoc(DDBlocks.GLOWING_VINES_PLANT)).renderType("cutout");
ModelFile berries = models().cross(DDBlocks.GLOWING_VINES_PLANT.getId().getPath() + "_berries", blockLoc(DDBlocks.GLOWING_VINES_PLANT, "berries")).renderType("cutout");
getVariantBuilder(DDBlocks.GLOWING_VINES_PLANT.get()).partialState().with(GlowingVinesPlantBlock.BERRIES, false).modelForState().modelFile(noBerries).addModel().partialState().with(GlowingVinesPlantBlock.BERRIES, true).modelForState().modelFile(berries).addModel();
simpleBlock(DDBlocks.ICE_LILY.get(), models().withExistingParent(DDBlocks.ICE_LILY.getId().getPath(), modLoc("block/ice_waterlily")).texture("texture", blockLoc(DDBlocks.ICE_LILY)).texture("flower", modLoc("block/lily_flower")));
getVariantBuilder(DDBlocks.GLOWING_VINES_PLANT.get())
.partialState().with(GlowingVinesPlantBlock.BERRIES, false).modelForState().modelFile(noBerries).addModel()
.partialState().with(GlowingVinesPlantBlock.BERRIES, true).modelForState().modelFile(berries).addModel();
simpleBlock(DDBlocks.ICE_LILY.get(), models().getExistingFile(blockLoc(DDBlocks.ICE_LILY)));

simpleBlock(DDBlocks.ANCIENT_VASE.get(), models().withExistingParent(DDBlocks.ANCIENT_VASE.getId().getPath(), modLoc("block/vase")).texture("vase", blockLoc(DDBlocks.ANCIENT_VASE)));
simpleBlock(DDBlocks.INFESTED_SCULK.get(), cubeAll(Blocks.SCULK));
ModelFile jaw = models().cubeTop(DDBlocks.SCULK_JAW.getId().getPath(), blockLoc(DDBlocks.SCULK_JAW, "side"), blockLoc(DDBlocks.SCULK_JAW));
ModelFile jawBiting = models().cubeTop(DDBlocks.SCULK_JAW.getId().getPath() + "_biting", blockLoc(DDBlocks.SCULK_JAW, "side"), blockLoc(DDBlocks.SCULK_JAW, "biting"));
getVariantBuilder(DDBlocks.SCULK_JAW.get()).partialState().with(SculkJawBlock.BITING, false).modelForState().modelFile(jaw).addModel().partialState().with(SculkJawBlock.BITING, true).modelForState().modelFile(jawBiting).addModel();
getVariantBuilder(DDBlocks.SCULK_JAW.get())
.partialState().with(SculkJawBlock.BITING, false).modelForState().modelFile(jaw).addModel()
.partialState().with(SculkJawBlock.BITING, true).modelForState().modelFile(jawBiting).addModel();

simpleBlock(DDBlocks.ANCIENT_VASE.get(), models().getExistingFile(blockLoc(DDBlocks.ANCIENT_VASE)));
getVariantBuilder(DDBlocks.OTHERSIDE_PORTAL.get())
.partialState().with(OthersidePortalBlock.AXIS, Direction.Axis.X).modelForState().modelFile(models().getExistingFile(blockLoc(DDBlocks.OTHERSIDE_PORTAL, "ns"))).addModel()
.partialState().with(OthersidePortalBlock.AXIS, Direction.Axis.Z).modelForState().modelFile(models().getExistingFile(blockLoc(DDBlocks.OTHERSIDE_PORTAL, "ew"))).addModel();
}

private void stemBlock(RegistryObject<Block> block) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"parent": "block/block",
"render_type": "cutout",
"texture_size": [48, 48],
"textures": {
"vase": "deeperdarker:block/ancient_vase",
"particle": "#vase"
},
"elements": [
{
"from": [2, 1, 2],
"to": [14, 13, 14],
"faces": {
"north": {"uv": [0, 0, 4, 4], "texture": "#vase"},
"east": {"uv": [12, 0, 16, 4], "texture": "#vase"},
"south": {"uv": [8, 0, 12, 4], "texture": "#vase"},
"west": {"uv": [4, 0, 8, 4], "texture": "#vase"},
"up": {"uv": [4, 8, 0, 4], "texture": "#vase"},
"down": {"uv": [8, 4, 4, 8], "texture": "#vase"}
}
},
{
"from": [3, 0, 3],
"to": [13, 1, 13],
"faces": {
"north": {"uv": [0, 9.33333, 3.33334, 9.66666], "texture": "#vase"},
"east": {"uv": [3.33333, 9.66667, 6.66667, 10], "texture": "#vase"},
"south": {"uv": [0, 9.66667, 3.33334, 10], "texture": "#vase"},
"west": {"uv": [3.33333, 9.33333, 6.66667, 9.66666], "texture": "#vase"},
"up": {"uv": [3.33333, 13.33333, 0, 10], "texture": "#vase"},
"down": {"uv": [6.66666, 10, 3.33333, 13.33333], "texture": "#vase"}
}
},
{
"from": [4, 13, 4],
"to": [12, 16, 12],
"faces": {
"north": {"uv": [10.66667, 5.33333, 13.33334, 6.33333], "texture": "#vase"},
"east": {"uv": [13.33333, 6.33334, 16, 7.33334], "texture": "#vase"},
"south": {"uv": [10.66667, 6.33333, 13.33334, 7.33333], "texture": "#vase"},
"west": {"uv": [13.33333, 5.33333, 16, 6.25], "texture": "#vase"},
"up": {"uv": [13.33333, 7.33333, 10.66666, 10], "texture": "#vase"},
"down": {"uv": [16, 7.33333, 13.33333, 10], "texture": "#vase"}
}
}
]
}

This file was deleted.

106 changes: 0 additions & 106 deletions src/main/resources/assets/deeperdarker/models/block/flowers.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "block/block",
"render_type": "cutout",
"textures": {
"side": "deeperdarker:block/gloomy_cactus_side",
"top": "deeperdarker:block/gloomy_cactus_top",
"particle": "#top"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 14, 16],
"faces": {
"up": {"uv": [0, 0, 16, 16], "texture": "#top", "cullface": "up"},
"down": {"uv": [0, 0, 16, 16], "texture": "#top", "cullface": "down"}
}
},
{
"from": [0, 0, 1],
"to": [16, 14, 15],
"faces": {
"north": {"uv": [0, 2, 16, 16], "texture": "#side"},
"south": {"uv": [0, 2, 16, 16], "texture": "#side"}
}
},
{
"from": [1, 0, 0],
"to": [15, 14, 16],
"faces": {
"east": {"uv": [0, 2, 16, 16], "texture": "#side"},
"west": {"uv": [0, 2, 16, 16], "texture": "#side"}
}
}
]
}
Loading

0 comments on commit 5027753

Please sign in to comment.