Skip to content

Commit 644acf7

Browse files
cassiancccassiancc
committed
Backport 0.15.3
1 parent fae3bf9 commit 644acf7

File tree

591 files changed

+2283
-1728
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

591 files changed

+2283
-1728
lines changed

‎common/src/main/java/cc/cassian/pyrite/Pyrite.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ public static void init() {
3737
generateBrickSet("calcite_brick", Blocks.CALCITE, MapColor.OFF_WHITE, true);
3838
// Mossy Deepslate Bricks
3939
generateBrickSet("mossy_deepslate_brick", Blocks.DEEPSLATE_BRICKS, MapColor.BLACK);
40+
// Sandstone Bricks
41+
generateBrickSet("sandstone_brick", Blocks.SANDSTONE, MapColor.PALE_YELLOW);
4042
// Grass Set
4143
generateTurfSets();
4244
// Nether Brick Fence Gate

‎common/src/main/resources/assets/pyrite/blockstates/sandstone_brick_slab.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"variants":{"type=bottom":{"model":"pyrite:block/sandstone_brick_slab"},"type=double":{"model":"pyrite:block/sandstone_bricks"},"type=top":{"model":"pyrite:block/sandstone_brick_slab_top"}}}

‎common/src/main/resources/assets/pyrite/blockstates/sandstone_brick_stairs.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"variants":{"facing=east,half=bottom,shape=inner_left":{"model":"pyrite:block/sandstone_brick_stairs_inner","y":270,"uvlock":true},"facing=east,half=bottom,shape=inner_right":{"model":"pyrite:block/sandstone_brick_stairs_inner"},"facing=east,half=bottom,shape=outer_left":{"model":"pyrite:block/sandstone_brick_stairs_outer","y":270,"uvlock":true},"facing=east,half=bottom,shape=outer_right":{"model":"pyrite:block/sandstone_brick_stairs_outer"},"facing=east,half=bottom,shape=straight":{"model":"pyrite:block/sandstone_brick_stairs"},"facing=east,half=top,shape=inner_left":{"model":"pyrite:block/sandstone_brick_stairs_inner","x":180,"uvlock":true},"facing=east,half=top,shape=inner_right":{"model":"pyrite:block/sandstone_brick_stairs_inner","x":180,"y":90,"uvlock":true},"facing=east,half=top,shape=outer_left":{"model":"pyrite:block/sandstone_brick_stairs_outer","x":180,"uvlock":true},"facing=east,half=top,shape=outer_right":{"model":"pyrite:block/sandstone_brick_stairs_outer","x":180,"y":90,"uvlock":true},"facing=east,half=top,shape=straight":{"model":"pyrite:block/sandstone_brick_stairs","x":180,"uvlock":true},"facing=north,half=bottom,shape=inner_left":{"model":"pyrite:block/sandstone_brick_stairs_inner","y":180,"uvlock":true},"facing=north,half=bottom,shape=inner_right":{"model":"pyrite:block/sandstone_brick_stairs_inner","y":270,"uvlock":true},"facing=north,half=bottom,shape=outer_left":{"model":"pyrite:block/sandstone_brick_stairs_outer","y":180,"uvlock":true},"facing=north,half=bottom,shape=outer_right":{"model":"pyrite:block/sandstone_brick_stairs_outer","y":270,"uvlock":true},"facing=north,half=bottom,shape=straight":{"model":"pyrite:block/sandstone_brick_stairs","y":270,"uvlock":true},"facing=north,half=top,shape=inner_left":{"model":"pyrite:block/sandstone_brick_stairs_inner","x":180,"y":270,"uvlock":true},"facing=north,half=top,shape=inner_right":{"model":"pyrite:block/sandstone_brick_stairs_inner","x":180,"uvlock":true},"facing=north,half=top,shape=outer_left":{"model":"pyrite:block/sandstone_brick_stairs_outer","x":180,"y":270,"uvlock":true},"facing=north,half=top,shape=outer_right":{"model":"pyrite:block/sandstone_brick_stairs_outer","x":180,"uvlock":true},"facing=north,half=top,shape=straight":{"model":"pyrite:block/sandstone_brick_stairs","x":180,"y":270,"uvlock":true},"facing=south,half=bottom,shape=inner_left":{"model":"pyrite:block/sandstone_brick_stairs_inner"},"facing=south,half=bottom,shape=inner_right":{"model":"pyrite:block/sandstone_brick_stairs_inner","y":90,"uvlock":true},"facing=south,half=bottom,shape=outer_left":{"model":"pyrite:block/sandstone_brick_stairs_outer"},"facing=south,half=bottom,shape=outer_right":{"model":"pyrite:block/sandstone_brick_stairs_outer","y":90,"uvlock":true},"facing=south,half=bottom,shape=straight":{"model":"pyrite:block/sandstone_brick_stairs","y":90,"uvlock":true},"facing=south,half=top,shape=inner_left":{"model":"pyrite:block/sandstone_brick_stairs_inner","x":180,"y":90,"uvlock":true},"facing=south,half=top,shape=inner_right":{"model":"pyrite:block/sandstone_brick_stairs_inner","x":180,"y":180,"uvlock":true},"facing=south,half=top,shape=outer_left":{"model":"pyrite:block/sandstone_brick_stairs_outer","x":180,"y":90,"uvlock":true},"facing=south,half=top,shape=outer_right":{"model":"pyrite:block/sandstone_brick_stairs_outer","x":180,"y":180,"uvlock":true},"facing=south,half=top,shape=straight":{"model":"pyrite:block/sandstone_brick_stairs","x":180,"y":90,"uvlock":true},"facing=west,half=bottom,shape=inner_left":{"model":"pyrite:block/sandstone_brick_stairs_inner","y":90,"uvlock":true},"facing=west,half=bottom,shape=inner_right":{"model":"pyrite:block/sandstone_brick_stairs_inner","y":180,"uvlock":true},"facing=west,half=bottom,shape=outer_left":{"model":"pyrite:block/sandstone_brick_stairs_outer","y":90,"uvlock":true},"facing=west,half=bottom,shape=outer_right":{"model":"pyrite:block/sandstone_brick_stairs_outer","y":180,"uvlock":true},"facing=west,half=bottom,shape=straight":{"model":"pyrite:block/sandstone_brick_stairs","y":180,"uvlock":true},"facing=west,half=top,shape=inner_left":{"model":"pyrite:block/sandstone_brick_stairs_inner","x":180,"y":180,"uvlock":true},"facing=west,half=top,shape=inner_right":{"model":"pyrite:block/sandstone_brick_stairs_inner","x":180,"y":270,"uvlock":true},"facing=west,half=top,shape=outer_left":{"model":"pyrite:block/sandstone_brick_stairs_outer","x":180,"y":180,"uvlock":true},"facing=west,half=top,shape=outer_right":{"model":"pyrite:block/sandstone_brick_stairs_outer","x":180,"y":270,"uvlock":true},"facing=west,half=top,shape=straight":{"model":"pyrite:block/sandstone_brick_stairs","x":180,"y":180,"uvlock":true}}}

