Skip to content

Commit

Permalink
Create stained quartz pillars, fix pickaxes block tag
Browse files Browse the repository at this point in the history
  • Loading branch information
andantet committed Aug 25, 2023
1 parent f0df83b commit 8f9f944
Show file tree
Hide file tree
Showing 119 changed files with 1,913 additions and 38 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hybrid-blocks:block/black_stained_quartz_pillar_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hybrid-blocks:block/black_stained_quartz_pillar"
},
"axis=z": {
"model": "hybrid-blocks:block/black_stained_quartz_pillar_horizontal",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hybrid-blocks:block/blue_stained_quartz_pillar_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hybrid-blocks:block/blue_stained_quartz_pillar"
},
"axis=z": {
"model": "hybrid-blocks:block/blue_stained_quartz_pillar_horizontal",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hybrid-blocks:block/brown_stained_quartz_pillar_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hybrid-blocks:block/brown_stained_quartz_pillar"
},
"axis=z": {
"model": "hybrid-blocks:block/brown_stained_quartz_pillar_horizontal",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hybrid-blocks:block/cyan_stained_quartz_pillar_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hybrid-blocks:block/cyan_stained_quartz_pillar"
},
"axis=z": {
"model": "hybrid-blocks:block/cyan_stained_quartz_pillar_horizontal",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hybrid-blocks:block/gray_stained_quartz_pillar_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hybrid-blocks:block/gray_stained_quartz_pillar"
},
"axis=z": {
"model": "hybrid-blocks:block/gray_stained_quartz_pillar_horizontal",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hybrid-blocks:block/green_stained_quartz_pillar_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hybrid-blocks:block/green_stained_quartz_pillar"
},
"axis=z": {
"model": "hybrid-blocks:block/green_stained_quartz_pillar_horizontal",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hybrid-blocks:block/light_blue_stained_quartz_pillar_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hybrid-blocks:block/light_blue_stained_quartz_pillar"
},
"axis=z": {
"model": "hybrid-blocks:block/light_blue_stained_quartz_pillar_horizontal",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hybrid-blocks:block/light_gray_stained_quartz_pillar_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hybrid-blocks:block/light_gray_stained_quartz_pillar"
},
"axis=z": {
"model": "hybrid-blocks:block/light_gray_stained_quartz_pillar_horizontal",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hybrid-blocks:block/lime_stained_quartz_pillar_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hybrid-blocks:block/lime_stained_quartz_pillar"
},
"axis=z": {
"model": "hybrid-blocks:block/lime_stained_quartz_pillar_horizontal",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hybrid-blocks:block/magenta_stained_quartz_pillar_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hybrid-blocks:block/magenta_stained_quartz_pillar"
},
"axis=z": {
"model": "hybrid-blocks:block/magenta_stained_quartz_pillar_horizontal",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hybrid-blocks:block/orange_stained_quartz_pillar_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hybrid-blocks:block/orange_stained_quartz_pillar"
},
"axis=z": {
"model": "hybrid-blocks:block/orange_stained_quartz_pillar_horizontal",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hybrid-blocks:block/pink_stained_quartz_pillar_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hybrid-blocks:block/pink_stained_quartz_pillar"
},
"axis=z": {
"model": "hybrid-blocks:block/pink_stained_quartz_pillar_horizontal",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hybrid-blocks:block/purple_stained_quartz_pillar_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hybrid-blocks:block/purple_stained_quartz_pillar"
},
"axis=z": {
"model": "hybrid-blocks:block/purple_stained_quartz_pillar_horizontal",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hybrid-blocks:block/red_stained_quartz_pillar_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hybrid-blocks:block/red_stained_quartz_pillar"
},
"axis=z": {
"model": "hybrid-blocks:block/red_stained_quartz_pillar_horizontal",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hybrid-blocks:block/white_stained_quartz_pillar_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hybrid-blocks:block/white_stained_quartz_pillar"
},
"axis=z": {
"model": "hybrid-blocks:block/white_stained_quartz_pillar_horizontal",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "hybrid-blocks:block/yellow_stained_quartz_pillar_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "hybrid-blocks:block/yellow_stained_quartz_pillar"
},
"axis=z": {
"model": "hybrid-blocks:block/yellow_stained_quartz_pillar_horizontal",
"x": 90
}
}
}
16 changes: 16 additions & 0 deletions src/generated/resources/assets/hybrid-blocks/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,68 +2,84 @@
"block.hybrid-blocks.black_stained_bricks": "Black Stained Bricks",
"block.hybrid-blocks.black_stained_cracked_bricks": "Black Stained Cracked Bricks",
"block.hybrid-blocks.black_stained_mossy_bricks": "Black Stained Mossy Bricks",
"block.hybrid-blocks.black_stained_quartz_pillar": "Black Stained Quartz Pillar",
"block.hybrid-blocks.black_stained_smooth_quartz": "Black Stained Smooth Quartz Block",
"block.hybrid-blocks.blue_stained_bricks": "Blue Stained Bricks",
"block.hybrid-blocks.blue_stained_cracked_bricks": "Blue Stained Cracked Bricks",
"block.hybrid-blocks.blue_stained_mossy_bricks": "Blue Stained Mossy Bricks",
"block.hybrid-blocks.blue_stained_quartz_pillar": "Blue Stained Quartz Pillar",
"block.hybrid-blocks.blue_stained_smooth_quartz": "Blue Stained Smooth Quartz Block",
"block.hybrid-blocks.brown_stained_bricks": "Brown Stained Bricks",
"block.hybrid-blocks.brown_stained_cracked_bricks": "Brown Stained Cracked Bricks",
"block.hybrid-blocks.brown_stained_mossy_bricks": "Brown Stained Mossy Bricks",
"block.hybrid-blocks.brown_stained_quartz_pillar": "Brown Stained Quartz Pillar",
"block.hybrid-blocks.brown_stained_smooth_quartz": "Brown Stained Smooth Quartz Block",
"block.hybrid-blocks.cracked_bricks": "Cracked Bricks",
"block.hybrid-blocks.cyan_stained_bricks": "Cyan Stained Bricks",
"block.hybrid-blocks.cyan_stained_cracked_bricks": "Cyan Stained Cracked Bricks",
"block.hybrid-blocks.cyan_stained_mossy_bricks": "Cyan Stained Mossy Bricks",
"block.hybrid-blocks.cyan_stained_quartz_pillar": "Cyan Stained Quartz Pillar",
"block.hybrid-blocks.cyan_stained_smooth_quartz": "Cyan Stained Smooth Quartz Block",
"block.hybrid-blocks.gray_stained_bricks": "Gray Stained Bricks",
"block.hybrid-blocks.gray_stained_cracked_bricks": "Gray Stained Cracked Bricks",
"block.hybrid-blocks.gray_stained_mossy_bricks": "Gray Stained Mossy Bricks",
"block.hybrid-blocks.gray_stained_quartz_pillar": "Gray Stained Quartz Pillar",
"block.hybrid-blocks.gray_stained_smooth_quartz": "Gray Stained Smooth Quartz Block",
"block.hybrid-blocks.green_stained_bricks": "Green Stained Bricks",
"block.hybrid-blocks.green_stained_cracked_bricks": "Green Stained Cracked Bricks",
"block.hybrid-blocks.green_stained_mossy_bricks": "Green Stained Mossy Bricks",
"block.hybrid-blocks.green_stained_quartz_pillar": "Green Stained Quartz Pillar",
"block.hybrid-blocks.green_stained_smooth_quartz": "Green Stained Smooth Quartz Block",
"block.hybrid-blocks.light_blue_stained_bricks": "Light Blue Stained Bricks",
"block.hybrid-blocks.light_blue_stained_cracked_bricks": "Light Blue Stained Cracked Bricks",
"block.hybrid-blocks.light_blue_stained_mossy_bricks": "Light Blue Stained Mossy Bricks",
"block.hybrid-blocks.light_blue_stained_quartz_pillar": "Light Blue Stained Quartz Pillar",
"block.hybrid-blocks.light_blue_stained_smooth_quartz": "Light Blue Stained Smooth Quartz Block",
"block.hybrid-blocks.light_gray_stained_bricks": "Light Gray Stained Bricks",
"block.hybrid-blocks.light_gray_stained_cracked_bricks": "Light Gray Stained Cracked Bricks",
"block.hybrid-blocks.light_gray_stained_mossy_bricks": "Light Gray Stained Mossy Bricks",
"block.hybrid-blocks.light_gray_stained_quartz_pillar": "Light Gray Stained Quartz Pillar",
"block.hybrid-blocks.light_gray_stained_smooth_quartz": "Light Gray Stained Smooth Quartz Block",
"block.hybrid-blocks.lime_stained_bricks": "Lime Stained Bricks",
"block.hybrid-blocks.lime_stained_cracked_bricks": "Lime Stained Cracked Bricks",
"block.hybrid-blocks.lime_stained_mossy_bricks": "Lime Stained Mossy Bricks",
"block.hybrid-blocks.lime_stained_quartz_pillar": "Lime Stained Quartz Pillar",
"block.hybrid-blocks.lime_stained_smooth_quartz": "Lime Stained Smooth Quartz Block",
"block.hybrid-blocks.magenta_stained_bricks": "Magenta Stained Bricks",
"block.hybrid-blocks.magenta_stained_cracked_bricks": "Magenta Stained Cracked Bricks",
"block.hybrid-blocks.magenta_stained_mossy_bricks": "Magenta Stained Mossy Bricks",
"block.hybrid-blocks.magenta_stained_quartz_pillar": "Magenta Stained Quartz Pillar",
"block.hybrid-blocks.magenta_stained_smooth_quartz": "Magenta Stained Smooth Quartz Block",
"block.hybrid-blocks.mossy_bricks": "Mossy Bricks",
"block.hybrid-blocks.orange_stained_bricks": "Orange Stained Bricks",
"block.hybrid-blocks.orange_stained_cracked_bricks": "Orange Stained Cracked Bricks",
"block.hybrid-blocks.orange_stained_mossy_bricks": "Orange Stained Mossy Bricks",
"block.hybrid-blocks.orange_stained_quartz_pillar": "Orange Stained Quartz Pillar",
"block.hybrid-blocks.orange_stained_smooth_quartz": "Orange Stained Smooth Quartz Block",
"block.hybrid-blocks.pink_stained_bricks": "Pink Stained Bricks",
"block.hybrid-blocks.pink_stained_cracked_bricks": "Pink Stained Cracked Bricks",
"block.hybrid-blocks.pink_stained_mossy_bricks": "Pink Stained Mossy Bricks",
"block.hybrid-blocks.pink_stained_quartz_pillar": "Pink Stained Quartz Pillar",
"block.hybrid-blocks.pink_stained_smooth_quartz": "Pink Stained Smooth Quartz Block",
"block.hybrid-blocks.purple_stained_bricks": "Purple Stained Bricks",
"block.hybrid-blocks.purple_stained_cracked_bricks": "Purple Stained Cracked Bricks",
"block.hybrid-blocks.purple_stained_mossy_bricks": "Purple Stained Mossy Bricks",
"block.hybrid-blocks.purple_stained_quartz_pillar": "Purple Stained Quartz Pillar",
"block.hybrid-blocks.purple_stained_smooth_quartz": "Purple Stained Smooth Quartz Block",
"block.hybrid-blocks.red_stained_bricks": "Red Stained Bricks",
"block.hybrid-blocks.red_stained_cracked_bricks": "Red Stained Cracked Bricks",
"block.hybrid-blocks.red_stained_mossy_bricks": "Red Stained Mossy Bricks",
"block.hybrid-blocks.red_stained_quartz_pillar": "Red Stained Quartz Pillar",
"block.hybrid-blocks.red_stained_smooth_quartz": "Red Stained Smooth Quartz Block",
"block.hybrid-blocks.white_stained_bricks": "White Stained Bricks",
"block.hybrid-blocks.white_stained_cracked_bricks": "White Stained Cracked Bricks",
"block.hybrid-blocks.white_stained_mossy_bricks": "White Stained Mossy Bricks",
"block.hybrid-blocks.white_stained_quartz_pillar": "White Stained Quartz Pillar",
"block.hybrid-blocks.white_stained_smooth_quartz": "White Stained Smooth Quartz Block",
"block.hybrid-blocks.yellow_stained_bricks": "Yellow Stained Bricks",
"block.hybrid-blocks.yellow_stained_cracked_bricks": "Yellow Stained Cracked Bricks",
"block.hybrid-blocks.yellow_stained_mossy_bricks": "Yellow Stained Mossy Bricks",
"block.hybrid-blocks.yellow_stained_quartz_pillar": "Yellow Stained Quartz Pillar",
"block.hybrid-blocks.yellow_stained_smooth_quartz": "Yellow Stained Smooth Quartz Block",
"itemGroup.hybrid-blocks": "Hybrid Blocks"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column",
"textures": {
"end": "hybrid-blocks:block/black_stained_quartz_pillar_top",
"side": "hybrid-blocks:block/black_stained_quartz_pillar"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column_horizontal",
"textures": {
"end": "hybrid-blocks:block/black_stained_quartz_pillar_top",
"side": "hybrid-blocks:block/black_stained_quartz_pillar"
}
}
Loading

0 comments on commit 8f9f944

Please sign in to comment.