Skip to content

Commit e010897

Browse files
JuuxelJuuxel
committed
Add painted wood block variants, fix EMI recipe defaults generator
1 parent 760bfe9 commit e010897

File tree

1,320 files changed

+37110
-100
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,320 files changed

+37110
-100
lines changed

‎build-logic/src/main/java/juuxel/adorn/gradle/datagen/EmiDataGeneratorExtension.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public void setupForPlatform() {
2020
public void setupForPlatform(@Nullable File generatedResources) {
2121
var project = getProject();
2222
project.getTasks().named("generateEmi", GenerateEmi.class, task -> {
23-
task.mustRunAfter(project.project(":common").getTasks().named("generateData"));
2423
var resourceDirs = new ArrayList<>(getSourceSets(project.project(":common")).getByName("main").getResources().getSrcDirs());
2524
resourceDirs.addAll(getSourceSets(project).getByName("main").getResources().getSrcDirs());
2625

@@ -29,11 +28,11 @@ public void setupForPlatform(@Nullable File generatedResources) {
2928
if (dir.equals(generatedResources)) continue;
3029

3130
task.getRecipes().from(project.fileTree(dir, tree -> {
32-
tree.include("data/adorn/recipes/**");
31+
tree.include("data/adorn/recipe/**");
3332

3433
// The unpacking recipes create "uncraftable" vanilla items like
3534
// nether wart, so exclude them.
36-
tree.exclude("data/adorn/recipes/crates/unpack/**");
35+
tree.exclude("data/adorn/recipe/crates/unpack/**");
3736
}));
3837
}
3938
});

‎build-logic/src/main/java/juuxel/adorn/gradle/datagen/GenerateEmi.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.stream.Collectors;
2222

2323
public abstract class GenerateEmi extends DefaultTask {
24-
private static final String RECIPE_DIR = "/data/adorn/recipes/";
24+
private static final String RECIPE_DIR = "/data/adorn/recipe/";
2525

2626
@InputFiles
2727
public abstract ConfigurableFileCollection getRecipes();
@@ -86,7 +86,7 @@ public void generateRecipeDefaults() throws IOException {
8686
var type = fixType(recipeJson.get("type").toString());
8787
return switch (type) {
8888
case "minecraft:crafting_shaped", "minecraft:crafting_shapeless", "adorn:brewing", "adorn:brewing_from_fluid" ->
89-
((Map<String, ?>) recipeJson.get("result")).get("item").toString();
89+
((Map<String, ?>) recipeJson.get("result")).get("id").toString();
9090

9191
case "minecraft:stonecutting" -> recipeJson.get("result").toString();
9292
case "adorn:fertilizer_refilling" -> null;

‎common/src/data/vanilla.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<data_generators wool="true">
1+
<data_generators color="true">
22
<wood id="minecraft:oak"/>
33
<wood id="minecraft:spruce"/>
44
<wood id="minecraft:birch">

‎common/src/generated/resources/assets/adorn/blockstates/black_bench.json

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"multipart": [
3+
{
4+
"when": { "axis": "x" },
5+
"apply": { "model": "adorn:block/black_bench_top" }
6+
},
7+
{
8+
"when": { "axis": "z" },
9+
"apply": { "model": "adorn:block/black_bench_top", "y": 90 }
10+
},
11+
{
12+
"when": { "axis": "x", "connected_n": false },
13+
"apply": { "model": "adorn:block/black_bench_leg" }
14+
},
15+
{
16+
"when": { "axis": "x", "connected_p": false },
17+
"apply": { "model": "adorn:block/black_bench_leg", "y": 180 }
18+
},
19+
{
20+
"when": { "axis": "z", "connected_n": false },
21+
"apply": { "model": "adorn:block/black_bench_leg", "y": 90 }
22+
},
23+
{
24+
"when": { "axis": "z", "connected_p": false },
25+
"apply": { "model": "adorn:block/black_bench_leg", "y": 270 }
26+
}
27+
]
28+
}

‎common/src/generated/resources/assets/adorn/blockstates/black_chair.json

+210
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,210 @@
1+
{
2+
"multipart": [
3+
{
4+
"apply": {
5+
"model": "adorn:block/black_chair_upper",
6+
"y": 270
7+
},
8+
"when": {
9+
"half": "upper",
10+
"facing": "north"
11+
}
12+
},
13+
{
14+
"apply": {
15+
"model": "adorn:block/black_chair_upper"
16+
},
17+
"when": {
18+
"half": "upper",
19+
"facing": "east"
20+
}
21+
},
22+
{
23+
"apply": {
24+
"model": "adorn:block/black_chair_upper",
25+
"y": 90
26+
},
27+
"when": {
28+
"half": "upper",
29+
"facing": "south"
30+
}
31+
},
32+
{
33+
"apply": {
34+
"model": "adorn:block/black_chair_upper",
35+
"y": 180
36+
},
37+
"when": {
38+
"half": "upper",
39+
"facing": "west"
40+
}
41+
},
42+
{
43+
"apply": {
44+
"model": "adorn:block/black_chair_lower",
45+
"y": 270
46+
},
47+
"when": {
48+
"half": "lower",
49+
"facing": "north"
50+
}
51+
},
52+
{
53+
"apply": {
54+
"model": "adorn:block/black_chair_lower"
55+
},
56+
"when": {
57+
"half": "lower",
58+
"facing": "east"
59+
}
60+
},
61+
{
62+
"apply": {
63+
"model": "adorn:block/black_chair_lower",
64+
"y": 90
65+
},
66+
"when": {
67+
"half": "lower",
68+
"facing": "south"
69+
}
70+
},
71+
{
72+
"apply": {
73+
"model": "adorn:block/black_chair_lower",
74+
"y": 180
75+
},
76+
"when": {
77+
"half": "lower",
78+
"facing": "west"
79+
}
80+
},
81+
{
82+
"apply": {
83+
"model": "minecraft:block/red_carpet"
84+
},
85+
"when": {
86+
"carpet": "red"
87+
}
88+
},
89+
{
90+
"apply": {
91+
"model": "minecraft:block/black_carpet"
92+
},
93+
"when": {
94+
"carpet": "black"
95+
}
96+
},
97+
{
98+
"apply": {
99+
"model": "minecraft:block/green_carpet"
100+
},
101+
"when": {
102+
"carpet": "green"
103+
}
104+
},
105+
{
106+
"apply": {
107+
"model": "minecraft:block/brown_carpet"
108+
},
109+
"when": {
110+
"carpet": "brown"
111+
}
112+
},
113+
{
114+
"apply": {
115+
"model": "minecraft:block/blue_carpet"
116+
},
117+
"when": {
118+
"carpet": "blue"
119+
}
120+
},
121+
{
122+
"apply": {
123+
"model": "minecraft:block/purple_carpet"
124+
},
125+
"when": {
126+
"carpet": "purple"
127+
}
128+
},
129+
{
130+
"apply": {
131+
"model": "minecraft:block/cyan_carpet"
132+
},
133+
"when": {
134+
"carpet": "cyan"
135+
}
136+
},
137+
{
138+
"apply": {
139+
"model": "minecraft:block/light_gray_carpet"
140+
},
141+
"when": {
142+
"carpet": "light_gray"
143+
}
144+
},
145+
{
146+
"apply": {
147+
"model": "minecraft:block/gray_carpet"
148+
},
149+
"when": {
150+
"carpet": "gray"
151+
}
152+
},
153+
{
154+
"apply": {
155+
"model": "minecraft:block/pink_carpet"
156+
},
157+
"when": {
158+
"carpet": "pink"
159+
}
160+
},
161+
{
162+
"apply": {
163+
"model": "minecraft:block/lime_carpet"
164+
},
165+
"when": {
166+
"carpet": "lime"
167+
}
168+
},
169+
{
170+
"apply": {
171+
"model": "minecraft:block/yellow_carpet"
172+
},
173+
"when": {
174+
"carpet": "yellow"
175+
}
176+
},
177+
{
178+
"apply": {
179+
"model": "minecraft:block/light_blue_carpet"
180+
},
181+
"when": {
182+
"carpet": "light_blue"
183+
}
184+
},
185+
{
186+
"apply": {
187+
"model": "minecraft:block/magenta_carpet"
188+
},
189+
"when": {
190+
"carpet": "magenta"
191+
}
192+
},
193+
{
194+
"apply": {
195+
"model": "minecraft:block/orange_carpet"
196+
},
197+
"when": {
198+
"carpet": "orange"
199+
}
200+
},
201+
{
202+
"apply": {
203+
"model": "minecraft:block/white_carpet"
204+
},
205+
"when": {
206+
"carpet": "white"
207+
}
208+
}
209+
]
210+
}

‎common/src/generated/resources/assets/adorn/blockstates/black_coffee_table.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants": {
3+
"": {
4+
"model": "adorn:block/black_coffee_table"
5+
}
6+
}
7+
}

‎common/src/generated/resources/assets/adorn/blockstates/black_drawer.json

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"variants": {
3+
"facing=north": {
4+
"model": "adorn:block/black_drawer"
5+
},
6+
"facing=east": {
7+
"model": "adorn:block/black_drawer",
8+
"y": 90
9+
},
10+
"facing=south": {
11+
"model": "adorn:block/black_drawer",
12+
"y": 180
13+
},
14+
"facing=west": {
15+
"model": "adorn:block/black_drawer",
16+
"y": 270
17+
}
18+
}
19+
}

0 commit comments

Comments
 (0)