Skip to content

Commit

Permalink
✨ xiaolongbao
Browse files Browse the repository at this point in the history
Signed-off-by: LocusAzzurro <[email protected]>
  • Loading branch information
LocusAzzurro committed Jul 30, 2023
1 parent fc6f016 commit 7834c8b
Show file tree
Hide file tree
Showing 18 changed files with 1,567 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/generated/resources/.cache/cache
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ a085e8def223fb7f5007d4edc3798c4ca6fe060f assets/ultramarine/blockstates/wooden_q
e8072fcfe238acc6cb2df48c4fdb765875d7c410 assets/ultramarine/blockstates/wooden_queti_edge.json
8ed7e276ebb25f447b088bc293392ef86e4e1d62 assets/ultramarine/blockstates/wooden_stool.json
9b26be793887b1e74daeb2ad7cec8d54f6dd76c2 assets/ultramarine/blockstates/woodworking_workbench.json
475b3f4d84d0e0d5f3bd4eadadc26f40c625eca6 assets/ultramarine/blockstates/xiaolongbao.json
e17be4899d412f7bcd4e7fbaf7cd240a205f274f assets/ultramarine/blockstates/yellow_and_green_fangxin_edge.json
90414d5715e7c0d360927af077c8988a6168d7a6 assets/ultramarine/blockstates/yellow_carved_fangxin_edge_pattern.json
6b6c2b13896f76e8a65278aef2119c4febdc601b assets/ultramarine/blockstates/yellow_carved_fangxin_pattern.json
Expand Down Expand Up @@ -991,6 +992,7 @@ b67815e2b51d6d6d1b4c1cffd07cacb5bd66f267 assets/ultramarine/models/item/wooden_p
a716289e7f27586ad14c188bf326b4f3305b0c5a assets/ultramarine/models/item/wooden_queti_edge.json
54efd79edcf78ccf9239a1250f59a1962b7caf61 assets/ultramarine/models/item/wooden_stool.json
c0c75429dadb07b01f6f00c445ce46057f1cd292 assets/ultramarine/models/item/woodworking_workbench.json
aa477e21ebc26b0ad47961759ca2fda8465aa2ad assets/ultramarine/models/item/xiaolongbao.json
f14c830e4cf389c400a973ae3ea933e21f9ed58e assets/ultramarine/models/item/xuan_paper.json
ba646edbbedc3b7d436375264a5024bf10cf8553 assets/ultramarine/models/item/yellow_and_green_fangxin_edge.json
d6a057354a423c26362280ddcbc091655e8cff23 assets/ultramarine/models/item/yellow_carved_fangxin_edge_pattern.json
Expand All @@ -1008,7 +1010,7 @@ e48e56ce7a08d5506893c975360626e425e808ea assets/ultramarine/models/item/yellow_s
67c3f3456e93f5361242cd02c815ee09b5824823 data/minecraft/advancements/recipes/decorations/white_candle.json
645284c5035f3bb0e95477cf7f70b5a9a5d5ac32 data/minecraft/recipes/white_candle.json
bb3cff8ef2b03825fc5bbeffb336436d70edcaa4 data/minecraft/tags/blocks/fences.json
28155bedd910a58dd0f1ce13e8c81603c7567a4f data/minecraft/tags/blocks/mineable/axe.json
cf950b371486794b68cbd17b132368152bcf0293 data/minecraft/tags/blocks/mineable/axe.json
133ea1a4ce05c3a4696a95395d626b3e0d5e861e data/minecraft/tags/blocks/mineable/hoe.json
2fa6af250add335a7b1ed07804549e2d9d12a577 data/minecraft/tags/blocks/mineable/pickaxe.json
17545dd0c9613eb0477c89b2b64307a497bc1d58 data/minecraft/tags/blocks/needs_iron_tool.json
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
{
"variants": {
"bites=0,facing=north": {
"model": "ultramarine:block/xiaolongbao_0",
"y": 180
},
"bites=1,facing=north": {
"model": "ultramarine:block/xiaolongbao_1",
"y": 180
},
"bites=2,facing=north": {
"model": "ultramarine:block/xiaolongbao_2",
"y": 180
},
"bites=3,facing=north": {
"model": "ultramarine:block/xiaolongbao_3",
"y": 180
},
"bites=4,facing=north": {
"model": "ultramarine:block/xiaolongbao_4",
"y": 180
},
"bites=5,facing=north": {
"model": "ultramarine:block/xiaolongbao_5",
"y": 180
},
"bites=6,facing=north": {
"model": "ultramarine:block/xiaolongbao_6",
"y": 180
},
"bites=7,facing=north": {
"model": "ultramarine:block/xiaolongbao_7",
"y": 180
},
"bites=8,facing=north": {
"model": "ultramarine:block/xiaolongbao_8",
"y": 180
},
"bites=0,facing=south": {
"model": "ultramarine:block/xiaolongbao_0"
},
"bites=1,facing=south": {
"model": "ultramarine:block/xiaolongbao_1"
},
"bites=2,facing=south": {
"model": "ultramarine:block/xiaolongbao_2"
},
"bites=3,facing=south": {
"model": "ultramarine:block/xiaolongbao_3"
},
"bites=4,facing=south": {
"model": "ultramarine:block/xiaolongbao_4"
},
"bites=5,facing=south": {
"model": "ultramarine:block/xiaolongbao_5"
},
"bites=6,facing=south": {
"model": "ultramarine:block/xiaolongbao_6"
},
"bites=7,facing=south": {
"model": "ultramarine:block/xiaolongbao_7"
},
"bites=8,facing=south": {
"model": "ultramarine:block/xiaolongbao_8"
},
"bites=0,facing=west": {
"model": "ultramarine:block/xiaolongbao_0",
"y": 90
},
"bites=1,facing=west": {
"model": "ultramarine:block/xiaolongbao_1",
"y": 90
},
"bites=2,facing=west": {
"model": "ultramarine:block/xiaolongbao_2",
"y": 90
},
"bites=3,facing=west": {
"model": "ultramarine:block/xiaolongbao_3",
"y": 90
},
"bites=4,facing=west": {
"model": "ultramarine:block/xiaolongbao_4",
"y": 90
},
"bites=5,facing=west": {
"model": "ultramarine:block/xiaolongbao_5",
"y": 90
},
"bites=6,facing=west": {
"model": "ultramarine:block/xiaolongbao_6",
"y": 90
},
"bites=7,facing=west": {
"model": "ultramarine:block/xiaolongbao_7",
"y": 90
},
"bites=8,facing=west": {
"model": "ultramarine:block/xiaolongbao_8",
"y": 90
},
"bites=0,facing=east": {
"model": "ultramarine:block/xiaolongbao_0",
"y": 270
},
"bites=1,facing=east": {
"model": "ultramarine:block/xiaolongbao_1",
"y": 270
},
"bites=2,facing=east": {
"model": "ultramarine:block/xiaolongbao_2",
"y": 270
},
"bites=3,facing=east": {
"model": "ultramarine:block/xiaolongbao_3",
"y": 270
},
"bites=4,facing=east": {
"model": "ultramarine:block/xiaolongbao_4",
"y": 270
},
"bites=5,facing=east": {
"model": "ultramarine:block/xiaolongbao_5",
"y": 270
},
"bites=6,facing=east": {
"model": "ultramarine:block/xiaolongbao_6",
"y": 270
},
"bites=7,facing=east": {
"model": "ultramarine:block/xiaolongbao_7",
"y": 270
},
"bites=8,facing=east": {
"model": "ultramarine:block/xiaolongbao_8",
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "ultramarine:block/xiaolongbao"
}
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
"ultramarine:food_hamper",
"ultramarine:plated_ham",
"ultramarine:plated_fish",
"ultramarine:xiaolongbao",
"ultramarine:oak_cabinet",
"ultramarine:warped_cabinet",
"ultramarine:ebony_cabinet",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,11 @@ public class BlockRegistry {
.shaped(DecorativeBlock.QUARTER_16).directional().noOcclusion().build());
public static final RegistryObject<Block> WINE_POT = BLOCKS.register("wine_pot",
() -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_6).directional().build());
public static final RegistryObject<Block> XIAOLONGBAO = BLOCKS.register("xiaolongbao", //TODO xiaolongbao 8 bites in one block, return 2 containers
() -> ConsumableDecorativeBlock.with(BaseBlockProperty.BAMBOO).bites(8).platedWith(ItemRegistry.POLISHED_OAK_PLANK).food(ModFoods.BAOZI)
.whenFinished((pState, pLevel, pPos, pPlayer) -> {pLevel.setBlock(pPos, Blocks.AIR.defaultBlockState(), Block.UPDATE_ALL); pLevel.gameEvent(pPlayer, GameEvent.BLOCK_DESTROY, pPos);})
.shaped(DecorativeBlock.FULL_BLOCK).directional().build());


public static final RegistryObject<Block> OAK_CABINET = BLOCKS.register("oak_cabinet",
() -> ContainerDecorativeBlock.with(BaseBlockProperty.WOOD).content(ContainerType.COMMON_REGULAR).shaped(DecorativeBlock.FULL_BLOCK).directional().noFenceConnect().build());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ public class ItemRegistry {
public static final RegistryObject<Item> PLATED_FISH = fromBlock(BlockRegistry.PLATED_FISH, CreativeTabs.DECORATIONS);
public static final RegistryObject<Item> SCATTERED_CARROTS = fromBlock(BlockRegistry.SCATTERED_CARROTS, CreativeTabs.DECORATIONS);
public static final RegistryObject<Item> WINE_POT = fromBlock(BlockRegistry.WINE_POT, CreativeTabs.DECORATIONS);
public static final RegistryObject<Item> XIAOLONGBAO = fromBlock(BlockRegistry.XIAOLONGBAO, CreativeTabs.DECORATIONS);


public static final RegistryObject<Item> OCTAGONAL_PALACE_LANTERN = fromBlock(BlockRegistry.OCTAGONAL_PALACE_LANTERN, CreativeTabs.LAMPS);
Expand Down
168 changes: 168 additions & 0 deletions src/main/resources/assets/ultramarine/models/block/xiaolongbao.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
{
"credit": "Made with Blockbench",
"texture_size": [64, 64],
"textures": {
"2": "ultramarine:block/xiaolongbao",
"particle": "block/oak_planks"
},
"elements": [
{
"from": [15, 14, 0],
"to": [16, 16, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 8, 0]},
"faces": {
"north": {"uv": [7, 12.25, 7.25, 12.75], "texture": "#2"},
"east": {"uv": [8.5, 0, 12.5, 0.5], "texture": "#2"},
"south": {"uv": [7.5, 12.25, 7.75, 12.75], "texture": "#2"},
"west": {"uv": [8.5, 0.75, 12.5, 1.25], "texture": "#2"},
"up": {"uv": [8.75, 10, 8.5, 6], "texture": "#2"},
"down": {"uv": [9.25, 6, 9, 10], "texture": "#2"}
}
},
{
"from": [0, 14, 0],
"to": [1, 16, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 8, 0]},
"faces": {
"north": {"uv": [12.25, 9.5, 12.5, 10], "texture": "#2"},
"east": {"uv": [8.5, 1.5, 12.5, 2], "texture": "#2"},
"south": {"uv": [12.25, 10.25, 12.5, 10.75], "texture": "#2"},
"west": {"uv": [8.5, 2.25, 12.5, 2.75], "texture": "#2"},
"up": {"uv": [9.75, 10, 9.5, 6], "texture": "#2"},
"down": {"uv": [10.25, 6, 10, 10], "texture": "#2"}
}
},
{
"from": [1, 14, 15],
"to": [15, 16, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 8, 0]},
"faces": {
"north": {"uv": [8.5, 3, 12, 3.5], "texture": "#2"},
"east": {"uv": [11.75, 12.25, 12, 12.75], "texture": "#2"},
"south": {"uv": [8.5, 3.75, 12, 4.25], "texture": "#2"},
"west": {"uv": [12.25, 12.25, 12.5, 12.75], "texture": "#2"},
"up": {"uv": [14.5, 11.25, 11, 11], "texture": "#2"},
"down": {"uv": [7.75, 11.25, 4.25, 11.5], "texture": "#2"}
}
},
{
"from": [1, 14, 0],
"to": [15, 16, 1],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 8, 0]},
"faces": {
"north": {"uv": [8.5, 4.5, 12, 5], "texture": "#2"},
"east": {"uv": [12.75, 0, 13, 0.5], "texture": "#2"},
"south": {"uv": [8.5, 5.25, 12, 5.75], "texture": "#2"},
"west": {"uv": [12.75, 0.75, 13, 1.25], "texture": "#2"},
"up": {"uv": [11.5, 11.75, 8, 11.5], "texture": "#2"},
"down": {"uv": [7.75, 11.75, 4.25, 12], "texture": "#2"}
}
},
{
"from": [0, 0, 0],
"to": [16, 14, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 8, 0]},
"faces": {
"north": {"uv": [4.25, 0, 8.25, 3.5], "texture": "#2"},
"east": {"uv": [4.25, 3.75, 8.25, 7.25], "texture": "#2"},
"south": {"uv": [4.25, 7.5, 8.25, 11], "texture": "#2"},
"west": {"uv": [0, 8.5, 4, 12], "texture": "#2"},
"up": {"uv": [4, 4, 0, 0], "texture": "#2"},
"down": {"uv": [4, 4.25, 0, 8.25], "texture": "#2"}
}
},
{
"from": [1, 14, 5],
"to": [5, 16, 9],
"rotation": {"angle": 22.5, "axis": "y", "origin": [0, 8, 0]},
"faces": {
"north": {"uv": [11.75, 8, 12.75, 8.5], "texture": "#2"},
"east": {"uv": [11.75, 8.75, 12.75, 9.25], "texture": "#2"},
"south": {"uv": [11.75, 11.5, 12.75, 12], "texture": "#2"},
"west": {"uv": [8, 12, 9, 12.5], "texture": "#2"},
"up": {"uv": [9.5, 11.25, 8.5, 10.25], "texture": "#2"},
"down": {"uv": [10.75, 10.25, 9.75, 11.25], "texture": "#2"}
}
},
{
"from": [1, 14, 12],
"to": [4, 16, 15],
"rotation": {"angle": 45, "axis": "y", "origin": [0, 8, 0]},
"faces": {
"north": {"uv": [12.25, 4.5, 13, 5], "texture": "#2"},
"east": {"uv": [5, 12.25, 5.75, 12.75], "texture": "#2"},
"south": {"uv": [12.25, 5.25, 13, 5.75], "texture": "#2"},
"west": {"uv": [6, 12.25, 6.75, 12.75], "texture": "#2"},
"up": {"uv": [12.5, 6.75, 11.75, 6], "texture": "#2"},
"down": {"uv": [12.5, 7, 11.75, 7.75], "texture": "#2"}
}
},
{
"from": [2, 14, 9],
"to": [6, 16, 13],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 8, 0]},
"faces": {
"north": {"uv": [9.25, 12, 10.25, 12.5], "texture": "#2"},
"east": {"uv": [10.5, 12, 11.5, 12.5], "texture": "#2"},
"south": {"uv": [0, 12.25, 1, 12.75], "texture": "#2"},
"west": {"uv": [1.25, 12.25, 2.25, 12.75], "texture": "#2"},
"up": {"uv": [11.5, 7, 10.5, 6], "texture": "#2"},
"down": {"uv": [11.5, 7.25, 10.5, 8.25], "texture": "#2"}
}
},
{
"from": [11, 14, 5],
"to": [15, 16, 9],
"rotation": {"angle": -22.5, "axis": "y", "origin": [0, 8, 0]},
"faces": {
"north": {"uv": [2.5, 12.25, 3.5, 12.75], "texture": "#2"},
"east": {"uv": [12.25, 3, 13.25, 3.5], "texture": "#2"},
"south": {"uv": [3.75, 12.25, 4.75, 12.75], "texture": "#2"},
"west": {"uv": [12.25, 3.75, 13.25, 4.25], "texture": "#2"},
"up": {"uv": [11.5, 9.5, 10.5, 8.5], "texture": "#2"},
"down": {"uv": [12, 9.75, 11, 10.75], "texture": "#2"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.375, 0.375, 0.375]
},
"thirdperson_lefthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.375, 0.375, 0.375]
},
"firstperson_righthand": {
"rotation": [0, 45, 0],
"scale": [0.4, 0.4, 0.4]
},
"firstperson_lefthand": {
"rotation": [0, 225, 0],
"scale": [0.4, 0.4, 0.4]
},
"ground": {
"translation": [0, 3, 0],
"scale": [0.25, 0.25, 0.25]
},
"gui": {
"rotation": [30, 225, 0],
"scale": [0.625, 0.625, 0.625]
},
"fixed": {
"rotation": [0, 14.25, 0],
"translation": [2.25, 32, 25.25],
"scale": [2, 2, 2]
}
},
"groups": [
{
"name": "group",
"origin": [8, 8, 8],
"color": 0,
"children": [0, 1, 2, 3, 4, 5, 6, 7, 8]
}
]
}
Loading

0 comments on commit 7834c8b

Please sign in to comment.