Skip to content

Commit f73a9f1

Browse files
cassiancccassiancc
committed
Finish backport
1 parent 6a263f2 commit f73a9f1

2,837 files changed

Lines changed: 2789 additions & 39743 deletions

File tree

Some content is hidden

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

‎common/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ dependencies {
99
modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
1010

1111
// Architectury API. This is optional, and you can comment it out if you don't need it.
12-
modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version"
12+
// modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version"
1313
}

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,7 @@ public static void createResourceBlockSet(String blockID, Block block) {
269269
//Brick Blocks
270270
createPyriteBlock(blockID+"_bricks", block);
271271
//Chiseled Blocks - Copper Blocks
272-
if (!blockID.contains("copper")) {
273-
createPyriteBlock("chiseled_"+blockID+"_block", "log", block);
274-
}
272+
createPyriteBlock("chiseled_"+blockID+"_block", "log", block);
275273
//Pillar Blocks
276274
createPyriteBlock(blockID+"_pillar", "log", block);
277275
}
@@ -284,11 +282,8 @@ public static void createResourceBlockSet(String blockID, Block block) {
284282
if (!Objects.equals(blockID, "iron")) {
285283
//Bars
286284
createPyriteBlock(blockID+"_bars","bars", block);
287-
//Disable Copper doors in 1.21+
288-
if (!blockID.contains("copper")) {
289-
createPyriteBlock(blockID+"_door","door", block, set);
290-
createPyriteBlock(blockID+"_trapdoor","trapdoor", block, set);
291-
}
285+
createPyriteBlock(blockID+"_door","door", block, set);
286+
createPyriteBlock(blockID+"_trapdoor","trapdoor", block, set);
292287
//Create Plates for those that don't already exist (Iron and Gold)
293288
if (!blockID.equals("gold")) {
294289
createPyriteBlock(blockID+"_pressure_plate","pressure_plate", block, set);

‎common/src/main/java/cc/cassian/pyrite/functions/architectury/ArchitecturyHelpers.java‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
1-
{
2-
"variants": {
3-
"": {
4-
"model": "pyrite:block/chiseled_copper_block"
5-
}
6-
}
7-
}
1+
{"variants":{"axis=x":{"model":"pyrite:block/chiseled_copper_block_horizontal","x":90,"y":90},"axis=y":{"model":"pyrite:block/chiseled_copper_block"},"axis=z":{"model":"pyrite:block/chiseled_copper_block_horizontal","x":90}}}

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
1-
{
2-
"variants": {
3-
"": {
4-
"model": "pyrite:block/chiseled_exposed_copper_block"
5-
}
6-
}
7-
}
1+
{"variants":{"axis=x":{"model":"pyrite:block/chiseled_exposed_copper_block_horizontal","x":90,"y":90},"axis=y":{"model":"pyrite:block/chiseled_exposed_copper_block"},"axis=z":{"model":"pyrite:block/chiseled_exposed_copper_block_horizontal","x":90}}}

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
1-
{
2-
"variants": {
3-
"": {
4-
"model": "pyrite:block/chiseled_oxidized_copper_block"
5-
}
6-
}
7-
}
1+
{"variants":{"axis=x":{"model":"pyrite:block/chiseled_oxidized_copper_block_horizontal","x":90,"y":90},"axis=y":{"model":"pyrite:block/chiseled_oxidized_copper_block"},"axis=z":{"model":"pyrite:block/chiseled_oxidized_copper_block_horizontal","x":90}}}

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
1-
{
2-
"variants": {
3-
"": {
4-
"model": "pyrite:block/chiseled_weathered_copper_block"
5-
}
6-
}
7-
}
1+
{"variants":{"axis=x":{"model":"pyrite:block/chiseled_weathered_copper_block_horizontal","x":90,"y":90},"axis=y":{"model":"pyrite:block/chiseled_weathered_copper_block"},"axis=z":{"model":"pyrite:block/chiseled_weathered_copper_block_horizontal","x":90}}}

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

Lines changed: 1 addition & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -1,124 +1 @@
1-
{
2-
"variants": {
3-
"facing=east,half=lower,hinge=left,open=false": {
4-
"model": "pyrite:block/copper_door_bottom_left"
5-
},
6-
"facing=east,half=lower,hinge=left,open=true": {
7-
"model": "pyrite:block/copper_door_bottom_left_open",
8-
"y": 90
9-
},
10-
"facing=east,half=lower,hinge=right,open=false": {
11-
"model": "pyrite:block/copper_door_bottom_right"
12-
},
13-
"facing=east,half=lower,hinge=right,open=true": {
14-
"model": "pyrite:block/copper_door_bottom_right_open",
15-
"y": 270
16-
},
17-
"facing=east,half=upper,hinge=left,open=false": {
18-
"model": "pyrite:block/copper_door_top_left"
19-
},
20-
"facing=east,half=upper,hinge=left,open=true": {
21-
"model": "pyrite:block/copper_door_top_left_open",
22-
"y": 90
23-
},
24-
"facing=east,half=upper,hinge=right,open=false": {
25-
"model": "pyrite:block/copper_door_top_right"
26-
},
27-
"facing=east,half=upper,hinge=right,open=true": {
28-
"model": "pyrite:block/copper_door_top_right_open",
29-
"y": 270
30-
},
31-
"facing=north,half=lower,hinge=left,open=false": {
32-
"model": "pyrite:block/copper_door_bottom_left",
33-
"y": 270
34-
},
35-
"facing=north,half=lower,hinge=left,open=true": {
36-
"model": "pyrite:block/copper_door_bottom_left_open"
37-
},
38-
"facing=north,half=lower,hinge=right,open=false": {
39-
"model": "pyrite:block/copper_door_bottom_right",
40-
"y": 270
41-
},
42-
"facing=north,half=lower,hinge=right,open=true": {
43-
"model": "pyrite:block/copper_door_bottom_right_open",
44-
"y": 180
45-
},
46-
"facing=north,half=upper,hinge=left,open=false": {
47-
"model": "pyrite:block/copper_door_top_left",
48-
"y": 270
49-
},
50-
"facing=north,half=upper,hinge=left,open=true": {
51-
"model": "pyrite:block/copper_door_top_left_open"
52-
},
53-
"facing=north,half=upper,hinge=right,open=false": {
54-
"model": "pyrite:block/copper_door_top_right",
55-
"y": 270
56-
},
57-
"facing=north,half=upper,hinge=right,open=true": {
58-
"model": "pyrite:block/copper_door_top_right_open",
59-
"y": 180
60-
},
61-
"facing=south,half=lower,hinge=left,open=false": {
62-
"model": "pyrite:block/copper_door_bottom_left",
63-
"y": 90
64-
},
65-
"facing=south,half=lower,hinge=left,open=true": {
66-
"model": "pyrite:block/copper_door_bottom_left_open",
67-
"y": 180
68-
},
69-
"facing=south,half=lower,hinge=right,open=false": {
70-
"model": "pyrite:block/copper_door_bottom_right",
71-
"y": 90
72-
},
73-
"facing=south,half=lower,hinge=right,open=true": {
74-
"model": "pyrite:block/copper_door_bottom_right_open"
75-
},
76-
"facing=south,half=upper,hinge=left,open=false": {
77-
"model": "pyrite:block/copper_door_top_left",
78-
"y": 90
79-
},
80-
"facing=south,half=upper,hinge=left,open=true": {
81-
"model": "pyrite:block/copper_door_top_left_open",
82-
"y": 180
83-
},
84-
"facing=south,half=upper,hinge=right,open=false": {
85-
"model": "pyrite:block/copper_door_top_right",
86-
"y": 90
87-
},
88-
"facing=south,half=upper,hinge=right,open=true": {
89-
"model": "pyrite:block/copper_door_top_right_open"
90-
},
91-
"facing=west,half=lower,hinge=left,open=false": {
92-
"model": "pyrite:block/copper_door_bottom_left",
93-
"y": 180
94-
},
95-
"facing=west,half=lower,hinge=left,open=true": {
96-
"model": "pyrite:block/copper_door_bottom_left_open",
97-
"y": 270
98-
},
99-
"facing=west,half=lower,hinge=right,open=false": {
100-
"model": "pyrite:block/copper_door_bottom_right",
101-
"y": 180
102-
},
103-
"facing=west,half=lower,hinge=right,open=true": {
104-
"model": "pyrite:block/copper_door_bottom_right_open",
105-
"y": 90
106-
},
107-
"facing=west,half=upper,hinge=left,open=false": {
108-
"model": "pyrite:block/copper_door_top_left",
109-
"y": 180
110-
},
111-
"facing=west,half=upper,hinge=left,open=true": {
112-
"model": "pyrite:block/copper_door_top_left_open",
113-
"y": 270
114-
},
115-
"facing=west,half=upper,hinge=right,open=false": {
116-
"model": "pyrite:block/copper_door_top_right",
117-
"y": 180
118-
},
119-
"facing=west,half=upper,hinge=right,open=true": {
120-
"model": "pyrite:block/copper_door_top_right_open",
121-
"y": 90
122-
}
123-
}
124-
}
1+
{"variants":{"facing=east,half=lower,hinge=left,open=false":{"model":"pyrite:block/copper_door_bottom_left"},"facing=east,half=lower,hinge=left,open=true":{"model":"pyrite:block/copper_door_bottom_left_open","y":90},"facing=east,half=lower,hinge=right,open=false":{"model":"pyrite:block/copper_door_bottom_right"},"facing=east,half=lower,hinge=right,open=true":{"model":"pyrite:block/copper_door_bottom_right_open","y":270},"facing=east,half=upper,hinge=left,open=false":{"model":"pyrite:block/copper_door_top_left"},"facing=east,half=upper,hinge=left,open=true":{"model":"pyrite:block/copper_door_top_left_open","y":90},"facing=east,half=upper,hinge=right,open=false":{"model":"pyrite:block/copper_door_top_right"},"facing=east,half=upper,hinge=right,open=true":{"model":"pyrite:block/copper_door_top_right_open","y":270},"facing=north,half=lower,hinge=left,open=false":{"model":"pyrite:block/copper_door_bottom_left","y":270},"facing=north,half=lower,hinge=left,open=true":{"model":"pyrite:block/copper_door_bottom_left_open"},"facing=north,half=lower,hinge=right,open=false":{"model":"pyrite:block/copper_door_bottom_right","y":270},"facing=north,half=lower,hinge=right,open=true":{"model":"pyrite:block/copper_door_bottom_right_open","y":180},"facing=north,half=upper,hinge=left,open=false":{"model":"pyrite:block/copper_door_top_left","y":270},"facing=north,half=upper,hinge=left,open=true":{"model":"pyrite:block/copper_door_top_left_open"},"facing=north,half=upper,hinge=right,open=false":{"model":"pyrite:block/copper_door_top_right","y":270},"facing=north,half=upper,hinge=right,open=true":{"model":"pyrite:block/copper_door_top_right_open","y":180},"facing=south,half=lower,hinge=left,open=false":{"model":"pyrite:block/copper_door_bottom_left","y":90},"facing=south,half=lower,hinge=left,open=true":{"model":"pyrite:block/copper_door_bottom_left_open","y":180},"facing=south,half=lower,hinge=right,open=false":{"model":"pyrite:block/copper_door_bottom_right","y":90},"facing=south,half=lower,hinge=right,open=true":{"model":"pyrite:block/copper_door_bottom_right_open"},"facing=south,half=upper,hinge=left,open=false":{"model":"pyrite:block/copper_door_top_left","y":90},"facing=south,half=upper,hinge=left,open=true":{"model":"pyrite:block/copper_door_top_left_open","y":180},"facing=south,half=upper,hinge=right,open=false":{"model":"pyrite:block/copper_door_top_right","y":90},"facing=south,half=upper,hinge=right,open=true":{"model":"pyrite:block/copper_door_top_right_open"},"facing=west,half=lower,hinge=left,open=false":{"model":"pyrite:block/copper_door_bottom_left","y":180},"facing=west,half=lower,hinge=left,open=true":{"model":"pyrite:block/copper_door_bottom_left_open","y":270},"facing=west,half=lower,hinge=right,open=false":{"model":"pyrite:block/copper_door_bottom_right","y":180},"facing=west,half=lower,hinge=right,open=true":{"model":"pyrite:block/copper_door_bottom_right_open","y":90},"facing=west,half=upper,hinge=left,open=false":{"model":"pyrite:block/copper_door_top_left","y":180},"facing=west,half=upper,hinge=left,open=true":{"model":"pyrite:block/copper_door_top_left_open","y":270},"facing=west,half=upper,hinge=right,open=false":{"model":"pyrite:block/copper_door_top_right","y":180},"facing=west,half=upper,hinge=right,open=true":{"model":"pyrite:block/copper_door_top_right_open","y":90}}}

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

Lines changed: 1 addition & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1 @@
1-
{
2-
"variants": {
3-
"facing=east,half=bottom,open=false": {
4-
"model": "pyrite:block/copper_trapdoor_bottom",
5-
"y": 90
6-
},
7-
"facing=east,half=bottom,open=true": {
8-
"model": "pyrite:block/copper_trapdoor_open",
9-
"y": 90
10-
},
11-
"facing=east,half=top,open=false": {
12-
"model": "pyrite:block/copper_trapdoor_top",
13-
"y": 90
14-
},
15-
"facing=east,half=top,open=true": {
16-
"model": "pyrite:block/copper_trapdoor_open",
17-
"x": 180,
18-
"y": 270
19-
},
20-
"facing=north,half=bottom,open=false": {
21-
"model": "pyrite:block/copper_trapdoor_bottom"
22-
},
23-
"facing=north,half=bottom,open=true": {
24-
"model": "pyrite:block/copper_trapdoor_open"
25-
},
26-
"facing=north,half=top,open=false": {
27-
"model": "pyrite:block/copper_trapdoor_top"
28-
},
29-
"facing=north,half=top,open=true": {
30-
"model": "pyrite:block/copper_trapdoor_open",
31-
"x": 180,
32-
"y": 180
33-
},
34-
"facing=south,half=bottom,open=false": {
35-
"model": "pyrite:block/copper_trapdoor_bottom",
36-
"y": 180
37-
},
38-
"facing=south,half=bottom,open=true": {
39-
"model": "pyrite:block/copper_trapdoor_open",
40-
"y": 180
41-
},
42-
"facing=south,half=top,open=false": {
43-
"model": "pyrite:block/copper_trapdoor_top",
44-
"y": 180
45-
},
46-
"facing=south,half=top,open=true": {
47-
"model": "pyrite:block/copper_trapdoor_open",
48-
"x": 180,
49-
"y": 0
50-
},
51-
"facing=west,half=bottom,open=false": {
52-
"model": "pyrite:block/copper_trapdoor_bottom",
53-
"y": 270
54-
},
55-
"facing=west,half=bottom,open=true": {
56-
"model": "pyrite:block/copper_trapdoor_open",
57-
"y": 270
58-
},
59-
"facing=west,half=top,open=false": {
60-
"model": "pyrite:block/copper_trapdoor_top",
61-
"y": 270
62-
},
63-
"facing=west,half=top,open=true": {
64-
"model": "pyrite:block/copper_trapdoor_open",
65-
"x": 180,
66-
"y": 90
67-
}
68-
}
69-
}
1+
{"variants":{"facing=east,half=bottom,open=false":{"model":"pyrite:block/copper_trapdoor_bottom","y":90},"facing=east,half=bottom,open=true":{"model":"pyrite:block/copper_trapdoor_open","y":90},"facing=east,half=top,open=false":{"model":"pyrite:block/copper_trapdoor_top","y":90},"facing=east,half=top,open=true":{"model":"pyrite:block/copper_trapdoor_open","x":180,"y":270},"facing=north,half=bottom,open=false":{"model":"pyrite:block/copper_trapdoor_bottom"},"facing=north,half=bottom,open=true":{"model":"pyrite:block/copper_trapdoor_open"},"facing=north,half=top,open=false":{"model":"pyrite:block/copper_trapdoor_top"},"facing=north,half=top,open=true":{"model":"pyrite:block/copper_trapdoor_open","x":180,"y":180},"facing=south,half=bottom,open=false":{"model":"pyrite:block/copper_trapdoor_bottom","y":180},"facing=south,half=bottom,open=true":{"model":"pyrite:block/copper_trapdoor_open","y":180},"facing=south,half=top,open=false":{"model":"pyrite:block/copper_trapdoor_top","y":180},"facing=south,half=top,open=true":{"model":"pyrite:block/copper_trapdoor_open","x":180,"y":0},"facing=west,half=bottom,open=false":{"model":"pyrite:block/copper_trapdoor_bottom","y":270},"facing=west,half=bottom,open=true":{"model":"pyrite:block/copper_trapdoor_open","y":270},"facing=west,half=top,open=false":{"model":"pyrite:block/copper_trapdoor_top","y":270},"facing=west,half=top,open=true":{"model":"pyrite:block/copper_trapdoor_open","x":180,"y":90}}}

0 commit comments

Comments
 (0)