‎common/src/main/resources/assets/pyrite/blockstates/sandstone_brick_wall.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"multipart":[{"apply":{"model":"pyrite:block/sandstone_brick_wall_post"},"when":{"up":"true"}},{"apply":{"model":"pyrite:block/sandstone_brick_wall_side","uvlock":true},"when":{"north":"low"}},{"apply":{"model":"pyrite:block/sandstone_brick_wall_side","uvlock":true,"y":90},"when":{"east":"low"}},{"apply":{"model":"pyrite:block/sandstone_brick_wall_side","uvlock":true,"y":180},"when":{"south":"low"}},{"apply":{"model":"pyrite:block/sandstone_brick_wall_side","uvlock":true,"y":270},"when":{"west":"low"}},{"apply":{"model":"pyrite:block/sandstone_brick_wall_side_tall","uvlock":true},"when":{"north":"tall"}},{"apply":{"model":"pyrite:block/sandstone_brick_wall_side_tall","uvlock":true,"y":90},"when":{"east":"tall"}},{"apply":{"model":"pyrite:block/sandstone_brick_wall_side_tall","uvlock":true,"y":180},"when":{"south":"tall"}},{"apply":{"model":"pyrite:block/sandstone_brick_wall_side_tall","uvlock":true,"y":270},"when":{"west":"tall"}}]}

‎common/src/main/resources/assets/pyrite/blockstates/sandstone_brick_wall_gate.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"variants":{"facing=east,in_wall=false,open=false":{"model":"pyrite:block/sandstone_brick_wall_gate","uvlock":true,"y":270},"facing=east,in_wall=false,open=true":{"model":"pyrite:block/sandstone_brick_wall_gate_open","uvlock":true,"y":270},"facing=east,in_wall=true,open=false":{"model":"pyrite:block/sandstone_brick_wall_gate_wall","uvlock":true,"y":270},"facing=east,in_wall=true,open=true":{"model":"pyrite:block/sandstone_brick_wall_gate_wall_open","uvlock":true,"y":270},"facing=north,in_wall=false,open=false":{"model":"pyrite:block/sandstone_brick_wall_gate","uvlock":true,"y":180},"facing=north,in_wall=false,open=true":{"model":"pyrite:block/sandstone_brick_wall_gate_open","uvlock":true,"y":180},"facing=north,in_wall=true,open=false":{"model":"pyrite:block/sandstone_brick_wall_gate_wall","uvlock":true,"y":180},"facing=north,in_wall=true,open=true":{"model":"pyrite:block/sandstone_brick_wall_gate_wall_open","uvlock":true,"y":180},"facing=south,in_wall=false,open=false":{"model":"pyrite:block/sandstone_brick_wall_gate","uvlock":true},"facing=south,in_wall=false,open=true":{"model":"pyrite:block/sandstone_brick_wall_gate_open","uvlock":true},"facing=south,in_wall=true,open=false":{"model":"pyrite:block/sandstone_brick_wall_gate_wall","uvlock":true},"facing=south,in_wall=true,open=true":{"model":"pyrite:block/sandstone_brick_wall_gate_wall_open","uvlock":true},"facing=west,in_wall=false,open=false":{"model":"pyrite:block/sandstone_brick_wall_gate","uvlock":true,"y":90},"facing=west,in_wall=false,open=true":{"model":"pyrite:block/sandstone_brick_wall_gate_open","uvlock":true,"y":90},"facing=west,in_wall=true,open=false":{"model":"pyrite:block/sandstone_brick_wall_gate_wall","uvlock":true,"y":90},"facing=west,in_wall=true,open=true":{"model":"pyrite:block/sandstone_brick_wall_gate_wall_open","uvlock":true,"y":90}}}

‎common/src/main/resources/assets/pyrite/blockstates/sandstone_bricks.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"variants":{"":{"model":"pyrite:block/sandstone_bricks_north_west_mirrored"}}}

0 commit comments

Comments
 (0)