Skip to content

Add frame stairs and frame slab #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SofiaTilde wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add frame stairs and frame slab #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f81f847
Add frame stairs
SofiaTilde May 19, 2022
e930454
Add slab block
SofiaTilde May 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
382 changes: 382 additions & 0 deletions .vscode/java-formatter.xml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"python.linting.enabled": false,
"java.format.settings.url": ".vscode/java-formatter.xml"
}
14 changes: 7 additions & 7 deletions Lava/bin/main/.cache/cache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
90595d326540bf223462a02b4bcaa81a3bd194b1 assets/lava/blockstates/frame_block.json
ced7584cec36346b81260c3cc2418d27ffa4dfc8 assets/lava/blockstates/frame_slope.json
494e23d0a9aed63796aaa9f378cc809a4be27e53 assets/lava/blockstates/obsidian_inscriptions.json
de36b5b81a2245be2d9391f4ae0e25c4178763fa assets/lava/blockstates/slope_block.json
5aa65a428b33ae4e05334260a9f65c9145391790 assets/lava/lang/en_us.json
5e1e0f17f506c3813014026d479039f9228cfddc assets/lava/lang/en_us.json
4b88186f152d08a3e44043b66a67720c3432612d assets/lava/models/block/frame_block.json
cbc1219031a11c8d06d4129e5b9aedd908f37459 assets/lava/models/block/frame_slope.json
09ea66eb20504f43933dce0385782a3718b1918e assets/lava/models/block/obsidian_inscriptions.json
b108610a0b46e0eeeed39458e7cc30990c4eca19 assets/lava/models/block/slope_block.json
3850f55f19aee5529a61494d3077a2bf10bf463f assets/lava/models/item/frame_block.json
f4ad69a85828d58345b3d209a368c32511caa4c5 assets/lava/models/item/frame_slope.json
1a3c6cdc93ee5c2661bc74a9a33af4d600f1a9ee assets/lava/models/item/obsidian_inscriptions.json
c0151ceb74228da4157c2c5ba63259e38e807fef assets/lava/models/item/slope_block.json
17858ececa5137634dba4e06fc832a58be42ceb7 data/lava/advancements/recipes/lavamod/frame_block.json
c15c5fb2dc713da047191928998c4fd0389682b8 data/lava/loot_tables/blocks/frame_block.json
306f4ae3f2dc438a8a2765768ec165c2a9840c73 data/lava/loot_tables/blocks/slope_block.json
108b1f07bf7d003ca97806c923505bd5a9c585ab data/lava/loot_tables/blocks/frame_slope.json
6c55dd61b4aa29f5acbf8a9b06ceb25ae0b72f54 data/lava/recipes/frame_block.json
f1c19212f7fdbd50678b53e9bf602197e68a64bd data/minecraft/tags/blocks/dragon_immune.json
5c4fa0ac8501475f752ee89b30ea0e177f7be439 data/minecraft/tags/blocks/mineable/axe.json
cae65ed3db29d1635aa6c38441ea714650162c64 data/minecraft/tags/blocks/mineable/axe.json
f1c19212f7fdbd50678b53e9bf602197e68a64bd data/minecraft/tags/blocks/mineable/pickaxe.json
f1c19212f7fdbd50678b53e9bf602197e68a64bd data/minecraft/tags/blocks/needs_diamond_tool.json
362e67a7e0c65f9794952f6f0fc58a7cc06f0092 data/minecraft/tags/blocks/needs_stone_tool.json
6b03b0dfdf07bd4de67776d9cfc1f2a76a2353a3 data/minecraft/tags/blocks/needs_stone_tool.json
2 changes: 2 additions & 0 deletions Lava/bin/main/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
/.cache/
/assets/
/se/
8 changes: 4 additions & 4 deletions .../assets/lava/blockstates/slope_block.json → .../assets/lava/blockstates/frame_slope.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"variants": {
"facing=north": {
"model": "lava:block/slope_block"
"model": "lava:block/frame_slope"
},
"facing=south": {
"model": "lava:block/slope_block",
"model": "lava:block/frame_slope",
"y": 180
},
"facing=west": {
"model": "lava:block/slope_block",
"model": "lava:block/frame_slope",
"y": 270
},
"facing=east": {
"model": "lava:block/slope_block",
"model": "lava:block/frame_slope",
"y": 90
}
}
Expand Down
174 changes: 174 additions & 0 deletions Lava/bin/main/assets/lava/blockstates/frame_stairs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
{
"variants": {
"facing=east,half=bottom,shape=inner_left": {
"model": "lava:block/frame_stairs_inner",
"y": 270
},
"facing=east,half=bottom,shape=inner_right": {
"model": "lava:block/frame_stairs_inner"
},
"facing=east,half=bottom,shape=outer_left": {
"model": "lava:block/frame_stairs_outer",
"y": 270
},
"facing=east,half=bottom,shape=outer_right": {
"model": "lava:block/frame_stairs_outer"
},
"facing=east,half=bottom,shape=straight": {
"model": "lava:block/frame_stairs"
},
"facing=east,half=top,shape=inner_left": {
"model": "lava:block/frame_stairs_inner",
"x": 180
},
"facing=east,half=top,shape=inner_right": {
"model": "lava:block/frame_stairs_inner",
"x": 180,
"y": 90
},
"facing=east,half=top,shape=outer_left": {
"model": "lava:block/frame_stairs_outer",
"x": 180
},
"facing=east,half=top,shape=outer_right": {
"model": "lava:block/frame_stairs_outer",
"x": 180,
"y": 90
},
"facing=east,half=top,shape=straight": {
"model": "lava:block/frame_stairs",
"x": 180
},
"facing=north,half=bottom,shape=inner_left": {
"model": "lava:block/frame_stairs_inner",
"y": 180
},
"facing=north,half=bottom,shape=inner_right": {
"model": "lava:block/frame_stairs_inner",
"y": 270
},
"facing=north,half=bottom,shape=outer_left": {
"model": "lava:block/frame_stairs_outer",
"y": 180
},
"facing=north,half=bottom,shape=outer_right": {
"model": "lava:block/frame_stairs_outer",
"y": 270
},
"facing=north,half=bottom,shape=straight": {
"model": "lava:block/frame_stairs",
"y": 270
},
"facing=north,half=top,shape=inner_left": {
"model": "lava:block/frame_stairs_inner",
"x": 180,
"y": 270
},
"facing=north,half=top,shape=inner_right": {
"model": "lava:block/frame_stairs_inner",
"x": 180
},
"facing=north,half=top,shape=outer_left": {
"model": "lava:block/frame_stairs_outer",
"x": 180,
"y": 270
},
"facing=north,half=top,shape=outer_right": {
"model": "lava:block/frame_stairs_outer",
"x": 180
},
"facing=north,half=top,shape=straight": {
"model": "lava:block/frame_stairs",
"x": 180,
"y": 270
},
"facing=south,half=bottom,shape=inner_left": {
"model": "lava:block/frame_stairs_inner"
},
"facing=south,half=bottom,shape=inner_right": {
"model": "lava:block/frame_stairs_inner",
"y": 90
},
"facing=south,half=bottom,shape=outer_left": {
"model": "lava:block/frame_stairs_outer"
},
"facing=south,half=bottom,shape=outer_right": {
"model": "lava:block/frame_stairs_outer",
"y": 90
},
"facing=south,half=bottom,shape=straight": {
"model": "lava:block/frame_stairs",
"y": 90
},
"facing=south,half=top,shape=inner_left": {
"model": "lava:block/frame_stairs_inner",
"x": 180,
"y": 90
},
"facing=south,half=top,shape=inner_right": {
"model": "lava:block/frame_stairs_inner",
"x": 180,
"y": 180
},
"facing=south,half=top,shape=outer_left": {
"model": "lava:block/frame_stairs_outer",
"x": 180,
"y": 90
},
"facing=south,half=top,shape=outer_right": {
"model": "lava:block/frame_stairs_outer",
"x": 180,
"y": 180
},
"facing=south,half=top,shape=straight": {
"model": "lava:block/frame_stairs",
"x": 180,
"y": 90
},
"facing=west,half=bottom,shape=inner_left": {
"model": "lava:block/frame_stairs_inner",
"y": 90
},
"facing=west,half=bottom,shape=inner_right": {
"model": "lava:block/frame_stairs_inner",
"y": 180
},
"facing=west,half=bottom,shape=outer_left": {
"model": "lava:block/frame_stairs_outer",
"y": 90
},
"facing=west,half=bottom,shape=outer_right": {
"model": "lava:block/frame_stairs_outer",
"y": 180
},
"facing=west,half=bottom,shape=straight": {
"model": "lava:block/frame_stairs",
"y": 180
},
"facing=west,half=top,shape=inner_left": {
"model": "lava:block/frame_stairs_inner",
"x": 180,
"y": 180
},
"facing=west,half=top,shape=inner_right": {
"model": "lava:block/frame_stairs_inner",
"x": 180,
"y": 270
},
"facing=west,half=top,shape=outer_left": {
"model": "lava:block/frame_stairs_outer",
"x": 180,
"y": 180
},
"facing=west,half=top,shape=outer_right": {
"model": "lava:block/frame_stairs_outer",
"x": 180,
"y": 270
},
"facing=west,half=top,shape=straight": {
"model": "lava:block/frame_stairs",
"x": 180,
"y": 180
}
}
}
4 changes: 3 additions & 1 deletion Lava/bin/main/assets/lava/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"block.lava.frame_block": "Frame Block",
"block.lava.frame_slab": "Frame Slab Block",
"block.lava.frame_slope": "Frame Slope Block",
"block.lava.frame_stairs": "Frame Stair Block",
"block.lava.obsidian_inscriptions": "Obsidian Inscriptions",
"block.lava.slope_block": "Slope Block",
"itemGroup.lavamod": "Lava"
}
24 changes: 24 additions & 0 deletions Lava/bin/main/assets/lava/models/block/frame_slab.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"credit": "Made with Blockbench",
"parent": "minecraft:block/cube_all",
"textures": {
"0": "lava:block/frame_block",
"1": "lava:block/frame_block_stair_side",
"particle": "lava:block/frame_block"
},
"elements": [
{
"name": "Slab",
"from": [0, 0, 0],
"to": [16, 8, 16],
"faces": {
"north": {"uv": [0, 8, 16, 16], "texture": "#1", "cullface": "north"},
"east": {"uv": [0, 8, 16, 16], "texture": "#1", "cullface": "east"},
"south": {"uv": [0, 8, 16, 16], "texture": "#1", "cullface": "south"},
"west": {"uv": [0, 8, 16, 16], "texture": "#1", "cullface": "west"},
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
"down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"}
}
}
]
}
24 changes: 24 additions & 0 deletions Lava/bin/main/assets/lava/models/block/frame_slab_top.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"credit": "Made with Blockbench",
"parent": "minecraft:block/cube_all",
"textures": {
"0": "lava:block/frame_block_stair_side",
"1": "lava:block/frame_block",
"particle": "lava:block/frame_block_stair_side"
},
"elements": [
{
"name": "Slab",
"from": [0, 8, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [16, 16, 0, 8], "texture": "#0", "cullface": "north"},
"east": {"uv": [0, 16, 16, 8], "texture": "#0", "cullface": "east"},
"south": {"uv": [0, 16, 16, 8], "texture": "#0", "cullface": "south"},
"west": {"uv": [0, 16, 16, 8], "texture": "#0", "cullface": "west"},
"up": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "up"},
"down": {"uv": [0, 0, 16, 16], "texture": "#1"}
}
}
]
}
40 changes: 23 additions & 17 deletions ...assets/lava/models/block/slope_block.json → ...assets/lava/models/block/frame_slope.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
{
"credit": "Made with Blockbench",
"parent": "minecraft:block/cube_all",
"textures": {
"0": "lava:block/frame_block",
"1": "lava:block/frame_slope_slide",
"1": "lava:block/frame_slope_side",
"particle": "lava:block/frame_block"
},
"elements": [
{
"name": "Front",
"from": [0, 0, 0],
"to": [16, 22.63, 0],
"rotation": {"angle": 45, "axis": "x", "origin": [0, 0, 0]},
Expand All @@ -19,6 +22,7 @@
}
},
{
"name": "Back",
"from": [0, 0, 16],
"to": [16, 16, 16],
"faces": {
Expand All @@ -31,6 +35,7 @@
}
},
{
"name": "Bottom",
"from": [0, 0.01, 0],
"to": [16, 0.01, 16],
"faces": {
Expand All @@ -43,29 +48,30 @@
}
},
{
"name": "Side, west",
"from": [0, 0, 0],
"to": [0, 22.63, 12],
"rotation": {"angle": 45, "axis": "x", "origin": [0, 0, 0]},
"to": [0, 16, 16],
"faces": {
"north": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#missing"},
"east": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"},
"south": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#missing"},
"west": {"uv": [0, 0, 16, 16], "texture": "#1"},
"up": {"uv": [0, 0, 16, 0], "rotation": 90, "texture": "#missing"},
"down": {"uv": [0, 0, 16, 0], "rotation": 90, "texture": "#missing"}
"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"east": {"uv": [0, 0, 16, 16], "texture": "#1"},
"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"west": {"uv": [16, 0, 0, 16], "texture": "#1"},
"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
}
},
{
"name": "Side, east",
"from": [16, 0, 0],
"to": [16, 22.63, 12],
"rotation": {"angle": 45, "axis": "x", "origin": [0, 0, 0]},
"to": [16, 16, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]},
"faces": {
"north": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#missing"},
"east": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"},
"south": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#missing"},
"west": {"uv": [0, 0, 16, 16], "texture": "#1"},
"up": {"uv": [0, 0, 16, 0], "rotation": 90, "texture": "#missing"},
"down": {"uv": [0, 0, 16, 0], "rotation": 90, "texture": "#missing"}
"north": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"east": {"uv": [0, 0, 16, 16], "texture": "#1"},
"south": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"west": {"uv": [16, 0, 0, 16], "texture": "#1"},
"up": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 16], "texture": "#missing"}
}
}
],
Expand Down
Loading