Fix wall, slab and stairs recipes not outputting the correct amount, add stonecutter recipes

As requested in #1465
This commit is contained in:
Mrbysco 2024-11-30 16:32:07 +01:00
parent 722f475306
commit d0f8c24a6d
48 changed files with 353 additions and 46 deletions

View file

@ -8,6 +8,9 @@
* Explicitly made the Drills unbreakable. * Explicitly made the Drills unbreakable.
* Fixed worldgenned AA plants breaking on block update. * Fixed worldgenned AA plants breaking on block update.
* Add off-hand slot to Energizer/Enervator * Add off-hand slot to Energizer/Enervator
* Fix Black Quartz wall recipe conflicts
* Fix output of Wall, Stair and Slab recipes
* Add stonecutter recipes for the walls/stairs and slabs
# 1.3.10+mc1.21.1 # 1.3.10+mc1.21.1
* Fixed Fluid placer not being harvestable. * Fixed Fluid placer not being harvestable.

View file

@ -1,24 +1,39 @@
// 1.21.1 2024-11-30T16:05:55.0827347 Recipes // 1.21.1 2024-11-30T16:30:50.7628671 Recipes
b44fee42c2b2b3f56256fe76b2d9f529dc87350a data/actuallyadditions/recipe/atomic_reconstructor.json b44fee42c2b2b3f56256fe76b2d9f529dc87350a data/actuallyadditions/recipe/atomic_reconstructor.json
b1c937b75ba7f8e02dfac4db5253271f2de502e5 data/actuallyadditions/recipe/battery_box.json b1c937b75ba7f8e02dfac4db5253271f2de502e5 data/actuallyadditions/recipe/battery_box.json
660b96730a8ef88b4b44e4ce67fde0945c13ae7f data/actuallyadditions/recipe/bio_reactor.json 660b96730a8ef88b4b44e4ce67fde0945c13ae7f data/actuallyadditions/recipe/bio_reactor.json
767d9b27b28f42f5946ea4693eccc000eff974cd data/actuallyadditions/recipe/black_quartz_block.json 767d9b27b28f42f5946ea4693eccc000eff974cd data/actuallyadditions/recipe/black_quartz_block.json
f9d6f63ed61e5336781d59694eac2e8ad48b6871 data/actuallyadditions/recipe/black_quartz_brick_slab.json bfea0d0f86a75b6a80ffa33dd62c2e77a3d8b9e0 data/actuallyadditions/recipe/black_quartz_brick_block_from_black_quartz_block_stonecutting.json
9b48829383319c593ca143e803d4d4286d435034 data/actuallyadditions/recipe/black_quartz_brick_stair.json d77a6c1214f32db93856d9c28509231980484c2b data/actuallyadditions/recipe/black_quartz_brick_slab.json
be5641c262536ed05fa7fa307b5087191e01ad1f data/actuallyadditions/recipe/black_quartz_brick_wall.json 2f26db57ee165b2d7cc4fab8c2247570f75db18a data/actuallyadditions/recipe/black_quartz_brick_slab_from_black_quartz_brick_block_stonecutting.json
1af52af01ac5d6d9d334aa745aba15d8e6392028 data/actuallyadditions/recipe/black_quartz_brick_stair.json
2c3787a2ac8424413984f3225f6ab36b39e527cb data/actuallyadditions/recipe/black_quartz_brick_stair_from_black_quartz_brick_block_stonecutting.json
8ab1ec58dcfdda58116b89d849566b51b5c439ec data/actuallyadditions/recipe/black_quartz_brick_wall.json
e666e30db3c2fe56c4e3ff7d8db575563303159b data/actuallyadditions/recipe/black_quartz_brick_wall_from_black_quartz_brick_block_stonecutting.json
bc3771d03192825636fb2d1037b902f5c39e97f8 data/actuallyadditions/recipe/black_quartz_pillar_block.json bc3771d03192825636fb2d1037b902f5c39e97f8 data/actuallyadditions/recipe/black_quartz_pillar_block.json
3d658c921ea08a80509f5e899c310d84af825854 data/actuallyadditions/recipe/black_quartz_pillar_slab.json 0b73f3b51261bc2446afc429ac325840da45908d data/actuallyadditions/recipe/black_quartz_pillar_block_from_black_quartz_block_stonecutting.json
72316aa353fa29f5d0eb5e74849e94ff68ac3ee8 data/actuallyadditions/recipe/black_quartz_pillar_stair.json 260c71809d2d50a932608d1e12c7a9bdea04532a data/actuallyadditions/recipe/black_quartz_pillar_slab.json
93052b0c0fdf1aa83a5a0b26037a008aefc3ba80 data/actuallyadditions/recipe/black_quartz_pillar_wall.json adfcc589233bec571a136992b36289ddc6dfc8c7 data/actuallyadditions/recipe/black_quartz_pillar_slab_from_black_quartz_pillar_block_stonecutting.json
faee252ef06044ffbef63886eba7bf1f3129cb4a data/actuallyadditions/recipe/black_quartz_slab.json 8d1378410d03d0595240cb151f807fcdb016e591 data/actuallyadditions/recipe/black_quartz_pillar_stair.json
7cfdb8371ff8e65b594664d9da40124c5e6ee5e3 data/actuallyadditions/recipe/black_quartz_stair.json 1cfae545dcaed20d9a04e115c3d71d8175007ee6 data/actuallyadditions/recipe/black_quartz_pillar_stair_from_black_quartz_pillar_block_stonecutting.json
18fb02ad6a38943b94bca71e9e5e948a80bd1aa3 data/actuallyadditions/recipe/black_quartz_wall.json e0d575550381121c255d6f8bb3bb0af97b0bb91f data/actuallyadditions/recipe/black_quartz_pillar_wall.json
826c69c73a331d28701da7b9da544b21ed88a4ee data/actuallyadditions/recipe/black_quartz_pillar_wall_from_black_quartz_pillar_block_stonecutting.json
e2062c44150881dd175fea42fde19f1d46e953d6 data/actuallyadditions/recipe/black_quartz_slab.json
cc8d3154e3dcc042fa7db5f82e1868041f35e3e2 data/actuallyadditions/recipe/black_quartz_slab_from_black_quartz_block_stonecutting.json
9b169b7bbb32cb4d5f2f2fdd7940022effca1523 data/actuallyadditions/recipe/black_quartz_stair.json
4734e57c030ea95d56a0fadb7b7d7f880eb963a2 data/actuallyadditions/recipe/black_quartz_stair_from_black_quartz_block_stonecutting.json
db063f87d91c3bc6acf44305c6c53f84fe5ee3aa data/actuallyadditions/recipe/black_quartz_wall.json
01c354c1b35c097c0da95a201e16ab6b714811da data/actuallyadditions/recipe/black_quartz_wall_from_black_quartz_block_stonecutting.json
bc5c51e659c0b493098b7919740fc6419efb94d9 data/actuallyadditions/recipe/breaker.json bc5c51e659c0b493098b7919740fc6419efb94d9 data/actuallyadditions/recipe/breaker.json
48a5893a0109e467dca8343ee6d4334095e6d118 data/actuallyadditions/recipe/canola_press.json 48a5893a0109e467dca8343ee6d4334095e6d118 data/actuallyadditions/recipe/canola_press.json
d46bb9d164ab5fcd00acb4f97f77f18245780243 data/actuallyadditions/recipe/chiseled_black_quartz_block.json d46bb9d164ab5fcd00acb4f97f77f18245780243 data/actuallyadditions/recipe/chiseled_black_quartz_block.json
f4f6b7f673e0296cbc363bc1600c19ce164f1b5e data/actuallyadditions/recipe/chiseled_black_quartz_slab.json a67b4de80eb291ff4a1925e991b5f8c4926efa23 data/actuallyadditions/recipe/chiseled_black_quartz_block_from_black_quartz_block_stonecutting.json
97e257913384101be10c578635e576c711286564 data/actuallyadditions/recipe/chiseled_black_quartz_stair.json 9a6402bd582c59e56916a231b98b1b412790bb71 data/actuallyadditions/recipe/chiseled_black_quartz_slab.json
dd3985f8a437083771d0d30753c31bb926543863 data/actuallyadditions/recipe/chiseled_black_quartz_wall.json 2b0c061e44a84be1089cb4081c16049a3af5937c data/actuallyadditions/recipe/chiseled_black_quartz_slab_from_chiseled_black_quartz_block_stonecutting.json
826ceb68952fc1b626d51c65d012fc0cc65c4a2d data/actuallyadditions/recipe/chiseled_black_quartz_stair.json
80a9c995c72e92f82e00529b0d702657bce22475 data/actuallyadditions/recipe/chiseled_black_quartz_stair_from_chiseled_black_quartz_block_stonecutting.json
3d4807c278acd5532570f2fa760b057f819e8712 data/actuallyadditions/recipe/chiseled_black_quartz_wall.json
ecfc5784367cc3dea1071c193131d218f75444a2 data/actuallyadditions/recipe/chiseled_black_quartz_wall_from_chiseled_black_quartz_block_stonecutting.json
604cb093b57de3c44a11a4737757ca8bf0630f35 data/actuallyadditions/recipe/coal_generator.json 604cb093b57de3c44a11a4737757ca8bf0630f35 data/actuallyadditions/recipe/coal_generator.json
e921a2a21a35ca35d09382795d94c701169cd094 data/actuallyadditions/recipe/coffee_machine.json e921a2a21a35ca35d09382795d94c701169cd094 data/actuallyadditions/recipe/coffee_machine.json
18ab4329cdf121ac5f3e4fb1f0cb4dc235815dc8 data/actuallyadditions/recipe/crusher.json 18ab4329cdf121ac5f3e4fb1f0cb4dc235815dc8 data/actuallyadditions/recipe/crusher.json
@ -29,12 +44,18 @@ e921a2a21a35ca35d09382795d94c701169cd094 data/actuallyadditions/recipe/coffee_ma
91b71d58ff0a0c4f65d562e7f28946ff7a3de9d5 data/actuallyadditions/recipe/ender_casing.json 91b71d58ff0a0c4f65d562e7f28946ff7a3de9d5 data/actuallyadditions/recipe/ender_casing.json
01293bdbfd75e1bae258fb233a5afbcb0fcc8384 data/actuallyadditions/recipe/energizer.json 01293bdbfd75e1bae258fb233a5afbcb0fcc8384 data/actuallyadditions/recipe/energizer.json
dba56befdc56f06337ab63a3d427833f17347634 data/actuallyadditions/recipe/enervator.json dba56befdc56f06337ab63a3d427833f17347634 data/actuallyadditions/recipe/enervator.json
2a198eee5ae79c15f1a3398f075b2f3d4565c3d0 data/actuallyadditions/recipe/ethetic_green_slab.json fe878da58771b7fffb11873a5fa1a7a727df0848 data/actuallyadditions/recipe/ethetic_green_slab.json
173358a81f156213d0a15923ff9d89a331e711df data/actuallyadditions/recipe/ethetic_green_stairs.json 76a9b46af381636f4ca051e3aa0dd536ab709f6c data/actuallyadditions/recipe/ethetic_green_slab_from_ethetic_green_block_stonecutting.json
0c8f8519680ac09fc0e8c2519747f94ba8cb51d7 data/actuallyadditions/recipe/ethetic_green_wall.json bee0a0869523d0b3139130c363062c41a97d9ffb data/actuallyadditions/recipe/ethetic_green_stairs.json
2ace821b6bfc343e4d16c02513a75c9942087a48 data/actuallyadditions/recipe/ethetic_white_slab.json 810241b13e7eab9a40c532b1ff32bb65626ada80 data/actuallyadditions/recipe/ethetic_green_stairs_from_ethetic_green_block_stonecutting.json
4791ef539c5d7d05ac0895a9eb0f0d1d8aed2a59 data/actuallyadditions/recipe/ethetic_white_stairs.json cbb2b3b195b55021ce771f7074ae6f45938d8252 data/actuallyadditions/recipe/ethetic_green_wall.json
ac9d03ce26651245bb59d6538348eb8e8f24870a data/actuallyadditions/recipe/ethetic_white_wall.json dcc312e2f9dd32985cfa30236abe4594e7956535 data/actuallyadditions/recipe/ethetic_green_wall_from_ethetic_green_block_stonecutting.json
5f4753f58ec0428f56eff6fd96c58bcc71b031e6 data/actuallyadditions/recipe/ethetic_white_slab.json
daa11114bf4fb9fca7668ea3fecc938e5aa688a7 data/actuallyadditions/recipe/ethetic_white_slab_from_ethetic_white_block_stonecutting.json
905a111cbd2c9715e3dbc93a9db546055f30485f data/actuallyadditions/recipe/ethetic_white_stairs.json
a0a7cfbc1803c6586c63c2b63d8c30f99fdbfa1b data/actuallyadditions/recipe/ethetic_white_stairs_from_ethetic_white_block_stonecutting.json
8f44332422e0ff21634005a6065b13de351d6e24 data/actuallyadditions/recipe/ethetic_white_wall.json
8d5a03654a675ce5565312cf8137629b3d02b41a data/actuallyadditions/recipe/ethetic_white_wall_from_ethetic_white_block_stonecutting.json
e538fd3e9c429ff7cc5358ab44e3cd336c7c5de8 data/actuallyadditions/recipe/farmer.json e538fd3e9c429ff7cc5358ab44e3cd336c7c5de8 data/actuallyadditions/recipe/farmer.json
b141cc8224f70d151e0aad5a5979dc66cf365ea3 data/actuallyadditions/recipe/feeder.json b141cc8224f70d151e0aad5a5979dc66cf365ea3 data/actuallyadditions/recipe/feeder.json
c1828800d15b83adfc3c76e08e90398f4e9f5fd7 data/actuallyadditions/recipe/fermenting_barrel.json c1828800d15b83adfc3c76e08e90398f4e9f5fd7 data/actuallyadditions/recipe/fermenting_barrel.json
@ -67,9 +88,12 @@ c2ac056a53acebbe002bae1edf2cb81175eebaa6 data/actuallyadditions/recipe/placer.js
6209355d9f0af0944e04dd940b94d1e7842bcf6a data/actuallyadditions/recipe/powered_furnace.json 6209355d9f0af0944e04dd940b94d1e7842bcf6a data/actuallyadditions/recipe/powered_furnace.json
81009abd0f659d5bde626a430509cb501b6c0ffd data/actuallyadditions/recipe/ranged_collector.json 81009abd0f659d5bde626a430509cb501b6c0ffd data/actuallyadditions/recipe/ranged_collector.json
b267b3df7e751818fadbbba4015706bc50c95c6a data/actuallyadditions/recipe/shock_suppressor.json b267b3df7e751818fadbbba4015706bc50c95c6a data/actuallyadditions/recipe/shock_suppressor.json
844e5ce4b6d5efbe6619f41996d9a53bed45bb9b data/actuallyadditions/recipe/smooth_black_quartz_slab.json c26cc551ceec989b7dd12487b44ed7742e74652d data/actuallyadditions/recipe/smooth_black_quartz_slab.json
c7626ec53d19fda16bc53ae0f39824d8cb6969d0 data/actuallyadditions/recipe/smooth_black_quartz_stair.json 4c5f44cd416a366b2ea5f1e3ee22dcaa7daa41c7 data/actuallyadditions/recipe/smooth_black_quartz_slab_from_smooth_black_quartz_block_stonecutting.json
a5bbea36e4e66a6c1aed2b618b6b2782b334963c data/actuallyadditions/recipe/smooth_black_quartz_wall.json b1f018cb6f81d30659409c08f46f9e30a9c4e38f data/actuallyadditions/recipe/smooth_black_quartz_stair.json
c5a4e0b7b88588992284fd6a0e6ebbf814cbaba3 data/actuallyadditions/recipe/smooth_black_quartz_stair_from_smooth_black_quartz_block_stonecutting.json
2fed77818c869924ecf00563b5618aabab47c3dd data/actuallyadditions/recipe/smooth_black_quartz_wall.json
1d42b42044a8ee24b171f050ac08aad675e20e00 data/actuallyadditions/recipe/smooth_black_quartz_wall_from_smooth_black_quartz_block_stonecutting.json
f0a6cbd14eac4a35f31b17818a10c3052d848e32 data/actuallyadditions/recipe/tiny_torch.json f0a6cbd14eac4a35f31b17818a10c3052d848e32 data/actuallyadditions/recipe/tiny_torch.json
417bba7527a62cea44fd900ce3882000ada36a2c data/actuallyadditions/recipe/vertical_digger.json 417bba7527a62cea44fd900ce3882000ada36a2c data/actuallyadditions/recipe/vertical_digger.json
207a2f79e0b0c94905c385aaa0dd843c26fcfa6d data/actuallyadditions/recipe/wood_casing.json 207a2f79e0b0c94905c385aaa0dd843c26fcfa6d data/actuallyadditions/recipe/wood_casing.json

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:black_quartz_block"
},
"result": {
"count": 1,
"id": "actuallyadditions:black_quartz_brick_block"
}
}

