From a18c08039b4c7a7863e64671b04e78d310723ee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ampflower=20=F0=9F=8C=BA?= Date: Fri, 14 Mar 2025 04:13:41 -0700 Subject: [PATCH] feat: Add blahaj recipes *technically a fix* --- .../joy/data/JoyItemTagProvider.java | 13 ++++++++ .../joy/data/JoyRecipeProvider.java | 28 +++++++++++++++++ .../gay/pridecraft/joy/tags/JoyItemTags.java | 4 +++ .../blahaj/loot_table/blocks/ace_shark.json | 20 ------------- .../loot_table/blocks/agender_shark.json | 20 ------------- .../blahaj/loot_table/blocks/aro_shark.json | 20 ------------- .../loot_table/blocks/aroace_shark.json | 20 ------------- .../blahaj/loot_table/blocks/bi_shark.json | 20 ------------- .../blahaj/loot_table/blocks/blue_shark.json | 20 ------------- .../blahaj/loot_table/blocks/blue_whale.json | 20 ------------- .../joy/blahaj/loot_table/blocks/bread.json | 20 ------------- .../blahaj/loot_table/blocks/brown_bear.json | 20 ------------- .../loot_table/blocks/demi_r_shark.json | 20 ------------- .../loot_table/blocks/demi_s_shark.json | 20 ------------- .../loot_table/blocks/demiboy_shark.json | 20 ------------- .../loot_table/blocks/demigirl_shark.json | 20 ------------- .../blahaj/loot_table/blocks/enby_shark.json | 20 ------------- .../blahaj/loot_table/blocks/gay_shark.json | 20 ------------- .../loot_table/blocks/genderfluid_shark.json | 20 ------------- .../loot_table/blocks/genderqueer_shark.json | 20 ------------- .../blahaj/loot_table/blocks/gray_shark.json | 20 ------------- .../loot_table/blocks/grey_r_shark.json | 20 ------------- .../loot_table/blocks/grey_s_shark.json | 20 ------------- .../loot_table/blocks/greyrose_shark.json | 20 ------------- .../loot_table/blocks/intersex_shark.json | 20 ------------- .../loot_table/blocks/lesbian_shark.json | 20 ------------- .../blahaj/loot_table/blocks/pan_shark.json | 20 ------------- .../blahaj/loot_table/blocks/poly_shark.json | 20 ------------- .../blahaj/loot_table/blocks/pride_shark.json | 20 ------------- .../blahaj/loot_table/blocks/trans_shark.json | 20 ------------- .../blahaj/recipe/stonecutter/ace_shark.json | 12 -------- .../recipe/stonecutter/agender_shark.json | 12 -------- .../blahaj/recipe/stonecutter/aro_shark.json | 12 -------- .../recipe/stonecutter/aroace_shark.json | 12 -------- .../blahaj/recipe/stonecutter/bi_shark.json | 12 -------- .../blahaj/recipe/stonecutter/blue_shark.json | 12 -------- .../recipe/stonecutter/demi_r_shark.json | 12 -------- .../recipe/stonecutter/demi_s_shark.json | 12 -------- .../recipe/stonecutter/demiboy_shark.json | 12 -------- .../recipe/stonecutter/demigirl_shark.json | 12 -------- .../blahaj/recipe/stonecutter/enby_shark.json | 12 -------- .../blahaj/recipe/stonecutter/gay_shark.json | 12 -------- .../recipe/stonecutter/genderfluid_shark.json | 12 -------- .../recipe/stonecutter/genderqueer_shark.json | 12 -------- .../recipe/stonecutter/grey_r_shark.json | 12 -------- .../recipe/stonecutter/grey_s_shark.json | 12 -------- .../recipe/stonecutter/greyrose_shark.json | 12 -------- .../recipe/stonecutter/intersex_shark.json | 12 -------- .../recipe/stonecutter/lesbian_shark.json | 12 -------- .../blahaj/recipe/stonecutter/pan_shark.json | 12 -------- .../blahaj/recipe/stonecutter/poly_shark.json | 12 -------- .../recipe/stonecutter/pride_shark.json | 12 -------- .../recipe/stonecutter/trans_shark.json | 12 -------- .../data/joy/blahaj/tags/item/plushies.json | 10 ------- .../data/joy/blahaj/tags/item/sharks.json | 30 ------------------- .../recipe/crafting/blue_shark.json | 0 .../recipe/crafting/blue_whale.json | 0 .../{blahaj => }/recipe/crafting/bread.json | 0 58 files changed, 45 insertions(+), 856 deletions(-) delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/ace_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/agender_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/aro_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/aroace_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/bi_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/blue_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/blue_whale.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/bread.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/brown_bear.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/demi_r_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/demi_s_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/demiboy_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/demigirl_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/enby_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/gay_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/genderfluid_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/genderqueer_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/gray_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/grey_r_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/grey_s_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/greyrose_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/intersex_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/lesbian_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/pan_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/poly_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/pride_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/trans_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/ace_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/agender_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/aro_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/aroace_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/bi_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/blue_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/demi_r_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/demi_s_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/demiboy_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/demigirl_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/enby_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/gay_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/genderfluid_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/genderqueer_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/grey_r_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/grey_s_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/greyrose_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/intersex_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/lesbian_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/pan_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/poly_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/pride_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/trans_shark.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/tags/item/plushies.json delete mode 100644 xplat/src/main/resources/data/joy/blahaj/tags/item/sharks.json rename xplat/src/main/resources/data/joy/{blahaj => }/recipe/crafting/blue_shark.json (100%) rename xplat/src/main/resources/data/joy/{blahaj => }/recipe/crafting/blue_whale.json (100%) rename xplat/src/main/resources/data/joy/{blahaj => }/recipe/crafting/bread.json (100%) diff --git a/xplat/src/datagen/java/gay/pridecraft/joy/data/JoyItemTagProvider.java b/xplat/src/datagen/java/gay/pridecraft/joy/data/JoyItemTagProvider.java index 55bda8a..eb19cb1 100644 --- a/xplat/src/datagen/java/gay/pridecraft/joy/data/JoyItemTagProvider.java +++ b/xplat/src/datagen/java/gay/pridecraft/joy/data/JoyItemTagProvider.java @@ -1,9 +1,11 @@ package gay.pridecraft.joy.data; +import gay.pridecraft.joy.block.BlahajBlocks; import gay.pridecraft.joy.registry.JoyItems; import gay.pridecraft.joy.tags.JoyItemTags; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.minecraft.item.Item; import net.minecraft.item.Items; import net.minecraft.registry.RegistryWrapper; @@ -31,5 +33,16 @@ public class JoyItemTagProvider extends FabricTagProvider.ItemTagProvider { Items.TOTEM_OF_UNDYING, JoyItems.TOTEM_OF_PRIDE ); + + getOrCreateTagBuilder(JoyItemTags.SHARKS).add( + BlahajBlocks.BLAHAJ_ITEM, + BlahajBlocks.GRAY_SHARK_ITEM + ).add(BlahajBlocks.PRIDE_ITEMS.toArray(Item[]::new)); + + getOrCreateTagBuilder(JoyItemTags.PLUSHIES).add( + BlahajBlocks.BLAVINGAD_ITEM, + BlahajBlocks.BREAD_ITEM, + BlahajBlocks.BROWN_BEAR_ITEM + ).addTag(JoyItemTags.SHARKS); } } diff --git a/xplat/src/datagen/java/gay/pridecraft/joy/data/JoyRecipeProvider.java b/xplat/src/datagen/java/gay/pridecraft/joy/data/JoyRecipeProvider.java index 1650240..3a1168f 100644 --- a/xplat/src/datagen/java/gay/pridecraft/joy/data/JoyRecipeProvider.java +++ b/xplat/src/datagen/java/gay/pridecraft/joy/data/JoyRecipeProvider.java @@ -1,16 +1,21 @@ package gay.pridecraft.joy.data; +import gay.pridecraft.joy.block.BlahajBlocks; import gay.pridecraft.joy.registry.JoyBlocks; +import gay.pridecraft.joy.tags.JoyItemTags; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; import net.minecraft.data.server.recipe.RecipeExporter; import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder; +import net.minecraft.data.server.recipe.StonecuttingRecipeJsonBuilder; import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; import net.minecraft.item.Items; +import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.book.RecipeCategory; import net.minecraft.registry.Registries; import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.tag.TagKey; import java.util.concurrent.CompletableFuture; @@ -28,6 +33,9 @@ public class JoyRecipeProvider extends FabricRecipeProvider { offerConversion(JoyBlocks.BLUE_ALLIUM, Items.BLUE_DYE, exporter); offerConversion(JoyBlocks.PINK_ALLIUM, Items.PINK_DYE, exporter); offerConversion(JoyBlocks.WHITE_ALLIUM, Items.WHITE_DYE, exporter); + + stonecutting(exporter, RecipeCategory.MISC, JoyItemTags.SHARKS, 1, + BlahajBlocks.PRIDE_ITEMS.toArray(Item[]::new)); } private static void offerConversion(ItemConvertible base, Item dye, RecipeExporter exporter) { @@ -38,4 +46,24 @@ public class JoyRecipeProvider extends FabricRecipeProvider { .withSuffixedPath("has_").toString(), conditionsFromItem(base)) .offerTo(exporter); } + + private static void stonecutting(RecipeExporter exporter, RecipeCategory category, TagKey base, int count, ItemConvertible... results) { + for (final var result : results) { + offerStonecuttingRecipe(exporter, category, result, base, count); + } + } + + private static void offerStonecuttingRecipe(RecipeExporter exporter, RecipeCategory category, ItemConvertible output, TagKey input, int count) { + StonecuttingRecipeJsonBuilder.createStonecutting(Ingredient.fromTag(input), category, output, count) + .criterion(hasTag(input), conditionsFromTag(input)) + .offerTo(exporter, "stonecutting/" + tagToItem(input, output)); + } + + private static String tagToItem(TagKey input, ItemConvertible output) { + return getItemPath(output) + "_from_" + input.id().getPath(); + } + + private static String hasTag(TagKey tag) { + return tag.id().withSuffixedPath("has_").toString(); + } } diff --git a/xplat/src/main/java/gay/pridecraft/joy/tags/JoyItemTags.java b/xplat/src/main/java/gay/pridecraft/joy/tags/JoyItemTags.java index 86d6b5f..89422f2 100644 --- a/xplat/src/main/java/gay/pridecraft/joy/tags/JoyItemTags.java +++ b/xplat/src/main/java/gay/pridecraft/joy/tags/JoyItemTags.java @@ -16,6 +16,10 @@ public final class JoyItemTags { ELYTRA = common("elytra"), TOTEM_OF_UNDYING = common("totem_of_undying"); + public static final TagKey + PLUSHIES = joy("plushies"), + SHARKS = joy("sharks"); + private static TagKey joy(String name) { return TagKey.of(RegistryKeys.ITEM, JoyUtil.id(name)); } diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/ace_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/ace_shark.json deleted file mode 100644 index 689b602..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/ace_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:ace_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/agender_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/agender_shark.json deleted file mode 100644 index ac255e2..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/agender_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:agender_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/aro_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/aro_shark.json deleted file mode 100644 index 4cfed9f..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/aro_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:aro_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/aroace_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/aroace_shark.json deleted file mode 100644 index b40786e..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/aroace_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:aroace_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/bi_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/bi_shark.json deleted file mode 100644 index b94dd5b..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/bi_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:bi_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/blue_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/blue_shark.json deleted file mode 100644 index bf0c3ea..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/blue_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:blue_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/blue_whale.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/blue_whale.json deleted file mode 100644 index 3ad6437..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/blue_whale.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:blue_whale" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/bread.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/bread.json deleted file mode 100644 index 727f774..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/bread.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:bread" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/brown_bear.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/brown_bear.json deleted file mode 100644 index 432d4a7..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/brown_bear.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:brown_bear" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/demi_r_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/demi_r_shark.json deleted file mode 100644 index a52a7c5..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/demi_r_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:demi_r_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/demi_s_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/demi_s_shark.json deleted file mode 100644 index 10032e9..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/demi_s_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:demi_s_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/demiboy_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/demiboy_shark.json deleted file mode 100644 index 76f61c9..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/demiboy_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:demiboy_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/demigirl_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/demigirl_shark.json deleted file mode 100644 index e8f6ab6..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/demigirl_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:demigirl_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/enby_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/enby_shark.json deleted file mode 100644 index 0ff47d7..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/enby_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:enby_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/gay_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/gay_shark.json deleted file mode 100644 index 681d523..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/gay_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:gay_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/genderfluid_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/genderfluid_shark.json deleted file mode 100644 index 5300e36..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/genderfluid_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:genderfluid_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/genderqueer_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/genderqueer_shark.json deleted file mode 100644 index e9ba7b7..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/genderqueer_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:genderqueer_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/gray_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/gray_shark.json deleted file mode 100644 index 1a1427f..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/gray_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:gray_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/grey_r_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/grey_r_shark.json deleted file mode 100644 index 6cf75d9..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/grey_r_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:grey_r_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/grey_s_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/grey_s_shark.json deleted file mode 100644 index 158896e..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/grey_s_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:grey_s_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/greyrose_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/greyrose_shark.json deleted file mode 100644 index e986008..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/greyrose_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:greyrose_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/intersex_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/intersex_shark.json deleted file mode 100644 index 7781c05..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/intersex_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:intersex_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/lesbian_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/lesbian_shark.json deleted file mode 100644 index 5683c10..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/lesbian_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:lesbian_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/pan_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/pan_shark.json deleted file mode 100644 index 8570c43..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/pan_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:pan_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/poly_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/poly_shark.json deleted file mode 100644 index ae786f2..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/poly_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:poly_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/pride_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/pride_shark.json deleted file mode 100644 index 3b315bc..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/pride_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:pride_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/trans_shark.json b/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/trans_shark.json deleted file mode 100644 index 98a96a6..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/loot_table/blocks/trans_shark.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "joy:trans_shark" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/ace_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/ace_shark.json deleted file mode 100644 index 210b40c..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/ace_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:ace_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/agender_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/agender_shark.json deleted file mode 100644 index 3771dea..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/agender_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:agender_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/aro_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/aro_shark.json deleted file mode 100644 index 075ead1..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/aro_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:aro_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/aroace_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/aroace_shark.json deleted file mode 100644 index edce606..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/aroace_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:aroace_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/bi_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/bi_shark.json deleted file mode 100644 index de85ba1..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/bi_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:bi_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/blue_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/blue_shark.json deleted file mode 100644 index b414bd3..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/blue_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:blue_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/demi_r_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/demi_r_shark.json deleted file mode 100644 index ac4676c..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/demi_r_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:demi_r_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/demi_s_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/demi_s_shark.json deleted file mode 100644 index e314218..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/demi_s_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:demi_s_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/demiboy_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/demiboy_shark.json deleted file mode 100644 index 7794a8a..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/demiboy_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:demiboy_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/demigirl_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/demigirl_shark.json deleted file mode 100644 index ab70304..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/demigirl_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:demigirl_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/enby_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/enby_shark.json deleted file mode 100644 index de08152..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/enby_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:enby_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/gay_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/gay_shark.json deleted file mode 100644 index 8526e68..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/gay_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:gay_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/genderfluid_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/genderfluid_shark.json deleted file mode 100644 index 4874259..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/genderfluid_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:genderfluid_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/genderqueer_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/genderqueer_shark.json deleted file mode 100644 index 6e26493..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/genderqueer_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:genderqueer_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/grey_r_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/grey_r_shark.json deleted file mode 100644 index 9fe9205..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/grey_r_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:grey_r_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/grey_s_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/grey_s_shark.json deleted file mode 100644 index 7691d43..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/grey_s_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:grey_s_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/greyrose_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/greyrose_shark.json deleted file mode 100644 index 1915dd2..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/greyrose_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:greyrose_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/intersex_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/intersex_shark.json deleted file mode 100644 index da576c2..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/intersex_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:intersex_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/lesbian_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/lesbian_shark.json deleted file mode 100644 index 3f53518..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/lesbian_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:lesbian_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/pan_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/pan_shark.json deleted file mode 100644 index 95af903..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/pan_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:pan_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/poly_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/poly_shark.json deleted file mode 100644 index 724ba4c..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/poly_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:poly_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/pride_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/pride_shark.json deleted file mode 100644 index cd0c481..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/pride_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:pride_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/trans_shark.json b/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/trans_shark.json deleted file mode 100644 index 41bbe25..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/recipe/stonecutter/trans_shark.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "category": "misc", - "group": "plush_sharks", - "ingredient": { - "tag": "joy:sharks" - }, - "result": { - "id": "joy:trans_shark" - }, - "count": 1 -} \ No newline at end of file diff --git a/xplat/src/main/resources/data/joy/blahaj/tags/item/plushies.json b/xplat/src/main/resources/data/joy/blahaj/tags/item/plushies.json deleted file mode 100644 index 3c3325a..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/tags/item/plushies.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - "#joy:sharks", - - "joy:blue_whale", - "joy:bread", - "joy:brown_bear" - ] -} diff --git a/xplat/src/main/resources/data/joy/blahaj/tags/item/sharks.json b/xplat/src/main/resources/data/joy/blahaj/tags/item/sharks.json deleted file mode 100644 index be58d1f..0000000 --- a/xplat/src/main/resources/data/joy/blahaj/tags/item/sharks.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "replace": false, - "values": [ - "joy:gray_shark", - "joy:blue_shark", - - "joy:ace_shark", - "joy:agender_shark", - "joy:aro_shark", - "joy:aroace_shark", - "joy:bi_shark", - "joy:demiboy_shark", - "joy:demigirl_shark", - "joy:demi_r_shark", - "joy:demi_s_shark", - "joy:enby_shark", - "joy:gay_shark", - "joy:genderfluid_shark", - "joy:genderqueer_shark", - "joy:greyrose_shark", - "joy:grey_r_shark", - "joy:grey_s_shark", - "joy:intersex_shark", - "joy:lesbian_shark", - "joy:pan_shark", - "joy:poly_shark", - "joy:pride_shark", - "joy:trans_shark" - ] -} diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/crafting/blue_shark.json b/xplat/src/main/resources/data/joy/recipe/crafting/blue_shark.json similarity index 100% rename from xplat/src/main/resources/data/joy/blahaj/recipe/crafting/blue_shark.json rename to xplat/src/main/resources/data/joy/recipe/crafting/blue_shark.json diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/crafting/blue_whale.json b/xplat/src/main/resources/data/joy/recipe/crafting/blue_whale.json similarity index 100% rename from xplat/src/main/resources/data/joy/blahaj/recipe/crafting/blue_whale.json rename to xplat/src/main/resources/data/joy/recipe/crafting/blue_whale.json diff --git a/xplat/src/main/resources/data/joy/blahaj/recipe/crafting/bread.json b/xplat/src/main/resources/data/joy/recipe/crafting/bread.json similarity index 100% rename from xplat/src/main/resources/data/joy/blahaj/recipe/crafting/bread.json rename to xplat/src/main/resources/data/joy/recipe/crafting/bread.json