Skip to content

Commit 1146dab

Browse files
BlayTheNinthBlayTheNinth
committed
feat: Slightly less ugly but still ugly Coffee Machine #352 
1 parent 5fd4ce5 commit 1146dab

5 files changed

Lines changed: 58 additions & 68 deletions

File tree

‎common/src/generated/resources/data/cookingforblockheads/recipe/coffee_machine.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"category": "misc",
44
"key": {
55
"B": "minecraft:stone_button",
6-
"C": "minecraft:black_dye",
6+
"F": "minecraft:flint",
77
"I": "#c:ingots/iron",
88
"T": "minecraft:iron_trapdoor",
99
"W": "minecraft:water_bucket"
1010
},
1111
"pattern": [
12-
" B ",
12+
"FFB",
1313
"ITI",
14-
"CWI"
14+
"IWI"
1515
],
1616
"result": {
1717
"id": "cookingforblockheads:coffee_machine"

‎common/src/main/java/net/blay09/mods/cookingforblockheads/client/ModRenderers.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public static void initialize(BalmBlockEntityRendererRegistrar blockEntityRender
3131
public static void initialize(BalmBlockColorRegistrar blockColors) {
3232
blockColors.register(List.of(BlockTintSources.constant(0xff3f76e4)), ModBlocks.sinks.values());
3333
blockColors.register(List.of(BlockTintSources.constant(0xff3f76e4)), ModBlocks.chickenSinks.values());
34+
blockColors.register(List.of(BlockTintSources.constant(0xff3f76e4)), ModBlocks.coffeeMachine);
3435
}
3536

3637
}

‎common/src/main/resources/assets/cookingforblockheads/models/block/coffee_machine.json‎

Lines changed: 51 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2+
"parent": "block/block",
23
"format_version": "1.21.11",
34
"credit": "Made with Blockbench",
5+
"texture_size": [32, 32],
46
"textures": {
5-
"0": "block/glass",
6-
"1": "block/gray_shulker_box",
7-
"2": "block/tube_coral_block",
8-
"3": "block/note_block",
9-
"particle": "block/glass"
7+
"1": "cookingforblockheads:block/coffee_machine",
8+
"5": "block/water_still",
9+
"particle": "cookingforblockheads:block/coffee_machine"
1010
},
1111
"elements": [
1212
{
@@ -15,12 +15,12 @@
1515
"to": [13, 2, 14],
1616
"rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]},
1717
"faces": {
18-
"north": {"uv": [2, 0, 12, 2], "texture": "#1"},
19-
"east": {"uv": [0, 0, 12, 2], "texture": "#1"},
20-
"south": {"uv": [1, 0, 11, 2], "texture": "#1"},
21-
"west": {"uv": [0, 0, 12, 2], "texture": "#1"},
22-
"up": {"uv": [1, 0, 11, 12], "texture": "#1"},
23-
"down": {"uv": [1, 0, 11, 12], "texture": "#1", "cullface": "down"}
18+
"north": {"uv": [5, 0, 10, 1], "texture": "#1"},
19+
"east": {"uv": [5, 0, 6, 6], "rotation": 90, "texture": "#1"},
20+
"south": {"uv": [0, 5.5, 5, 6.5], "texture": "#1"},
21+
"west": {"uv": [9, 0, 10, 6], "rotation": 90, "texture": "#1"},
22+
"up": {"uv": [10, 6, 5, 0], "texture": "#1"},
23+
"down": {"uv": [10, 0, 5, 6], "texture": "#1", "cullface": "down"}
2424
}
2525
},
2626
{
@@ -29,10 +29,10 @@
2929
"to": [13, 12, 14],
3030
"rotation": {"angle": 0, "axis": "y", "origin": [2, 1, 2]},
3131
"faces": {
32-
"north": {"uv": [2, 1, 12, 11], "texture": "#1"},
33-
"east": {"uv": [0, 1, 1, 11], "texture": "#1"},
34-
"south": {"uv": [1, 1, 11, 11], "texture": "#1"},
35-
"west": {"uv": [11, 1, 12, 11], "texture": "#1"}
32+
"north": {"uv": [0, 0.5, 5, 5.5], "texture": "#1"},
33+
"east": {"uv": [0, 0.5, 0.5, 5.5], "texture": "#1"},
34+
"south": {"uv": [0, 0.5, 5, 5.5], "texture": "#1"},
35+
"west": {"uv": [4.5, 0.5, 5, 5.5], "texture": "#1"}
3636
}
3737
},
3838
{
@@ -41,10 +41,10 @@
4141
"to": [13, 12, 10],
4242
"rotation": {"angle": 0, "axis": "y", "origin": [2, 1, -2]},
4343
"faces": {
44-
"north": {"uv": [2, 1, 12, 11], "texture": "#1"},
45-
"east": {"uv": [0, 1, 1, 11], "texture": "#1"},
46-
"south": {"uv": [1, 1, 11, 11], "texture": "#1"},
47-
"west": {"uv": [11, 1, 12, 11], "texture": "#1"}
44+
"north": {"uv": [0, 0.5, 5, 5.5], "texture": "#1"},
45+
"east": {"uv": [9, 0.5, 9.5, 5.5], "texture": "#1"},
46+
"south": {"uv": [0, 0.5, 5, 5.5], "texture": "#1"},
47+
"west": {"uv": [5.5, 0.5, 6, 5.5], "texture": "#1"}
4848
}
4949
},
5050
{
@@ -53,12 +53,12 @@
5353
"to": [13, 13, 14],
5454
"rotation": {"angle": 0, "axis": "y", "origin": [2, 1, -2]},
5555
"faces": {
56-
"north": {"uv": [2, 0, 12, 1], "texture": "#1"},
57-
"east": {"uv": [0, 0, 5, 1], "texture": "#1"},
58-
"south": {"uv": [1, 0, 11, 1], "texture": "#1"},
59-
"west": {"uv": [11, 0, 16, 1], "texture": "#1"},
60-
"up": {"uv": [1, 11, 11, 16], "texture": "#1", "cullface": "up"},
61-
"down": {"uv": [1, 0, 11, 5], "texture": "#1"}
56+
"north": {"uv": [16.5, 16, 21.5, 16.5], "texture": "#missing"},
57+
"east": {"uv": [0, 0, 2.5, 0.5], "texture": "#1"},
58+
"south": {"uv": [0, 0, 5, 0.5], "texture": "#1"},
59+
"west": {"uv": [0, 0, 2.5, 0.5], "texture": "#1"},
60+
"up": {"uv": [10, 2.5, 5, 0], "texture": "#1", "cullface": "up"},
61+
"down": {"uv": [10, 0, 5, 2.5], "texture": "#1"}
6262
}
6363
},
6464
{
@@ -67,12 +67,12 @@
6767
"to": [13, 13, 9],
6868
"rotation": {"angle": 0, "axis": "y", "origin": [2, 1, -7]},
6969
"faces": {
70-
"north": {"uv": [2, 0, 12, 3], "texture": "#1"},
71-
"east": {"uv": [0, 0, 7, 3], "texture": "#1"},
72-
"south": {"uv": [1, 0, 11, 3], "texture": "#1"},
73-
"west": {"uv": [9, 0, 16, 3], "texture": "#1"},
74-
"up": {"uv": [1, 9, 11, 16], "texture": "#1", "cullface": "up"},
75-
"down": {"uv": [1, 0, 11, 7], "texture": "#1"}
70+
"north": {"uv": [5, 1, 10, 2.5], "texture": "#1"},
71+
"east": {"uv": [1, 0.5, 4.5, 2], "texture": "#1"},
72+
"south": {"uv": [14.5, 13.5, 19.5, 15], "texture": "#missing"},
73+
"west": {"uv": [1, 4.5, 4.5, 6], "rotation": 180, "texture": "#1"},
74+
"up": {"uv": [10, 6, 5, 2.5], "texture": "#1", "cullface": "up"},
75+
"down": {"uv": [10, 1.5, 5, 5], "texture": "#1"}
7676
}
7777
},
7878
{
@@ -81,12 +81,10 @@
8181
"to": [10, 10, 9],
8282
"rotation": {"angle": 0, "axis": "y", "origin": [2, 1, -7]},
8383
"faces": {
84-
"north": {"uv": [5, 3, 9, 5], "texture": "#1"},
85-
"east": {"uv": [0, 3, 6, 5], "texture": "#1"},
86-
"south": {"uv": [4, 3, 8, 5], "texture": "#1"},
87-
"west": {"uv": [10, 3, 16, 5], "texture": "#1"},
88-
"up": {"uv": [4, 10, 8, 16], "texture": "#1", "cullface": "up"},
89-
"down": {"uv": [4, 0, 8, 6], "texture": "#1"}
84+
"north": {"uv": [0.5, 6.5, 2.5, 7.5], "texture": "#1"},
85+
"east": {"uv": [0, 7, 1, 10], "rotation": 90, "texture": "#1"},
86+
"west": {"uv": [2, 7, 3, 10], "rotation": 90, "texture": "#1"},
87+
"down": {"uv": [2.5, 7, 0.5, 10], "texture": "#1"}
9088
}
9189
},
9290
{
@@ -95,12 +93,11 @@
9593
"to": [9, 8, 6],
9694
"rotation": {"angle": 0, "axis": "y", "origin": [2, -1, -7]},
9795
"faces": {
98-
"north": {"uv": [6, 3, 8, 4], "texture": "#1"},
99-
"east": {"uv": [3, 3, 5, 4], "texture": "#1"},
100-
"south": {"uv": [5, 3, 7, 4], "texture": "#1"},
101-
"west": {"uv": [11, 3, 13, 4], "texture": "#1"},
102-
"up": {"uv": [5, 11, 7, 13], "texture": "#1", "cullface": "up"},
103-
"down": {"uv": [5, 3, 7, 5], "texture": "#1"}
96+
"north": {"uv": [1, 7, 2, 7.5], "texture": "#1"},
97+
"east": {"uv": [1, 7.5, 2, 8], "texture": "#1"},
98+
"south": {"uv": [1, 7, 2, 7.5], "texture": "#1"},
99+
"west": {"uv": [1, 7.5, 2, 8], "texture": "#1"},
100+
"down": {"uv": [2, 7, 1, 8], "texture": "#1"}
104101
}
105102
},
106103
{
@@ -109,7 +106,7 @@
109106
"to": [6.5, 12, 13],
110107
"rotation": {"angle": 0, "axis": "y", "origin": [3.5, 0, 10]},
111108
"faces": {
112-
"west": {"uv": [0, 0, 16, 16], "texture": "#2"}
109+
"west": {"uv": [6, 4, 7.5, 9], "texture": "#5", "tintindex": 0}
113110
}
114111
},
115112
{
@@ -118,7 +115,7 @@
118115
"to": [12.5, 12, 13],
119116
"rotation": {"angle": 0, "axis": "y", "origin": [9.5, 0, 10]},
120117
"faces": {
121-
"east": {"uv": [0, 0, 16, 16], "texture": "#3"}
118+
"east": {"uv": [13, 0, 14.5, 2.5], "texture": "#1"}
122119
}
123120
},
124121
{
@@ -127,26 +124,18 @@
127124
"to": [3.5, 12, 13],
128125
"rotation": {"angle": 0, "axis": "y", "origin": [3.5, 0, 10]},
129126
"faces": {
130-
"west": {"uv": [0, 0, 16, 16], "texture": "#0"}
131-
}
132-
},
133-
{
134-
"name": "CoffeeWindow",
135-
"from": [12.5, 7, 10],
136-
"to": [12.5, 12, 13],
137-
"rotation": {"angle": 0, "axis": "y", "origin": [12.5, 0, 10]},
138-
"faces": {
139-
"east": {"uv": [0, 0, 16, 16], "texture": "#0"}
127+
"west": {"uv": [10, 0, 11.5, 5], "texture": "#1"}
140128
}
141129
},
142130
{
143131
"name": "Seperator",
144132
"from": [7, 2, 10],
145133
"to": [9, 12, 13],
146134
"rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 10]},
135+
"color": 9,
147136
"faces": {
148-
"east": {"uv": [0, 0, 3, 10], "texture": "#1"},
149-
"west": {"uv": [0, 0, 3, 10], "texture": "#1"}
137+
"east": {"uv": [11.5, 13.5, 13, 18.5], "texture": "#missing"},
138+
"west": {"uv": [13, 13.5, 14.5, 18.5], "texture": "#missing"}
150139
}
151140
},
152141
{
@@ -155,11 +144,11 @@
155144
"to": [13, 7, 13],
156145
"rotation": {"angle": 0, "axis": "y", "origin": [9, 0, 10]},
157146
"faces": {
158-
"north": {"uv": [3, 0, 5, 10], "texture": "#1"},
159-
"east": {"uv": [0, 0, 3, 10], "texture": "#1"},
160-
"south": {"uv": [0, 0, 2, 10], "texture": "#1"},
161-
"west": {"uv": [0, 0, 3, 10], "texture": "#1"},
162-
"up": {"uv": [0, 0, 0, 3], "texture": "#1"}
147+
"north": {"uv": [15, 10, 17, 12.5], "texture": "#missing"},
148+
"east": {"uv": [1, 3, 2.5, 5.5], "texture": "#1"},
149+
"south": {"uv": [14.5, 15, 16.5, 17.5], "texture": "#missing"},
150+
"west": {"uv": [4.5, 16, 6, 18.5], "texture": "#missing"},
151+
"up": {"uv": [8.5, 5, 6.5, 3.5], "texture": "#1"}
163152
}
164153
}
165154
]

‎common/src/main/resources/assets/cookingforblockheads/textures/block/coffee_machine.png‎

1.02 KB
Loading

‎fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModRecipeProvider.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,11 +296,11 @@ public void buildRecipes() {
296296
.save(exporter);
297297

298298
shaped(RecipeCategory.DECORATIONS, ModBlocks.coffeeMachine)
299-
.pattern(" B ")
299+
.pattern("FFB")
300300
.pattern("ITI")
301-
.pattern("CWI")
301+
.pattern("IWI")
302+
.define('F', Items.FLINT)
302303
.define('B', Blocks.STONE_BUTTON)
303-
.define('C', Items.BLACK_DYE)
304304
.define('I', BalmItemTags.IRON_INGOTS)
305305
.define('T', Blocks.IRON_TRAPDOOR)
306306
.define('W', Items.WATER_BUCKET)

0 commit comments

Comments
 (0)