diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/PatternRegistryManifest.java b/Common/src/main/java/at/petrak/hexcasting/common/casting/PatternRegistryManifest.java index f2aa793f..76472e24 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/PatternRegistryManifest.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/PatternRegistryManifest.java @@ -81,8 +81,8 @@ public class PatternRegistryManifest { } } - HexAPI.LOGGER.info(("We're on the %s! Loaded %d regular actions, %d per-world actions, and %d special " + - "handlers").formatted( + HexAPI.LOGGER.info(("We're on the %s! " + + "Loaded %d regular actions, %d per-world actions, and %d special handlers").formatted( (overworld == null) ? "client" : "server", NORMAL_ACTION_LOOKUP.size(), PER_WORLD_ACTIONS.size(), IXplatAbstractions.INSTANCE.getSpecialHandlerRegistry().size() )); diff --git a/Fabric/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b b/Fabric/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b index 6bbac1c9..43d3daa8 100644 --- a/Fabric/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b +++ b/Fabric/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b @@ -1,4 +1,4 @@ -// 1.19.2 2023-01-21T13:21:56.749293749 Tags for minecraft:item +// 1.19.2 2023-01-21T14:45:49.102988105 Tags for minecraft:item 5928bad07d3872bb60f29ef4f3c885c8e1967c20 data/hexcasting/tags/items/phial_base.json fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data/minecraft/tags/items/wooden_doors.json e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data/hexcasting/tags/items/edified_planks.json diff --git a/Fabric/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 b/Fabric/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 index 5b0192b2..2344bfbc 100644 --- a/Fabric/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 +++ b/Fabric/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 @@ -1,4 +1,4 @@ -// 1.19.2 2023-01-21T13:21:56.793259038 LootTables +// 1.19.2 2023-01-21T14:45:49.133731101 LootTables 01a50f557196c705c275722015cf893e0abe6425 data/hexcasting/loot_tables/inject/scroll_loot_many.json dec1d3592e82f99d9e059d9c771530f103b2bda5 data/hexcasting/loot_tables/blocks/empty_directrix.json 2c42fc5d8c74c98ad15b8bd50f56541fccbef750 data/hexcasting/loot_tables/blocks/edified_tile.json diff --git a/Fabric/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 b/Fabric/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 index 4d845417..f671e6ab 100644 --- a/Fabric/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 +++ b/Fabric/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 @@ -1,4 +1,4 @@ -// 1.19.2 2023-01-21T13:21:56.751752593 Tags for minecraft:block +// 1.19.2 2023-01-21T14:45:49.143179079 Tags for minecraft:block 20183cd61968ff6548df2dde1100b6378d68d64b data/minecraft/tags/blocks/wooden_buttons.json 357eddf3cee6f16725bed0701d57b2ca3097d74d data/minecraft/tags/blocks/mineable/shovel.json 5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data/minecraft/tags/blocks/wooden_trapdoors.json diff --git a/Fabric/src/generated/resources/.cache/844611d4af49e23072b8a888c8e73c6c5d8c0768 b/Fabric/src/generated/resources/.cache/844611d4af49e23072b8a888c8e73c6c5d8c0768 new file mode 100644 index 00000000..db33488f --- /dev/null +++ b/Fabric/src/generated/resources/.cache/844611d4af49e23072b8a888c8e73c6c5d8c0768 @@ -0,0 +1,3 @@ +// 1.19.2 2023-01-21T14:45:49.142544446 Tags for hexcasting:action +e5afc567ea17f035e4eb1d1d48825100b7f6ad68 data/hexcasting/tags/action/per_world_pattern.json +e0464372b1bfe00bb9e9fdaa9889f88c31080cc4 data/hexcasting/tags/action/requires_enlightenment.json diff --git a/Fabric/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/Fabric/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index b291e45c..5d9065de 100644 --- a/Fabric/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/Fabric/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.19.2 2023-01-21T13:21:56.764789809 Recipes +// 1.19.2 2023-01-21T14:45:49.119742079 Recipes 858dada9c41974f5aa80c66423bf371c9e176a53 data/hexcasting/recipes/pride_colorizer_demigirl.json bb0f91c534c888d1cff8793b49986dce236c7b2d data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_white.json 9f75d3e93ecbbbf3ed9a92b2943397e09dcae1a9 data/hexcasting/recipes/dye_colorizer_light_blue.json diff --git a/Fabric/src/generated/resources/data/hexcasting/tags/action/per_world_pattern.json b/Fabric/src/generated/resources/data/hexcasting/tags/action/per_world_pattern.json new file mode 100644 index 00000000..2417e4d5 --- /dev/null +++ b/Fabric/src/generated/resources/data/hexcasting/tags/action/per_world_pattern.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "hexcasting:lightning", + "hexcasting:flight", + "hexcasting:create_lava", + "hexcasting:teleport", + "hexcasting:sentinel/create/great", + "hexcasting:dispel_rain", + "hexcasting:summon_rain", + "hexcasting:brainsweep" + ] +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/tags/action/requires_enlightenment.json b/Fabric/src/generated/resources/data/hexcasting/tags/action/requires_enlightenment.json new file mode 100644 index 00000000..bbfcb9b7 --- /dev/null +++ b/Fabric/src/generated/resources/data/hexcasting/tags/action/requires_enlightenment.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "hexcasting:lightning", + "hexcasting:flight", + "hexcasting:create_lava", + "hexcasting:teleport", + "hexcasting:sentinel/create/great", + "hexcasting:dispel_rain", + "hexcasting:summon_rain", + "hexcasting:brainsweep", + "hexcasting:akashic/write" + ] +} \ No newline at end of file diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/datagen/HexFabricDataGenerators.java b/Fabric/src/main/java/at/petrak/hexcasting/fabric/datagen/HexFabricDataGenerators.java index 5379a969..fb651dbd 100644 --- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/datagen/HexFabricDataGenerators.java +++ b/Fabric/src/main/java/at/petrak/hexcasting/fabric/datagen/HexFabricDataGenerators.java @@ -5,6 +5,7 @@ import at.petrak.hexcasting.datagen.HexLootTables; import at.petrak.hexcasting.datagen.IXplatIngredients; import at.petrak.hexcasting.datagen.recipe.HexplatRecipes; import at.petrak.hexcasting.datagen.recipe.builders.FarmersDelightToolIngredient; +import at.petrak.hexcasting.datagen.tag.HexActionTagProvider; import at.petrak.hexcasting.datagen.tag.HexBlockTagProvider; import at.petrak.hexcasting.datagen.tag.HexItemTagProvider; import at.petrak.hexcasting.fabric.recipe.FabricModConditionalIngredient; @@ -33,6 +34,8 @@ public class HexFabricDataGenerators implements DataGeneratorEntrypoint { gen.addProvider(blockTagProvider); gen.addProvider(new HexItemTagProvider(gen, blockTagProvider, xtags)); + gen.addProvider(new HexActionTagProvider(gen)); + gen.addProvider(new HexLootTables(gen)); } diff --git a/Common/src/generated/resources/.cache/844611d4af49e23072b8a888c8e73c6c5d8c0768 b/Forge/src/generated/resources/.cache/844611d4af49e23072b8a888c8e73c6c5d8c0768 similarity index 76% rename from Common/src/generated/resources/.cache/844611d4af49e23072b8a888c8e73c6c5d8c0768 rename to Forge/src/generated/resources/.cache/844611d4af49e23072b8a888c8e73c6c5d8c0768 index 74f865db..6914e485 100644 --- a/Common/src/generated/resources/.cache/844611d4af49e23072b8a888c8e73c6c5d8c0768 +++ b/Forge/src/generated/resources/.cache/844611d4af49e23072b8a888c8e73c6c5d8c0768 @@ -1,3 +1,3 @@ -// 1.19.2 2023-01-21T13:20:42.592825003 Tags for hexcasting:action +// 1.19.2 2023-01-21T14:47:29.414121689 Tags for hexcasting:action 7684713a5311ad151b5591d22757988c8462d647 data/hexcasting/tags/hexcasting/action/per_world_pattern.json 9eb0b98603394a44b9202d1ff6778a539edfdfa4 data/hexcasting/tags/hexcasting/action/requires_enlightenment.json diff --git a/Common/src/generated/resources/data/hexcasting/tags/hexcasting/action/per_world_pattern.json b/Forge/src/generated/resources/data/hexcasting/tags/hexcasting/action/per_world_pattern.json similarity index 100% rename from Common/src/generated/resources/data/hexcasting/tags/hexcasting/action/per_world_pattern.json rename to Forge/src/generated/resources/data/hexcasting/tags/hexcasting/action/per_world_pattern.json diff --git a/Common/src/generated/resources/data/hexcasting/tags/hexcasting/action/requires_enlightenment.json b/Forge/src/generated/resources/data/hexcasting/tags/hexcasting/action/requires_enlightenment.json similarity index 100% rename from Common/src/generated/resources/data/hexcasting/tags/hexcasting/action/requires_enlightenment.json rename to Forge/src/generated/resources/data/hexcasting/tags/hexcasting/action/requires_enlightenment.json diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/HexForgeDataGenerators.java b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/HexForgeDataGenerators.java index 64c567a7..1304019d 100644 --- a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/HexForgeDataGenerators.java +++ b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/HexForgeDataGenerators.java @@ -51,8 +51,6 @@ public class HexForgeDataGenerators { gen.addProvider(ev.includeClient(), new HexBlockStatesAndModels(gen, efh)); gen.addProvider(ev.includeServer(), PaucalForgeDatagenWrappers.addEFHToAdvancements(new HexAdvancements(gen), efh)); - gen.addProvider(ev.includeServer(), PaucalForgeDatagenWrappers.addEFHToTagProvider( - new HexActionTagProvider(gen), efh)); } private static void configureForgeDatagen(GatherDataEvent ev) { @@ -70,6 +68,8 @@ public class HexForgeDataGenerators { var itemTagProvider = PaucalForgeDatagenWrappers.addEFHToTagProvider( new HexItemTagProvider(gen, blockTagProvider, IXplatAbstractions.INSTANCE.tags()), efh); gen.addProvider(ev.includeServer(), itemTagProvider); + gen.addProvider(ev.includeServer(), + PaucalForgeDatagenWrappers.addEFHToTagProvider(new HexActionTagProvider(gen), efh)); } private static final IXplatIngredients INGREDIENTS = new IXplatIngredients() {