fixed action tags not working on fabc

This commit is contained in:
petrak@ 2023-01-21 14:51:40 -06:00
parent 7e7b5ff3ae
commit 2f2ab69816
13 changed files with 42 additions and 9 deletions

View file

@ -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 " + HexAPI.LOGGER.info(("We're on the %s! " +
"handlers").formatted( "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(), (overworld == null) ? "client" : "server", NORMAL_ACTION_LOOKUP.size(), PER_WORLD_ACTIONS.size(),
IXplatAbstractions.INSTANCE.getSpecialHandlerRegistry().size() IXplatAbstractions.INSTANCE.getSpecialHandlerRegistry().size()
)); ));

View file

@ -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 5928bad07d3872bb60f29ef4f3c885c8e1967c20 data/hexcasting/tags/items/phial_base.json
fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data/minecraft/tags/items/wooden_doors.json fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data/minecraft/tags/items/wooden_doors.json
e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data/hexcasting/tags/items/edified_planks.json e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data/hexcasting/tags/items/edified_planks.json

View file

@ -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 01a50f557196c705c275722015cf893e0abe6425 data/hexcasting/loot_tables/inject/scroll_loot_many.json
dec1d3592e82f99d9e059d9c771530f103b2bda5 data/hexcasting/loot_tables/blocks/empty_directrix.json dec1d3592e82f99d9e059d9c771530f103b2bda5 data/hexcasting/loot_tables/blocks/empty_directrix.json
2c42fc5d8c74c98ad15b8bd50f56541fccbef750 data/hexcasting/loot_tables/blocks/edified_tile.json 2c42fc5d8c74c98ad15b8bd50f56541fccbef750 data/hexcasting/loot_tables/blocks/edified_tile.json

View file

@ -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 20183cd61968ff6548df2dde1100b6378d68d64b data/minecraft/tags/blocks/wooden_buttons.json
357eddf3cee6f16725bed0701d57b2ca3097d74d data/minecraft/tags/blocks/mineable/shovel.json 357eddf3cee6f16725bed0701d57b2ca3097d74d data/minecraft/tags/blocks/mineable/shovel.json
5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data/minecraft/tags/blocks/wooden_trapdoors.json 5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data/minecraft/tags/blocks/wooden_trapdoors.json

View file

@ -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

View file

@ -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 858dada9c41974f5aa80c66423bf371c9e176a53 data/hexcasting/recipes/pride_colorizer_demigirl.json
bb0f91c534c888d1cff8793b49986dce236c7b2d data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_white.json bb0f91c534c888d1cff8793b49986dce236c7b2d data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_white.json
9f75d3e93ecbbbf3ed9a92b2943397e09dcae1a9 data/hexcasting/recipes/dye_colorizer_light_blue.json 9f75d3e93ecbbbf3ed9a92b2943397e09dcae1a9 data/hexcasting/recipes/dye_colorizer_light_blue.json

View file

@ -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"
]
}

View file

@ -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"
]
}

View file

@ -5,6 +5,7 @@ import at.petrak.hexcasting.datagen.HexLootTables;
import at.petrak.hexcasting.datagen.IXplatIngredients; import at.petrak.hexcasting.datagen.IXplatIngredients;
import at.petrak.hexcasting.datagen.recipe.HexplatRecipes; import at.petrak.hexcasting.datagen.recipe.HexplatRecipes;
import at.petrak.hexcasting.datagen.recipe.builders.FarmersDelightToolIngredient; 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.HexBlockTagProvider;
import at.petrak.hexcasting.datagen.tag.HexItemTagProvider; import at.petrak.hexcasting.datagen.tag.HexItemTagProvider;
import at.petrak.hexcasting.fabric.recipe.FabricModConditionalIngredient; import at.petrak.hexcasting.fabric.recipe.FabricModConditionalIngredient;
@ -33,6 +34,8 @@ public class HexFabricDataGenerators implements DataGeneratorEntrypoint {
gen.addProvider(blockTagProvider); gen.addProvider(blockTagProvider);
gen.addProvider(new HexItemTagProvider(gen, blockTagProvider, xtags)); gen.addProvider(new HexItemTagProvider(gen, blockTagProvider, xtags));
gen.addProvider(new HexActionTagProvider(gen));
gen.addProvider(new HexLootTables(gen)); gen.addProvider(new HexLootTables(gen));
} }

View file

@ -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 7684713a5311ad151b5591d22757988c8462d647 data/hexcasting/tags/hexcasting/action/per_world_pattern.json
9eb0b98603394a44b9202d1ff6778a539edfdfa4 data/hexcasting/tags/hexcasting/action/requires_enlightenment.json 9eb0b98603394a44b9202d1ff6778a539edfdfa4 data/hexcasting/tags/hexcasting/action/requires_enlightenment.json

View file

@ -51,8 +51,6 @@ public class HexForgeDataGenerators {
gen.addProvider(ev.includeClient(), new HexBlockStatesAndModels(gen, efh)); gen.addProvider(ev.includeClient(), new HexBlockStatesAndModels(gen, efh));
gen.addProvider(ev.includeServer(), gen.addProvider(ev.includeServer(),
PaucalForgeDatagenWrappers.addEFHToAdvancements(new HexAdvancements(gen), efh)); PaucalForgeDatagenWrappers.addEFHToAdvancements(new HexAdvancements(gen), efh));
gen.addProvider(ev.includeServer(), PaucalForgeDatagenWrappers.addEFHToTagProvider(
new HexActionTagProvider(gen), efh));
} }
private static void configureForgeDatagen(GatherDataEvent ev) { private static void configureForgeDatagen(GatherDataEvent ev) {
@ -70,6 +68,8 @@ public class HexForgeDataGenerators {
var itemTagProvider = PaucalForgeDatagenWrappers.addEFHToTagProvider( var itemTagProvider = PaucalForgeDatagenWrappers.addEFHToTagProvider(
new HexItemTagProvider(gen, blockTagProvider, IXplatAbstractions.INSTANCE.tags()), efh); new HexItemTagProvider(gen, blockTagProvider, IXplatAbstractions.INSTANCE.tags()), efh);
gen.addProvider(ev.includeServer(), itemTagProvider); gen.addProvider(ev.includeServer(), itemTagProvider);
gen.addProvider(ev.includeServer(),
PaucalForgeDatagenWrappers.addEFHToTagProvider(new HexActionTagProvider(gen), efh));
} }
private static final IXplatIngredients INGREDIENTS = new IXplatIngredients() { private static final IXplatIngredients INGREDIENTS = new IXplatIngredients() {