Skip to content

Commit 88939c1

Browse files
committed
Added split/combine recipes for dyed slabs and panels, Closes #60
1 parent 22fa2f7 commit 88939c1

36 files changed

+566
-8
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 1.5.3+mc1.21.1
2+
* Fixed dye recipes giving the wrong amount of items.
3+
* Added Split and Combine recipes for dyed slabs and panels.
4+
15
# 1.5.2+mc1.21.1
26
* Fixed edge lights missing default state causing waterlogging with building gadgets.
37

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This is required to provide enough memory for the Minecraft decompilation process.
33
org.gradle.jvmargs=-Xmx3G
44
org.gradle.daemon=false
5-
mod_version=1.5.2
5+
mod_version=1.5.3
66
minecraft_version=1.21.1
77
loader_version=[4,)
88
neo_version=21.1.89

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.1 2025-02-21T16:36:12.573745 Recipes
1+
// 1.21.1 2025-02-21T16:52:11.999433 Recipes
22
82c5fd1516eaccdcceb561c786c064e4aca159f7 data/simplylight/recipe/bulb.json
33
d0bd64796b1a7fa580a529d3854882191cf6057e data/simplylight/recipe/edge_light.json
44
e2615ef3c8d8d804e5b631417c73084df5e66734 data/simplylight/recipe/edge_light_black_dyed.json
@@ -85,23 +85,38 @@ e03b912517473e251516a06b6106af2ade3192df data/simplylight/recipe/illuminant_oran
8585
b3a6a2acdc99c38d0d100cdfa3be67f59211d398 data/simplylight/recipe/illuminant_orange_block_on_dyed.json
8686
ef9061b465d2615af2eefd93c8c9a1fd9bea42d3 data/simplylight/recipe/illuminant_orange_block_on_toggle.json
8787
5424e49577db7a7d854bfeb5d4f50a392fcd8e94 data/simplylight/recipe/illuminant_orange_block_toggle.json
88-
81d55d0a01f43ba43ba68a0f9bd9df5bd3ed7c75 data/simplylight/recipe/illuminant_panel.json
8988
faee372c1ca343a633c9fdff48aa4127212063fe data/simplylight/recipe/illuminant_panel_black_dyed.json
89+
db58b14230bee890d457bf4fb1e2d1571ef6c08f data/simplylight/recipe/illuminant_panel_black_split.json
9090
17d48d477161738682c4fd6c7629358f19030f5f data/simplylight/recipe/illuminant_panel_blue_dyed.json
91+
f4b643b320115bdbfa30b852d25b938f5ce748f9 data/simplylight/recipe/illuminant_panel_blue_split.json
9192
4a92d2d14ae14c6c86f6dbbacd918f171d468216 data/simplylight/recipe/illuminant_panel_brown_dyed.json
93+
908535e0c94ae0ca9f23348187c81cf3f971735b data/simplylight/recipe/illuminant_panel_brown_split.json
9294
9a3eca8c96e2a53be3acbc2df7e4281b4fe98aec data/simplylight/recipe/illuminant_panel_cyan_dyed.json
95+
6cccaac39fe91ad46258f0efebd87f5266c79fbd data/simplylight/recipe/illuminant_panel_cyan_split.json
9396
7fa3f805813daea9c446e6d3a93cfb4128ec7b8b data/simplylight/recipe/illuminant_panel_dyed.json
9497
3f6debac278bbbc8d9b96497f9c96b3f97d9c02d data/simplylight/recipe/illuminant_panel_gray_dyed.json
98+
d1219babbacc4ad73529459c0a401fb8abec80bc data/simplylight/recipe/illuminant_panel_gray_split.json
9599
c4a90047db7c048b514ce465ffaa81e7eaef2fc1 data/simplylight/recipe/illuminant_panel_green_dyed.json
100+
e8c3b34181712e2e7010a300c1a94fd30e1811db data/simplylight/recipe/illuminant_panel_green_split.json
96101
cfd923bee2c1c0e88c1d97d88fa9f45880c6334e data/simplylight/recipe/illuminant_panel_light_blue_dyed.json
102+
5edbd6c2bf23b525eb7ac23d491fca08ba455b61 data/simplylight/recipe/illuminant_panel_light_blue_split.json
97103
fbbbac8bf7a52c8c91796466326097279e8ad824 data/simplylight/recipe/illuminant_panel_light_gray_dyed.json
104+
ddbb7ab48aba7e14ba4b53d769db05b3af21d785 data/simplylight/recipe/illuminant_panel_light_gray_split.json
98105
938a5d8f8b3f6fc097f4f6607fac772732fcd4b7 data/simplylight/recipe/illuminant_panel_lime_dyed.json
106+
a4e948d38ed3a71c69e7eec53bf4c89177382b39 data/simplylight/recipe/illuminant_panel_lime_split.json
99107
1e7711376bc656878c99f20c300f1838e9b70016 data/simplylight/recipe/illuminant_panel_magenta_dyed.json
108+
61dcedd494c14cb8114eabef3bfa28d66633c351 data/simplylight/recipe/illuminant_panel_magenta_split.json
100109
6933b5a52c1df9e5f21f9a74f941971366e36138 data/simplylight/recipe/illuminant_panel_orange_dyed.json
110+
0d7af158d8cfbed95c134b69f396dc5d6edd656a data/simplylight/recipe/illuminant_panel_orange_split.json
101111
ab2195705558343bd17a9bf4cdba11f7a8aabde7 data/simplylight/recipe/illuminant_panel_pink_dyed.json
112+
a30808cb0ccafb592bea31b98a7ede964fa65660 data/simplylight/recipe/illuminant_panel_pink_split.json
102113
4d8b1a5b673e90140fdbc0bce3dc4c87d5ed42c7 data/simplylight/recipe/illuminant_panel_purple_dyed.json
114+
6426de7eb3e7682e3b16f0ed2d5e3ff2dabf6aa2 data/simplylight/recipe/illuminant_panel_purple_split.json
103115
cbc8b407111da4231f12e8b030242fbca32b1dc3 data/simplylight/recipe/illuminant_panel_red_dyed.json
116+
708130d2385d3153560b07e477a8cd0527279b29 data/simplylight/recipe/illuminant_panel_red_split.json
117+
7b02e5aad750cb5db9913c04d53cc703f7d933dd data/simplylight/recipe/illuminant_panel_split.json
104118
0b43a1a0198aef39b76ca1e79825245f5b0adff6 data/simplylight/recipe/illuminant_panel_yellow_dyed.json
119+
f378912bce0ea3eb134ebdb304ecc9fe250388f3 data/simplylight/recipe/illuminant_panel_yellow_split.json
105120
176da699db5d9fdd08633331e538bd58faaaed5c data/simplylight/recipe/illuminant_pink_block_dyed.json
106121
893652b3ef2b0277fdabff668c99d0a7e57bf165 data/simplylight/recipe/illuminant_pink_block_on_dyed.json
107122
5314583ab80d839802d27949ef85b056b8766ac1 data/simplylight/recipe/illuminant_pink_block_on_toggle.json
@@ -115,22 +130,37 @@ ad50e91752e64d49ae2f76e6b9b04507e0e07ab1 data/simplylight/recipe/illuminant_purp
115130
b2c7f33311275c30123f2f2357c10f823bb0ad26 data/simplylight/recipe/illuminant_red_block_on_toggle.json
116131
5330bc7802ddaf080326ace9166fa438adf61758 data/simplylight/recipe/illuminant_red_block_toggle.json
117132
1e448dc98487c63b47bc2864c3367a79ecba4d63 data/simplylight/recipe/illuminant_slab.json
133+
14c8d4d3aaeba1062247c394e90afd7cf22493c9 data/simplylight/recipe/illuminant_slab_black_combine.json
118134
e5383a332f83c127df4bd5c5c13bd8af54c07ae4 data/simplylight/recipe/illuminant_slab_black_dyed.json
135+
32c6ec433f396fbf8bbddb95e56d362d634a7046 data/simplylight/recipe/illuminant_slab_blue_combine.json
119136
e14a8a859de667e9fc209837f6cdec59e0f1e1d6 data/simplylight/recipe/illuminant_slab_blue_dyed.json
137+
429eb83ab185e8aa7445681d5d16316c5a7e7ebb data/simplylight/recipe/illuminant_slab_brown_combine.json
120138
df5dd323e5611e1864ea9c7102c71b81713bd0f6 data/simplylight/recipe/illuminant_slab_brown_dyed.json
139+
9dbc7e8b8005f334b70512da35c21e7892402f88 data/simplylight/recipe/illuminant_slab_combine.json
140+
8220597531733b0afa418ed890d9e32412840c0c data/simplylight/recipe/illuminant_slab_cyan_combine.json
121141
1a41aa7ddc0bdf08327ee7981d426414cd7cac13 data/simplylight/recipe/illuminant_slab_cyan_dyed.json
122142
41bf1078a89b7e563e849c4bdf569cb928d3866d data/simplylight/recipe/illuminant_slab_dyed.json
123-
9dbc7e8b8005f334b70512da35c21e7892402f88 data/simplylight/recipe/illuminant_slab_from_panel.json
143+
18277749fa137083ae5ae33073b6b66971fbdb16 data/simplylight/recipe/illuminant_slab_gray_combine.json
124144
9d95327b772acb2c6369ba4b6f636d1065ee981b data/simplylight/recipe/illuminant_slab_gray_dyed.json
145+
1b0e8ab05dd321446b9c1a540955ab5d346dc1a3 data/simplylight/recipe/illuminant_slab_green_combine.json
125146
88de57286b26199d0053d13fe776bcccecb5771a data/simplylight/recipe/illuminant_slab_green_dyed.json
147+
2da6a8225371fc858a56c07690545dff7586ed23 data/simplylight/recipe/illuminant_slab_light_blue_combine.json
126148
f25a775508c421df0a443a193b9aa9af48c3ad88 data/simplylight/recipe/illuminant_slab_light_blue_dyed.json
149+
73fc6486d9adbc56259d56923d53fd4cbfa0395b data/simplylight/recipe/illuminant_slab_light_gray_combine.json
127150
9f0a87ab4ef1671d16b9914bbde049fff57c13d8 data/simplylight/recipe/illuminant_slab_light_gray_dyed.json
151+
b0019726abafa55b3a5f5ce0af82d2807d0ede5b data/simplylight/recipe/illuminant_slab_lime_combine.json
128152
933459f864f42779890aed783c028fd320871d6e data/simplylight/recipe/illuminant_slab_lime_dyed.json
153+
fda000d5e36a89def006cae0f16b14a28eeda216 data/simplylight/recipe/illuminant_slab_magenta_combine.json
129154
580510e861b64b16f9ebad6313f9db86bf259109 data/simplylight/recipe/illuminant_slab_magenta_dyed.json
155+
da22205bf0eb5fae226d31e2e1e7a2a7b792aa91 data/simplylight/recipe/illuminant_slab_orange_combine.json
130156
df5d6f412e6b18e01c7409667be14e4f14929457 data/simplylight/recipe/illuminant_slab_orange_dyed.json
157+
0b57300d0decb99823ff74cc34d2dd48bcff9c6b data/simplylight/recipe/illuminant_slab_pink_combine.json
131158
b4a0375ea755117261fcf4fe3bdff2e88b7192fa data/simplylight/recipe/illuminant_slab_pink_dyed.json
159+
a0371935b3096473a1e0df5708b8e05658b2a364 data/simplylight/recipe/illuminant_slab_purple_combine.json
132160
56c447fc4f1819b5b21b61bd5221067ecfaaa0bf data/simplylight/recipe/illuminant_slab_purple_dyed.json
161+
cf2ca596d2427cfb71951daad0592628057ef832 data/simplylight/recipe/illuminant_slab_red_combine.json
133162
0a0df22284693706060c162ab30023096b7c7158 data/simplylight/recipe/illuminant_slab_red_dyed.json
163+
31feb9ae2924228855e0e9dfbfd8948eae4a9af3 data/simplylight/recipe/illuminant_slab_yellow_combine.json
134164
6bd807277118e9896cadb51f393e8037a2d25fce data/simplylight/recipe/illuminant_slab_yellow_dyed.json
135165
e606cb4890be659073d4ace050a2216c4887a140 data/simplylight/recipe/illuminant_yellow_block_dyed.json
136166
0f7695219a089d6876bf2432e5d933b86e719c40 data/simplylight/recipe/illuminant_yellow_block_on_dyed.json
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"type": "minecraft:crafting_shaped",
3+
"category": "misc",
4+
"key": {
5+
"A": {
6+
"item": "simplylight:illuminant_slab_black"
7+
}
8+
},
9+
"pattern": [
10+
"AAA"
11+
],
12+
"result": {
13+
"count": 6,
14+
"id": "simplylight:illuminant_panel_black"
15+
},
16+
"show_notification": false
17+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"type": "minecraft:crafting_shaped",
3+
"category": "misc",
4+
"key": {
5+
"A": {
6+
"item": "simplylight:illuminant_slab_blue"
7+
}
8+
},
9+
"pattern": [
10+
"AAA"
11+
],
12+
"result": {
13+
"count": 6,
14+
"id": "simplylight:illuminant_panel_blue"
15+
},
16+
"show_notification": false
17+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"type": "minecraft:crafting_shaped",
3+
"category": "misc",
4+
"key": {
5+
"A": {
6+
"item": "simplylight:illuminant_slab_brown"
7+
}
8+
},
9+
"pattern": [
10+
"AAA"
11+
],
12+
"result": {
13+
"count": 6,
14+
"id": "simplylight:illuminant_panel_brown"
15+
},
16+
"show_notification": false
17+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"type": "minecraft:crafting_shaped",
3+
"category": "misc",
4+
"key": {
5+
"A": {
6+
"item": "simplylight:illuminant_slab_cyan"
7+
}
8+
},
9+
"pattern": [
10+
"AAA"
11+
],
12+
"result": {
13+
"count": 6,
14+
"id": "simplylight:illuminant_panel_cyan"
15+
},
16+
"show_notification": false
17+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"type": "minecraft:crafting_shaped",
3+
"category": "misc",
4+
"key": {
5+
"A": {
6+
"item": "simplylight:illuminant_slab_gray"
7+
}
8+
},
9+
"pattern": [
10+
"AAA"
11+
],
12+
"result": {
13+
"count": 6,
14+
"id": "simplylight:illuminant_panel_gray"
15+
},
16+
"show_notification": false
17+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"type": "minecraft:crafting_shaped",
3+
"category": "misc",
4+
"key": {
5+
"A": {
6+
"item": "simplylight:illuminant_slab_green"
7+
}
8+
},
9+
"pattern": [
10+
"AAA"
11+
],
12+
"result": {
13+
"count": 6,
14+
"id": "simplylight:illuminant_panel_green"
15+
},
16+
"show_notification": false
17+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"type": "minecraft:crafting_shaped",
3+
"category": "misc",
4+
"key": {
5+
"A": {
6+
"item": "simplylight:illuminant_slab_light_blue"
7+
}
8+
},
9+
"pattern": [
10+
"AAA"
11+
],
12+
"result": {
13+
"count": 6,
14+
"id": "simplylight:illuminant_panel_light_blue"
15+
},
16+
"show_notification": false
17+
}

0 commit comments

Comments
 (0)