View file

@ -10,7 +10,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 6,
"id": "actuallyadditions:black_quartz_brick_slab" "id": "actuallyadditions:black_quartz_brick_slab"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:black_quartz_brick_block"
},
"result": {
"count": 2,
"id": "actuallyadditions:black_quartz_brick_slab"
}
}

View file

@ -12,7 +12,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 4,
"id": "actuallyadditions:black_quartz_brick_stair" "id": "actuallyadditions:black_quartz_brick_stair"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:black_quartz_brick_block"
},
"result": {
"count": 1,
"id": "actuallyadditions:black_quartz_brick_stair"
}
}

View file

@ -11,7 +11,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 6,
"id": "actuallyadditions:black_quartz_brick_wall" "id": "actuallyadditions:black_quartz_brick_wall"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:black_quartz_brick_block"
},
"result": {
"count": 1,
"id": "actuallyadditions:black_quartz_brick_wall"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:black_quartz_block"
},
"result": {
"count": 1,
"id": "actuallyadditions:black_quartz_pillar_block"
}
}

View file

@ -10,7 +10,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 6,
"id": "actuallyadditions:black_quartz_pillar_slab" "id": "actuallyadditions:black_quartz_pillar_slab"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:black_quartz_pillar_block"
},
"result": {
"count": 2,
"id": "actuallyadditions:black_quartz_pillar_slab"
}
}

