mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-11-22 07:13:28 +01:00
Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4
This commit is contained in:
commit
90a923bd08
3 changed files with 37 additions and 1 deletions
|
@ -1,4 +1,4 @@
|
||||||
// 1.20.4 2024-03-12T17:59:34.1573737 Recipes
|
// 1.20.4 2024-03-13T18:06:15.6143021 Recipes
|
||||||
4d3128b37a7153882a9324cda49b5069207561c5 data/actuallyadditions/recipes/atomic_reconstructor.json
|
4d3128b37a7153882a9324cda49b5069207561c5 data/actuallyadditions/recipes/atomic_reconstructor.json
|
||||||
b0367f5012651764931e8b8fd0c5bcca4e8614c0 data/actuallyadditions/recipes/battery_box.json
|
b0367f5012651764931e8b8fd0c5bcca4e8614c0 data/actuallyadditions/recipes/battery_box.json
|
||||||
dba5d4a1a79489d5766fad32f912ab1a64618854 data/actuallyadditions/recipes/bio_reactor.json
|
dba5d4a1a79489d5766fad32f912ab1a64618854 data/actuallyadditions/recipes/bio_reactor.json
|
||||||
|
@ -61,6 +61,7 @@ c7b65084e855bd7f083819ed9339320577510c6f data/actuallyadditions/recipes/phantom_
|
||||||
6d3aa070e0fccbb126c80323423c9482259dd6de data/actuallyadditions/recipes/phantom_liquiface.json
|
6d3aa070e0fccbb126c80323423c9482259dd6de data/actuallyadditions/recipes/phantom_liquiface.json
|
||||||
253e31ad471e2a8e20bfbe077826a8fac35fcc84 data/actuallyadditions/recipes/phantom_redstoneface.json
|
253e31ad471e2a8e20bfbe077826a8fac35fcc84 data/actuallyadditions/recipes/phantom_redstoneface.json
|
||||||
8c78ebb9351b98ffe368391a391b90385c0b8b7f data/actuallyadditions/recipes/placer.json
|
8c78ebb9351b98ffe368391a391b90385c0b8b7f data/actuallyadditions/recipes/placer.json
|
||||||
|
981e7e91216504b421d069f72920499df052e64f data/actuallyadditions/recipes/player_interface.json
|
||||||
184acfb5fd3799b3fbe35150c67b6530581f8bf1 data/actuallyadditions/recipes/powered_furnace.json
|
184acfb5fd3799b3fbe35150c67b6530581f8bf1 data/actuallyadditions/recipes/powered_furnace.json
|
||||||
b81a706a5f635d8a63ffd3034c80838dc10699c9 data/actuallyadditions/recipes/ranged_collector.json
|
b81a706a5f635d8a63ffd3034c80838dc10699c9 data/actuallyadditions/recipes/ranged_collector.json
|
||||||
532a454741e8068941f1f3c44f3be257530db8c3 data/actuallyadditions/recipes/shock_suppressor.json
|
532a454741e8068941f1f3c44f3be257530db8c3 data/actuallyadditions/recipes/shock_suppressor.json
|
||||||
|
|
|
@ -0,0 +1,26 @@
|
||||||
|
{
|
||||||
|
"type": "minecraft:crafting_shaped",
|
||||||
|
"category": "misc",
|
||||||
|
"key": {
|
||||||
|
"A": {
|
||||||
|
"item": "actuallyadditions:advanced_coil"
|
||||||
|
},
|
||||||
|
"C": {
|
||||||
|
"item": "actuallyadditions:ender_casing"
|
||||||
|
},
|
||||||
|
"E": {
|
||||||
|
"item": "actuallyadditions:empowered_diamatine_crystal"
|
||||||
|
},
|
||||||
|
"W": {
|
||||||
|
"item": "minecraft:wither_skeleton_skull"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"pattern": [
|
||||||
|
"CWC",
|
||||||
|
"ECE",
|
||||||
|
"CAC"
|
||||||
|
],
|
||||||
|
"result": {
|
||||||
|
"item": "actuallyadditions:player_interface"
|
||||||
|
}
|
||||||
|
}
|
|
@ -89,6 +89,15 @@ public class BlockRecipeGenerator extends RecipeProvider {
|
||||||
.define('D', ActuallyTags.Items.DRILLS)
|
.define('D', ActuallyTags.Items.DRILLS)
|
||||||
.save(recipeOutput);
|
.save(recipeOutput);
|
||||||
|
|
||||||
|
// Player Interface
|
||||||
|
Recipe.shaped(ActuallyBlocks.PLAYER_INTERFACE.getItem())
|
||||||
|
.pattern("CWC", "ECE", "CAC")
|
||||||
|
.define('C', ActuallyBlocks.ENDER_CASING.getItem())
|
||||||
|
.define('W', Items.WITHER_SKELETON_SKULL)
|
||||||
|
.define('E', ActuallyItems.EMPOWERED_DIAMATINE_CRYSTAL)
|
||||||
|
.define('A', ActuallyItems.ADVANCED_COIL)
|
||||||
|
.save(recipeOutput);
|
||||||
|
|
||||||
//Black Quartz Wall
|
//Black Quartz Wall
|
||||||
Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), recipeOutput);
|
Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), recipeOutput);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue