diff --git a/Common/src/main/java/at/petrak/hexcasting/api/mod/HexTags.java b/Common/src/main/java/at/petrak/hexcasting/api/mod/HexTags.java index 0b329d693..4cb64f627 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/mod/HexTags.java +++ b/Common/src/main/java/at/petrak/hexcasting/api/mod/HexTags.java @@ -20,6 +20,10 @@ public static final class Items { public static final TagKey GRANTS_ROOT_ADVANCEMENT = create("grants_root_advancement"); public static final TagKey SEAL_MATERIALS = create("seal_materials"); + public static final TagKey IMPETI = create("impeti"); + public static final TagKey DIRECTRICES = create("directrices"); + public static final TagKey MINDFLAYED_CIRCLE_COMPONENTS = create("brainswept_circle_components"); + public static TagKey create(String name) { return create(modLoc(name)); } @@ -33,6 +37,11 @@ public static final class Blocks { public static final TagKey EDIFIED_LOGS = create("edified_logs"); public static final TagKey EDIFIED_PLANKS = create("edified_planks"); + + public static final TagKey IMPETI = create("impeti"); + public static final TagKey DIRECTRICES = create("directrices"); + public static final TagKey MINDFLAYED_CIRCLE_COMPONENTS = create("brainswept_circle_components"); + public static TagKey create(String name) { return TagKey.create(Registry.BLOCK_REGISTRY, modLoc(name)); } diff --git a/Common/src/main/java/at/petrak/hexcasting/client/RegisterClientStuff.java b/Common/src/main/java/at/petrak/hexcasting/client/RegisterClientStuff.java index fda14b602..8e953ec75 100644 --- a/Common/src/main/java/at/petrak/hexcasting/client/RegisterClientStuff.java +++ b/Common/src/main/java/at/petrak/hexcasting/client/RegisterClientStuff.java @@ -104,6 +104,7 @@ public static void init() { registerGaslight4(HexItems.STAFF_QUENCHED); registerGaslight4(HexBlocks.QUENCHED_ALLAY.asItem()); + registerGaslight4(HexItems.QUENCHED_SHARD); x.setRenderLayer(HexBlocks.CONJURED_LIGHT, RenderType.cutout()); x.setRenderLayer(HexBlocks.CONJURED_BLOCK, RenderType.cutout()); diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/HexLootTables.java b/Common/src/main/java/at/petrak/hexcasting/datagen/HexLootTables.java index 33eb510e9..64fc8ab2e 100644 --- a/Common/src/main/java/at/petrak/hexcasting/datagen/HexLootTables.java +++ b/Common/src/main/java/at/petrak/hexcasting/datagen/HexLootTables.java @@ -22,7 +22,6 @@ import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.level.storage.loot.entries.AlternativesEntry; -import net.minecraft.world.level.storage.loot.entries.EntryGroup; import net.minecraft.world.level.storage.loot.entries.LootItem; import net.minecraft.world.level.storage.loot.functions.ApplyBonusCount; import net.minecraft.world.level.storage.loot.functions.ApplyExplosionDecay; @@ -114,15 +113,15 @@ protected void makeLootTables(Map blockTables, .withPool(isThatAnMFingBrandonSandersonReference) .withPool(isThatAnMFingBadBrandonSandersonReference)); + // it looks like loot groups are bugged? + // so instead we add some and then *increment* the amount, gated behind the cond var quenchedPool = LootPool.lootPool().add(AlternativesEntry.alternatives( LootItem.lootTableItem(HexBlocks.QUENCHED_ALLAY).when(silkTouchCond), - EntryGroup.list( - LootItem.lootTableItem(HexItems.QUENCHED_SHARD) - .apply(SetItemCountFunction.setCount(UniformGenerator.between(2f, 4f))), - LootItem.lootTableItem(HexItems.QUENCHED_SHARD) + LootItem.lootTableItem(HexItems.QUENCHED_SHARD) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(2f, 4f))) + .apply(SetItemCountFunction.setCount(ConstantValue.exactly(1), true) .when(BonusLevelTableCondition.bonusLevelFlatChance(Enchantments.BLOCK_FORTUNE, - 0.25f, 0.35f, 0.5f, 0.75f, 1.0f)) - ) + 0.25f, 0.5f, 0.75f, 1.0f))) )); blockTables.put(HexBlocks.QUENCHED_ALLAY, LootTable.lootTable().withPool(quenchedPool)); } diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java b/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java index 6e0303a0d..9e2bf23f1 100644 --- a/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java +++ b/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java @@ -67,6 +67,8 @@ protected void makeRecipes(Consumer recipes) { staffRecipe(recipes, HexItems.STAFF_WARPED, Items.WARPED_PLANKS); staffRecipe(recipes, HexItems.STAFF_MANGROVE, Items.MANGROVE_PLANKS); staffRecipe(recipes, HexItems.STAFF_EDIFIED, HexBlocks.EDIFIED_PLANKS.asItem()); + staffRecipe(recipes, HexItems.STAFF_QUENCHED, HexItems.QUENCHED_SHARD); + staffRecipe(recipes, HexItems.STAFF_MINDSPLICE, Ingredient.of(HexTags.Items.MINDFLAYED_CIRCLE_COMPONENTS)); ShapelessRecipeBuilder.shapeless(HexItems.THOUGHT_KNOT) .requires(HexItems.AMETHYST_DUST) @@ -501,6 +503,10 @@ protected void makeRecipes(Consumer recipes) { } private void staffRecipe(Consumer recipes, ItemStaff staff, Item plank) { + staffRecipe(recipes, staff, Ingredient.of(plank)); + } + + private void staffRecipe(Consumer recipes, ItemStaff staff, Ingredient plank) { ShapedRecipeBuilder.shaped(staff) .define('W', plank) .define('S', Items.STICK) diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexBlockTagProvider.java b/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexBlockTagProvider.java index 0d74b45f3..779546b08 100644 --- a/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexBlockTagProvider.java +++ b/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexBlockTagProvider.java @@ -17,6 +17,14 @@ public HexBlockTagProvider(DataGenerator pGenerator, IXplatTags xtags) { @Override public void addTags() { + tag(HexTags.Blocks.IMPETI) + .add(HexBlocks.IMPETUS_LOOK, HexBlocks.IMPETUS_RIGHTCLICK, HexBlocks.IMPETUS_STOREDPLAYER); + tag(HexTags.Blocks.DIRECTRICES) + .add(HexBlocks.DIRECTRIX_REDSTONE); + tag(HexTags.Blocks.MINDFLAYED_CIRCLE_COMPONENTS) + .addTag(HexTags.Blocks.IMPETI) + .addTag(HexTags.Blocks.DIRECTRICES); + tag(BlockTags.MINEABLE_WITH_PICKAXE) .add(HexBlocks.SLATE_BLOCK, HexBlocks.SLATE, HexBlocks.EMPTY_DIRECTRIX, HexBlocks.DIRECTRIX_REDSTONE, diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexItemTagProvider.java b/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexItemTagProvider.java index ba4448b3f..9fa313620 100644 --- a/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexItemTagProvider.java +++ b/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexItemTagProvider.java @@ -37,6 +37,9 @@ protected void addTags() { this.copy(HexTags.Blocks.EDIFIED_LOGS, HexTags.Items.EDIFIED_LOGS); this.copy(HexTags.Blocks.EDIFIED_PLANKS, HexTags.Items.EDIFIED_PLANKS); + this.copy(HexTags.Blocks.IMPETI, HexTags.Items.IMPETI); + this.copy(HexTags.Blocks.DIRECTRICES, HexTags.Items.DIRECTRICES); + this.copy(HexTags.Blocks.MINDFLAYED_CIRCLE_COMPONENTS, HexTags.Items.MINDFLAYED_CIRCLE_COMPONENTS); this.copy(BlockTags.LOGS_THAT_BURN, ItemTags.LOGS_THAT_BURN); this.copy(BlockTags.LOGS, ItemTags.LOGS); this.copy(BlockTags.PLANKS, ItemTags.PLANKS); diff --git a/Common/src/main/resources/assets/hexcasting/lang/en_us.json b/Common/src/main/resources/assets/hexcasting/lang/en_us.json index 7e1ea4521..6fd7c5e83 100644 --- a/Common/src/main/resources/assets/hexcasting/lang/en_us.json +++ b/Common/src/main/resources/assets/hexcasting/lang/en_us.json @@ -22,6 +22,7 @@ "item.hexcasting.battery": "Phial of Media", "item.hexcasting.amethyst_dust": "Amethyst Dust", "item.hexcasting.charged_amethyst": "Charged Amethyst", + "item.hexcasting.quenched_allay_shard": "Shard of Quenched Allay", "item.hexcasting.lens": "Scrying Lens", "item.hexcasting.scroll_small": "Small Scroll", "item.hexcasting.scroll_small.of": "How did you get this item of %s", diff --git a/Fabric/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b b/Fabric/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b index a6539ceba..4c0c9a0c1 100644 --- a/Fabric/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b +++ b/Fabric/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b @@ -1,4 +1,5 @@ -// 1.19.2 2023-02-17T23:47:13.460414023 Tags for minecraft:item +// 1.19.2 2023-02-18T11:41:21.846317687 Tags for minecraft:item +b61c62d136132d63889fccca2055c5f7e9b25112 data/hexcasting/tags/items/impeti.json 5928bad07d3872bb60f29ef4f3c885c8e1967c20 data/hexcasting/tags/items/phial_base.json fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data/minecraft/tags/items/wooden_doors.json e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data/hexcasting/tags/items/edified_planks.json @@ -13,10 +14,12 @@ fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data/minecraft/tags/items/doors.json 684c3206f38cc9cc494d5875c5e56aad004486af data/hexcasting/tags/items/edified_logs.json e186f43ed06770e698c886691f91b2c6acdb5a2a data/hexcasting/tags/items/seal_materials.json 5f3b600b4fd98744bd08c993ce7bcb9c2f195cd2 data/minecraft/tags/items/leaves.json +9818dcd28edc496bc434b4f7b6b9cc27658d545e data/hexcasting/tags/items/directrices.json 684c3206f38cc9cc494d5875c5e56aad004486af data/minecraft/tags/items/logs.json 5bbfd513fd2eb2090b0c2d1ec33504deb79d53b9 data/minecraft/tags/items/slabs.json 5bbfd513fd2eb2090b0c2d1ec33504deb79d53b9 data/minecraft/tags/items/wooden_slabs.json 4461ef6db41a675fd077dd833cfd0ea537e755be data/c/tags/items/amethyst_dusts.json 5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data/minecraft/tags/items/trapdoors.json e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data/minecraft/tags/items/planks.json +c72a147bc65d26424df199388969ebd11119aed3 data/hexcasting/tags/items/brainswept_circle_components.json 5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data/minecraft/tags/items/wooden_trapdoors.json diff --git a/Fabric/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 b/Fabric/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 index c3d678239..473c93542 100644 --- a/Fabric/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 +++ b/Fabric/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 @@ -1,4 +1,4 @@ -// 1.19.2 2023-02-17T23:47:13.480823941 LootTables +// 1.19.2 2023-02-18T11:41:21.846932255 LootTables dec1d3592e82f99d9e059d9c771530f103b2bda5 data/hexcasting/loot_tables/blocks/empty_directrix.json 2c42fc5d8c74c98ad15b8bd50f56541fccbef750 data/hexcasting/loot_tables/blocks/edified_tile.json cfb39e2151725fe4f9a7269d9b5de8031ea54a44 data/hexcasting/loot_tables/blocks/directrix_redstone.json @@ -34,4 +34,4 @@ b7f7af68760b51d0c438f5c6039f1cd7157fa452 data/hexcasting/loot_tables/blocks/anci 9ee4259b51cccd4582fb2e52ab9f64e92af857bb data/hexcasting/loot_tables/blocks/edified_log.json c089d3d230ae5354f2a9953f65bba77b6e26d976 data/hexcasting/loot_tables/blocks/edified_trapdoor.json 745b510161cfff804b115f566ad6b50e0cb492d1 data/hexcasting/loot_tables/blocks/slate.json -468f68d1e889afe4f7ce28d1a597a57a17f5a6c3 data/hexcasting/loot_tables/blocks/quenched_allay.json +33ac65cb8351f73958f6d1cb9a5dacfe53d4a2a7 data/hexcasting/loot_tables/blocks/quenched_allay.json diff --git a/Fabric/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 b/Fabric/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 index 113e7bba8..ba2d9fa50 100644 --- a/Fabric/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 +++ b/Fabric/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 @@ -1,24 +1,27 @@ -// 1.19.2 2023-02-17T23:47:13.479469333 Tags for minecraft:block -20183cd61968ff6548df2dde1100b6378d68d64b data/minecraft/tags/blocks/wooden_buttons.json +// 1.19.2 2023-02-18T11:41:21.839953411 Tags for minecraft:block +c72a147bc65d26424df199388969ebd11119aed3 data/hexcasting/tags/blocks/brainswept_circle_components.json 357eddf3cee6f16725bed0701d57b2ca3097d74d data/minecraft/tags/blocks/mineable/shovel.json -5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data/minecraft/tags/blocks/wooden_trapdoors.json 20183cd61968ff6548df2dde1100b6378d68d64b data/minecraft/tags/blocks/buttons.json 2044a90007e0e25b8d973c936476ac9ae8bc4c5b data/minecraft/tags/blocks/mineable/pickaxe.json d5a3405be832907cb12fd9d1f423e297fe8e3e66 data/minecraft/tags/blocks/mineable/axe.json 5f3b600b4fd98744bd08c993ce7bcb9c2f195cd2 data/minecraft/tags/blocks/mineable/hoe.json +684c3206f38cc9cc494d5875c5e56aad004486af data/minecraft/tags/blocks/logs_that_burn.json +5f3b600b4fd98744bd08c993ce7bcb9c2f195cd2 data/minecraft/tags/blocks/leaves.json +281cb08b9b68ef049820c4f3f36b40820044681e data/minecraft/tags/blocks/wooden_stairs.json +36b54a86d2ed41c8a503f7a61817a7a9d7a94536 data/minecraft/tags/blocks/crystal_sound_blocks.json +5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data/minecraft/tags/blocks/trapdoors.json +37cff4ce449b8069b59b2327d78e073fc026d348 data/minecraft/tags/blocks/wooden_pressure_plates.json +20183cd61968ff6548df2dde1100b6378d68d64b data/minecraft/tags/blocks/wooden_buttons.json +5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data/minecraft/tags/blocks/wooden_trapdoors.json fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data/minecraft/tags/blocks/wooden_doors.json 684c3206f38cc9cc494d5875c5e56aad004486af data/minecraft/tags/blocks/logs.json 684c3206f38cc9cc494d5875c5e56aad004486af data/hexcasting/tags/blocks/edified_logs.json 5bbfd513fd2eb2090b0c2d1ec33504deb79d53b9 data/minecraft/tags/blocks/slabs.json -684c3206f38cc9cc494d5875c5e56aad004486af data/minecraft/tags/blocks/logs_that_burn.json e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data/minecraft/tags/blocks/planks.json -5f3b600b4fd98744bd08c993ce7bcb9c2f195cd2 data/minecraft/tags/blocks/leaves.json +b61c62d136132d63889fccca2055c5f7e9b25112 data/hexcasting/tags/blocks/impeti.json 281cb08b9b68ef049820c4f3f36b40820044681e data/minecraft/tags/blocks/stairs.json -281cb08b9b68ef049820c4f3f36b40820044681e data/minecraft/tags/blocks/wooden_stairs.json +9818dcd28edc496bc434b4f7b6b9cc27658d545e data/hexcasting/tags/blocks/directrices.json 37cff4ce449b8069b59b2327d78e073fc026d348 data/minecraft/tags/blocks/pressure_plates.json -36b54a86d2ed41c8a503f7a61817a7a9d7a94536 data/minecraft/tags/blocks/crystal_sound_blocks.json fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data/minecraft/tags/blocks/doors.json -5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data/minecraft/tags/blocks/trapdoors.json 5bbfd513fd2eb2090b0c2d1ec33504deb79d53b9 data/minecraft/tags/blocks/wooden_slabs.json -37cff4ce449b8069b59b2327d78e073fc026d348 data/minecraft/tags/blocks/wooden_pressure_plates.json e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data/hexcasting/tags/blocks/edified_planks.json diff --git a/Fabric/src/generated/resources/.cache/844611d4af49e23072b8a888c8e73c6c5d8c0768 b/Fabric/src/generated/resources/.cache/844611d4af49e23072b8a888c8e73c6c5d8c0768 index 38f767e42..6bcd9889b 100644 --- a/Fabric/src/generated/resources/.cache/844611d4af49e23072b8a888c8e73c6c5d8c0768 +++ b/Fabric/src/generated/resources/.cache/844611d4af49e23072b8a888c8e73c6c5d8c0768 @@ -1,4 +1,4 @@ -// 1.19.2 2023-02-17T23:47:13.480402857 Tags for hexcasting:action +// 1.19.2 2023-02-18T11:41:21.842737196 Tags for hexcasting:action e5afc567ea17f035e4eb1d1d48825100b7f6ad68 data/hexcasting/tags/action/per_world_pattern.json e5afc567ea17f035e4eb1d1d48825100b7f6ad68 data/hexcasting/tags/action/requires_enlightenment.json e5afc567ea17f035e4eb1d1d48825100b7f6ad68 data/hexcasting/tags/action/can_start_enlighten.json diff --git a/Fabric/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/Fabric/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index cc35d6686..15cf8048c 100644 --- a/Fabric/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/Fabric/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,7 +1,8 @@ -// 1.19.2 2023-02-17T23:47:13.464974503 Recipes +// 1.19.2 2023-02-18T11:41:21.843161249 Recipes 9f75d3e93ecbbbf3ed9a92b2943397e09dcae1a9 data/hexcasting/recipes/dye_colorizer_light_blue.json 04569ccadfd99f203b0485d0c3e877209290f2b3 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_pink.json 2a9d4a0f3618abf9e9b8699b318a984d2c836913 data/hexcasting/advancements/recipes/brainsweep/brainsweep/directrix_redstone.json +e8933b048f77673c0d278b238be2a41e76c5fa88 data/hexcasting/recipes/quenched_staff.json 1b510d32bad1a51ad6795fb8e7702d34c8c8cfbe data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_green.json d73e5d8fec4d3f7d15888bd292f4ad9c1b37cac5 data/hexcasting/advancements/recipes/hexcasting.creative_tab/ageing_scroll_paper_lantern.json b54339a9e990419e4820491001c4cbdb7aa9fddb data/hexcasting/recipes/artifact.json @@ -31,6 +32,7 @@ ebfa29e0a62a629afbe18681e09cc7be95a3529e data/hexcasting/advancements/recipes/he 2aa2e5c268ae440238eaf4cea20011b0c8f81a49 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_demiboy.json 326925a948aeb17aabafbc25ed2562a257796d29 data/hexcasting/recipes/dye_colorizer_yellow.json 9f55e6ff1f2633e4ad390868e7952b700e5309a4 data/hexcasting/advancements/recipes/brainsweep/brainsweep/impetus_rightclick.json +8293ffbca8a83c19bdb4684a6f8676791b5f0884 data/hexcasting/advancements/recipes/hexcasting.creative_tab/quenched_staff.json 4440b41499c9c32e297dc184c39da010ff82ac5e data/hexcasting/advancements/recipes/hexcasting.creative_tab/uuid_colorizer.json 5a90084c03d6e8424872870c8b65f4771b447f03 data/hexcasting/recipes/brainsweep/budding_amethyst.json 638c534059597cebb9dc1e927c76a2809ddbfd42 data/hexcasting/recipes/akashic_connector.json @@ -111,6 +113,7 @@ ef5a19ab2710fd0ce836d767588fe6a54a528a48 data/hexcasting/recipes/dye_colorizer_w 229931adf8d62f659de5950d711afd24fb5aa535 data/hexcasting/advancements/recipes/brainsweep/brainsweep/akashic_record.json 1754e1304908edf58a70fe8548f9d0ede22a1dd3 data/hexcasting/recipes/pride_colorizer_pansexual.json d684142c75bee35e6035d1829e271704d4ccdff3 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_lesbian.json +7fc1a033a4c628c72539e8b4941b488234f57045 data/hexcasting/recipes/mindsplice_staff.json 4ffed306e5f640054a6f269ae0e548388f087996 data/hexcasting/recipes/warped_staff.json f45428f892d2064fafa29ea644eea21354e2e322 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_staff.json 8715e71c2fb59ee458ce217040c9a8dd0db04789 data/hexcasting/advancements/recipes/hexcasting.creative_tab/lens.json @@ -177,6 +180,7 @@ d323e21de69d0606d1fac03fa8820e5857e4e1f1 data/hexcasting/recipes/dynamicseal_spe 5902d75cd2474604f2bb1067187ba574eb1e15fc data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_wood.json 07902912a9ca6f8da48ed579ec318bb760d4f8df data/hexcasting/recipes/pride_colorizer_nonbinary.json 7a51e934846a0d7fe00a808cfa22fd85da67fe9d data/hexcasting/recipes/brainsweep/impetus_look.json +01fe458d83b9f196b59407d2099b70f93656fc71 data/hexcasting/advancements/recipes/hexcasting.creative_tab/mindsplice_staff.json 1407fa19f33b98ad0f125a0cba0cf8388b1441e5 data/hexcasting/advancements/recipes/hexcasting.creative_tab/decompose_quenched_shard/charged.json a184ee70962538e4f8641c707d6dca8796ca36e7 data/hexcasting/recipes/edified_slab.json 22ff2d626da7f5fdc1411b4df75a6fc6a0e52df7 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_slab.json diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/mindsplice_staff.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/mindsplice_staff.json new file mode 100644 index 000000000..268f94e30 --- /dev/null +++ b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/mindsplice_staff.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "hexcasting:charged_amethyst" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hexcasting:mindsplice_staff" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hexcasting:mindsplice_staff" + ] + } +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/quenched_staff.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/quenched_staff.json new file mode 100644 index 000000000..f26d8ab88 --- /dev/null +++ b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/quenched_staff.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "hexcasting:charged_amethyst" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hexcasting:quenched_staff" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hexcasting:quenched_staff" + ] + } +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/quenched_allay.json b/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/quenched_allay.json index eb20f85b2..bb2e6fe10 100644 --- a/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/quenched_allay.json +++ b/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/quenched_allay.json @@ -24,30 +24,23 @@ "name": "hexcasting:quenched_allay" }, { - "type": "minecraft:group", - "children": [ + "type": "minecraft:item", + "functions": [ { - "type": "minecraft:item", - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 4.0, - "min": 2.0 - }, - "function": "minecraft:set_count" - } - ], - "name": "hexcasting:quenched_allay_shard" + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 2.0 + }, + "function": "minecraft:set_count" }, { - "type": "minecraft:item", + "add": true, "conditions": [ { "chances": [ 0.25, - 0.35, 0.5, 0.75, 1.0 @@ -56,9 +49,11 @@ "enchantment": "minecraft:fortune" } ], - "name": "hexcasting:quenched_allay_shard" + "count": 1.0, + "function": "minecraft:set_count" } - ] + ], + "name": "hexcasting:quenched_allay_shard" } ] } diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/mindsplice_staff.json b/Fabric/src/generated/resources/data/hexcasting/recipes/mindsplice_staff.json new file mode 100644 index 000000000..3491512ff --- /dev/null +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/mindsplice_staff.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "key": { + "A": { + "item": "hexcasting:charged_amethyst" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "tag": "hexcasting:brainswept_circle_components" + } + }, + "pattern": [ + " SA", + " WS", + "S " + ], + "result": { + "item": "hexcasting:mindsplice_staff" + } +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/quenched_staff.json b/Fabric/src/generated/resources/data/hexcasting/recipes/quenched_staff.json new file mode 100644 index 000000000..c3d5af820 --- /dev/null +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/quenched_staff.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "key": { + "A": { + "item": "hexcasting:charged_amethyst" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "hexcasting:quenched_allay_shard" + } + }, + "pattern": [ + " SA", + " WS", + "S " + ], + "result": { + "item": "hexcasting:quenched_staff" + } +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/tags/blocks/brainswept_circle_components.json b/Fabric/src/generated/resources/data/hexcasting/tags/blocks/brainswept_circle_components.json new file mode 100644 index 000000000..ea830ffa1 --- /dev/null +++ b/Fabric/src/generated/resources/data/hexcasting/tags/blocks/brainswept_circle_components.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#hexcasting:impeti", + "#hexcasting:directrices" + ] +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/tags/blocks/directrices.json b/Fabric/src/generated/resources/data/hexcasting/tags/blocks/directrices.json new file mode 100644 index 000000000..db72fe850 --- /dev/null +++ b/Fabric/src/generated/resources/data/hexcasting/tags/blocks/directrices.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "hexcasting:directrix_redstone" + ] +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/tags/blocks/impeti.json b/Fabric/src/generated/resources/data/hexcasting/tags/blocks/impeti.json new file mode 100644 index 000000000..49f7389bd --- /dev/null +++ b/Fabric/src/generated/resources/data/hexcasting/tags/blocks/impeti.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "hexcasting:impetus_look", + "hexcasting:impetus_rightclick", + "hexcasting:impetus_storedplayer" + ] +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/tags/items/brainswept_circle_components.json b/Fabric/src/generated/resources/data/hexcasting/tags/items/brainswept_circle_components.json new file mode 100644 index 000000000..ea830ffa1 --- /dev/null +++ b/Fabric/src/generated/resources/data/hexcasting/tags/items/brainswept_circle_components.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#hexcasting:impeti", + "#hexcasting:directrices" + ] +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/tags/items/directrices.json b/Fabric/src/generated/resources/data/hexcasting/tags/items/directrices.json new file mode 100644 index 000000000..db72fe850 --- /dev/null +++ b/Fabric/src/generated/resources/data/hexcasting/tags/items/directrices.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "hexcasting:directrix_redstone" + ] +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/tags/items/impeti.json b/Fabric/src/generated/resources/data/hexcasting/tags/items/impeti.json new file mode 100644 index 000000000..49f7389bd --- /dev/null +++ b/Fabric/src/generated/resources/data/hexcasting/tags/items/impeti.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "hexcasting:impetus_look", + "hexcasting:impetus_rightclick", + "hexcasting:impetus_storedplayer" + ] +} \ No newline at end of file diff --git a/Forge/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b b/Forge/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b index 43a8e76ce..83cd26d59 100644 --- a/Forge/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b +++ b/Forge/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b @@ -1,9 +1,12 @@ -// 1.19.2 2023-02-17T23:14:30.876927309 Tags for minecraft:item +// 1.19.2 2023-02-18T11:42:13.01822805 Tags for minecraft:item 2f5c5bd21580004c998765215166adaa72e0d96b data/forge/tags/items/dusts/amethyst.json 873bab891e0827973ebfe9fedd352c95778d7fbe data/forge/tags/items/gems.json +c5aac196bf97183b43d794c6aac8e206f4b71e37 data/hexcasting/tags/items/brainswept_circle_components.json +918a356b647d2670172763517ab9f885d3b9451b data/hexcasting/tags/items/directrices.json 42c76a43081acfb0194e2cee6de18104fb0ba5ad data/hexcasting/tags/items/edified_logs.json 86828f8056bfdfdd2aff10d7a9dbc6c269c25b8a data/hexcasting/tags/items/edified_planks.json 03bd3a58ae7367d6a21eb3acbbd70fe65a41b8f6 data/hexcasting/tags/items/grants_root_advancement.json +3cc7c170b3faa415a1ab41e6ddf6d6f085c62e66 data/hexcasting/tags/items/impeti.json 7f7d5f6cc9b5cfb39d240fc901c4ae2d2037ec14 data/hexcasting/tags/items/phial_base.json d878c230cd5cb1b54fbe6e53f3ef71379d080c6f data/hexcasting/tags/items/seal_materials.json 65b4d296017084143261adc617b727749ed7eba4 data/hexcasting/tags/items/staves.json diff --git a/Forge/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 b/Forge/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 index 9d3881305..a90bb288e 100644 --- a/Forge/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 +++ b/Forge/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 @@ -1,4 +1,4 @@ -// 1.19.2 2023-02-17T23:44:47.192617485 LootTables +// 1.19.2 2023-02-18T11:42:13.019002411 LootTables 3b1e2f738c4906371a4cdecf24253ad94ae66320 data/hexcasting/loot_tables/blocks/akashic_bookshelf.json 201bbf7adff979ff8cb087e1798da5a2a31eed09 data/hexcasting/loot_tables/blocks/akashic_connector.json 16498092b43c43a4a7617ba91bcfcc13b87d9a7e data/hexcasting/loot_tables/blocks/akashic_record.json @@ -27,7 +27,7 @@ f99e241d651abe7f9234301508bc805deba179ad data/hexcasting/loot_tables/blocks/empt 90f8f97b941408ed89d01b69e1fccf5f2a35e2bc data/hexcasting/loot_tables/blocks/impetus_look.json d97f573d03712b4d677e3a0a22ab6a000b1db060 data/hexcasting/loot_tables/blocks/impetus_rightclick.json c8dd063aa3fe320f9f4518736d4ae97ba2c93a79 data/hexcasting/loot_tables/blocks/impetus_storedplayer.json -468f68d1e889afe4f7ce28d1a597a57a17f5a6c3 data/hexcasting/loot_tables/blocks/quenched_allay.json +33ac65cb8351f73958f6d1cb9a5dacfe53d4a2a7 data/hexcasting/loot_tables/blocks/quenched_allay.json 4bd736b9d96bb5a0f0b18cb423566bf0ec63f530 data/hexcasting/loot_tables/blocks/scroll_paper.json a3ca7f9427bd57a6033f241754d49425251cc091 data/hexcasting/loot_tables/blocks/scroll_paper_lantern.json 745b510161cfff804b115f566ad6b50e0cb492d1 data/hexcasting/loot_tables/blocks/slate.json diff --git a/Forge/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 b/Forge/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 index 1c68f6b38..b895e11c1 100644 --- a/Forge/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 +++ b/Forge/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 @@ -1,6 +1,9 @@ -// 1.19.2 2023-02-16T14:30:44.861480995 Tags for minecraft:block +// 1.19.2 2023-02-18T11:42:13.017468146 Tags for minecraft:block +c5aac196bf97183b43d794c6aac8e206f4b71e37 data/hexcasting/tags/blocks/brainswept_circle_components.json +918a356b647d2670172763517ab9f885d3b9451b data/hexcasting/tags/blocks/directrices.json 42c76a43081acfb0194e2cee6de18104fb0ba5ad data/hexcasting/tags/blocks/edified_logs.json 86828f8056bfdfdd2aff10d7a9dbc6c269c25b8a data/hexcasting/tags/blocks/edified_planks.json +3cc7c170b3faa415a1ab41e6ddf6d6f085c62e66 data/hexcasting/tags/blocks/impeti.json 841dfbe4970e9167b205e5aa2b0f0936c6b9af60 data/minecraft/tags/blocks/buttons.json 136977a539664f25ea6f762ca8c2ee72d430cc49 data/minecraft/tags/blocks/crystal_sound_blocks.json cba96d2ff28087e7fd9807e5e80104f3befc2512 data/minecraft/tags/blocks/doors.json diff --git a/Forge/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/Forge/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index a6b3a1393..19eb9aaab 100644 --- a/Forge/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/Forge/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.19.2 2023-02-17T23:44:47.197247947 Recipes +// 1.19.2 2023-02-18T11:42:13.012790417 Recipes 29056d8bbc023668564ee81f4eb8b2a11411cf4a data/create/recipes/crushing/amethyst_block.json 5bb0b70967a422bfd88c01fa1af64e9b98781fd1 data/create/recipes/crushing/amethyst_cluster.json 229931adf8d62f659de5950d711afd24fb5aa535 data/hexcasting/advancements/recipes/brainsweep/brainsweep/akashic_record.json @@ -61,6 +61,7 @@ b21a84886b937a4c4e72a674f265dccb21411ab9 data/hexcasting/advancements/recipes/he 182c2b5dd406c80ed957e1b43d554cce1b212d28 data/hexcasting/advancements/recipes/hexcasting/jungle_staff.json 8715e71c2fb59ee458ce217040c9a8dd0db04789 data/hexcasting/advancements/recipes/hexcasting/lens.json 6a9a89cfa34732437996431a9c885332cf714449 data/hexcasting/advancements/recipes/hexcasting/mangrove_staff.json +01fe458d83b9f196b59407d2099b70f93656fc71 data/hexcasting/advancements/recipes/hexcasting/mindsplice_staff.json a58f37bc66e65c1ac00ba7dbc4d9a7b902f42aad data/hexcasting/advancements/recipes/hexcasting/oak_staff.json f9e4d9171ffc6a125d9899f1867398acf8037b27 data/hexcasting/advancements/recipes/hexcasting/pride_colorizer_agender.json b7d75dcd88e5091ff44eec236531a56e82c7bd91 data/hexcasting/advancements/recipes/hexcasting/pride_colorizer_aroace.json @@ -78,6 +79,7 @@ d684142c75bee35e6035d1829e271704d4ccdff3 data/hexcasting/advancements/recipes/he c9c2b33afc4b5de1f10df08d901312ee1ded1c5e data/hexcasting/advancements/recipes/hexcasting/pride_colorizer_pansexual.json cd22886924e7aaeb62e8f7da0747cc950af9dc32 data/hexcasting/advancements/recipes/hexcasting/pride_colorizer_plural.json be7ceaf2b55525f06178fb09070dfeeef8da1c65 data/hexcasting/advancements/recipes/hexcasting/pride_colorizer_transgender.json +8293ffbca8a83c19bdb4684a6f8676791b5f0884 data/hexcasting/advancements/recipes/hexcasting/quenched_staff.json bfca15c4ef7bea4704d062c3ab690e23887e55b0 data/hexcasting/advancements/recipes/hexcasting/scroll.json 7df149b266e4f7925defd3b017163698070dbcb9 data/hexcasting/advancements/recipes/hexcasting/scroll_medium.json 898319b3a4ee7a8d7bd7a4af0313593561ed657e data/hexcasting/advancements/recipes/hexcasting/scroll_paper.json @@ -164,6 +166,7 @@ f124395483d1ae0e10b7db2b1828f1a4e269a88c data/hexcasting/recipes/jeweler_hammer. a776209b64fea520f6a2fff9f1623e7086939dd9 data/hexcasting/recipes/jungle_staff.json 3662834d6e0bac03aba28f0f9d9f07f511492118 data/hexcasting/recipes/lens.json cba5ffa7cd89116aba040956f4a85073cedd39cf data/hexcasting/recipes/mangrove_staff.json +7fc1a033a4c628c72539e8b4941b488234f57045 data/hexcasting/recipes/mindsplice_staff.json 735a7d770f23a02dc4ae93644e7f4c44a32e313a data/hexcasting/recipes/oak_staff.json ce0cd4d73792c30dcec2eea306bff44b28cb237f data/hexcasting/recipes/pride_colorizer_agender.json 17aa26ce6bc9941d1477dee99e514fd66be7f664 data/hexcasting/recipes/pride_colorizer_aroace.json @@ -181,6 +184,7 @@ fa49dab810cff4f827d2662a93fc3439a8e99cba data/hexcasting/recipes/pride_colorizer 1754e1304908edf58a70fe8548f9d0ede22a1dd3 data/hexcasting/recipes/pride_colorizer_pansexual.json db105c67babb1ffc1bcad53ed1c98d7eb2fee4b1 data/hexcasting/recipes/pride_colorizer_plural.json dc0fb37084974cf396264d046fa6708338eb0879 data/hexcasting/recipes/pride_colorizer_transgender.json +e8933b048f77673c0d278b238be2a41e76c5fa88 data/hexcasting/recipes/quenched_staff.json 446b5adea918e25bb93959fe381e4c8f3fe789f5 data/hexcasting/recipes/scroll.json 2e02e371ed43f72f101588ce4fa6e7ac8b5ef471 data/hexcasting/recipes/scroll_medium.json 6978ff90efdd067940caccdd29437d2aefd0fe1f data/hexcasting/recipes/scroll_paper.json diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/mindsplice_staff.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/mindsplice_staff.json new file mode 100644 index 000000000..268f94e30 --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/mindsplice_staff.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "hexcasting:charged_amethyst" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hexcasting:mindsplice_staff" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hexcasting:mindsplice_staff" + ] + } +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/quenched_staff.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/quenched_staff.json new file mode 100644 index 000000000..f26d8ab88 --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/quenched_staff.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "hexcasting:charged_amethyst" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hexcasting:quenched_staff" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hexcasting:quenched_staff" + ] + } +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/quenched_allay.json b/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/quenched_allay.json index eb20f85b2..bb2e6fe10 100644 --- a/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/quenched_allay.json +++ b/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/quenched_allay.json @@ -24,30 +24,23 @@ "name": "hexcasting:quenched_allay" }, { - "type": "minecraft:group", - "children": [ + "type": "minecraft:item", + "functions": [ { - "type": "minecraft:item", - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 4.0, - "min": 2.0 - }, - "function": "minecraft:set_count" - } - ], - "name": "hexcasting:quenched_allay_shard" + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 2.0 + }, + "function": "minecraft:set_count" }, { - "type": "minecraft:item", + "add": true, "conditions": [ { "chances": [ 0.25, - 0.35, 0.5, 0.75, 1.0 @@ -56,9 +49,11 @@ "enchantment": "minecraft:fortune" } ], - "name": "hexcasting:quenched_allay_shard" + "count": 1.0, + "function": "minecraft:set_count" } - ] + ], + "name": "hexcasting:quenched_allay_shard" } ] } diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/mindsplice_staff.json b/Forge/src/generated/resources/data/hexcasting/recipes/mindsplice_staff.json new file mode 100644 index 000000000..3491512ff --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/recipes/mindsplice_staff.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "key": { + "A": { + "item": "hexcasting:charged_amethyst" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "tag": "hexcasting:brainswept_circle_components" + } + }, + "pattern": [ + " SA", + " WS", + "S " + ], + "result": { + "item": "hexcasting:mindsplice_staff" + } +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/quenched_staff.json b/Forge/src/generated/resources/data/hexcasting/recipes/quenched_staff.json new file mode 100644 index 000000000..c3d5af820 --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/recipes/quenched_staff.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "key": { + "A": { + "item": "hexcasting:charged_amethyst" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "hexcasting:quenched_allay_shard" + } + }, + "pattern": [ + " SA", + " WS", + "S " + ], + "result": { + "item": "hexcasting:quenched_staff" + } +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/tags/blocks/brainswept_circle_components.json b/Forge/src/generated/resources/data/hexcasting/tags/blocks/brainswept_circle_components.json new file mode 100644 index 000000000..aa71f4b19 --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/tags/blocks/brainswept_circle_components.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#hexcasting:impeti", + "#hexcasting:directrices" + ] +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/tags/blocks/directrices.json b/Forge/src/generated/resources/data/hexcasting/tags/blocks/directrices.json new file mode 100644 index 000000000..cca1c3758 --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/tags/blocks/directrices.json @@ -0,0 +1,5 @@ +{ + "values": [ + "hexcasting:directrix_redstone" + ] +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/tags/blocks/impeti.json b/Forge/src/generated/resources/data/hexcasting/tags/blocks/impeti.json new file mode 100644 index 000000000..ce19ec9e5 --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/tags/blocks/impeti.json @@ -0,0 +1,7 @@ +{ + "values": [ + "hexcasting:impetus_look", + "hexcasting:impetus_rightclick", + "hexcasting:impetus_storedplayer" + ] +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/tags/items/brainswept_circle_components.json b/Forge/src/generated/resources/data/hexcasting/tags/items/brainswept_circle_components.json new file mode 100644 index 000000000..aa71f4b19 --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/tags/items/brainswept_circle_components.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#hexcasting:impeti", + "#hexcasting:directrices" + ] +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/tags/items/directrices.json b/Forge/src/generated/resources/data/hexcasting/tags/items/directrices.json new file mode 100644 index 000000000..cca1c3758 --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/tags/items/directrices.json @@ -0,0 +1,5 @@ +{ + "values": [ + "hexcasting:directrix_redstone" + ] +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/tags/items/impeti.json b/Forge/src/generated/resources/data/hexcasting/tags/items/impeti.json new file mode 100644 index 000000000..ce19ec9e5 --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/tags/items/impeti.json @@ -0,0 +1,7 @@ +{ + "values": [ + "hexcasting:impetus_look", + "hexcasting:impetus_rightclick", + "hexcasting:impetus_storedplayer" + ] +} \ No newline at end of file