View file

@ -12,7 +12,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 4,
"id": "actuallyadditions:black_quartz_pillar_stair" "id": "actuallyadditions:black_quartz_pillar_stair"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:black_quartz_pillar_block"
},
"result": {
"count": 1,
"id": "actuallyadditions:black_quartz_pillar_stair"
}
}

View file

@ -11,7 +11,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 6,
"id": "actuallyadditions:black_quartz_pillar_wall" "id": "actuallyadditions:black_quartz_pillar_wall"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:black_quartz_pillar_block"
},
"result": {
"count": 1,
"id": "actuallyadditions:black_quartz_pillar_wall"
}
}

View file

@ -10,7 +10,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 6,
"id": "actuallyadditions:black_quartz_slab" "id": "actuallyadditions:black_quartz_slab"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:black_quartz_block"
},
"result": {
"count": 2,
"id": "actuallyadditions:black_quartz_slab"
}
}

View file

@ -12,7 +12,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 4,
"id": "actuallyadditions:black_quartz_stair" "id": "actuallyadditions:black_quartz_stair"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:black_quartz_block"
},
"result": {
"count": 1,
"id": "actuallyadditions:black_quartz_stair"
}
}

View file

@ -11,7 +11,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 6,
"id": "actuallyadditions:black_quartz_wall" "id": "actuallyadditions:black_quartz_wall"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:black_quartz_block"
},
"result": {
"count": 1,
"id": "actuallyadditions:black_quartz_wall"
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:black_quartz_block"
},
"result": {
"count": 1,
"id": "actuallyadditions:chiseled_black_quartz_block"
}
}

