mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-11-21 23:13:28 +01:00
Change itemstack codec used by LaserRecipe
This commit is contained in:
Mrbysco
parent
718494a938
commit
7fd9c103fc
28 changed files with 28 additions and 54 deletions
|
|
@ -1,27 +1,27 @@
|
||||||
// 1.21.1 2024-08-11T19:30:01.8293196 Laser Recipes
|
// 1.21.1 2024-10-23T15:56:03.829867 Laser Recipes
|
||||||
87241b118b814a391cbd863725adc11c133c0edc data/actuallyadditions/recipe/laser/crystalize_diamatine_crystal.json
|
87f1b80067bdc8e1b27db0a2ff657307323977f1 data/actuallyadditions/recipe/laser/crystalize_diamatine_crystal.json
|
||||||
754057c5a9afa9cf459ea90aaa5d909659d09b6a data/actuallyadditions/recipe/laser/crystalize_diamatine_crystal_block.json
|
c361631711c92f959cf875fca71fcef784daf6d0 data/actuallyadditions/recipe/laser/crystalize_diamatine_crystal_block.json
|
||||||
590455ccbd96125c5d3a1d7e536cb71d219d91e9 data/actuallyadditions/recipe/laser/crystalize_emeradic_crystal.json
|
73dbbbbc20514868a236bcc972ac28254a69725f data/actuallyadditions/recipe/laser/crystalize_emeradic_crystal.json
|
||||||
a727d81ff626e2f802654624b42e77a89b4f0e33 data/actuallyadditions/recipe/laser/crystalize_emeradic_crystal_block.json
|
ca6b06f1ab8a31d05fc48045468c18cc8d37e6e0 data/actuallyadditions/recipe/laser/crystalize_emeradic_crystal_block.json
|
||||||
6376e12087f78f041eb1f90147a016e382a383cf data/actuallyadditions/recipe/laser/crystalize_enori_crystal.json
|
138b2663ca3dad2604cd3ac06eb98e6758de20ce data/actuallyadditions/recipe/laser/crystalize_enori_crystal.json
|
||||||
e99076bbc74cab8baff64a91820188269bc6cd87 data/actuallyadditions/recipe/laser/crystalize_enori_crystal_block.json
|
4c753a1f1a3d1ec4fe78b61065ab0814eb4634cf data/actuallyadditions/recipe/laser/crystalize_enori_crystal_block.json
|
||||||
89a8a53297e655fc0e0221ba97a5add18b335b0d data/actuallyadditions/recipe/laser/crystalize_palis_crystal.json
|
c5ac8b550b215e367f5bcef4fb939b3daee5d1b1 data/actuallyadditions/recipe/laser/crystalize_palis_crystal.json
|
||||||
a32bca31753c71aa543df5c7a3147eadc1e78e45 data/actuallyadditions/recipe/laser/crystalize_palis_crystal_block.json
|
730697a9f711d44cfbc54b1a714ccff8d6cff89a data/actuallyadditions/recipe/laser/crystalize_palis_crystal_block.json
|
||||||
ca4fbcf92b3b3699cbd3cf1283884b426669df97 data/actuallyadditions/recipe/laser/crystalize_restonia_crystal.json
|
2014fcb70fdb0a7341db4500ac2569b07109e390 data/actuallyadditions/recipe/laser/crystalize_restonia_crystal.json
|
||||||
4729a2a3b8dbe6902d9fcebd0ac3905d044d483b data/actuallyadditions/recipe/laser/crystalize_restonia_crystal_block.json
|
a634db4bfd67fbc35695b43d1afc354b0d1a75f2 data/actuallyadditions/recipe/laser/crystalize_restonia_crystal_block.json
|
||||||
b584add4655acb280bc24616b6ba1b1dd9d0b38b data/actuallyadditions/recipe/laser/crystalize_void_crystal.json
|
5b8f7571e086d5978c30593e03f24508aa34cbd4 data/actuallyadditions/recipe/laser/crystalize_void_crystal.json
|
||||||
b2621aa91fdeebf9705b70fa4f01d4262096cba0 data/actuallyadditions/recipe/laser/crystalize_void_crystal_block.json
|
1a0a43d0324d2dcd83df2812e107d22a44a9456f data/actuallyadditions/recipe/laser/crystalize_void_crystal_block.json
|
||||||
938bed9bceca162d173b6d4542e0dbd0366a4c49 data/actuallyadditions/recipe/laser/crystallized_canola_seed.json
|
3ba5e2bc709c69f2d2ff4da0311d57a323b030f7 data/actuallyadditions/recipe/laser/crystallized_canola_seed.json
|
||||||
736cf4b8226cb183a0bd651a1c28022c9acb3e52 data/actuallyadditions/recipe/laser/ethetic_green_block.json
|
85804eeb251bec6d093e707f0e1a1e827a239120 data/actuallyadditions/recipe/laser/ethetic_green_block.json
|
||||||
9a44c080089e6b5e4b600da68c3fc972dcf6aa15 data/actuallyadditions/recipe/laser/ethetic_white_block.json
|
a42879186a3a7547c7ae4fd98eb748d8460aab6f data/actuallyadditions/recipe/laser/ethetic_white_block.json
|
||||||
fd38a9081daa8646ef55f9ec25fd5b5e0a09255f data/actuallyadditions/recipe/laser/laser_relay.json
|
99be24a9d1f51b3078ad53133f7b2f552509b81a data/actuallyadditions/recipe/laser/laser_relay.json
|
||||||
48c18a5791f50cc6f3b76660f8aac1bccabdf62a data/actuallyadditions/recipe/laser/laser_relay_fluids.json
|
5a952fe0eeb86bc841771bf879d93a1f43380256 data/actuallyadditions/recipe/laser/laser_relay_fluids.json
|
||||||
3c20b765f9915a6c9466421603f355dccdcfb10c data/actuallyadditions/recipe/laser/laser_relay_item.json
|
0b853a3847b99aedd81d1ac01fa506e185f1d4b8 data/actuallyadditions/recipe/laser/laser_relay_item.json
|
||||||
7cf00be05e1fbb4f4a2f5ce44a08926851a21ff6 data/actuallyadditions/recipe/laser/leather.json
|
e7d05995bdf8c32df06a0a4bbb5d3dcad22ae01a data/actuallyadditions/recipe/laser/leather.json
|
||||||
b85dd37d5988db90e345b2c396a8308ffc4ad22c data/actuallyadditions/recipe/laser/lens.json
|
b8c2185c315a1b7f2a68fb270906265e2473b085 data/actuallyadditions/recipe/laser/lens.json
|
||||||
de281395e6ba0b996c829d7a75a8713d82ac1d33 data/actuallyadditions/recipe/laser/lens_of_certain_death.json
|
1596045dcc44b6271c2819263716c83ceb6e6269 data/actuallyadditions/recipe/laser/lens_of_certain_death.json
|
||||||
6466842a3a7029e055118f1353d16a57b3e89e6c data/actuallyadditions/recipe/laser/lens_of_color.json
|
60d5c4148dfea328117b51315286d9a9fbd8465a data/actuallyadditions/recipe/laser/lens_of_color.json
|
||||||
e10b210e3be18fbd1d3906796db7c373f963a86e data/actuallyadditions/recipe/laser/lens_of_detonation.json
|
615c1450083fd9abef8e250298600701ee6437c6 data/actuallyadditions/recipe/laser/lens_of_detonation.json
|
||||||
48cab5f063ece53dabd7ba86221d378945fe6521 data/actuallyadditions/recipe/laser/nether_wart.json
|
682d595ee483c26bc20f35679d6928eb324acf6c data/actuallyadditions/recipe/laser/nether_wart.json
|
||||||
6967a51223fad6a390bf2cef5a0ec944eb35ca60 data/actuallyadditions/recipe/laser/prismarine_shard.json
|
c5930335da1b996509e6e72c943549c347a0c5e3 data/actuallyadditions/recipe/laser/prismarine_shard.json
|
||||||
f56877c79cc053b38ae7bd71aeda43a022cb80ee data/actuallyadditions/recipe/laser/soul_sand.json
|
15580fc1b94dcebcf061a8936e72a491733bba04 data/actuallyadditions/recipe/laser/soul_sand.json
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"tag": "c:gems/diamond"
|
"tag": "c:gems/diamond"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:diamatine_crystal"
|
"id": "actuallyadditions:diamatine_crystal"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"tag": "c:storage_blocks/diamond"
|
"tag": "c:storage_blocks/diamond"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:diamatine_crystal_block"
|
"id": "actuallyadditions:diamatine_crystal_block"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"tag": "c:gems/emerald"
|
"tag": "c:gems/emerald"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:emeradic_crystal"
|
"id": "actuallyadditions:emeradic_crystal"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"tag": "c:storage_blocks/emerald"
|
"tag": "c:storage_blocks/emerald"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:emeradic_crystal_block"
|
"id": "actuallyadditions:emeradic_crystal_block"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"tag": "c:ingots/iron"
|
"tag": "c:ingots/iron"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:enori_crystal"
|
"id": "actuallyadditions:enori_crystal"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"tag": "c:storage_blocks/iron"
|
"tag": "c:storage_blocks/iron"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:enori_crystal_block"
|
"id": "actuallyadditions:enori_crystal_block"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"tag": "c:gems/lapis"
|
"tag": "c:gems/lapis"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:palis_crystal"
|
"id": "actuallyadditions:palis_crystal"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"tag": "c:storage_blocks/lapis"
|
"tag": "c:storage_blocks/lapis"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:palis_crystal_block"
|
"id": "actuallyadditions:palis_crystal_block"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"tag": "c:dusts/redstone"
|
"tag": "c:dusts/redstone"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:restonia_crystal"
|
"id": "actuallyadditions:restonia_crystal"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"tag": "c:storage_blocks/redstone"
|
"tag": "c:storage_blocks/redstone"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:restonia_crystal_block"
|
"id": "actuallyadditions:restonia_crystal_block"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"tag": "minecraft:coals"
|
"tag": "minecraft:coals"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:void_crystal"
|
"id": "actuallyadditions:void_crystal"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"tag": "c:storage_blocks/coal"
|
"tag": "c:storage_blocks/coal"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:void_crystal_block"
|
"id": "actuallyadditions:void_crystal_block"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"item": "actuallyadditions:canola_seeds"
|
"item": "actuallyadditions:canola_seeds"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:crystallized_canola_seed"
|
"id": "actuallyadditions:crystallized_canola_seed"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"item": "minecraft:chiseled_quartz_block"
|
"item": "minecraft:chiseled_quartz_block"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:ethetic_green_block"
|
"id": "actuallyadditions:ethetic_green_block"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"item": "minecraft:quartz_block"
|
"item": "minecraft:quartz_block"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:ethetic_white_block"
|
"id": "actuallyadditions:ethetic_white_block"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"item": "actuallyadditions:laser_relay_item"
|
"item": "actuallyadditions:laser_relay_item"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:laser_relay"
|
"id": "actuallyadditions:laser_relay"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"item": "actuallyadditions:laser_relay"
|
"item": "actuallyadditions:laser_relay"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:laser_relay_fluids"
|
"id": "actuallyadditions:laser_relay_fluids"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"item": "actuallyadditions:laser_relay_fluids"
|
"item": "actuallyadditions:laser_relay_fluids"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:laser_relay_item"
|
"id": "actuallyadditions:laser_relay_item"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"item": "minecraft:rotten_flesh"
|
"item": "minecraft:rotten_flesh"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "minecraft:leather"
|
"id": "minecraft:leather"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"item": "actuallyadditions:lens_of_certain_death"
|
"item": "actuallyadditions:lens_of_certain_death"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:lens"
|
"id": "actuallyadditions:lens"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"item": "actuallyadditions:lens_of_detonation"
|
"item": "actuallyadditions:lens_of_detonation"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:lens_of_certain_death"
|
"id": "actuallyadditions:lens_of_certain_death"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"item": "actuallyadditions:lens"
|
"item": "actuallyadditions:lens"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:lens_of_color"
|
"id": "actuallyadditions:lens_of_color"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"item": "actuallyadditions:lens_of_color"
|
"item": "actuallyadditions:lens_of_color"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "actuallyadditions:lens_of_detonation"
|
"id": "actuallyadditions:lens_of_detonation"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"item": "minecraft:red_mushroom"
|
"item": "minecraft:red_mushroom"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "minecraft:nether_wart"
|
"id": "minecraft:nether_wart"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"item": "minecraft:quartz"
|
"item": "minecraft:quartz"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "minecraft:prismarine_shard"
|
"id": "minecraft:prismarine_shard"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
"tag": "c:sands"
|
"tag": "c:sands"
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"count": 1,
|
|
||||||
"id": "minecraft:soul_sand"
|
"id": "minecraft:soul_sand"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -101,7 +101,7 @@ public class LaserRecipe implements Recipe<RecipeInput> {
|
||||||
public static class Serializer implements RecipeSerializer<LaserRecipe> {
|
public static class Serializer implements RecipeSerializer<LaserRecipe> {
|
||||||
private static final MapCodec<LaserRecipe> CODEC = RecordCodecBuilder.mapCodec(
|
private static final MapCodec<LaserRecipe> CODEC = RecordCodecBuilder.mapCodec(
|
||||||
instance -> instance.group(
|
instance -> instance.group(
|
||||||
ItemStack.STRICT_CODEC.fieldOf("result").forGetter(recipe -> recipe.result),
|
ItemStack.STRICT_SINGLE_ITEM_CODEC.fieldOf("result").forGetter(recipe -> recipe.result),
|
||||||
Ingredient.CODEC_NONEMPTY.fieldOf("ingredient").forGetter(recipe -> recipe.itemIngredient),
|
Ingredient.CODEC_NONEMPTY.fieldOf("ingredient").forGetter(recipe -> recipe.itemIngredient),
|
||||||
Codec.INT.fieldOf("energy").forGetter(recipe -> recipe.energy)
|
Codec.INT.fieldOf("energy").forGetter(recipe -> recipe.energy)
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue