diff --git a/src/generated/resources/.cache/74807d958079a027731c973b9550985af6711175 b/src/generated/resources/.cache/74807d958079a027731c973b9550985af6711175 index 834af280e..013901f5f 100644 --- a/src/generated/resources/.cache/74807d958079a027731c973b9550985af6711175 +++ b/src/generated/resources/.cache/74807d958079a027731c973b9550985af6711175 @@ -1,5 +1,6 @@ -// 1.20.4 2024-03-04T22:51:31.5989305 Tags for minecraft:item mod id actuallyadditions +// 1.20.4 2024-03-08T17:03:47.6380549 Tags for minecraft:item mod id actuallyadditions 87327118c2f16da245b76de4fdcaab149456d9b8 data/actuallyadditions/tags/items/coffee_beans.json f3ee78cd8c9563bd1828de2b4b336735f289f9f2 data/actuallyadditions/tags/items/crystals.json 7e6e49c3eb5302af147a2d6ba439e83bd4831cbc data/actuallyadditions/tags/items/drills.json ae55da193b94fd6375c05d5aa46cafdda9d335cd data/actuallyadditions/tags/items/tiny_coals.json +da125442e98e78f6dac7e0c8f35a51503f5bb79d data/forge/tags/items/slimeballs.json diff --git a/src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 b/src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 index c83ba9fff..d5b12a3ee 100644 --- a/src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 +++ b/src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 @@ -1,4 +1,4 @@ -// 1.20.4 2024-03-08T16:52:06.2354947 Item Recipes +// 1.20.4 2024-03-08T17:07:43.7158398 Item Recipes d374edde9294d1a224b4b5610b50117a11328c00 data/actuallyadditions/recipes/advanced_coil.json f67629e45d152c96f3467a90a67520f78ecf9f07 data/actuallyadditions/recipes/advanced_leaf_blower.json d65e5a70232fa2f0e74d2a67c1cd4b0e87124242 data/actuallyadditions/recipes/basic_coil.json @@ -94,3 +94,5 @@ b4aa29ef0d47b557f354a23cb6ee8ef60d273de3 data/actuallyadditions/recipes/teleport 89c9512eeb746befb1bdc31037baa9bd86220f74 data/actuallyadditions/recipes/triple_battery.json 0737014abee48f688982412297e04e994aa6f9a6 data/actuallyadditions/recipes/wings_of_the_bats.json c80073fcade3cdcb15f28c4a1cb12df4ae6cf4ec data/actuallyadditions/recipes/wooden_aiot.json +2bd8e4e4ed83a0d870e4509c0e722a9bbfd54a73 data/minecraft/recipes/slime_block.json +77fa026351592845c5fd6bbe430e6362e755eaaf data/minecraft/recipes/sticky_piston.json diff --git a/src/generated/resources/data/forge/tags/items/slimeballs.json b/src/generated/resources/data/forge/tags/items/slimeballs.json new file mode 100644 index 000000000..8fbbbc426 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/slimeballs.json @@ -0,0 +1,5 @@ +{ + "values": [ + "actuallyadditions:rice_slimeball" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/slime_block.json b/src/generated/resources/data/minecraft/recipes/slime_block.json new file mode 100644 index 000000000..01eac01ff --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/slime_block.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "R": { + "item": "actuallyadditions:rice_slimeball" + } + }, + "pattern": [ + "RRR", + "RRR", + "RRR" + ], + "result": { + "item": "minecraft:slime_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/sticky_piston.json b/src/generated/resources/data/minecraft/recipes/sticky_piston.json new file mode 100644 index 000000000..0065d5706 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/sticky_piston.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "P": { + "item": "minecraft:piston" + }, + "R": { + "item": "actuallyadditions:rice_slimeball" + } + }, + "pattern": [ + "R", + "P" + ], + "result": { + "item": "minecraft:sticky_piston" + } +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java index e97682d9f..cf7eb9b84 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java @@ -489,6 +489,19 @@ public class ItemRecipeGenerator extends RecipeProvider { .define('I', Items.IRON_HELMET) .save(recipeOutput); + // Sticky Piston from rice slime + Recipe.shaped(Items.STICKY_PISTON) + .pattern("R", "P") + .define('R', ActuallyItems.RICE_SLIMEBALL.get()) + .define('P', Items.PISTON) + .save(recipeOutput); + + // Slime block from rice slime balls + Recipe.shaped(Items.SLIME_BLOCK) + .pattern("RRR", "RRR", "RRR") + .define('R', ActuallyItems.RICE_SLIMEBALL.get()) + .save(recipeOutput); + //Shards addShard(recipeOutput, ActuallyItems.VOID_CRYSTAL_SHARD, ActuallyItems.VOID_CRYSTAL); addShard(recipeOutput, ActuallyItems.ENORI_CRYSTAL_SHARD, ActuallyItems.ENORI_CRYSTAL); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java index 0fe658721..ff4cd557c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java @@ -8,6 +8,7 @@ import net.minecraft.data.PackOutput; import net.minecraft.data.tags.ItemTagsProvider; import net.minecraft.data.tags.TagsProvider; import net.minecraft.world.level.block.Block; +import net.neoforged.neoforge.common.Tags; import net.neoforged.neoforge.common.data.ExistingFileHelper; import javax.annotation.Nonnull; @@ -37,5 +38,8 @@ public class ItemTagsGenerator extends ItemTagsProvider { .add(ActuallyItems.RESTONIA_CRYSTAL.get(), ActuallyItems.PALIS_CRYSTAL.get(), ActuallyItems.DIAMATINE_CRYSTAL.get(), ActuallyItems.VOID_CRYSTAL.get(), ActuallyItems.EMERADIC_CRYSTAL.get(), ActuallyItems.ENORI_CRYSTAL.get()); + + tag(Tags.Items.SLIMEBALLS) + .add(ActuallyItems.RICE_SLIMEBALL.get()); } } diff --git a/src/main/resources/assets/actuallyadditions/lang/en_us.json b/src/main/resources/assets/actuallyadditions/lang/en_us.json index d017d422d..e2cbaf027 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/main/resources/assets/actuallyadditions/lang/en_us.json @@ -275,13 +275,11 @@ "item.actuallyadditions.drill_light_gray": "Light Gray Drill (wip)", "item.actuallyadditions.drill_lime": "Lime Drill (wip)", "item.actuallyadditions.rice": "Rice", - "item.actuallyadditions.food_doughnut": "Doughnut (wip)", "item.actuallyadditions.rice_dough": "Rice Dough", - "item.actuallyadditions.food_rice_bread": "Rice Bread (wip)", "item.actuallyadditions.rice_seeds": "Rice Seeds", "item.actuallyadditions.tiny_coal": "Tiny Coal", "item.actuallyadditions.tiny_charcoal": "Tiny Charcoal", - "item.actuallyadditions.rice_slimeball": "Rice Slimeball (wip)", + "item.actuallyadditions.rice_slimeball": "Rice Slimeball", "item.actuallyadditions.single_battery": "Single Battery", "item.actuallyadditions.double_battery": "Double Battery", "item.actuallyadditions.triple_battery": "Triple Battery", @@ -319,10 +317,7 @@ "item.actuallyadditions.drill_upgrade_three_by_three": "Drill Mining Augment I (wip)", "item.actuallyadditions.drill_upgrade_five_by_five": "Drill Mining Augment II (wip)", "item.actuallyadditions.dough": "Dough (wip)", - "item.actuallyadditions.paper_cone": "Paper Cone (wip)", - "item.actuallyadditions.knife_blade": "Knife Blade (wip)", - "item.actuallyadditions.knife_handle": "Knife Handle (wip)", - "item.actuallyadditions.black_quartz": "Black Quartz (wip)", + "item.actuallyadditions.black_quartz": "Black Quartz", "item.actuallyadditions.ring": "Ring", "item.actuallyadditions.ring.storage": "Blaze Stored (wip)", "item.actuallyadditions.teleport_staff": "Teleport Staff", @@ -365,12 +360,12 @@ "item.actuallyadditions.lens_of_certain_death": "Lens of Certain Death", "item.actuallyadditions.lens_of_disenchanting": "Lens of Disenchanting", "item.actuallyadditions.crate_keeper": "Storage Crate Keeper (wip)", - "item.actuallyadditions.paxel_crystal_red": "Restonia Crystal AIOT (wip)", - "item.actuallyadditions.paxel_crystal_blue": "Palis Crystal AIOT (wip)", - "item.actuallyadditions.paxel_crystal_light_blue": "Diamatine Crystal AIOT (wip)", - "item.actuallyadditions.paxel_crystal_black": "Void Crystal AIOT (wip)", - "item.actuallyadditions.paxel_crystal_white": "Enori Crystal AIOT (wip)", - "item.actuallyadditions.paxel_crystal_green": "Emeradic Crystal AIOT (wip)", + "item.actuallyadditions.paxel_crystal_red": "Restonia Crystal AIOT", + "item.actuallyadditions.paxel_crystal_blue": "Palis Crystal AIOT", + "item.actuallyadditions.paxel_crystal_light_blue": "Diamatine Crystal AIOT", + "item.actuallyadditions.paxel_crystal_black": "Void Crystal AIOT", + "item.actuallyadditions.paxel_crystal_white": "Enori Crystal AIOT)", + "item.actuallyadditions.paxel_crystal_green": "Emeradic Crystal AIOT", "item.actuallyadditions.food_bacon": "Bacon (wip)", "item.actuallyadditions.ender_star": "Ender Star (wip)", "item.actuallyadditions.spawner_changer": "Spawner Changer (wip)",