View file

@ -10,7 +10,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 6,
"id": "actuallyadditions:chiseled_black_quartz_slab" "id": "actuallyadditions:chiseled_black_quartz_slab"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:chiseled_black_quartz_block"
},
"result": {
"count": 2,
"id": "actuallyadditions:chiseled_black_quartz_slab"
}
}

View file

@ -12,7 +12,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 4,
"id": "actuallyadditions:chiseled_black_quartz_stair" "id": "actuallyadditions:chiseled_black_quartz_stair"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:chiseled_black_quartz_block"
},
"result": {
"count": 1,
"id": "actuallyadditions:chiseled_black_quartz_stair"
}
}

View file

@ -11,7 +11,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 6,
"id": "actuallyadditions:chiseled_black_quartz_wall" "id": "actuallyadditions:chiseled_black_quartz_wall"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:chiseled_black_quartz_block"
},
"result": {
"count": 1,
"id": "actuallyadditions:chiseled_black_quartz_wall"
}
}

View file

@ -10,7 +10,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 6,
"id": "actuallyadditions:ethetic_green_slab" "id": "actuallyadditions:ethetic_green_slab"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:ethetic_green_block"
},
"result": {
"count": 2,
"id": "actuallyadditions:ethetic_green_slab"
}
}

View file

@ -12,7 +12,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 4,
"id": "actuallyadditions:ethetic_green_stairs" "id": "actuallyadditions:ethetic_green_stairs"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:ethetic_green_block"
},
"result": {
"count": 1,
"id": "actuallyadditions:ethetic_green_stairs"
}
}

