Skip to content

Commit fae3bf9

Browse files
cassiancccassiancc
committed
backport: 0.15.2
1 parent f73a9f1 commit fae3bf9

File tree

1,653 files changed

+6048
-232
lines changed

Some content is hidden

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

1,653 files changed

+6048
-232
lines changed

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,19 @@ public static void init() {
2424
// Switchable Glass
2525
createPyriteBlock("switchable_glass", "switchable_glass", Blocks.GLASS);
2626
// Cobblestone Bricks
27-
generateBrickSet("cobblestone_brick", Blocks.COBBLESTONE, MapColor.STONE_GRAY, 0);
28-
// Mossy Cobblestone Bricks
29-
generateBrickSet("mossy_cobblestone_brick", Blocks.MOSSY_COBBLESTONE, MapColor.STONE_GRAY, 0);
30-
generateBrickSet("smooth_stone_brick", Blocks.COBBLESTONE, MapColor.STONE_GRAY, 0);
27+
generateBrickSet("cobblestone_brick", Blocks.COBBLESTONE, MapColor.STONE_GRAY, true);
28+
// Smooth Stone Bricks
29+
generateBrickSet("smooth_stone_brick", Blocks.SMOOTH_STONE, MapColor.STONE_GRAY, true);
30+
// Granite Bricks
31+
generateBrickSet("granite_brick", Blocks.GRANITE, MapColor.DIRT_BROWN, true);
32+
// Andesite Bricks
33+
generateBrickSet("andesite_brick", Blocks.ANDESITE, MapColor.STONE_GRAY, true);
34+
// Diorite Bricks
35+
generateBrickSet("diorite_brick", Blocks.DIORITE, MapColor.OFF_WHITE, true);
36+
// Calcite Bricks
37+
generateBrickSet("calcite_brick", Blocks.CALCITE, MapColor.OFF_WHITE, true);
38+
// Mossy Deepslate Bricks
39+
generateBrickSet("mossy_deepslate_brick", Blocks.DEEPSLATE_BRICKS, MapColor.BLACK);
3140
// Grass Set
3241
generateTurfSets();
3342
// Nether Brick Fence Gate

‎common/src/main/java/cc/cassian/pyrite/functions/BlockCreator.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,16 @@ public static void generateBrickSet(String blockID, Block copyBlock, MapColor co
180180
createPyriteBlock(blockID+"_wall_gate","fence_gate", copyBlock);
181181
}
182182

183+
public static void generateBrickSet(String blockID, Block copyBlock, MapColor color) {
184+
generateBrickSet(blockID, copyBlock, color, 0);
185+
}
186+
187+
public static void generateBrickSet(String blockID, Block copyBlock, MapColor color, boolean generateMossySet) {
188+
generateBrickSet(blockID, copyBlock, color, 0);
189+
if (generateMossySet)
190+
generateBrickSet("mossy_"+blockID, copyBlock, color, 0);
191+
}
192+
183193

184194
//Generate a Turf block set - including block and its slab, stair, and carpet variants.
185195
public static void createTurfSet(String blockID, Block copyBlock) {

‎common/src/main/resources/assets/pyrite/blockstates/andesite_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/andesite_brick_slab"},"type=double":{"model":"pyrite:block/andesite_bricks"},"type=top":{"model":"pyrite:block/andesite_brick_slab_top"}}}

‎common/src/main/resources/assets/pyrite/blockstates/andesite_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/andesite_brick_stairs_inner","y":270,"uvlock":true},"facing=east,half=bottom,shape=inner_right":{"model":"pyrite:block/andesite_brick_stairs_inner"},"facing=east,half=bottom,shape=outer_left":{"model":"pyrite:block/andesite_brick_stairs_outer","y":270,"uvlock":true},"facing=east,half=bottom,shape=outer_right":{"model":"pyrite:block/andesite_brick_stairs_outer"},"facing=east,half=bottom,shape=straight":{"model":"pyrite:block/andesite_brick_stairs"},"facing=east,half=top,shape=inner_left":{"model":"pyrite:block/andesite_brick_stairs_inner","x":180,"uvlock":true},"facing=east,half=top,shape=inner_right":{"model":"pyrite:block/andesite_brick_stairs_inner","x":180,"y":90,"uvlock":true},"facing=east,half=top,shape=outer_left":{"model":"pyrite:block/andesite_brick_stairs_outer","x":180,"uvlock":true},"facing=east,half=top,shape=outer_right":{"model":"pyrite:block/andesite_brick_stairs_outer","x":180,"y":90,"uvlock":true},"facing=east,half=top,shape=straight":{"model":"pyrite:block/andesite_brick_stairs","x":180,"uvlock":true},"facing=north,half=bottom,shape=inner_left":{"model":"pyrite:block/andesite_brick_stairs_inner","y":180,"uvlock":true},"facing=north,half=bottom,shape=inner_right":{"model":"pyrite:block/andesite_brick_stairs_inner","y":270,"uvlock":true},"facing=north,half=bottom,shape=outer_left":{"model":"pyrite:block/andesite_brick_stairs_outer","y":180,"uvlock":true},"facing=north,half=bottom,shape=outer_right":{"model":"pyrite:block/andesite_brick_stairs_outer","y":270,"uvlock":true},"facing=north,half=bottom,shape=straight":{"model":"pyrite:block/andesite_brick_stairs","y":270,"uvlock":true},"facing=north,half=top,shape=inner_left":{"model":"pyrite:block/andesite_brick_stairs_inner","x":180,"y":270,"uvlock":true},"facing=north,half=top,shape=inner_right":{"model":"pyrite:block/andesite_brick_stairs_inner","x":180,"uvlock":true},"facing=north,half=top,shape=outer_left":{"model":"pyrite:block/andesite_brick_stairs_outer","x":180,"y":270,"uvlock":true},"facing=north,half=top,shape=outer_right":{"model":"pyrite:block/andesite_brick_stairs_outer","x":180,"uvlock":true},"facing=north,half=top,shape=straight":{"model":"pyrite:block/andesite_brick_stairs","x":180,"y":270,"uvlock":true},"facing=south,half=bottom,shape=inner_left":{"model":"pyrite:block/andesite_brick_stairs_inner"},"facing=south,half=bottom,shape=inner_right":{"model":"pyrite:block/andesite_brick_stairs_inner","y":90,"uvlock":true},"facing=south,half=bottom,shape=outer_left":{"model":"pyrite:block/andesite_brick_stairs_outer"},"facing=south,half=bottom,shape=outer_right":{"model":"pyrite:block/andesite_brick_stairs_outer","y":90,"uvlock":true},"facing=south,half=bottom,shape=straight":{"model":"pyrite:block/andesite_brick_stairs","y":90,"uvlock":true},"facing=south,half=top,shape=inner_left":{"model":"pyrite:block/andesite_brick_stairs_inner","x":180,"y":90,"uvlock":true},"facing=south,half=top,shape=inner_right":{"model":"pyrite:block/andesite_brick_stairs_inner","x":180,"y":180,"uvlock":true},"facing=south,half=top,shape=outer_left":{"model":"pyrite:block/andesite_brick_stairs_outer","x":180,"y":90,"uvlock":true},"facing=south,half=top,shape=outer_right":{"model":"pyrite:block/andesite_brick_stairs_outer","x":180,"y":180,"uvlock":true},"facing=south,half=top,shape=straight":{"model":"pyrite:block/andesite_brick_stairs","x":180,"y":90,"uvlock":true},"facing=west,half=bottom,shape=inner_left":{"model":"pyrite:block/andesite_brick_stairs_inner","y":90,"uvlock":true},"facing=west,half=bottom,shape=inner_right":{"model":"pyrite:block/andesite_brick_stairs_inner","y":180,"uvlock":true},"facing=west,half=bottom,shape=outer_left":{"model":"pyrite:block/andesite_brick_stairs_outer","y":90,"uvlock":true},"facing=west,half=bottom,shape=outer_right":{"model":"pyrite:block/andesite_brick_stairs_outer","y":180,"uvlock":true},"facing=west,half=bottom,shape=straight":{"model":"pyrite:block/andesite_brick_stairs","y":180,"uvlock":true},"facing=west,half=top,shape=inner_left":{"model":"pyrite:block/andesite_brick_stairs_inner","x":180,"y":180,"uvlock":true},"facing=west,half=top,shape=inner_right":{"model":"pyrite:block/andesite_brick_stairs_inner","x":180,"y":270,"uvlock":true},"facing=west,half=top,shape=outer_left":{"model":"pyrite:block/andesite_brick_stairs_outer","x":180,"y":180,"uvlock":true},"facing=west,half=top,shape=outer_right":{"model":"pyrite:block/andesite_brick_stairs_outer","x":180,"y":270,"uvlock":true},"facing=west,half=top,shape=straight":{"model":"pyrite:block/andesite_brick_stairs","x":180,"y":180,"uvlock":true}}}

‎common/src/main/resources/assets/pyrite/blockstates/andesite_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/andesite_brick_wall_post"},"when":{"up":"true"}},{"apply":{"model":"pyrite:block/andesite_brick_wall_side","uvlock":true},"when":{"north":"low"}},{"apply":{"model":"pyrite:block/andesite_brick_wall_side","uvlock":true,"y":90},"when":{"east":"low"}},{"apply":{"model":"pyrite:block/andesite_brick_wall_side","uvlock":true,"y":180},"when":{"south":"low"}},{"apply":{"model":"pyrite:block/andesite_brick_wall_side","uvlock":true,"y":270},"when":{"west":"low"}},{"apply":{"model":"pyrite:block/andesite_brick_wall_side_tall","uvlock":true},"when":{"north":"tall"}},{"apply":{"model":"pyrite:block/andesite_brick_wall_side_tall","uvlock":true,"y":90},"when":{"east":"tall"}},{"apply":{"model":"pyrite:block/andesite_brick_wall_side_tall","uvlock":true,"y":180},"when":{"south":"tall"}},{"apply":{"model":"pyrite:block/andesite_brick_wall_side_tall","uvlock":true,"y":270},"when":{"west":"tall"}}]}

‎common/src/main/resources/assets/pyrite/blockstates/andesite_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/andesite_brick_wall_gate","uvlock":true,"y":270},"facing=east,in_wall=false,open=true":{"model":"pyrite:block/andesite_brick_wall_gate_open","uvlock":true,"y":270},"facing=east,in_wall=true,open=false":{"model":"pyrite:block/andesite_brick_wall_gate_wall","uvlock":true,"y":270},"facing=east,in_wall=true,open=true":{"model":"pyrite:block/andesite_brick_wall_gate_wall_open","uvlock":true,"y":270},"facing=north,in_wall=false,open=false":{"model":"pyrite:block/andesite_brick_wall_gate","uvlock":true,"y":180},"facing=north,in_wall=false,open=true":{"model":"pyrite:block/andesite_brick_wall_gate_open","uvlock":true,"y":180},"facing=north,in_wall=true,open=false":{"model":"pyrite:block/andesite_brick_wall_gate_wall","uvlock":true,"y":180},"facing=north,in_wall=true,open=true":{"model":"pyrite:block/andesite_brick_wall_gate_wall_open","uvlock":true,"y":180},"facing=south,in_wall=false,open=false":{"model":"pyrite:block/andesite_brick_wall_gate","uvlock":true},"facing=south,in_wall=false,open=true":{"model":"pyrite:block/andesite_brick_wall_gate_open","uvlock":true},"facing=south,in_wall=true,open=false":{"model":"pyrite:block/andesite_brick_wall_gate_wall","uvlock":true},"facing=south,in_wall=true,open=true":{"model":"pyrite:block/andesite_brick_wall_gate_wall_open","uvlock":true},"facing=west,in_wall=false,open=false":{"model":"pyrite:block/andesite_brick_wall_gate","uvlock":true,"y":90},"facing=west,in_wall=false,open=true":{"model":"pyrite:block/andesite_brick_wall_gate_open","uvlock":true,"y":90},"facing=west,in_wall=true,open=false":{"model":"pyrite:block/andesite_brick_wall_gate_wall","uvlock":true,"y":90},"facing=west,in_wall=true,open=true":{"model":"pyrite:block/andesite_brick_wall_gate_wall_open","uvlock":true,"y":90}}}

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

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

‎common/src/main/resources/assets/pyrite/blockstates/calcite_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/calcite_brick_slab"},"type=double":{"model":"pyrite:block/calcite_bricks"},"type=top":{"model":"pyrite:block/calcite_brick_slab_top"}}}

‎common/src/main/resources/assets/pyrite/blockstates/calcite_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/calcite_brick_stairs_inner","y":270,"uvlock":true},"facing=east,half=bottom,shape=inner_right":{"model":"pyrite:block/calcite_brick_stairs_inner"},"facing=east,half=bottom,shape=outer_left":{"model":"pyrite:block/calcite_brick_stairs_outer","y":270,"uvlock":true},"facing=east,half=bottom,shape=outer_right":{"model":"pyrite:block/calcite_brick_stairs_outer"},"facing=east,half=bottom,shape=straight":{"model":"pyrite:block/calcite_brick_stairs"},"facing=east,half=top,shape=inner_left":{"model":"pyrite:block/calcite_brick_stairs_inner","x":180,"uvlock":true},"facing=east,half=top,shape=inner_right":{"model":"pyrite:block/calcite_brick_stairs_inner","x":180,"y":90,"uvlock":true},"facing=east,half=top,shape=outer_left":{"model":"pyrite:block/calcite_brick_stairs_outer","x":180,"uvlock":true},"facing=east,half=top,shape=outer_right":{"model":"pyrite:block/calcite_brick_stairs_outer","x":180,"y":90,"uvlock":true},"facing=east,half=top,shape=straight":{"model":"pyrite:block/calcite_brick_stairs","x":180,"uvlock":true},"facing=north,half=bottom,shape=inner_left":{"model":"pyrite:block/calcite_brick_stairs_inner","y":180,"uvlock":true},"facing=north,half=bottom,shape=inner_right":{"model":"pyrite:block/calcite_brick_stairs_inner","y":270,"uvlock":true},"facing=north,half=bottom,shape=outer_left":{"model":"pyrite:block/calcite_brick_stairs_outer","y":180,"uvlock":true},"facing=north,half=bottom,shape=outer_right":{"model":"pyrite:block/calcite_brick_stairs_outer","y":270,"uvlock":true},"facing=north,half=bottom,shape=straight":{"model":"pyrite:block/calcite_brick_stairs","y":270,"uvlock":true},"facing=north,half=top,shape=inner_left":{"model":"pyrite:block/calcite_brick_stairs_inner","x":180,"y":270,"uvlock":true},"facing=north,half=top,shape=inner_right":{"model":"pyrite:block/calcite_brick_stairs_inner","x":180,"uvlock":true},"facing=north,half=top,shape=outer_left":{"model":"pyrite:block/calcite_brick_stairs_outer","x":180,"y":270,"uvlock":true},"facing=north,half=top,shape=outer_right":{"model":"pyrite:block/calcite_brick_stairs_outer","x":180,"uvlock":true},"facing=north,half=top,shape=straight":{"model":"pyrite:block/calcite_brick_stairs","x":180,"y":270,"uvlock":true},"facing=south,half=bottom,shape=inner_left":{"model":"pyrite:block/calcite_brick_stairs_inner"},"facing=south,half=bottom,shape=inner_right":{"model":"pyrite:block/calcite_brick_stairs_inner","y":90,"uvlock":true},"facing=south,half=bottom,shape=outer_left":{"model":"pyrite:block/calcite_brick_stairs_outer"},"facing=south,half=bottom,shape=outer_right":{"model":"pyrite:block/calcite_brick_stairs_outer","y":90,"uvlock":true},"facing=south,half=bottom,shape=straight":{"model":"pyrite:block/calcite_brick_stairs","y":90,"uvlock":true},"facing=south,half=top,shape=inner_left":{"model":"pyrite:block/calcite_brick_stairs_inner","x":180,"y":90,"uvlock":true},"facing=south,half=top,shape=inner_right":{"model":"pyrite:block/calcite_brick_stairs_inner","x":180,"y":180,"uvlock":true},"facing=south,half=top,shape=outer_left":{"model":"pyrite:block/calcite_brick_stairs_outer","x":180,"y":90,"uvlock":true},"facing=south,half=top,shape=outer_right":{"model":"pyrite:block/calcite_brick_stairs_outer","x":180,"y":180,"uvlock":true},"facing=south,half=top,shape=straight":{"model":"pyrite:block/calcite_brick_stairs","x":180,"y":90,"uvlock":true},"facing=west,half=bottom,shape=inner_left":{"model":"pyrite:block/calcite_brick_stairs_inner","y":90,"uvlock":true},"facing=west,half=bottom,shape=inner_right":{"model":"pyrite:block/calcite_brick_stairs_inner","y":180,"uvlock":true},"facing=west,half=bottom,shape=outer_left":{"model":"pyrite:block/calcite_brick_stairs_outer","y":90,"uvlock":true},"facing=west,half=bottom,shape=outer_right":{"model":"pyrite:block/calcite_brick_stairs_outer","y":180,"uvlock":true},"facing=west,half=bottom,shape=straight":{"model":"pyrite:block/calcite_brick_stairs","y":180,"uvlock":true},"facing=west,half=top,shape=inner_left":{"model":"pyrite:block/calcite_brick_stairs_inner","x":180,"y":180,"uvlock":true},"facing=west,half=top,shape=inner_right":{"model":"pyrite:block/calcite_brick_stairs_inner","x":180,"y":270,"uvlock":true},"facing=west,half=top,shape=outer_left":{"model":"pyrite:block/calcite_brick_stairs_outer","x":180,"y":180,"uvlock":true},"facing=west,half=top,shape=outer_right":{"model":"pyrite:block/calcite_brick_stairs_outer","x":180,"y":270,"uvlock":true},"facing=west,half=top,shape=straight":{"model":"pyrite:block/calcite_brick_stairs","x":180,"y":180,"uvlock":true}}}

‎common/src/main/resources/assets/pyrite/blockstates/calcite_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/calcite_brick_wall_post"},"when":{"up":"true"}},{"apply":{"model":"pyrite:block/calcite_brick_wall_side","uvlock":true},"when":{"north":"low"}},{"apply":{"model":"pyrite:block/calcite_brick_wall_side","uvlock":true,"y":90},"when":{"east":"low"}},{"apply":{"model":"pyrite:block/calcite_brick_wall_side","uvlock":true,"y":180},"when":{"south":"low"}},{"apply":{"model":"pyrite:block/calcite_brick_wall_side","uvlock":true,"y":270},"when":{"west":"low"}},{"apply":{"model":"pyrite:block/calcite_brick_wall_side_tall","uvlock":true},"when":{"north":"tall"}},{"apply":{"model":"pyrite:block/calcite_brick_wall_side_tall","uvlock":true,"y":90},"when":{"east":"tall"}},{"apply":{"model":"pyrite:block/calcite_brick_wall_side_tall","uvlock":true,"y":180},"when":{"south":"tall"}},{"apply":{"model":"pyrite:block/calcite_brick_wall_side_tall","uvlock":true,"y":270},"when":{"west":"tall"}}]}

0 commit comments

Comments
 (0)