Skip to content

Commit

Permalink
backport: 0.15.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@cassiancc
cassiancc committed Nov 24, 2024
1 parent f73a9f1 commit fae3bf9
Show file tree
Hide file tree
Showing 1,653 changed files with 6,048 additions and 232 deletions.
17 changes: 13 additions & 4 deletions common/src/main/java/cc/cassian/pyrite/Pyrite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,19 @@ public static void init() {
// Switchable Glass
createPyriteBlock("switchable_glass", "switchable_glass", Blocks.GLASS);
// Cobblestone Bricks
generateBrickSet("cobblestone_brick", Blocks.COBBLESTONE, MapColor.STONE_GRAY, 0);
// Mossy Cobblestone Bricks
generateBrickSet("mossy_cobblestone_brick", Blocks.MOSSY_COBBLESTONE, MapColor.STONE_GRAY, 0);
generateBrickSet("smooth_stone_brick", Blocks.COBBLESTONE, MapColor.STONE_GRAY, 0);
generateBrickSet("cobblestone_brick", Blocks.COBBLESTONE, MapColor.STONE_GRAY, true);
// Smooth Stone Bricks
generateBrickSet("smooth_stone_brick", Blocks.SMOOTH_STONE, MapColor.STONE_GRAY, true);
// Granite Bricks
generateBrickSet("granite_brick", Blocks.GRANITE, MapColor.DIRT_BROWN, true);
// Andesite Bricks
generateBrickSet("andesite_brick", Blocks.ANDESITE, MapColor.STONE_GRAY, true);
// Diorite Bricks
generateBrickSet("diorite_brick", Blocks.DIORITE, MapColor.OFF_WHITE, true);
// Calcite Bricks
generateBrickSet("calcite_brick", Blocks.CALCITE, MapColor.OFF_WHITE, true);
// Mossy Deepslate Bricks
generateBrickSet("mossy_deepslate_brick", Blocks.DEEPSLATE_BRICKS, MapColor.BLACK);
// Grass Set
generateTurfSets();
// Nether Brick Fence Gate
Expand Down
10 changes: 10 additions & 0 deletions common/src/main/java/cc/cassian/pyrite/functions/BlockCreator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,16 @@ public static void generateBrickSet(String blockID, Block copyBlock, MapColor co
createPyriteBlock(blockID+"_wall_gate","fence_gate", copyBlock);
}

public static void generateBrickSet(String blockID, Block copyBlock, MapColor color) {
generateBrickSet(blockID, copyBlock, color, 0);
}

public static void generateBrickSet(String blockID, Block copyBlock, MapColor color, boolean generateMossySet) {
generateBrickSet(blockID, copyBlock, color, 0);
if (generateMossySet)
generateBrickSet("mossy_"+blockID, copyBlock, color, 0);
}


//Generate a Turf block set - including block and its slab, stair, and carpet variants.
public static void createTurfSet(String blockID, Block copyBlock) {
Expand Down
1 change: 1 addition & 0 deletions common/src/main/resources/assets/pyrite/blockstates/andesite_brick_slab.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +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"}}}
1 change: 1 addition & 0 deletions common/src/main/resources/assets/pyrite/blockstates/andesite_brick_stairs.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +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}}}
1 change: 1 addition & 0 deletions common/src/main/resources/assets/pyrite/blockstates/andesite_brick_wall.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +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"}}]}
1 change: 1 addition & 0 deletions common/src/main/resources/assets/pyrite/blockstates/andesite_brick_wall_gate.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +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}}}
1 change: 1 addition & 0 deletions common/src/main/resources/assets/pyrite/blockstates/andesite_bricks.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"variants":{"":{"model":"pyrite:block/andesite_bricks"}}}
1 change: 1 addition & 0 deletions common/src/main/resources/assets/pyrite/blockstates/calcite_brick_slab.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +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"}}}
1 change: 1 addition & 0 deletions common/src/main/resources/assets/pyrite/blockstates/calcite_brick_stairs.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +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}}}
1 change: 1 addition & 0 deletions common/src/main/resources/assets/pyrite/blockstates/calcite_brick_wall.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +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"}}]}
1 change: 1 addition & 0 deletions common/src/main/resources/assets/pyrite/blockstates/calcite_brick_wall_gate.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"variants":{"facing=east,in_wall=false,open=false":{"model":"pyrite:block/calcite_brick_wall_gate","uvlock":true,"y":270},"facing=east,in_wall=false,open=true":{"model":"pyrite:block/calcite_brick_wall_gate_open","uvlock":true,"y":270},"facing=east,in_wall=true,open=false":{"model":"pyrite:block/calcite_brick_wall_gate_wall","uvlock":true,"y":270},"facing=east,in_wall=true,open=true":{"model":"pyrite:block/calcite_brick_wall_gate_wall_open","uvlock":true,"y":270},"facing=north,in_wall=false,open=false":{"model":"pyrite:block/calcite_brick_wall_gate","uvlock":true,"y":180},"facing=north,in_wall=false,open=true":{"model":"pyrite:block/calcite_brick_wall_gate_open","uvlock":true,"y":180},"facing=north,in_wall=true,open=false":{"model":"pyrite:block/calcite_brick_wall_gate_wall","uvlock":true,"y":180},"facing=north,in_wall=true,open=true":{"model":"pyrite:block/calcite_brick_wall_gate_wall_open","uvlock":true,"y":180},"facing=south,in_wall=false,open=false":{"model":"pyrite:block/calcite_brick_wall_gate","uvlock":true},"facing=south,in_wall=false,open=true":{"model":"pyrite:block/calcite_brick_wall_gate_open","uvlock":true},"facing=south,in_wall=true,open=false":{"model":"pyrite:block/calcite_brick_wall_gate_wall","uvlock":true},"facing=south,in_wall=true,open=true":{"model":"pyrite:block/calcite_brick_wall_gate_wall_open","uvlock":true},"facing=west,in_wall=false,open=false":{"model":"pyrite:block/calcite_brick_wall_gate","uvlock":true,"y":90},"facing=west,in_wall=false,open=true":{"model":"pyrite:block/calcite_brick_wall_gate_open","uvlock":true,"y":90},"facing=west,in_wall=true,open=false":{"model":"pyrite:block/calcite_brick_wall_gate_wall","uvlock":true,"y":90},"facing=west,in_wall=true,open=true":{"model":"pyrite:block/calcite_brick_wall_gate_wall_open","uvlock":true,"y":90}}}
1 change: 1 addition & 0 deletions common/src/main/resources/assets/pyrite/blockstates/calcite_bricks.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"variants":{"":{"model":"pyrite:block/calcite_bricks"}}}
1 change: 1 addition & 0 deletions common/src/main/resources/assets/pyrite/blockstates/diorite_brick_slab.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"variants":{"type=bottom":{"model":"pyrite:block/diorite_brick_slab"},"type=double":{"model":"pyrite:block/diorite_bricks"},"type=top":{"model":"pyrite:block/diorite_brick_slab_top"}}}
Loading

0 comments on commit fae3bf9

Please sign in to comment.