View file

@ -11,7 +11,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 6,
"id": "actuallyadditions:ethetic_green_wall" "id": "actuallyadditions:ethetic_green_wall"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:ethetic_green_block"
},
"result": {
"count": 1,
"id": "actuallyadditions:ethetic_green_wall"
}
}

View file

@ -10,7 +10,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 6,
"id": "actuallyadditions:ethetic_white_slab" "id": "actuallyadditions:ethetic_white_slab"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:ethetic_white_block"
},
"result": {
"count": 2,
"id": "actuallyadditions:ethetic_white_slab"
}
}

View file

@ -12,7 +12,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 4,
"id": "actuallyadditions:ethetic_white_stairs" "id": "actuallyadditions:ethetic_white_stairs"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:ethetic_white_block"
},
"result": {
"count": 1,
"id": "actuallyadditions:ethetic_white_stairs"
}
}

View file

@ -11,7 +11,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 6,
"id": "actuallyadditions:ethetic_white_wall" "id": "actuallyadditions:ethetic_white_wall"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:ethetic_white_block"
},
"result": {
"count": 1,
"id": "actuallyadditions:ethetic_white_wall"
}
}

View file

@ -10,7 +10,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 6,
"id": "actuallyadditions:smooth_black_quartz_slab" "id": "actuallyadditions:smooth_black_quartz_slab"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:smooth_black_quartz_block"
},
"result": {
"count": 2,
"id": "actuallyadditions:smooth_black_quartz_slab"
}
}

View file

@ -12,7 +12,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 4,
"id": "actuallyadditions:smooth_black_quartz_stair" "id": "actuallyadditions:smooth_black_quartz_stair"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:smooth_black_quartz_block"
},
"result": {
"count": 1,
"id": "actuallyadditions:smooth_black_quartz_stair"
}
}

View file

@ -11,7 +11,7 @@
"QQQ" "QQQ"
], ],
"result": { "result": {
"count": 1, "count": 6,
"id": "actuallyadditions:smooth_black_quartz_wall" "id": "actuallyadditions:smooth_black_quartz_wall"
} }
} }

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:stonecutting",
"ingredient": {
"item": "actuallyadditions:smooth_black_quartz_block"
},
"result": {
"count": 1,
"id": "actuallyadditions:smooth_black_quartz_wall"
}
}

View file

@ -1,6 +1,7 @@
package de.ellpeck.actuallyadditions.data; package de.ellpeck.actuallyadditions.data;
import de.ellpeck.actuallyadditions.api.ActuallyTags; import de.ellpeck.actuallyadditions.api.ActuallyTags;
import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks; import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
import de.ellpeck.actuallyadditions.mod.items.ActuallyItems; import de.ellpeck.actuallyadditions.mod.items.ActuallyItems;
import de.ellpeck.actuallyadditions.mod.util.NoAdvRecipeOutput; import de.ellpeck.actuallyadditions.mod.util.NoAdvRecipeOutput;
@ -11,9 +12,12 @@ import net.minecraft.data.recipes.RecipeOutput;
import net.minecraft.data.recipes.RecipeProvider; import net.minecraft.data.recipes.RecipeProvider;
import net.minecraft.data.recipes.ShapedRecipeBuilder; import net.minecraft.data.recipes.ShapedRecipeBuilder;
import net.minecraft.data.recipes.ShapelessRecipeBuilder; import net.minecraft.data.recipes.ShapelessRecipeBuilder;
import net.minecraft.data.recipes.SingleItemRecipeBuilder;
import net.minecraft.tags.ItemTags; import net.minecraft.tags.ItemTags;
import net.minecraft.world.item.Items; import net.minecraft.world.item.Items;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.ItemLike;
import net.minecraft.world.level.block.Blocks;
import net.neoforged.neoforge.common.Tags; import net.neoforged.neoforge.common.Tags;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
@ -100,68 +104,94 @@ public class BlockRecipeGenerator extends RecipeProvider {
.define('A', ActuallyItems.ADVANCED_COIL) .define('A', ActuallyItems.ADVANCED_COIL)
.save(recipeOutput); .save(recipeOutput);
//Black Quartz stonecutting
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.BLACK_QUARTZ_PILLAR.getItem(), ActuallyBlocks.BLACK_QUARTZ.get());
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.BLACK_QUARTZ_BRICK.getItem(), ActuallyBlocks.BLACK_QUARTZ.get());
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.CHISELED_BLACK_QUARTZ.getItem(), ActuallyBlocks.BLACK_QUARTZ.get());
//Black Quartz Wall //Black Quartz Wall
Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ.get(), recipeOutput); Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ.get());
//Black Quartz Slab //Black Quartz Slab
Recipe.slab(ActuallyBlocks.BLACK_QUARTZ_SLAB.getItem(), ActuallyBlocks.BLACK_QUARTZ.get(), recipeOutput); Recipe.slab(ActuallyBlocks.BLACK_QUARTZ_SLAB.getItem(), ActuallyBlocks.BLACK_QUARTZ.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.BLACK_QUARTZ_SLAB.getItem(), ActuallyBlocks.BLACK_QUARTZ.get(), 2);
//Black Quartz Stairs //Black Quartz Stairs
Recipe.stairs(ActuallyBlocks.BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ.get(), recipeOutput); Recipe.stairs(ActuallyBlocks.BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ.get());
//Smooth Black Quartz Wall //Smooth Black Quartz Wall
Recipe.wall(ActuallyBlocks.SMOOTH_BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.SMOOTH_BLACK_QUARTZ.get(), recipeOutput); Recipe.wall(ActuallyBlocks.SMOOTH_BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.SMOOTH_BLACK_QUARTZ.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.SMOOTH_BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.SMOOTH_BLACK_QUARTZ.get());
//Smooth Black Quartz Slab //Smooth Black Quartz Slab
Recipe.slab(ActuallyBlocks.SMOOTH_BLACK_QUARTZ_SLAB.getItem(), ActuallyBlocks.SMOOTH_BLACK_QUARTZ.get(), recipeOutput); Recipe.slab(ActuallyBlocks.SMOOTH_BLACK_QUARTZ_SLAB.getItem(), ActuallyBlocks.SMOOTH_BLACK_QUARTZ.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.SMOOTH_BLACK_QUARTZ_SLAB.getItem(), ActuallyBlocks.SMOOTH_BLACK_QUARTZ.get(), 2);
//Smooth Black Quartz Stairs //Smooth Black Quartz Stairs
Recipe.stairs(ActuallyBlocks.SMOOTH_BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.SMOOTH_BLACK_QUARTZ.get(), recipeOutput); Recipe.stairs(ActuallyBlocks.SMOOTH_BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.SMOOTH_BLACK_QUARTZ.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.SMOOTH_BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.SMOOTH_BLACK_QUARTZ.get());
//Black Quartz Brick Wall //Black Quartz Brick Wall
Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_BRICK_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ_BRICK.get(), recipeOutput); Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_BRICK_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ_BRICK.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.BLACK_QUARTZ_BRICK_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ_BRICK.get());
//Black Quartz Brick Slab //Black Quartz Brick Slab
Recipe.slab(ActuallyBlocks.BLACK_QUARTZ_BRICK_SLAB.getItem(), ActuallyBlocks.BLACK_QUARTZ_BRICK.get(), recipeOutput); Recipe.slab(ActuallyBlocks.BLACK_QUARTZ_BRICK_SLAB.getItem(), ActuallyBlocks.BLACK_QUARTZ_BRICK.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.BLACK_QUARTZ_BRICK_SLAB.getItem(), ActuallyBlocks.BLACK_QUARTZ_BRICK.get(), 2);
//Black Quartz Brick Stairs //Black Quartz Brick Stairs
Recipe.stairs(ActuallyBlocks.BLACK_QUARTZ_BRICK_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ_BRICK.get(), recipeOutput); Recipe.stairs(ActuallyBlocks.BLACK_QUARTZ_BRICK_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ_BRICK.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.BLACK_QUARTZ_BRICK_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ_BRICK.get());
//Pillar Black Quartz Wall //Pillar Black Quartz Wall
Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_PILLAR_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), recipeOutput); Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_PILLAR_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.BLACK_QUARTZ_PILLAR_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get());
//Pillar Black Quartz Slab //Pillar Black Quartz Slab
Recipe.slab(ActuallyBlocks.BLACK_QUARTZ_PILLAR_SLAB.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), recipeOutput); Recipe.slab(ActuallyBlocks.BLACK_QUARTZ_PILLAR_SLAB.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.BLACK_QUARTZ_PILLAR_SLAB.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), 2);
//Pillar Black Quartz Stairs //Pillar Black Quartz Stairs
Recipe.stairs(ActuallyBlocks.BLACK_QUARTZ_PILLAR_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), recipeOutput); Recipe.stairs(ActuallyBlocks.BLACK_QUARTZ_PILLAR_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.BLACK_QUARTZ_PILLAR_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get());
//Chiseled Black Quartz Wall //Chiseled Black Quartz Wall
Recipe.wall(ActuallyBlocks.CHISELED_BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.CHISELED_BLACK_QUARTZ.get(), recipeOutput); Recipe.wall(ActuallyBlocks.CHISELED_BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.CHISELED_BLACK_QUARTZ.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.CHISELED_BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.CHISELED_BLACK_QUARTZ.get());
//Chiseled Black Quartz Slab //Chiseled Black Quartz Slab
Recipe.slab(ActuallyBlocks.CHISELED_BLACK_QUARTZ_SLAB.getItem(), ActuallyBlocks.CHISELED_BLACK_QUARTZ.get(), recipeOutput); Recipe.slab(ActuallyBlocks.CHISELED_BLACK_QUARTZ_SLAB.getItem(), ActuallyBlocks.CHISELED_BLACK_QUARTZ.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.CHISELED_BLACK_QUARTZ_SLAB.getItem(), ActuallyBlocks.CHISELED_BLACK_QUARTZ.get(), 2);
//Chiseled Black Quartz Stairs //Chiseled Black Quartz Stairs
Recipe.stairs(ActuallyBlocks.CHISELED_BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.CHISELED_BLACK_QUARTZ.get(), recipeOutput); Recipe.stairs(ActuallyBlocks.CHISELED_BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.CHISELED_BLACK_QUARTZ.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.CHISELED_BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.CHISELED_BLACK_QUARTZ.get());
//Ethetic White Wall //Ethetic White Wall
Recipe.wall(ActuallyBlocks.ETHETIC_WHITE_WALL.getItem(), ActuallyBlocks.ETHETIC_WHITE_BLOCK.get(), recipeOutput); Recipe.wall(ActuallyBlocks.ETHETIC_WHITE_WALL.getItem(), ActuallyBlocks.ETHETIC_WHITE_BLOCK.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.ETHETIC_WHITE_WALL.getItem(), ActuallyBlocks.ETHETIC_WHITE_BLOCK.get());
//Ethetic White Slab //Ethetic White Slab
Recipe.slab(ActuallyBlocks.ETHETIC_WHITE_SLAB.getItem(), ActuallyBlocks.ETHETIC_WHITE_BLOCK.get(), recipeOutput); Recipe.slab(ActuallyBlocks.ETHETIC_WHITE_SLAB.getItem(), ActuallyBlocks.ETHETIC_WHITE_BLOCK.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.ETHETIC_WHITE_SLAB.getItem(), ActuallyBlocks.ETHETIC_WHITE_BLOCK.get(), 2);
//Ethetic White Stairs //Ethetic White Stairs
Recipe.stairs(ActuallyBlocks.ETHETIC_WHITE_STAIRS.getItem(), ActuallyBlocks.ETHETIC_WHITE_BLOCK.get(), recipeOutput); Recipe.stairs(ActuallyBlocks.ETHETIC_WHITE_STAIRS.getItem(), ActuallyBlocks.ETHETIC_WHITE_BLOCK.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.ETHETIC_WHITE_STAIRS.getItem(), ActuallyBlocks.ETHETIC_WHITE_BLOCK.get());
// Ethetic Green Wall // Ethetic Green Wall
Recipe.wall(ActuallyBlocks.ETHETIC_GREEN_WALL.getItem(), ActuallyBlocks.ETHETIC_GREEN_BLOCK.get(), recipeOutput); Recipe.wall(ActuallyBlocks.ETHETIC_GREEN_WALL.getItem(), ActuallyBlocks.ETHETIC_GREEN_BLOCK.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.ETHETIC_GREEN_WALL.getItem(), ActuallyBlocks.ETHETIC_GREEN_BLOCK.get());
// Ethetic Green Slab // Ethetic Green Slab
Recipe.slab(ActuallyBlocks.ETHETIC_GREEN_SLAB.getItem(), ActuallyBlocks.ETHETIC_GREEN_BLOCK.get(), recipeOutput); Recipe.slab(ActuallyBlocks.ETHETIC_GREEN_SLAB.getItem(), ActuallyBlocks.ETHETIC_GREEN_BLOCK.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.ETHETIC_GREEN_SLAB.getItem(), ActuallyBlocks.ETHETIC_GREEN_BLOCK.get(), 2);
// Ethetic Green Stairs // Ethetic Green Stairs
Recipe.stairs(ActuallyBlocks.ETHETIC_GREEN_STAIRS.getItem(), ActuallyBlocks.ETHETIC_GREEN_BLOCK.get(), recipeOutput); Recipe.stairs(ActuallyBlocks.ETHETIC_GREEN_STAIRS.getItem(), ActuallyBlocks.ETHETIC_GREEN_BLOCK.get(), recipeOutput);
Recipe.stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, ActuallyBlocks.ETHETIC_GREEN_STAIRS.getItem(), ActuallyBlocks.ETHETIC_GREEN_BLOCK.get());
// Atomic Reconstructor // Atomic Reconstructor
Recipe.shaped(ActuallyBlocks.ATOMIC_RECONSTRUCTOR.getItem()) Recipe.shaped(ActuallyBlocks.ATOMIC_RECONSTRUCTOR.getItem())
@ -535,15 +565,25 @@ public class BlockRecipeGenerator extends RecipeProvider {
} }
public static void stairs(ItemLike result, ItemLike resource, RecipeOutput consumer) { public static void stairs(ItemLike result, ItemLike resource, RecipeOutput consumer) {
Recipe.shaped(result).patternSingleKey('Q', resource, "Q ", "QQ ", "QQQ").save(consumer); Recipe.shaped(result, 4).patternSingleKey('Q', resource, "Q ", "QQ ", "QQQ").save(consumer);
} }
public static void wall(ItemLike result, ItemLike resource, RecipeOutput consumer) { public static void wall(ItemLike result, ItemLike resource, RecipeOutput consumer) {
Recipe.shaped(result).patternSingleKey('Q', resource, "QQQ", "QQQ").save(consumer); Recipe.shaped(result, 6).patternSingleKey('Q', resource, "QQQ", "QQQ").save(consumer);
} }
public static void slab(ItemLike result, ItemLike resource, RecipeOutput consumer) { public static void slab(ItemLike result, ItemLike resource, RecipeOutput consumer) {
Recipe.shaped(result).patternSingleKey('Q', resource, "QQQ").save(consumer); Recipe.shaped(result,6).patternSingleKey('Q', resource, "QQQ").save(consumer);
}
protected static void stonecutterResultFromBase(RecipeOutput recipeOutput, RecipeCategory category, ItemLike result, ItemLike material) {
stonecutterResultFromBase(recipeOutput, category, result, material, 1);
}
protected static void stonecutterResultFromBase(RecipeOutput recipeOutput, RecipeCategory category, ItemLike result, ItemLike material, int resultCount) {
SingleItemRecipeBuilder.stonecutting(Ingredient.of(material), category, result, resultCount)
.unlockedBy(getHasName(material), has(material))
.save(recipeOutput, ActuallyAdditions.modLoc(getConversionRecipeName(result, material) + "_stonecutting"));
} }
private static class Shapeless extends ShapelessRecipeBuilder { private static class Shapeless extends ShapelessRecipeBuilder {