From 31ae25e002336401f05e746c91c2d18059bad9b0 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Fri, 24 Nov 2023 13:37:30 +1100 Subject: [PATCH] All data is now generated automatically --- .../103d9f3f36b01595f1aa5172191e60eff02e6924 | 2 +- .../20dae170dba4c8eb919766d5be31700d182da0d9 | 8 ++ .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 3 + .../9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 | 40 +++++++ .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 38 ++++++- .../d5932a16d3f0544ba1e8cda3b77d0d46f353493b | 2 +- .../d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 | 2 +- .../recipes/combat/leaf_boots.json | 25 ++--- .../recipes/combat/leaf_chestplate.json | 25 ++--- .../recipes/combat/leaf_helmet.json | 25 ++--- .../recipes/combat/leaf_leggings.json | 25 ++--- .../recipes/combat/wool_boots.json | 33 +++--- .../recipes/combat/wool_chestplate.json | 33 +++--- .../recipes/combat/wool_helmet.json | 33 +++--- .../recipes/combat/wool_leggings.json | 33 +++--- .../recipes/decorations/rain_collector.json | 25 ++--- .../recipes/decorations/water_purifier.json | 25 ++--- .../recipes/food/apple_juice.json | 25 ++--- .../recipes/food/cactus_juice.json | 25 ++--- .../recipes/food/chorus_fruit_juice.json} | 25 ++--- .../recipes/food/glow_berry_juice.json | 25 ++--- .../recipes/food/melon_juice.json | 25 ++--- .../recipes/food/pumpkin_juice.json | 25 ++--- .../recipes/food/sweet_berry_juice.json | 25 ++--- .../recipes/tools/empty_canteen.json} | 27 ++--- .../loot_tables/blocks/rain_collector.json | 16 +-- .../loot_tables/blocks/water_purifier.json | 22 ++-- .../toughasnails/recipes/apple_juice.json | 1 + .../toughasnails/recipes/cactus_juice.json | 1 + .../recipes/chorus_fruit_juice.json | 1 + .../toughasnails/recipes/empty_canteen.json} | 16 +-- .../recipes/glow_berry_juice.json | 1 + .../data/toughasnails/recipes/leaf_boots.json | 12 ++- .../toughasnails/recipes/leaf_chestplate.json | 14 +-- .../toughasnails/recipes/leaf_helmet.json | 12 ++- .../toughasnails/recipes/leaf_leggings.json | 14 +-- .../toughasnails/recipes/melon_juice.json | 1 + .../toughasnails/recipes/pumpkin_juice.json | 1 + .../toughasnails/recipes/rain_collector.json | 22 ++-- .../recipes/sweet_berry_juice.json | 1 + .../toughasnails/recipes/water_purifier.json | 30 +++--- .../data/toughasnails/recipes/wool_boots.json | 12 ++- .../toughasnails/recipes/wool_chestplate.json | 14 +-- .../toughasnails/recipes/wool_helmet.json | 12 ++- .../toughasnails/recipes/wool_leggings.json | 14 +-- .../tags/items/cooling_armor.json | 8 ++ .../tags/items/cooling_items.json | 5 + .../data/toughasnails/tags/items/drinks.json | 24 +++++ .../tags/items/heating_armor.json | 8 ++ .../tags/items/heating_items.json | 5 + .../items/hydration/100_hydration_drinks.json | 3 + .../items/hydration/10_hydration_drinks.json | 8 ++ .../items/hydration/20_hydration_drinks.json | 7 ++ .../items/hydration/30_hydration_drinks.json | 6 ++ .../items/hydration/40_hydration_drinks.json | 3 + .../items/hydration/50_hydration_drinks.json | 3 +- .../items/hydration/60_hydration_drinks.json | 6 ++ .../items/hydration/70_hydration_drinks.json | 3 + .../items/hydration/80_hydration_drinks.json | 5 + .../items/hydration/90_hydration_drinks.json | 3 + .../100_poison_chance_drinks.json | 3 + .../25_poison_chance_drinks.json | 6 ++ .../50_poison_chance_drinks.json | 3 + .../75_poison_chance_drinks.json | 3 +- .../tags/items/thirst/10_thirst_drinks.json | 5 + .../tags/items/thirst/11_thirst_drinks.json | 3 + .../tags/items/thirst/12_thirst_drinks.json | 3 + .../tags/items/thirst/13_thirst_drinks.json | 3 + .../tags/items/thirst/14_thirst_drinks.json | 3 + .../tags/items/thirst/15_thirst_drinks.json | 3 + .../tags/items/thirst/16_thirst_drinks.json | 3 + .../tags/items/thirst/17_thirst_drinks.json | 3 + .../tags/items/thirst/18_thirst_drinks.json | 3 + .../tags/items/thirst/19_thirst_drinks.json | 3 + .../tags/items/thirst/1_thirst_drinks.json | 3 +- .../tags/items/thirst/20_thirst_drinks.json | 3 + .../tags/items/thirst/2_thirst_drinks.json | 5 + .../tags/items/thirst/3_thirst_drinks.json | 6 ++ .../tags/items/thirst/4_thirst_drinks.json | 3 + .../tags/items/thirst/5_thirst_drinks.json | 3 +- .../tags/items/thirst/6_thirst_drinks.json | 7 ++ .../tags/items/thirst/7_thirst_drinks.json | 6 ++ .../tags/items/thirst/8_thirst_drinks.json | 5 + .../tags/items/thirst/9_thirst_drinks.json | 3 + .../tags/worldgen/biome/cold_biomes.json | 3 + .../worldgen/biome/dirty_water_biomes.json | 7 ++ .../tags/worldgen/biome/hot_biomes.json | 3 + .../tags/worldgen/biome/icy_biomes.json | 3 + .../tags/worldgen/biome/neutral_biomes.json | 3 + .../worldgen/biome/purified_water_biomes.json | 3 + .../tags/worldgen/biome/warm_biomes.json | 3 + .../datagen/DataGenerationHandler.java | 16 +-- .../toughasnails/datagen/ModDamageTypes.java | 1 + .../datagen/loot/TANBlockLoot.java | 39 +++++++ .../datagen/loot/TANLootTableProvider.java | 21 ++++ .../provider/TANBiomeTagsProvider.java | 40 +++++++ .../datagen/provider/TANItemTagsProvider.java | 102 ++++++++++++++++++ .../datagen/provider/TANRecipeProvider.java | 39 ++++++- .../tags/items/cooling_armor.json | 9 -- .../tags/items/cooling_items.json | 6 -- .../data/toughasnails/tags/items/drinks.json | 25 ----- .../tags/items/heating_armor.json | 9 -- .../tags/items/heating_items.json | 6 -- .../items/hydration/100_hydration_drinks.json | 5 - .../items/hydration/10_hydration_drinks.json | 9 -- .../items/hydration/20_hydration_drinks.json | 8 -- .../items/hydration/30_hydration_drinks.json | 7 -- .../items/hydration/40_hydration_drinks.json | 5 - .../items/hydration/60_hydration_drinks.json | 7 -- .../items/hydration/70_hydration_drinks.json | 5 - .../items/hydration/80_hydration_drinks.json | 6 -- .../items/hydration/90_hydration_drinks.json | 5 - .../100_poison_chance_drinks.json | 5 - .../25_poison_chance_drinks.json | 7 -- .../50_poison_chance_drinks.json | 5 - .../tags/items/thirst/10_thirst_drinks.json | 6 -- .../tags/items/thirst/11_thirst_drinks.json | 5 - .../tags/items/thirst/12_thirst_drinks.json | 5 - .../tags/items/thirst/13_thirst_drinks.json | 5 - .../tags/items/thirst/14_thirst_drinks.json | 5 - .../tags/items/thirst/15_thirst_drinks.json | 5 - .../tags/items/thirst/16_thirst_drinks.json | 5 - .../tags/items/thirst/17_thirst_drinks.json | 5 - .../tags/items/thirst/18_thirst_drinks.json | 5 - .../tags/items/thirst/19_thirst_drinks.json | 5 - .../tags/items/thirst/20_thirst_drinks.json | 5 - .../tags/items/thirst/2_thirst_drinks.json | 6 -- .../tags/items/thirst/3_thirst_drinks.json | 7 -- .../tags/items/thirst/4_thirst_drinks.json | 5 - .../tags/items/thirst/6_thirst_drinks.json | 8 -- .../tags/items/thirst/7_thirst_drinks.json | 7 -- .../tags/items/thirst/8_thirst_drinks.json | 6 -- .../tags/items/thirst/9_thirst_drinks.json | 5 - .../tags/worldgen/biome/cold_biomes.json | 5 - .../worldgen/biome/dirty_water_biomes.json | 7 -- .../tags/worldgen/biome/hot_biomes.json | 5 - .../tags/worldgen/biome/icy_biomes.json | 5 - .../tags/worldgen/biome/neutral_biomes.json | 5 - .../worldgen/biome/purified_water_biomes.json | 4 - .../tags/worldgen/biome/warm_biomes.json | 5 - 140 files changed, 919 insertions(+), 613 deletions(-) create mode 100644 src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9 create mode 100644 src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d create mode 100644 src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 rename src/{main => generated}/resources/data/toughasnails/advancements/recipes/combat/leaf_boots.json (67%) rename src/{main => generated}/resources/data/toughasnails/advancements/recipes/combat/leaf_chestplate.json (68%) rename src/{main => generated}/resources/data/toughasnails/advancements/recipes/combat/leaf_helmet.json (68%) rename src/{main => generated}/resources/data/toughasnails/advancements/recipes/combat/leaf_leggings.json (68%) rename src/{main => generated}/resources/data/toughasnails/advancements/recipes/combat/wool_boots.json (67%) rename src/{main => generated}/resources/data/toughasnails/advancements/recipes/combat/wool_chestplate.json (68%) rename src/{main => generated}/resources/data/toughasnails/advancements/recipes/combat/wool_helmet.json (68%) rename src/{main => generated}/resources/data/toughasnails/advancements/recipes/combat/wool_leggings.json (68%) rename src/{main => generated}/resources/data/toughasnails/advancements/recipes/decorations/rain_collector.json (69%) rename src/{main => generated}/resources/data/toughasnails/advancements/recipes/decorations/water_purifier.json (69%) rename src/{main => generated}/resources/data/toughasnails/advancements/recipes/food/apple_juice.json (69%) rename src/{main => generated}/resources/data/toughasnails/advancements/recipes/food/cactus_juice.json (69%) rename src/{main/resources/data/toughasnails/advancements/recipes/food/chorus_fruit.json => generated/resources/data/toughasnails/advancements/recipes/food/chorus_fruit_juice.json} (70%) rename src/{main => generated}/resources/data/toughasnails/advancements/recipes/food/glow_berry_juice.json (70%) rename src/{main => generated}/resources/data/toughasnails/advancements/recipes/food/melon_juice.json (69%) rename src/{main => generated}/resources/data/toughasnails/advancements/recipes/food/pumpkin_juice.json (69%) rename src/{main => generated}/resources/data/toughasnails/advancements/recipes/food/sweet_berry_juice.json (70%) rename src/{main/resources/data/toughasnails/advancements/recipes/tools/canteen.json => generated/resources/data/toughasnails/advancements/recipes/tools/empty_canteen.json} (56%) rename src/{main => generated}/resources/data/toughasnails/loot_tables/blocks/rain_collector.json (70%) rename src/{main => generated}/resources/data/toughasnails/loot_tables/blocks/water_purifier.json (60%) rename src/{main => generated}/resources/data/toughasnails/recipes/apple_juice.json (93%) rename src/{main => generated}/resources/data/toughasnails/recipes/cactus_juice.json (93%) rename src/{main => generated}/resources/data/toughasnails/recipes/chorus_fruit_juice.json (93%) rename src/{main/resources/data/toughasnails/recipes/canteen.json => generated/resources/data/toughasnails/recipes/empty_canteen.json} (77%) rename src/{main => generated}/resources/data/toughasnails/recipes/glow_berry_juice.json (93%) rename src/{main => generated}/resources/data/toughasnails/recipes/leaf_boots.json (76%) rename src/{main => generated}/resources/data/toughasnails/recipes/leaf_chestplate.json (78%) rename src/{main => generated}/resources/data/toughasnails/recipes/leaf_helmet.json (77%) rename src/{main => generated}/resources/data/toughasnails/recipes/leaf_leggings.json (78%) rename src/{main => generated}/resources/data/toughasnails/recipes/melon_juice.json (93%) rename src/{main => generated}/resources/data/toughasnails/recipes/pumpkin_juice.json (93%) rename src/{main => generated}/resources/data/toughasnails/recipes/rain_collector.json (84%) rename src/{main => generated}/resources/data/toughasnails/recipes/sweet_berry_juice.json (93%) rename src/{main => generated}/resources/data/toughasnails/recipes/water_purifier.json (81%) rename src/{main => generated}/resources/data/toughasnails/recipes/wool_boots.json (76%) rename src/{main => generated}/resources/data/toughasnails/recipes/wool_chestplate.json (78%) rename src/{main => generated}/resources/data/toughasnails/recipes/wool_helmet.json (76%) rename src/{main => generated}/resources/data/toughasnails/recipes/wool_leggings.json (77%) create mode 100644 src/generated/resources/data/toughasnails/tags/items/cooling_armor.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/cooling_items.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/heating_armor.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/heating_items.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/hydration/100_hydration_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/hydration/10_hydration_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/hydration/20_hydration_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/hydration/30_hydration_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/hydration/40_hydration_drinks.json rename src/{main => generated}/resources/data/toughasnails/tags/items/hydration/50_hydration_drinks.json (51%) create mode 100644 src/generated/resources/data/toughasnails/tags/items/hydration/60_hydration_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/hydration/70_hydration_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/hydration/80_hydration_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/hydration/90_hydration_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/poison_chance/100_poison_chance_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/poison_chance/25_poison_chance_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/poison_chance/50_poison_chance_drinks.json rename src/{main => generated}/resources/data/toughasnails/tags/items/poison_chance/75_poison_chance_drinks.json (51%) create mode 100644 src/generated/resources/data/toughasnails/tags/items/thirst/10_thirst_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/thirst/11_thirst_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/thirst/12_thirst_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/thirst/13_thirst_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/thirst/14_thirst_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/thirst/15_thirst_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/thirst/16_thirst_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/thirst/17_thirst_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/thirst/18_thirst_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/thirst/19_thirst_drinks.json rename src/{main => generated}/resources/data/toughasnails/tags/items/thirst/1_thirst_drinks.json (51%) create mode 100644 src/generated/resources/data/toughasnails/tags/items/thirst/20_thirst_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/thirst/2_thirst_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/thirst/3_thirst_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/thirst/4_thirst_drinks.json rename src/{main => generated}/resources/data/toughasnails/tags/items/thirst/5_thirst_drinks.json (51%) create mode 100644 src/generated/resources/data/toughasnails/tags/items/thirst/6_thirst_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/thirst/7_thirst_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/thirst/8_thirst_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/items/thirst/9_thirst_drinks.json create mode 100644 src/generated/resources/data/toughasnails/tags/worldgen/biome/cold_biomes.json create mode 100644 src/generated/resources/data/toughasnails/tags/worldgen/biome/dirty_water_biomes.json create mode 100644 src/generated/resources/data/toughasnails/tags/worldgen/biome/hot_biomes.json create mode 100644 src/generated/resources/data/toughasnails/tags/worldgen/biome/icy_biomes.json create mode 100644 src/generated/resources/data/toughasnails/tags/worldgen/biome/neutral_biomes.json create mode 100644 src/generated/resources/data/toughasnails/tags/worldgen/biome/purified_water_biomes.json create mode 100644 src/generated/resources/data/toughasnails/tags/worldgen/biome/warm_biomes.json create mode 100644 src/main/java/toughasnails/datagen/loot/TANBlockLoot.java create mode 100644 src/main/java/toughasnails/datagen/loot/TANLootTableProvider.java create mode 100644 src/main/java/toughasnails/datagen/provider/TANBiomeTagsProvider.java create mode 100644 src/main/java/toughasnails/datagen/provider/TANItemTagsProvider.java delete mode 100644 src/main/resources/data/toughasnails/tags/items/cooling_armor.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/cooling_items.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/heating_armor.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/heating_items.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/hydration/100_hydration_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/hydration/10_hydration_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/hydration/20_hydration_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/hydration/30_hydration_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/hydration/40_hydration_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/hydration/60_hydration_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/hydration/70_hydration_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/hydration/80_hydration_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/hydration/90_hydration_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/poison_chance/100_poison_chance_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/poison_chance/25_poison_chance_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/poison_chance/50_poison_chance_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/thirst/10_thirst_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/thirst/11_thirst_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/thirst/12_thirst_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/thirst/13_thirst_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/thirst/14_thirst_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/thirst/15_thirst_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/thirst/16_thirst_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/thirst/17_thirst_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/thirst/18_thirst_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/thirst/19_thirst_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/thirst/20_thirst_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/thirst/2_thirst_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/thirst/3_thirst_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/thirst/4_thirst_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/thirst/6_thirst_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/thirst/7_thirst_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/thirst/8_thirst_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/items/thirst/9_thirst_drinks.json delete mode 100644 src/main/resources/data/toughasnails/tags/worldgen/biome/cold_biomes.json delete mode 100644 src/main/resources/data/toughasnails/tags/worldgen/biome/dirty_water_biomes.json delete mode 100644 src/main/resources/data/toughasnails/tags/worldgen/biome/hot_biomes.json delete mode 100644 src/main/resources/data/toughasnails/tags/worldgen/biome/icy_biomes.json delete mode 100644 src/main/resources/data/toughasnails/tags/worldgen/biome/neutral_biomes.json delete mode 100644 src/main/resources/data/toughasnails/tags/worldgen/biome/purified_water_biomes.json delete mode 100644 src/main/resources/data/toughasnails/tags/worldgen/biome/warm_biomes.json diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 index 3aaa9234..925b2aca 100644 --- a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 +++ b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 @@ -1,2 +1,2 @@ -// 1.20.2 2023-09-24T13:38:34.0294966 Registries +// 1.20.2 2023-11-24T11:10:59.976108 Registries d470b0b2874a8852f0c4685792683ee5e40da360 data/toughasnails/damage_type/hyperthermia.json diff --git a/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9 b/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9 new file mode 100644 index 00000000..11542478 --- /dev/null +++ b/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9 @@ -0,0 +1,8 @@ +// 1.20.2 2023-11-24T11:10:59.9681098 Tags for minecraft:worldgen/biome mod id toughasnails +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/worldgen/biome/cold_biomes.json +92158999e9537d3b7c9cd1a65cc1aa65bf673c2d data/toughasnails/tags/worldgen/biome/dirty_water_biomes.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/worldgen/biome/hot_biomes.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/worldgen/biome/icy_biomes.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/worldgen/biome/neutral_biomes.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/worldgen/biome/purified_water_biomes.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/worldgen/biome/warm_biomes.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d new file mode 100644 index 00000000..603dd5e3 --- /dev/null +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -0,0 +1,3 @@ +// 1.20.2 2023-11-24T11:34:57.5541002 Loot Tables +8fca2e50f9df3893ec7ecb84fb15e5f83b33508a data/toughasnails/loot_tables/blocks/rain_collector.json +1410cb58946442b13107a7153298bdcdc8ccaacc data/toughasnails/loot_tables/blocks/water_purifier.json diff --git a/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 b/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 new file mode 100644 index 00000000..de4f1c3f --- /dev/null +++ b/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 @@ -0,0 +1,40 @@ +// 1.20.2 2023-11-24T13:07:42.9798146 Tags for minecraft:item mod id toughasnails +f05342856fe99891fa5e94bbe8db82a4f75ac41e data/toughasnails/tags/items/cooling_armor.json +7c304628a9c17ca3ba6cd13e199fcf73ad9c974f data/toughasnails/tags/items/cooling_items.json +d7e37bc0c1468593bf2403c8bab7e97c17edde8e data/toughasnails/tags/items/drinks.json +eb101cb126ebd917a2c240ff53e1e6e16ba3bf83 data/toughasnails/tags/items/heating_armor.json +efe9e0caf089100a228c46379f3aa70d7f602ddc data/toughasnails/tags/items/heating_items.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/hydration/100_hydration_drinks.json +9c0dc65d9f036f654b10088e08368b1a58a41237 data/toughasnails/tags/items/hydration/10_hydration_drinks.json +80da436d00c60f0926a75bfc6452ef3e03d0e4cf data/toughasnails/tags/items/hydration/20_hydration_drinks.json +c3717474b5903bcc644087abd9758494594dc09b data/toughasnails/tags/items/hydration/30_hydration_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/hydration/40_hydration_drinks.json +4fa41e9b41dd839136206b5935757ba390f588a8 data/toughasnails/tags/items/hydration/50_hydration_drinks.json +a485e913b63b0237e95ef2af66ed886ba820154a data/toughasnails/tags/items/hydration/60_hydration_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/hydration/70_hydration_drinks.json +d7b753d45aecdc84f69d294a00dc5271088c2abc data/toughasnails/tags/items/hydration/80_hydration_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/hydration/90_hydration_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/poison_chance/100_poison_chance_drinks.json +fc698dddd5a4b2d4d0ef9438b45036416c380b0f data/toughasnails/tags/items/poison_chance/25_poison_chance_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/poison_chance/50_poison_chance_drinks.json +ab761c277e9e318f660c08eb4da51946e028f083 data/toughasnails/tags/items/poison_chance/75_poison_chance_drinks.json +0395ed7d6e3d7510a25d2f4ef8b498b0d8c6c9eb data/toughasnails/tags/items/thirst/10_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/11_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/12_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/13_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/14_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/15_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/16_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/17_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/18_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/19_thirst_drinks.json +ab761c277e9e318f660c08eb4da51946e028f083 data/toughasnails/tags/items/thirst/1_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/20_thirst_drinks.json +edb5947f84984a39ab47c98c6fb0b3c3a9a8cc39 data/toughasnails/tags/items/thirst/2_thirst_drinks.json +fc698dddd5a4b2d4d0ef9438b45036416c380b0f data/toughasnails/tags/items/thirst/3_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/4_thirst_drinks.json +4fa41e9b41dd839136206b5935757ba390f588a8 data/toughasnails/tags/items/thirst/5_thirst_drinks.json +24b02d22d0e3e4abbeed0c96fc20b8dc05dc5f6e data/toughasnails/tags/items/thirst/6_thirst_drinks.json +a90844d1583073e1a3538fe5afe6e279aa3073b8 data/toughasnails/tags/items/thirst/7_thirst_drinks.json +a8d4693f32c2dabe2f0ff10cb6ccae93882c8530 data/toughasnails/tags/items/thirst/8_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/9_thirst_drinks.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index e58c7fa6..3f2d93d6 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,5 +1,41 @@ -// 1.20.2 2023-10-01T12:29:40.8623443 Recipes +// 1.20.2 2023-11-24T13:34:52.0253341 Recipes +d3c99d7c4237e2285465ded1736a2db9b8627b37 data/toughasnails/advancements/recipes/combat/leaf_boots.json +8411f8f2c0efbe71f5bb1cc9fbc160bec2a79ddc data/toughasnails/advancements/recipes/combat/leaf_chestplate.json +10156869e79e4ae9db1a1c1951c0d97aa21cfcb6 data/toughasnails/advancements/recipes/combat/leaf_helmet.json +8fb0bc8ce032e5e6154a79f9648457feb1aa2f56 data/toughasnails/advancements/recipes/combat/leaf_leggings.json +6b889acb5effbbf5bedec10c7c816b5e940272ab data/toughasnails/advancements/recipes/combat/wool_boots.json +fce0a840af2e9497d3989c35d1c353419270fbbb data/toughasnails/advancements/recipes/combat/wool_chestplate.json +fc8e847d4b4e7c35cff23213ed27d71d5f491fca data/toughasnails/advancements/recipes/combat/wool_helmet.json +27785b8f7c6d1312d3bcfb47869d5f937cfe58ad data/toughasnails/advancements/recipes/combat/wool_leggings.json +d8871440fd1b19ca45f4ae4e1d3822858da4bac3 data/toughasnails/advancements/recipes/decorations/rain_collector.json +4e95d2ef78182d3cf05311572cf6e9c0a8299699 data/toughasnails/advancements/recipes/decorations/water_purifier.json +83911853c8c5f14460eeea79f5d44c953e713845 data/toughasnails/advancements/recipes/food/apple_juice.json +e97bd3155dd73aca7aff414df3a882bbc4006ff1 data/toughasnails/advancements/recipes/food/cactus_juice.json +ee3accfe75efd2a63e6cb83f4496abac317edb2f data/toughasnails/advancements/recipes/food/chorus_fruit_juice.json +034facbb7df919b7634d0ac5be7407c0b452ecf1 data/toughasnails/advancements/recipes/food/glow_berry_juice.json +5a293f02f2c6de8230de8ed5b47412ca1c87dbaa data/toughasnails/advancements/recipes/food/melon_juice.json +527294a0ba9833dc593cc6c0e86bed52fb3a40a1 data/toughasnails/advancements/recipes/food/pumpkin_juice.json +77a713c2effa4b7ea7afb9b348e1b7a668666f5d data/toughasnails/advancements/recipes/food/sweet_berry_juice.json +bb551a179c15aa676a2dbdbb629b988bb5af07ff data/toughasnails/advancements/recipes/tools/empty_canteen.json +715184d6dfbadc65234a787d2e8271dce076e7b1 data/toughasnails/recipes/apple_juice.json +7aefc36c9cb1e7393660e57c9bfe2f47e9c472b9 data/toughasnails/recipes/cactus_juice.json +c03137fedf80a5cea96fa69ecc23ddcc733b02bf data/toughasnails/recipes/chorus_fruit_juice.json +c2ae2af844527d4774f9aa264c9d491cdfa50dfe data/toughasnails/recipes/empty_canteen.json +af1b982b9d1cc7246035fc73abfd1b34fbb1394d data/toughasnails/recipes/glow_berry_juice.json +79867decf991c3dadab0ab69057af5822e5f5394 data/toughasnails/recipes/leaf_boots.json +868d8e8d46ee239dbb63607aa1a4c633c070bbf9 data/toughasnails/recipes/leaf_chestplate.json +c2c5e5aab6e3ce2ca88812543d2d4cf2d5f6bf08 data/toughasnails/recipes/leaf_helmet.json +44313658fcaafbd2af0fe11a252091e0e4cc2ddb data/toughasnails/recipes/leaf_leggings.json +3832d3998e8c69d60fbd12ae52965337708eddb3 data/toughasnails/recipes/melon_juice.json 23d01cbd22f68c4a24a36a57a11401e9c42d9477 data/toughasnails/recipes/potion.json +e4a98b0325be4fb27194eb56a079871cdc8d4114 data/toughasnails/recipes/pumpkin_juice.json 1ed5721002714ae4029126d79a7b73ac58fa755d data/toughasnails/recipes/purified_water_bottle.json 351a2d892d1bc8eaf091aa41c732953c85b661b0 data/toughasnails/recipes/purified_water_canteen.json +2a3348105b9af25af57fdcf6f2c3add953cf7531 data/toughasnails/recipes/rain_collector.json +2512026dc3a027f39db7e77e023a7017de386b9c data/toughasnails/recipes/sweet_berry_juice.json 9e06d792260bac7da2725c0b4ab95e165f6ffbec data/toughasnails/recipes/water_canteen.json +ce16cbba22ca6c9c18782b0035b4d70dd9efef02 data/toughasnails/recipes/water_purifier.json +b7f65be3f6011725117815ce6d09527b03dd0622 data/toughasnails/recipes/wool_boots.json +f1b202bfcfbba621db3bfb8e8e3e7577e9bb2cbc data/toughasnails/recipes/wool_chestplate.json +53cdb1c795f6c857bbd1de91d27f76a4d33e55e9 data/toughasnails/recipes/wool_helmet.json +90816ac85b57b182bacb106741568cd7a3c34ea4 data/toughasnails/recipes/wool_leggings.json diff --git a/src/generated/resources/.cache/d5932a16d3f0544ba1e8cda3b77d0d46f353493b b/src/generated/resources/.cache/d5932a16d3f0544ba1e8cda3b77d0d46f353493b index 34a0f7d1..0adedab4 100644 --- a/src/generated/resources/.cache/d5932a16d3f0544ba1e8cda3b77d0d46f353493b +++ b/src/generated/resources/.cache/d5932a16d3f0544ba1e8cda3b77d0d46f353493b @@ -1,2 +1,2 @@ -// 1.20.2 2023-09-24T13:38:34.0299956 Tags for minecraft:damage_type mod id toughasnails +// 1.20.2 2023-11-24T11:10:59.9912965 Tags for minecraft:damage_type mod id toughasnails 38c38aa2296b3985a81eeeb8cfc6a4a99b2f142d data/minecraft/tags/damage_type/bypasses_armor.json diff --git a/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 b/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 index 6410f251..a45d7f73 100644 --- a/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 +++ b/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 @@ -1,4 +1,4 @@ -// 1.20.2 2023-09-24T13:38:34.0284963 Tags for minecraft:block mod id toughasnails +// 1.20.2 2023-11-24T11:10:59.9601091 Tags for minecraft:block mod id toughasnails bffb0fdf09ac6cfbed64666a723e8a78cb784bbd data/minecraft/tags/blocks/mineable/pickaxe.json eed9ca8217c04724f67008aba1a0a5edde5697c2 data/toughasnails/tags/blocks/cooling_blocks.json d4134d307e68e7865444c0d1d1ab81babc6a27ff data/toughasnails/tags/blocks/heating_blocks.json diff --git a/src/main/resources/data/toughasnails/advancements/recipes/combat/leaf_boots.json b/src/generated/resources/data/toughasnails/advancements/recipes/combat/leaf_boots.json similarity index 67% rename from src/main/resources/data/toughasnails/advancements/recipes/combat/leaf_boots.json rename to src/generated/resources/data/toughasnails/advancements/recipes/combat/leaf_boots.json index e219dbd5..b0b25f0c 100644 --- a/src/main/resources/data/toughasnails/advancements/recipes/combat/leaf_boots.json +++ b/src/generated/resources/data/toughasnails/advancements/recipes/combat/leaf_boots.json @@ -1,32 +1,33 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "toughasnails:leaf_boots" - ] - }, "criteria": { "has_leaves": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "minecraft:leaves" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "toughasnails:leaf_boots" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_leaves", - "has_the_recipe" + "has_the_recipe", + "has_leaves" ] - ] + ], + "rewards": { + "recipes": [ + "toughasnails:leaf_boots" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/advancements/recipes/combat/leaf_chestplate.json b/src/generated/resources/data/toughasnails/advancements/recipes/combat/leaf_chestplate.json similarity index 68% rename from src/main/resources/data/toughasnails/advancements/recipes/combat/leaf_chestplate.json rename to src/generated/resources/data/toughasnails/advancements/recipes/combat/leaf_chestplate.json index cf4583c3..f296c078 100644 --- a/src/main/resources/data/toughasnails/advancements/recipes/combat/leaf_chestplate.json +++ b/src/generated/resources/data/toughasnails/advancements/recipes/combat/leaf_chestplate.json @@ -1,32 +1,33 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "toughasnails:leaf_chestplate" - ] - }, "criteria": { "has_leaves": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "minecraft:leaves" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "toughasnails:leaf_chestplate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_leaves", - "has_the_recipe" + "has_the_recipe", + "has_leaves" ] - ] + ], + "rewards": { + "recipes": [ + "toughasnails:leaf_chestplate" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/advancements/recipes/combat/leaf_helmet.json b/src/generated/resources/data/toughasnails/advancements/recipes/combat/leaf_helmet.json similarity index 68% rename from src/main/resources/data/toughasnails/advancements/recipes/combat/leaf_helmet.json rename to src/generated/resources/data/toughasnails/advancements/recipes/combat/leaf_helmet.json index 45b4993a..a1bb7a57 100644 --- a/src/main/resources/data/toughasnails/advancements/recipes/combat/leaf_helmet.json +++ b/src/generated/resources/data/toughasnails/advancements/recipes/combat/leaf_helmet.json @@ -1,32 +1,33 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "toughasnails:leaf_helmet" - ] - }, "criteria": { "has_leaves": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "minecraft:leaves" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "toughasnails:leaf_helmet" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_leaves", - "has_the_recipe" + "has_the_recipe", + "has_leaves" ] - ] + ], + "rewards": { + "recipes": [ + "toughasnails:leaf_helmet" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/advancements/recipes/combat/leaf_leggings.json b/src/generated/resources/data/toughasnails/advancements/recipes/combat/leaf_leggings.json similarity index 68% rename from src/main/resources/data/toughasnails/advancements/recipes/combat/leaf_leggings.json rename to src/generated/resources/data/toughasnails/advancements/recipes/combat/leaf_leggings.json index c098889a..c8399e57 100644 --- a/src/main/resources/data/toughasnails/advancements/recipes/combat/leaf_leggings.json +++ b/src/generated/resources/data/toughasnails/advancements/recipes/combat/leaf_leggings.json @@ -1,32 +1,33 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "toughasnails:leaf_leggings" - ] - }, "criteria": { "has_leaves": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "minecraft:leaves" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "toughasnails:leaf_leggings" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_leaves", - "has_the_recipe" + "has_the_recipe", + "has_leaves" ] - ] + ], + "rewards": { + "recipes": [ + "toughasnails:leaf_leggings" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/advancements/recipes/combat/wool_boots.json b/src/generated/resources/data/toughasnails/advancements/recipes/combat/wool_boots.json similarity index 67% rename from src/main/resources/data/toughasnails/advancements/recipes/combat/wool_boots.json rename to src/generated/resources/data/toughasnails/advancements/recipes/combat/wool_boots.json index f5da91ba..fff7e36e 100644 --- a/src/main/resources/data/toughasnails/advancements/recipes/combat/wool_boots.json +++ b/src/generated/resources/data/toughasnails/advancements/recipes/combat/wool_boots.json @@ -1,32 +1,33 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "toughasnails:wool_boots" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "toughasnails:wool_boots" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_wool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "minecraft:wool" } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "toughasnails:wool_boots" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ [ - "has_wool", - "has_the_recipe" + "has_the_recipe", + "has_wool" ] - ] + ], + "rewards": { + "recipes": [ + "toughasnails:wool_boots" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/advancements/recipes/combat/wool_chestplate.json b/src/generated/resources/data/toughasnails/advancements/recipes/combat/wool_chestplate.json similarity index 68% rename from src/main/resources/data/toughasnails/advancements/recipes/combat/wool_chestplate.json rename to src/generated/resources/data/toughasnails/advancements/recipes/combat/wool_chestplate.json index 43b4ad6b..e811ca78 100644 --- a/src/main/resources/data/toughasnails/advancements/recipes/combat/wool_chestplate.json +++ b/src/generated/resources/data/toughasnails/advancements/recipes/combat/wool_chestplate.json @@ -1,32 +1,33 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "toughasnails:wool_chestplate" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "toughasnails:wool_chestplate" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_wool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "minecraft:wool" } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "toughasnails:wool_chestplate" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ [ - "has_wool", - "has_the_recipe" + "has_the_recipe", + "has_wool" ] - ] + ], + "rewards": { + "recipes": [ + "toughasnails:wool_chestplate" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/advancements/recipes/combat/wool_helmet.json b/src/generated/resources/data/toughasnails/advancements/recipes/combat/wool_helmet.json similarity index 68% rename from src/main/resources/data/toughasnails/advancements/recipes/combat/wool_helmet.json rename to src/generated/resources/data/toughasnails/advancements/recipes/combat/wool_helmet.json index 9b13d5d4..3a1705d9 100644 --- a/src/main/resources/data/toughasnails/advancements/recipes/combat/wool_helmet.json +++ b/src/generated/resources/data/toughasnails/advancements/recipes/combat/wool_helmet.json @@ -1,32 +1,33 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "toughasnails:wool_helmet" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "toughasnails:wool_helmet" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_wool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "minecraft:wool" } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "toughasnails:wool_helmet" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ [ - "has_wool", - "has_the_recipe" + "has_the_recipe", + "has_wool" ] - ] + ], + "rewards": { + "recipes": [ + "toughasnails:wool_helmet" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/advancements/recipes/combat/wool_leggings.json b/src/generated/resources/data/toughasnails/advancements/recipes/combat/wool_leggings.json similarity index 68% rename from src/main/resources/data/toughasnails/advancements/recipes/combat/wool_leggings.json rename to src/generated/resources/data/toughasnails/advancements/recipes/combat/wool_leggings.json index cfbe230a..c9d2c2be 100644 --- a/src/main/resources/data/toughasnails/advancements/recipes/combat/wool_leggings.json +++ b/src/generated/resources/data/toughasnails/advancements/recipes/combat/wool_leggings.json @@ -1,32 +1,33 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "toughasnails:wool_leggings" - ] - }, "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "toughasnails:wool_leggings" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_wool": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "minecraft:wool" } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "toughasnails:wool_leggings" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ [ - "has_wool", - "has_the_recipe" + "has_the_recipe", + "has_wool" ] - ] + ], + "rewards": { + "recipes": [ + "toughasnails:wool_leggings" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/advancements/recipes/decorations/rain_collector.json b/src/generated/resources/data/toughasnails/advancements/recipes/decorations/rain_collector.json similarity index 69% rename from src/main/resources/data/toughasnails/advancements/recipes/decorations/rain_collector.json rename to src/generated/resources/data/toughasnails/advancements/recipes/decorations/rain_collector.json index eeef7e20..fe73d2f1 100644 --- a/src/main/resources/data/toughasnails/advancements/recipes/decorations/rain_collector.json +++ b/src/generated/resources/data/toughasnails/advancements/recipes/decorations/rain_collector.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "toughasnails:rain_collector" - ] - }, "criteria": { "has_barrel": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,19 +10,26 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "toughasnails:rain_collector" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_barrel", - "has_the_recipe" + "has_the_recipe", + "has_barrel" ] - ] + ], + "rewards": { + "recipes": [ + "toughasnails:rain_collector" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/advancements/recipes/decorations/water_purifier.json b/src/generated/resources/data/toughasnails/advancements/recipes/decorations/water_purifier.json similarity index 69% rename from src/main/resources/data/toughasnails/advancements/recipes/decorations/water_purifier.json rename to src/generated/resources/data/toughasnails/advancements/recipes/decorations/water_purifier.json index 6ac9ba97..974b5f81 100644 --- a/src/main/resources/data/toughasnails/advancements/recipes/decorations/water_purifier.json +++ b/src/generated/resources/data/toughasnails/advancements/recipes/decorations/water_purifier.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "toughasnails:water_purifier" - ] - }, "criteria": { "has_charcoal": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,19 +10,26 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "toughasnails:water_purifier" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_charcoal", - "has_the_recipe" + "has_the_recipe", + "has_charcoal" ] - ] + ], + "rewards": { + "recipes": [ + "toughasnails:water_purifier" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/advancements/recipes/food/apple_juice.json b/src/generated/resources/data/toughasnails/advancements/recipes/food/apple_juice.json similarity index 69% rename from src/main/resources/data/toughasnails/advancements/recipes/food/apple_juice.json rename to src/generated/resources/data/toughasnails/advancements/recipes/food/apple_juice.json index 5a8710f9..bc0f90b0 100644 --- a/src/main/resources/data/toughasnails/advancements/recipes/food/apple_juice.json +++ b/src/generated/resources/data/toughasnails/advancements/recipes/food/apple_juice.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "toughasnails:apple_juice" - ] - }, "criteria": { "has_apple": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,19 +10,26 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "toughasnails:apple_juice" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_apple", - "has_the_recipe" + "has_the_recipe", + "has_apple" ] - ] + ], + "rewards": { + "recipes": [ + "toughasnails:apple_juice" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/advancements/recipes/food/cactus_juice.json b/src/generated/resources/data/toughasnails/advancements/recipes/food/cactus_juice.json similarity index 69% rename from src/main/resources/data/toughasnails/advancements/recipes/food/cactus_juice.json rename to src/generated/resources/data/toughasnails/advancements/recipes/food/cactus_juice.json index d15673b1..9384de4b 100644 --- a/src/main/resources/data/toughasnails/advancements/recipes/food/cactus_juice.json +++ b/src/generated/resources/data/toughasnails/advancements/recipes/food/cactus_juice.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "toughasnails:cactus_juice" - ] - }, "criteria": { "has_cactus": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,19 +10,26 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "toughasnails:cactus_juice" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_cactus", - "has_the_recipe" + "has_the_recipe", + "has_cactus" ] - ] + ], + "rewards": { + "recipes": [ + "toughasnails:cactus_juice" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/advancements/recipes/food/chorus_fruit.json b/src/generated/resources/data/toughasnails/advancements/recipes/food/chorus_fruit_juice.json similarity index 70% rename from src/main/resources/data/toughasnails/advancements/recipes/food/chorus_fruit.json rename to src/generated/resources/data/toughasnails/advancements/recipes/food/chorus_fruit_juice.json index 2a7879d1..da4fc097 100644 --- a/src/main/resources/data/toughasnails/advancements/recipes/food/chorus_fruit.json +++ b/src/generated/resources/data/toughasnails/advancements/recipes/food/chorus_fruit_juice.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "toughasnails:chorus_fruit_juice" - ] - }, "criteria": { "has_chorus_fruit": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,19 +10,26 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "toughasnails:chorus_fruit_juice" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_chorus_fruit", - "has_the_recipe" + "has_the_recipe", + "has_chorus_fruit" ] - ] + ], + "rewards": { + "recipes": [ + "toughasnails:chorus_fruit_juice" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/advancements/recipes/food/glow_berry_juice.json b/src/generated/resources/data/toughasnails/advancements/recipes/food/glow_berry_juice.json similarity index 70% rename from src/main/resources/data/toughasnails/advancements/recipes/food/glow_berry_juice.json rename to src/generated/resources/data/toughasnails/advancements/recipes/food/glow_berry_juice.json index 7e43c467..2d5df7e3 100644 --- a/src/main/resources/data/toughasnails/advancements/recipes/food/glow_berry_juice.json +++ b/src/generated/resources/data/toughasnails/advancements/recipes/food/glow_berry_juice.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "toughasnails:glow_berry_juice" - ] - }, "criteria": { "has_glow_berries": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,19 +10,26 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "toughasnails:glow_berry_juice" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_glow_berries", - "has_the_recipe" + "has_the_recipe", + "has_glow_berries" ] - ] + ], + "rewards": { + "recipes": [ + "toughasnails:glow_berry_juice" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/advancements/recipes/food/melon_juice.json b/src/generated/resources/data/toughasnails/advancements/recipes/food/melon_juice.json similarity index 69% rename from src/main/resources/data/toughasnails/advancements/recipes/food/melon_juice.json rename to src/generated/resources/data/toughasnails/advancements/recipes/food/melon_juice.json index 6ca0e44c..0ef489aa 100644 --- a/src/main/resources/data/toughasnails/advancements/recipes/food/melon_juice.json +++ b/src/generated/resources/data/toughasnails/advancements/recipes/food/melon_juice.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "toughasnails:melon_juice" - ] - }, "criteria": { "has_melon_slice": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,19 +10,26 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "toughasnails:melon_juice" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_melon_slice", - "has_the_recipe" + "has_the_recipe", + "has_melon_slice" ] - ] + ], + "rewards": { + "recipes": [ + "toughasnails:melon_juice" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/advancements/recipes/food/pumpkin_juice.json b/src/generated/resources/data/toughasnails/advancements/recipes/food/pumpkin_juice.json similarity index 69% rename from src/main/resources/data/toughasnails/advancements/recipes/food/pumpkin_juice.json rename to src/generated/resources/data/toughasnails/advancements/recipes/food/pumpkin_juice.json index 5f02be78..112fe55b 100644 --- a/src/main/resources/data/toughasnails/advancements/recipes/food/pumpkin_juice.json +++ b/src/generated/resources/data/toughasnails/advancements/recipes/food/pumpkin_juice.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "toughasnails:pumpkin_juice" - ] - }, "criteria": { "has_pumpkin": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,19 +10,26 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "toughasnails:pumpkin_juice" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_pumpkin", - "has_the_recipe" + "has_the_recipe", + "has_pumpkin" ] - ] + ], + "rewards": { + "recipes": [ + "toughasnails:pumpkin_juice" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/advancements/recipes/food/sweet_berry_juice.json b/src/generated/resources/data/toughasnails/advancements/recipes/food/sweet_berry_juice.json similarity index 70% rename from src/main/resources/data/toughasnails/advancements/recipes/food/sweet_berry_juice.json rename to src/generated/resources/data/toughasnails/advancements/recipes/food/sweet_berry_juice.json index 75c1ad48..16454524 100644 --- a/src/main/resources/data/toughasnails/advancements/recipes/food/sweet_berry_juice.json +++ b/src/generated/resources/data/toughasnails/advancements/recipes/food/sweet_berry_juice.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "toughasnails:sweet_berry_juice" - ] - }, "criteria": { "has_sweet_berries": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,19 +10,26 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "toughasnails:sweet_berry_juice" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_sweet_berries", - "has_the_recipe" + "has_the_recipe", + "has_sweet_berries" ] - ] + ], + "rewards": { + "recipes": [ + "toughasnails:sweet_berry_juice" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/advancements/recipes/tools/canteen.json b/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_canteen.json similarity index 56% rename from src/main/resources/data/toughasnails/advancements/recipes/tools/canteen.json rename to src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_canteen.json index 3507b87f..e6882152 100644 --- a/src/main/resources/data/toughasnails/advancements/recipes/tools/canteen.json +++ b/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_canteen.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "toughasnails:canteen" - ] - }, "criteria": { "has_leather": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,19 +10,26 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "toughasnails:canteen" - } + "recipe": "toughasnails:empty_canteen" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_leather", - "has_the_recipe" + "has_the_recipe", + "has_leather" ] - ] + ], + "rewards": { + "recipes": [ + "toughasnails:empty_canteen" + ] + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/loot_tables/blocks/rain_collector.json b/src/generated/resources/data/toughasnails/loot_tables/blocks/rain_collector.json similarity index 70% rename from src/main/resources/data/toughasnails/loot_tables/blocks/rain_collector.json rename to src/generated/resources/data/toughasnails/loot_tables/blocks/rain_collector.json index 426a0521..32e4801d 100644 --- a/src/main/resources/data/toughasnails/loot_tables/blocks/rain_collector.json +++ b/src/generated/resources/data/toughasnails/loot_tables/blocks/rain_collector.json @@ -2,18 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "toughasnails:rain_collector" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "toughasnails:blocks/rain_collector" } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/loot_tables/blocks/water_purifier.json b/src/generated/resources/data/toughasnails/loot_tables/blocks/water_purifier.json similarity index 60% rename from src/main/resources/data/toughasnails/loot_tables/blocks/water_purifier.json rename to src/generated/resources/data/toughasnails/loot_tables/blocks/water_purifier.json index 9b64ed95..f2163e4e 100644 --- a/src/main/resources/data/toughasnails/loot_tables/blocks/water_purifier.json +++ b/src/generated/resources/data/toughasnails/loot_tables/blocks/water_purifier.json @@ -2,24 +2,20 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:copy_name", - "source": "block_entity" - } - ], "name": "toughasnails:water_purifier" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "toughasnails:blocks/water_purifier" } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/recipes/apple_juice.json b/src/generated/resources/data/toughasnails/recipes/apple_juice.json similarity index 93% rename from src/main/resources/data/toughasnails/recipes/apple_juice.json rename to src/generated/resources/data/toughasnails/recipes/apple_juice.json index bc2424c7..517635fa 100644 --- a/src/main/resources/data/toughasnails/recipes/apple_juice.json +++ b/src/generated/resources/data/toughasnails/recipes/apple_juice.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "juice", "ingredients": [ { diff --git a/src/main/resources/data/toughasnails/recipes/cactus_juice.json b/src/generated/resources/data/toughasnails/recipes/cactus_juice.json similarity index 93% rename from src/main/resources/data/toughasnails/recipes/cactus_juice.json rename to src/generated/resources/data/toughasnails/recipes/cactus_juice.json index e258f517..c966c0f1 100644 --- a/src/main/resources/data/toughasnails/recipes/cactus_juice.json +++ b/src/generated/resources/data/toughasnails/recipes/cactus_juice.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "juice", "ingredients": [ { diff --git a/src/main/resources/data/toughasnails/recipes/chorus_fruit_juice.json b/src/generated/resources/data/toughasnails/recipes/chorus_fruit_juice.json similarity index 93% rename from src/main/resources/data/toughasnails/recipes/chorus_fruit_juice.json rename to src/generated/resources/data/toughasnails/recipes/chorus_fruit_juice.json index 3fbc8e31..a2baf12e 100644 --- a/src/main/resources/data/toughasnails/recipes/chorus_fruit_juice.json +++ b/src/generated/resources/data/toughasnails/recipes/chorus_fruit_juice.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "juice", "ingredients": [ { diff --git a/src/main/resources/data/toughasnails/recipes/canteen.json b/src/generated/resources/data/toughasnails/recipes/empty_canteen.json similarity index 77% rename from src/main/resources/data/toughasnails/recipes/canteen.json rename to src/generated/resources/data/toughasnails/recipes/empty_canteen.json index a96c52f8..01c0d2a1 100644 --- a/src/main/resources/data/toughasnails/recipes/canteen.json +++ b/src/generated/resources/data/toughasnails/recipes/empty_canteen.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - " # ", - "# #", - " # " - ], + "category": "equipment", "key": { "#": { "item": "minecraft:leather" } }, + "pattern": [ + " # ", + "# #", + " # " + ], "result": { "item": "toughasnails:empty_canteen" - } -} + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/recipes/glow_berry_juice.json b/src/generated/resources/data/toughasnails/recipes/glow_berry_juice.json similarity index 93% rename from src/main/resources/data/toughasnails/recipes/glow_berry_juice.json rename to src/generated/resources/data/toughasnails/recipes/glow_berry_juice.json index da24aa76..30651e28 100644 --- a/src/main/resources/data/toughasnails/recipes/glow_berry_juice.json +++ b/src/generated/resources/data/toughasnails/recipes/glow_berry_juice.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "juice", "ingredients": [ { diff --git a/src/main/resources/data/toughasnails/recipes/leaf_boots.json b/src/generated/resources/data/toughasnails/recipes/leaf_boots.json similarity index 76% rename from src/main/resources/data/toughasnails/recipes/leaf_boots.json rename to src/generated/resources/data/toughasnails/recipes/leaf_boots.json index 0a193424..a3c21fe4 100644 --- a/src/main/resources/data/toughasnails/recipes/leaf_boots.json +++ b/src/generated/resources/data/toughasnails/recipes/leaf_boots.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], + "category": "equipment", "key": { "X": { "tag": "minecraft:leaves" } }, + "pattern": [ + "X X", + "X X" + ], "result": { "item": "toughasnails:leaf_boots" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/recipes/leaf_chestplate.json b/src/generated/resources/data/toughasnails/recipes/leaf_chestplate.json similarity index 78% rename from src/main/resources/data/toughasnails/recipes/leaf_chestplate.json rename to src/generated/resources/data/toughasnails/recipes/leaf_chestplate.json index d7f8bbd2..36dc112f 100644 --- a/src/main/resources/data/toughasnails/recipes/leaf_chestplate.json +++ b/src/generated/resources/data/toughasnails/recipes/leaf_chestplate.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], + "category": "equipment", "key": { "X": { "tag": "minecraft:leaves" } }, + "pattern": [ + "X X", + "XXX", + "XXX" + ], "result": { "item": "toughasnails:leaf_chestplate" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/recipes/leaf_helmet.json b/src/generated/resources/data/toughasnails/recipes/leaf_helmet.json similarity index 77% rename from src/main/resources/data/toughasnails/recipes/leaf_helmet.json rename to src/generated/resources/data/toughasnails/recipes/leaf_helmet.json index 256089e8..f17b6017 100644 --- a/src/main/resources/data/toughasnails/recipes/leaf_helmet.json +++ b/src/generated/resources/data/toughasnails/recipes/leaf_helmet.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], + "category": "equipment", "key": { "X": { "tag": "minecraft:leaves" } }, + "pattern": [ + "XXX", + "X X" + ], "result": { "item": "toughasnails:leaf_helmet" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/recipes/leaf_leggings.json b/src/generated/resources/data/toughasnails/recipes/leaf_leggings.json similarity index 78% rename from src/main/resources/data/toughasnails/recipes/leaf_leggings.json rename to src/generated/resources/data/toughasnails/recipes/leaf_leggings.json index 72da8d19..a4198527 100644 --- a/src/main/resources/data/toughasnails/recipes/leaf_leggings.json +++ b/src/generated/resources/data/toughasnails/recipes/leaf_leggings.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], + "category": "equipment", "key": { "X": { "tag": "minecraft:leaves" } }, + "pattern": [ + "XXX", + "X X", + "X X" + ], "result": { "item": "toughasnails:leaf_leggings" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/recipes/melon_juice.json b/src/generated/resources/data/toughasnails/recipes/melon_juice.json similarity index 93% rename from src/main/resources/data/toughasnails/recipes/melon_juice.json rename to src/generated/resources/data/toughasnails/recipes/melon_juice.json index 84be8140..48cc3ed1 100644 --- a/src/main/resources/data/toughasnails/recipes/melon_juice.json +++ b/src/generated/resources/data/toughasnails/recipes/melon_juice.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "juice", "ingredients": [ { diff --git a/src/main/resources/data/toughasnails/recipes/pumpkin_juice.json b/src/generated/resources/data/toughasnails/recipes/pumpkin_juice.json similarity index 93% rename from src/main/resources/data/toughasnails/recipes/pumpkin_juice.json rename to src/generated/resources/data/toughasnails/recipes/pumpkin_juice.json index fbc95885..50978e16 100644 --- a/src/main/resources/data/toughasnails/recipes/pumpkin_juice.json +++ b/src/generated/resources/data/toughasnails/recipes/pumpkin_juice.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "juice", "ingredients": [ { diff --git a/src/main/resources/data/toughasnails/recipes/rain_collector.json b/src/generated/resources/data/toughasnails/recipes/rain_collector.json similarity index 84% rename from src/main/resources/data/toughasnails/recipes/rain_collector.json rename to src/generated/resources/data/toughasnails/recipes/rain_collector.json index 55a887db..18918635 100644 --- a/src/main/resources/data/toughasnails/recipes/rain_collector.json +++ b/src/generated/resources/data/toughasnails/recipes/rain_collector.json @@ -1,21 +1,23 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "ISI", - "IBI" - ], + "category": "misc", "key": { - "S": { - "item": "minecraft:string" + "B": { + "item": "minecraft:barrel" }, "I": { "item": "minecraft:iron_ingot" }, - "B": { - "item": "minecraft:barrel" + "S": { + "item": "minecraft:string" } }, + "pattern": [ + "ISI", + "IBI" + ], "result": { "item": "toughasnails:rain_collector" - } -} + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/recipes/sweet_berry_juice.json b/src/generated/resources/data/toughasnails/recipes/sweet_berry_juice.json similarity index 93% rename from src/main/resources/data/toughasnails/recipes/sweet_berry_juice.json rename to src/generated/resources/data/toughasnails/recipes/sweet_berry_juice.json index 9a8c1a47..e59b5a11 100644 --- a/src/main/resources/data/toughasnails/recipes/sweet_berry_juice.json +++ b/src/generated/resources/data/toughasnails/recipes/sweet_berry_juice.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "group": "juice", "ingredients": [ { diff --git a/src/main/resources/data/toughasnails/recipes/water_purifier.json b/src/generated/resources/data/toughasnails/recipes/water_purifier.json similarity index 81% rename from src/main/resources/data/toughasnails/recipes/water_purifier.json rename to src/generated/resources/data/toughasnails/recipes/water_purifier.json index de3155a7..72be7584 100644 --- a/src/main/resources/data/toughasnails/recipes/water_purifier.json +++ b/src/generated/resources/data/toughasnails/recipes/water_purifier.json @@ -1,25 +1,27 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "WSW", - "GCG", - "GGG" - ], + "category": "misc", "key": { - "W": { - "tag": "minecraft:planks" - }, - "S": { - "tag": "minecraft:sand" - }, "C": { "item": "minecraft:charcoal" }, - "G": { + "G": { "item": "minecraft:glass" + }, + "S": { + "tag": "minecraft:sand" + }, + "W": { + "tag": "minecraft:planks" } }, + "pattern": [ + "WSW", + "GCG", + "GGG" + ], "result": { "item": "toughasnails:water_purifier" - } -} + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/recipes/wool_boots.json b/src/generated/resources/data/toughasnails/recipes/wool_boots.json similarity index 76% rename from src/main/resources/data/toughasnails/recipes/wool_boots.json rename to src/generated/resources/data/toughasnails/recipes/wool_boots.json index 946ec0d0..cd08876f 100644 --- a/src/main/resources/data/toughasnails/recipes/wool_boots.json +++ b/src/generated/resources/data/toughasnails/recipes/wool_boots.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], + "category": "equipment", "key": { "X": { "tag": "minecraft:wool" } }, + "pattern": [ + "X X", + "X X" + ], "result": { "item": "toughasnails:wool_boots" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/recipes/wool_chestplate.json b/src/generated/resources/data/toughasnails/recipes/wool_chestplate.json similarity index 78% rename from src/main/resources/data/toughasnails/recipes/wool_chestplate.json rename to src/generated/resources/data/toughasnails/recipes/wool_chestplate.json index dbde7f73..2c7763ab 100644 --- a/src/main/resources/data/toughasnails/recipes/wool_chestplate.json +++ b/src/generated/resources/data/toughasnails/recipes/wool_chestplate.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], + "category": "equipment", "key": { "X": { "tag": "minecraft:wool" } }, + "pattern": [ + "X X", + "XXX", + "XXX" + ], "result": { "item": "toughasnails:wool_chestplate" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/recipes/wool_helmet.json b/src/generated/resources/data/toughasnails/recipes/wool_helmet.json similarity index 76% rename from src/main/resources/data/toughasnails/recipes/wool_helmet.json rename to src/generated/resources/data/toughasnails/recipes/wool_helmet.json index 939c6748..e5a82e84 100644 --- a/src/main/resources/data/toughasnails/recipes/wool_helmet.json +++ b/src/generated/resources/data/toughasnails/recipes/wool_helmet.json @@ -1,15 +1,17 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], + "category": "equipment", "key": { "X": { "tag": "minecraft:wool" } }, + "pattern": [ + "XXX", + "X X" + ], "result": { "item": "toughasnails:wool_helmet" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/recipes/wool_leggings.json b/src/generated/resources/data/toughasnails/recipes/wool_leggings.json similarity index 77% rename from src/main/resources/data/toughasnails/recipes/wool_leggings.json rename to src/generated/resources/data/toughasnails/recipes/wool_leggings.json index 6ab8aa1c..c22ae474 100644 --- a/src/main/resources/data/toughasnails/recipes/wool_leggings.json +++ b/src/generated/resources/data/toughasnails/recipes/wool_leggings.json @@ -1,16 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], + "category": "equipment", "key": { "X": { "tag": "minecraft:wool" } }, + "pattern": [ + "XXX", + "X X", + "X X" + ], "result": { "item": "toughasnails:wool_leggings" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/cooling_armor.json b/src/generated/resources/data/toughasnails/tags/items/cooling_armor.json new file mode 100644 index 00000000..bc804778 --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/cooling_armor.json @@ -0,0 +1,8 @@ +{ + "values": [ + "toughasnails:leaf_helmet", + "toughasnails:leaf_chestplate", + "toughasnails:leaf_leggings", + "toughasnails:leaf_boots" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/cooling_items.json b/src/generated/resources/data/toughasnails/tags/items/cooling_items.json new file mode 100644 index 00000000..399a04e7 --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/cooling_items.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:powder_snow_bucket" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/drinks.json b/src/generated/resources/data/toughasnails/tags/items/drinks.json new file mode 100644 index 00000000..287ba077 --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/drinks.json @@ -0,0 +1,24 @@ +{ + "values": [ + "#toughasnails:thirst/1_thirst_drinks", + "#toughasnails:thirst/2_thirst_drinks", + "#toughasnails:thirst/3_thirst_drinks", + "#toughasnails:thirst/4_thirst_drinks", + "#toughasnails:thirst/5_thirst_drinks", + "#toughasnails:thirst/6_thirst_drinks", + "#toughasnails:thirst/7_thirst_drinks", + "#toughasnails:thirst/8_thirst_drinks", + "#toughasnails:thirst/9_thirst_drinks", + "#toughasnails:thirst/10_thirst_drinks", + "#toughasnails:thirst/11_thirst_drinks", + "#toughasnails:thirst/12_thirst_drinks", + "#toughasnails:thirst/13_thirst_drinks", + "#toughasnails:thirst/14_thirst_drinks", + "#toughasnails:thirst/15_thirst_drinks", + "#toughasnails:thirst/16_thirst_drinks", + "#toughasnails:thirst/17_thirst_drinks", + "#toughasnails:thirst/18_thirst_drinks", + "#toughasnails:thirst/19_thirst_drinks", + "#toughasnails:thirst/20_thirst_drinks" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/heating_armor.json b/src/generated/resources/data/toughasnails/tags/items/heating_armor.json new file mode 100644 index 00000000..f7efd117 --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/heating_armor.json @@ -0,0 +1,8 @@ +{ + "values": [ + "toughasnails:wool_helmet", + "toughasnails:wool_chestplate", + "toughasnails:wool_leggings", + "toughasnails:wool_boots" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/heating_items.json b/src/generated/resources/data/toughasnails/tags/items/heating_items.json new file mode 100644 index 00000000..fec09c77 --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/heating_items.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:lava_bucket" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/hydration/100_hydration_drinks.json b/src/generated/resources/data/toughasnails/tags/items/hydration/100_hydration_drinks.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/hydration/100_hydration_drinks.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/hydration/10_hydration_drinks.json b/src/generated/resources/data/toughasnails/tags/items/hydration/10_hydration_drinks.json new file mode 100644 index 00000000..c4abd7b2 --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/hydration/10_hydration_drinks.json @@ -0,0 +1,8 @@ +{ + "values": [ + "toughasnails:dirty_water_bottle", + "toughasnails:dirty_water_canteen", + "toughasnails:glow_berry_juice", + "toughasnails:sweet_berry_juice" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/hydration/20_hydration_drinks.json b/src/generated/resources/data/toughasnails/tags/items/hydration/20_hydration_drinks.json new file mode 100644 index 00000000..350e0fdb --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/hydration/20_hydration_drinks.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:potion", + "toughasnails:water_canteen", + "toughasnails:chorus_fruit_juice" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/hydration/30_hydration_drinks.json b/src/generated/resources/data/toughasnails/tags/items/hydration/30_hydration_drinks.json new file mode 100644 index 00000000..0bac6000 --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/hydration/30_hydration_drinks.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:milk_bucket", + "toughasnails:pumpkin_juice" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/hydration/40_hydration_drinks.json b/src/generated/resources/data/toughasnails/tags/items/hydration/40_hydration_drinks.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/hydration/40_hydration_drinks.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/hydration/50_hydration_drinks.json b/src/generated/resources/data/toughasnails/tags/items/hydration/50_hydration_drinks.json similarity index 51% rename from src/main/resources/data/toughasnails/tags/items/hydration/50_hydration_drinks.json rename to src/generated/resources/data/toughasnails/tags/items/hydration/50_hydration_drinks.json index 1f8a6d51..28a987be 100644 --- a/src/main/resources/data/toughasnails/tags/items/hydration/50_hydration_drinks.json +++ b/src/generated/resources/data/toughasnails/tags/items/hydration/50_hydration_drinks.json @@ -1,7 +1,6 @@ { - "replace": false, "values": [ "toughasnails:purified_water_bottle", - "toughasnails:purified_water_canteen" + "toughasnails:purified_water_canteen" ] } \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/hydration/60_hydration_drinks.json b/src/generated/resources/data/toughasnails/tags/items/hydration/60_hydration_drinks.json new file mode 100644 index 00000000..f29f189b --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/hydration/60_hydration_drinks.json @@ -0,0 +1,6 @@ +{ + "values": [ + "toughasnails:apple_juice", + "toughasnails:melon_juice" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/hydration/70_hydration_drinks.json b/src/generated/resources/data/toughasnails/tags/items/hydration/70_hydration_drinks.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/hydration/70_hydration_drinks.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/hydration/80_hydration_drinks.json b/src/generated/resources/data/toughasnails/tags/items/hydration/80_hydration_drinks.json new file mode 100644 index 00000000..2d08f049 --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/hydration/80_hydration_drinks.json @@ -0,0 +1,5 @@ +{ + "values": [ + "toughasnails:cactus_juice" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/hydration/90_hydration_drinks.json b/src/generated/resources/data/toughasnails/tags/items/hydration/90_hydration_drinks.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/hydration/90_hydration_drinks.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/poison_chance/100_poison_chance_drinks.json b/src/generated/resources/data/toughasnails/tags/items/poison_chance/100_poison_chance_drinks.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/poison_chance/100_poison_chance_drinks.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/poison_chance/25_poison_chance_drinks.json b/src/generated/resources/data/toughasnails/tags/items/poison_chance/25_poison_chance_drinks.json new file mode 100644 index 00000000..2969560b --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/poison_chance/25_poison_chance_drinks.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:potion", + "toughasnails:water_canteen" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/poison_chance/50_poison_chance_drinks.json b/src/generated/resources/data/toughasnails/tags/items/poison_chance/50_poison_chance_drinks.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/poison_chance/50_poison_chance_drinks.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/poison_chance/75_poison_chance_drinks.json b/src/generated/resources/data/toughasnails/tags/items/poison_chance/75_poison_chance_drinks.json similarity index 51% rename from src/main/resources/data/toughasnails/tags/items/poison_chance/75_poison_chance_drinks.json rename to src/generated/resources/data/toughasnails/tags/items/poison_chance/75_poison_chance_drinks.json index b6762810..09a98c04 100644 --- a/src/main/resources/data/toughasnails/tags/items/poison_chance/75_poison_chance_drinks.json +++ b/src/generated/resources/data/toughasnails/tags/items/poison_chance/75_poison_chance_drinks.json @@ -1,7 +1,6 @@ { - "replace": false, "values": [ "toughasnails:dirty_water_bottle", - "toughasnails:dirty_water_canteen" + "toughasnails:dirty_water_canteen" ] } \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/thirst/10_thirst_drinks.json b/src/generated/resources/data/toughasnails/tags/items/thirst/10_thirst_drinks.json new file mode 100644 index 00000000..1fc56d9c --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/thirst/10_thirst_drinks.json @@ -0,0 +1,5 @@ +{ + "values": [ + "toughasnails:chorus_fruit_juice" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/thirst/11_thirst_drinks.json b/src/generated/resources/data/toughasnails/tags/items/thirst/11_thirst_drinks.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/thirst/11_thirst_drinks.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/thirst/12_thirst_drinks.json b/src/generated/resources/data/toughasnails/tags/items/thirst/12_thirst_drinks.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/thirst/12_thirst_drinks.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/thirst/13_thirst_drinks.json b/src/generated/resources/data/toughasnails/tags/items/thirst/13_thirst_drinks.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/thirst/13_thirst_drinks.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/thirst/14_thirst_drinks.json b/src/generated/resources/data/toughasnails/tags/items/thirst/14_thirst_drinks.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/thirst/14_thirst_drinks.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/thirst/15_thirst_drinks.json b/src/generated/resources/data/toughasnails/tags/items/thirst/15_thirst_drinks.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/thirst/15_thirst_drinks.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/thirst/16_thirst_drinks.json b/src/generated/resources/data/toughasnails/tags/items/thirst/16_thirst_drinks.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/thirst/16_thirst_drinks.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/thirst/17_thirst_drinks.json b/src/generated/resources/data/toughasnails/tags/items/thirst/17_thirst_drinks.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/thirst/17_thirst_drinks.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/thirst/18_thirst_drinks.json b/src/generated/resources/data/toughasnails/tags/items/thirst/18_thirst_drinks.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/thirst/18_thirst_drinks.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/thirst/19_thirst_drinks.json b/src/generated/resources/data/toughasnails/tags/items/thirst/19_thirst_drinks.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/thirst/19_thirst_drinks.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/thirst/1_thirst_drinks.json b/src/generated/resources/data/toughasnails/tags/items/thirst/1_thirst_drinks.json similarity index 51% rename from src/main/resources/data/toughasnails/tags/items/thirst/1_thirst_drinks.json rename to src/generated/resources/data/toughasnails/tags/items/thirst/1_thirst_drinks.json index b6762810..09a98c04 100644 --- a/src/main/resources/data/toughasnails/tags/items/thirst/1_thirst_drinks.json +++ b/src/generated/resources/data/toughasnails/tags/items/thirst/1_thirst_drinks.json @@ -1,7 +1,6 @@ { - "replace": false, "values": [ "toughasnails:dirty_water_bottle", - "toughasnails:dirty_water_canteen" + "toughasnails:dirty_water_canteen" ] } \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/thirst/20_thirst_drinks.json b/src/generated/resources/data/toughasnails/tags/items/thirst/20_thirst_drinks.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/thirst/20_thirst_drinks.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/thirst/2_thirst_drinks.json b/src/generated/resources/data/toughasnails/tags/items/thirst/2_thirst_drinks.json new file mode 100644 index 00000000..899451cb --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/thirst/2_thirst_drinks.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:milk_bucket" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/thirst/3_thirst_drinks.json b/src/generated/resources/data/toughasnails/tags/items/thirst/3_thirst_drinks.json new file mode 100644 index 00000000..2969560b --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/thirst/3_thirst_drinks.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:potion", + "toughasnails:water_canteen" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/thirst/4_thirst_drinks.json b/src/generated/resources/data/toughasnails/tags/items/thirst/4_thirst_drinks.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/thirst/4_thirst_drinks.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/thirst/5_thirst_drinks.json b/src/generated/resources/data/toughasnails/tags/items/thirst/5_thirst_drinks.json similarity index 51% rename from src/main/resources/data/toughasnails/tags/items/thirst/5_thirst_drinks.json rename to src/generated/resources/data/toughasnails/tags/items/thirst/5_thirst_drinks.json index 1f8a6d51..28a987be 100644 --- a/src/main/resources/data/toughasnails/tags/items/thirst/5_thirst_drinks.json +++ b/src/generated/resources/data/toughasnails/tags/items/thirst/5_thirst_drinks.json @@ -1,7 +1,6 @@ { - "replace": false, "values": [ "toughasnails:purified_water_bottle", - "toughasnails:purified_water_canteen" + "toughasnails:purified_water_canteen" ] } \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/thirst/6_thirst_drinks.json b/src/generated/resources/data/toughasnails/tags/items/thirst/6_thirst_drinks.json new file mode 100644 index 00000000..02733fe6 --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/thirst/6_thirst_drinks.json @@ -0,0 +1,7 @@ +{ + "values": [ + "toughasnails:glow_berry_juice", + "toughasnails:pumpkin_juice", + "toughasnails:sweet_berry_juice" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/thirst/7_thirst_drinks.json b/src/generated/resources/data/toughasnails/tags/items/thirst/7_thirst_drinks.json new file mode 100644 index 00000000..8d90f0be --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/thirst/7_thirst_drinks.json @@ -0,0 +1,6 @@ +{ + "values": [ + "toughasnails:cactus_juice", + "toughasnails:melon_juice" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/thirst/8_thirst_drinks.json b/src/generated/resources/data/toughasnails/tags/items/thirst/8_thirst_drinks.json new file mode 100644 index 00000000..d50fa3a0 --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/thirst/8_thirst_drinks.json @@ -0,0 +1,5 @@ +{ + "values": [ + "toughasnails:apple_juice" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/items/thirst/9_thirst_drinks.json b/src/generated/resources/data/toughasnails/tags/items/thirst/9_thirst_drinks.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/items/thirst/9_thirst_drinks.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/worldgen/biome/cold_biomes.json b/src/generated/resources/data/toughasnails/tags/worldgen/biome/cold_biomes.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/worldgen/biome/cold_biomes.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/worldgen/biome/dirty_water_biomes.json b/src/generated/resources/data/toughasnails/tags/worldgen/biome/dirty_water_biomes.json new file mode 100644 index 00000000..95227bb0 --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/worldgen/biome/dirty_water_biomes.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:mangrove_swamp", + "minecraft:mushroom_fields", + "minecraft:swamp" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/worldgen/biome/hot_biomes.json b/src/generated/resources/data/toughasnails/tags/worldgen/biome/hot_biomes.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/worldgen/biome/hot_biomes.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/worldgen/biome/icy_biomes.json b/src/generated/resources/data/toughasnails/tags/worldgen/biome/icy_biomes.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/worldgen/biome/icy_biomes.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/worldgen/biome/neutral_biomes.json b/src/generated/resources/data/toughasnails/tags/worldgen/biome/neutral_biomes.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/worldgen/biome/neutral_biomes.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/worldgen/biome/purified_water_biomes.json b/src/generated/resources/data/toughasnails/tags/worldgen/biome/purified_water_biomes.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/worldgen/biome/purified_water_biomes.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/toughasnails/tags/worldgen/biome/warm_biomes.json b/src/generated/resources/data/toughasnails/tags/worldgen/biome/warm_biomes.json new file mode 100644 index 00000000..f72d209d --- /dev/null +++ b/src/generated/resources/data/toughasnails/tags/worldgen/biome/warm_biomes.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/java/toughasnails/datagen/DataGenerationHandler.java b/src/main/java/toughasnails/datagen/DataGenerationHandler.java index ab0bb2f8..5d13e86a 100644 --- a/src/main/java/toughasnails/datagen/DataGenerationHandler.java +++ b/src/main/java/toughasnails/datagen/DataGenerationHandler.java @@ -14,9 +14,8 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import toughasnails.core.ToughAsNails; -import toughasnails.datagen.provider.TANBlockTagsProvider; -import toughasnails.datagen.provider.TANDamageTypeTagsProvider; -import toughasnails.datagen.provider.TANRecipeProvider; +import toughasnails.datagen.loot.TANLootTableProvider; +import toughasnails.datagen.provider.*; import java.util.Set; @@ -33,13 +32,18 @@ public static void onGatherData(GatherDataEvent event) ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); PackOutput output = generator.getPackOutput(); - generator.addProvider(event.includeServer(), new DatapackBuiltinEntriesProvider(output, event.getLookupProvider(), REG_BUILDER, Set.of(ToughAsNails.MOD_ID))); + var datapackProvider = generator.addProvider(event.includeServer(), new DatapackBuiltinEntriesProvider(output, event.getLookupProvider(), REG_BUILDER, Set.of(ToughAsNails.MOD_ID))); // Recipes generator.addProvider(event.includeServer(), new TANRecipeProvider(output)); + // Loot + generator.addProvider(event.includeServer(), TANLootTableProvider.create(output)); + // Tags - generator.addProvider(event.includeServer(), new TANBlockTagsProvider(output, event.getLookupProvider(), existingFileHelper)); - generator.addProvider(event.includeServer(), new TANDamageTypeTagsProvider(output, event.getLookupProvider(), existingFileHelper)); + var blocksTagProvider = generator.addProvider(event.includeServer(), new TANBlockTagsProvider(output, datapackProvider.getRegistryProvider(), existingFileHelper)); + generator.addProvider(event.includeServer(), new TANItemTagsProvider(output, datapackProvider.getRegistryProvider(), blocksTagProvider.contentsGetter(), existingFileHelper)); + generator.addProvider(event.includeServer(), new TANBiomeTagsProvider(output, datapackProvider.getRegistryProvider(), existingFileHelper)); + generator.addProvider(event.includeServer(), new TANDamageTypeTagsProvider(output, datapackProvider.getRegistryProvider(), existingFileHelper)); } } diff --git a/src/main/java/toughasnails/datagen/ModDamageTypes.java b/src/main/java/toughasnails/datagen/ModDamageTypes.java index 76300c0d..fece10ee 100644 --- a/src/main/java/toughasnails/datagen/ModDamageTypes.java +++ b/src/main/java/toughasnails/datagen/ModDamageTypes.java @@ -7,6 +7,7 @@ import net.minecraft.data.worldgen.BootstapContext; import net.minecraft.world.damagesource.DamageType; import toughasnails.api.damagesource.TANDamageTypes; +import toughasnails.core.ToughAsNails; public class ModDamageTypes { diff --git a/src/main/java/toughasnails/datagen/loot/TANBlockLoot.java b/src/main/java/toughasnails/datagen/loot/TANBlockLoot.java new file mode 100644 index 00000000..37e5f368 --- /dev/null +++ b/src/main/java/toughasnails/datagen/loot/TANBlockLoot.java @@ -0,0 +1,39 @@ +/******************************************************************************* + * Copyright 2023, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.datagen.loot; + +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.data.loot.BlockLootSubProvider; +import net.minecraft.world.flag.FeatureFlags; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import toughasnails.api.block.TANBlocks; +import toughasnails.core.ToughAsNails; + +import java.util.Map; +import java.util.Set; + +public class TANBlockLoot extends BlockLootSubProvider +{ + private static final Set EXPLOSION_RESISTANT = Set.of(); + + public TANBlockLoot() + { + super(EXPLOSION_RESISTANT, FeatureFlags.REGISTRY.allFlags()); + } + + @Override + protected void generate() + { + this.dropSelf(TANBlocks.RAIN_COLLECTOR.get()); + this.dropSelf(TANBlocks.WATER_PURIFIER.get()); + } + + @Override + protected Iterable getKnownBlocks() + { + return BuiltInRegistries.BLOCK.entrySet().stream().filter(e -> e.getKey().location().getNamespace().equals(ToughAsNails.MOD_ID)).map(Map.Entry::getValue).toList(); + } +} diff --git a/src/main/java/toughasnails/datagen/loot/TANLootTableProvider.java b/src/main/java/toughasnails/datagen/loot/TANLootTableProvider.java new file mode 100644 index 00000000..5df00185 --- /dev/null +++ b/src/main/java/toughasnails/datagen/loot/TANLootTableProvider.java @@ -0,0 +1,21 @@ +/******************************************************************************* + * Copyright 2023, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.datagen.loot; + +import net.minecraft.data.PackOutput; +import net.minecraft.data.loot.LootTableProvider; +import net.minecraft.data.loot.packs.VanillaBlockLoot; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; + +import java.util.List; +import java.util.Set; + +public class TANLootTableProvider +{ + public static LootTableProvider create(PackOutput output) + { + return new LootTableProvider(output, Set.of(), List.of(new LootTableProvider.SubProviderEntry(TANBlockLoot::new, LootContextParamSets.BLOCK))); + } +} diff --git a/src/main/java/toughasnails/datagen/provider/TANBiomeTagsProvider.java b/src/main/java/toughasnails/datagen/provider/TANBiomeTagsProvider.java new file mode 100644 index 00000000..730fb5e3 --- /dev/null +++ b/src/main/java/toughasnails/datagen/provider/TANBiomeTagsProvider.java @@ -0,0 +1,40 @@ +/******************************************************************************* + * Copyright 2023, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.datagen.provider; + +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.BiomeTagsProvider; +import net.minecraft.world.level.biome.Biomes; +import net.minecraft.world.level.block.Blocks; +import net.minecraftforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.Nullable; +import toughasnails.core.ToughAsNails; +import toughasnails.init.ModTags; + +import java.util.concurrent.CompletableFuture; + +public class TANBiomeTagsProvider extends BiomeTagsProvider +{ + public TANBiomeTagsProvider(PackOutput output, CompletableFuture lookupProvider, @Nullable ExistingFileHelper existingFileHelper) + { + super(output, lookupProvider, ToughAsNails.MOD_ID, existingFileHelper); + } + + @Override + protected void addTags(HolderLookup.Provider provider) + { + // Temperature tags + this.tag(ModTags.Biomes.ICY_BIOMES); + this.tag(ModTags.Biomes.COLD_BIOMES); + this.tag(ModTags.Biomes.NEUTRAL_BIOMES); + this.tag(ModTags.Biomes.WARM_BIOMES); + this.tag(ModTags.Biomes.HOT_BIOMES); + + // Water purity tags + this.tag(ModTags.Biomes.DIRTY_WATER_BIOMES).add(Biomes.MANGROVE_SWAMP, Biomes.MUSHROOM_FIELDS, Biomes.SWAMP); + this.tag(ModTags.Biomes.PURIFIED_WATER_BIOMES); + } +} diff --git a/src/main/java/toughasnails/datagen/provider/TANItemTagsProvider.java b/src/main/java/toughasnails/datagen/provider/TANItemTagsProvider.java new file mode 100644 index 00000000..7e1dfb66 --- /dev/null +++ b/src/main/java/toughasnails/datagen/provider/TANItemTagsProvider.java @@ -0,0 +1,102 @@ +/******************************************************************************* + * Copyright 2023, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.datagen.provider; + +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.ItemTagsProvider; +import net.minecraft.data.tags.TagsProvider; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.Nullable; +import toughasnails.api.item.TANItems; +import toughasnails.core.ToughAsNails; +import toughasnails.init.ModItems; +import toughasnails.init.ModTags; + +import java.util.concurrent.CompletableFuture; + +public class TANItemTagsProvider extends ItemTagsProvider +{ + public TANItemTagsProvider(PackOutput output, CompletableFuture lookupProvider, CompletableFuture> blockLookup, @Nullable ExistingFileHelper existingFileHelper) + { + super(output, lookupProvider, blockLookup, ToughAsNails.MOD_ID, existingFileHelper); + } + + @Override + protected void addTags(HolderLookup.Provider provider) + { + // Temperature armor + this.tag(ModTags.Items.COOLING_ARMOR).add(TANItems.LEAF_HELMET.get(), TANItems.LEAF_CHESTPLATE.get(), TANItems.LEAF_LEGGINGS.get(), TANItems.LEAF_BOOTS.get()); + this.tag(ModTags.Items.HEATING_ARMOR).add(TANItems.WOOL_HELMET.get(), TANItems.WOOL_CHESTPLATE.get(), TANItems.WOOL_LEGGINGS.get(), TANItems.WOOL_BOOTS.get()); + + // Temperature items + this.tag(ModTags.Items.COOLING_ITEMS).add(Items.POWDER_SNOW_BUCKET); + this.tag(ModTags.Items.HEATING_ITEMS).add(Items.LAVA_BUCKET); + + // Drinks + this.tag(ModTags.Items.DRINKS).addTags( + ModTags.Items.ONE_THIRST_DRINKS, + ModTags.Items.TWO_THIRST_DRINKS, + ModTags.Items.THREE_THIRST_DRINKS, + ModTags.Items.FOUR_THIRST_DRINKS, + ModTags.Items.FIVE_THIRST_DRINKS, + ModTags.Items.SIX_THIRST_DRINKS, + ModTags.Items.SEVEN_THIRST_DRINKS, + ModTags.Items.EIGHT_THIRST_DRINKS, + ModTags.Items.NINE_THIRST_DRINKS, + ModTags.Items.TEN_THIRST_DRINKS, + ModTags.Items.ELEVEN_THIRST_DRINKS, + ModTags.Items.TWELVE_THIRST_DRINKS, + ModTags.Items.THIRTEEN_THIRST_DRINKS, + ModTags.Items.FOURTEEN_THIRST_DRINKS, + ModTags.Items.FIFTEEN_THIRST_DRINKS, + ModTags.Items.SIXTEEN_THIRST_DRINKS, + ModTags.Items.SEVENTEEN_THIRST_DRINKS, + ModTags.Items.EIGHTEEN_THIRST_DRINKS, + ModTags.Items.NINETEEN_THIRST_DRINKS, + ModTags.Items.TWENTY_THIRST_DRINKS + ); + this.tag(ModTags.Items.ONE_THIRST_DRINKS).add(TANItems.DIRTY_WATER_BOTTLE.get(), TANItems.DIRTY_WATER_CANTEEN.get()); + this.tag(ModTags.Items.TWO_THIRST_DRINKS).add(Items.MILK_BUCKET); + this.tag(ModTags.Items.THREE_THIRST_DRINKS).add(Items.POTION, TANItems.WATER_CANTEEN.get()); + this.tag(ModTags.Items.FOUR_THIRST_DRINKS); + this.tag(ModTags.Items.FIVE_THIRST_DRINKS).add(TANItems.PURIFIED_WATER_BOTTLE.get(), TANItems.PURIFIED_WATER_CANTEEN.get()); + this.tag(ModTags.Items.SIX_THIRST_DRINKS).add(TANItems.GLOW_BERRY_JUICE.get(), TANItems.PUMPKIN_JUICE.get(), TANItems.SWEET_BERRY_JUICE.get()); + this.tag(ModTags.Items.SEVEN_THIRST_DRINKS).add(TANItems.CACTUS_JUICE.get(), TANItems.MELON_JUICE.get()); + this.tag(ModTags.Items.EIGHT_THIRST_DRINKS).add(TANItems.APPLE_JUICE.get()); + this.tag(ModTags.Items.NINE_THIRST_DRINKS); + this.tag(ModTags.Items.TEN_THIRST_DRINKS).add(TANItems.CHORUS_FRUIT_JUICE.get()); + this.tag(ModTags.Items.ELEVEN_THIRST_DRINKS); + this.tag(ModTags.Items.TWELVE_THIRST_DRINKS); + this.tag(ModTags.Items.THIRTEEN_THIRST_DRINKS); + this.tag(ModTags.Items.FOURTEEN_THIRST_DRINKS); + this.tag(ModTags.Items.FIFTEEN_THIRST_DRINKS); + this.tag(ModTags.Items.SIXTEEN_THIRST_DRINKS); + this.tag(ModTags.Items.SEVENTEEN_THIRST_DRINKS); + this.tag(ModTags.Items.EIGHTEEN_THIRST_DRINKS); + this.tag(ModTags.Items.NINETEEN_THIRST_DRINKS); + this.tag(ModTags.Items.TWENTY_THIRST_DRINKS); + + // Poison chance + this.tag(ModTags.Items.TWENTY_FIVE_POISON_CHANCE_DRINKS).add(Items.POTION, TANItems.WATER_CANTEEN.get()); + this.tag(ModTags.Items.FIFTY_POISON_CHANCE_DRINKS); + this.tag(ModTags.Items.SEVENTY_FIVE_POISON_CHANCE_DRINKS).add(TANItems.DIRTY_WATER_BOTTLE.get(), TANItems.DIRTY_WATER_CANTEEN.get()); + this.tag(ModTags.Items.ONE_HUNDRED_POISON_CHANCE_DRINKS); + + // Hydration + this.tag(ModTags.Items.TEN_HYDRATION_DRINKS).add(TANItems.DIRTY_WATER_BOTTLE.get(), TANItems.DIRTY_WATER_CANTEEN.get(), TANItems.GLOW_BERRY_JUICE.get(), TANItems.SWEET_BERRY_JUICE.get()); + this.tag(ModTags.Items.TWENTY_HYDRATION_DRINKS).add(Items.POTION, TANItems.WATER_CANTEEN.get(), TANItems.CHORUS_FRUIT_JUICE.get()); + this.tag(ModTags.Items.THIRTY_HYDRATION_DRINKS).add(Items.MILK_BUCKET, TANItems.PUMPKIN_JUICE.get()); + this.tag(ModTags.Items.FOURTY_HYDRATION_DRINKS); + this.tag(ModTags.Items.FIFTY_HYDRATION_DRINKS).add(TANItems.PURIFIED_WATER_BOTTLE.get(), TANItems.PURIFIED_WATER_CANTEEN.get()); + this.tag(ModTags.Items.SIXTY_HYDRATION_DRINKS).add(TANItems.APPLE_JUICE.get(), TANItems.MELON_JUICE.get()); + this.tag(ModTags.Items.SEVENTY_HYDRATION_DRINKS); + this.tag(ModTags.Items.EIGHTY_HYDRATION_DRINKS).add(TANItems.CACTUS_JUICE.get()); + this.tag(ModTags.Items.NINETY_HYDRATION_DRINKS); + this.tag(ModTags.Items.ONE_HUNDRED_HYDRATION_DRINKS); + } +} diff --git a/src/main/java/toughasnails/datagen/provider/TANRecipeProvider.java b/src/main/java/toughasnails/datagen/provider/TANRecipeProvider.java index 88991a2f..6720b848 100644 --- a/src/main/java/toughasnails/datagen/provider/TANRecipeProvider.java +++ b/src/main/java/toughasnails/datagen/provider/TANRecipeProvider.java @@ -1,13 +1,17 @@ package toughasnails.datagen.provider; import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.RecipeOutput; -import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.data.recipes.*; import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ItemTags; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.alchemy.PotionUtils; import net.minecraft.world.item.alchemy.Potions; +import net.minecraft.world.level.block.Blocks; +import toughasnails.api.block.TANBlocks; import toughasnails.api.item.TANItems; import toughasnails.core.ToughAsNails; import toughasnails.datagen.recipes.WaterPurifierRecipeBuilder; @@ -22,6 +26,37 @@ public TANRecipeProvider(PackOutput output) @Override protected void buildRecipes(RecipeOutput output) { + // Canteen + ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, TANItems.EMPTY_CANTEEN.get()).define('#', Items.LEATHER).pattern(" # ").pattern("# #").pattern(" # ").unlockedBy("has_leather", has(Items.LEATHER)).save(output); + + // Juice + ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, TANItems.APPLE_JUICE.get()).requires(TANItems.PURIFIED_WATER_BOTTLE.get()).requires(Items.SUGAR).requires(Items.APPLE).group("juice").unlockedBy("has_apple", has(Items.APPLE)).save(output); + ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, TANItems.CACTUS_JUICE.get()).requires(TANItems.PURIFIED_WATER_BOTTLE.get()).requires(Items.SUGAR).requires(Items.CACTUS).group("juice").unlockedBy("has_cactus", has(Items.CACTUS)).save(output); + ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, TANItems.CHORUS_FRUIT_JUICE.get()).requires(TANItems.PURIFIED_WATER_BOTTLE.get()).requires(Items.SUGAR).requires(Items.CHORUS_FRUIT).group("juice").unlockedBy("has_chorus_fruit", has(Items.CHORUS_FRUIT)).save(output); + ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, TANItems.GLOW_BERRY_JUICE.get()).requires(TANItems.PURIFIED_WATER_BOTTLE.get()).requires(Items.SUGAR).requires(Items.GLOW_BERRIES).group("juice").unlockedBy("has_glow_berries", has(Items.GLOW_BERRIES)).save(output); + ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, TANItems.MELON_JUICE.get()).requires(TANItems.PURIFIED_WATER_BOTTLE.get()).requires(Items.SUGAR).requires(Items.MELON_SLICE).group("juice").unlockedBy("has_melon_slice", has(Items.MELON_SLICE)).save(output); + ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, TANItems.PUMPKIN_JUICE.get()).requires(TANItems.PURIFIED_WATER_BOTTLE.get()).requires(Items.SUGAR).requires(Items.PUMPKIN).group("juice").unlockedBy("has_pumpkin", has(Items.PUMPKIN)).save(output); + ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, TANItems.SWEET_BERRY_JUICE.get()).requires(TANItems.PURIFIED_WATER_BOTTLE.get()).requires(Items.SUGAR).requires(Items.SWEET_BERRIES).group("juice").unlockedBy("has_sweet_berries", has(Items.SWEET_BERRIES)).save(output); + + // Blocks + ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, TANBlocks.RAIN_COLLECTOR.get()).define('S', Items.STRING).define('I', Items.IRON_INGOT).define('B', Items.BARREL).pattern("ISI").pattern("IBI").unlockedBy("has_barrel", has(Items.BARREL)).save(output); + ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, TANBlocks.WATER_PURIFIER.get()).define('W', ItemTags.PLANKS).define('S', ItemTags.SAND).define('C', Items.CHARCOAL).define('G', Items.GLASS).pattern("WSW").pattern("GCG").pattern("GGG").unlockedBy("has_charcoal", has(Items.CHARCOAL)).save(output); + + // Armor + ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, TANItems.LEAF_BOOTS.get()).define('X', ItemTags.LEAVES).pattern("X X").pattern("X X").unlockedBy("has_leaves", has(ItemTags.LEAVES)).save(output); + ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, TANItems.LEAF_CHESTPLATE.get()).define('X', ItemTags.LEAVES).pattern("X X").pattern("XXX").pattern("XXX").unlockedBy("has_leaves", has(ItemTags.LEAVES)).save(output); + ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, TANItems.LEAF_HELMET.get()).define('X', ItemTags.LEAVES).pattern("XXX").pattern("X X").unlockedBy("has_leaves", has(ItemTags.LEAVES)).save(output); + ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, TANItems.LEAF_LEGGINGS.get()).define('X', ItemTags.LEAVES).pattern("XXX").pattern("X X").pattern("X X").unlockedBy("has_leaves", has(ItemTags.LEAVES)).save(output); + + ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, TANItems.WOOL_BOOTS.get()).define('X', ItemTags.WOOL).pattern("X X").pattern("X X").unlockedBy("has_wool", has(ItemTags.WOOL)).save(output); + ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, TANItems.WOOL_CHESTPLATE.get()).define('X', ItemTags.WOOL).pattern("X X").pattern("XXX").pattern("XXX").unlockedBy("has_wool", has(ItemTags.WOOL)).save(output); + ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, TANItems.WOOL_HELMET.get()).define('X', ItemTags.WOOL).pattern("XXX").pattern("X X").unlockedBy("has_wool", has(ItemTags.WOOL)).save(output); + ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, TANItems.WOOL_LEGGINGS.get()).define('X', ItemTags.WOOL).pattern("XXX").pattern("X X").pattern("X X").unlockedBy("has_wool", has(ItemTags.WOOL)).save(output); + + // + // Water purification recipes + // + // Water bottle waterPurifier(output, new ItemStack(TANItems.DIRTY_WATER_BOTTLE.get()), PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER), 400); waterPurifier(output, PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER), new ItemStack(TANItems.PURIFIED_WATER_BOTTLE.get()), 200); diff --git a/src/main/resources/data/toughasnails/tags/items/cooling_armor.json b/src/main/resources/data/toughasnails/tags/items/cooling_armor.json deleted file mode 100644 index 35b962b3..00000000 --- a/src/main/resources/data/toughasnails/tags/items/cooling_armor.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "toughasnails:leaf_helmet", - "toughasnails:leaf_chestplate", - "toughasnails:leaf_leggings", - "toughasnails:leaf_boots" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/cooling_items.json b/src/main/resources/data/toughasnails/tags/items/cooling_items.json deleted file mode 100644 index e980af29..00000000 --- a/src/main/resources/data/toughasnails/tags/items/cooling_items.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:powder_snow_bucket" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/drinks.json b/src/main/resources/data/toughasnails/tags/items/drinks.json deleted file mode 100644 index 712e4713..00000000 --- a/src/main/resources/data/toughasnails/tags/items/drinks.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "replace": false, - "values": [ - "#toughasnails:thirst/1_thirst_drinks", - "#toughasnails:thirst/2_thirst_drinks", - "#toughasnails:thirst/3_thirst_drinks", - "#toughasnails:thirst/4_thirst_drinks", - "#toughasnails:thirst/5_thirst_drinks", - "#toughasnails:thirst/6_thirst_drinks", - "#toughasnails:thirst/7_thirst_drinks", - "#toughasnails:thirst/8_thirst_drinks", - "#toughasnails:thirst/9_thirst_drinks", - "#toughasnails:thirst/10_thirst_drinks", - "#toughasnails:thirst/11_thirst_drinks", - "#toughasnails:thirst/12_thirst_drinks", - "#toughasnails:thirst/13_thirst_drinks", - "#toughasnails:thirst/14_thirst_drinks", - "#toughasnails:thirst/15_thirst_drinks", - "#toughasnails:thirst/16_thirst_drinks", - "#toughasnails:thirst/17_thirst_drinks", - "#toughasnails:thirst/18_thirst_drinks", - "#toughasnails:thirst/19_thirst_drinks", - "#toughasnails:thirst/20_thirst_drinks" - ] -} diff --git a/src/main/resources/data/toughasnails/tags/items/heating_armor.json b/src/main/resources/data/toughasnails/tags/items/heating_armor.json deleted file mode 100644 index 4f41b46b..00000000 --- a/src/main/resources/data/toughasnails/tags/items/heating_armor.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "toughasnails:wool_helmet", - "toughasnails:wool_chestplate", - "toughasnails:wool_leggings", - "toughasnails:wool_boots" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/heating_items.json b/src/main/resources/data/toughasnails/tags/items/heating_items.json deleted file mode 100644 index b776e7b8..00000000 --- a/src/main/resources/data/toughasnails/tags/items/heating_items.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:lava_bucket" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/hydration/100_hydration_drinks.json b/src/main/resources/data/toughasnails/tags/items/hydration/100_hydration_drinks.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/items/hydration/100_hydration_drinks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/hydration/10_hydration_drinks.json b/src/main/resources/data/toughasnails/tags/items/hydration/10_hydration_drinks.json deleted file mode 100644 index 6c9e8296..00000000 --- a/src/main/resources/data/toughasnails/tags/items/hydration/10_hydration_drinks.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "toughasnails:dirty_water_bottle", - "toughasnails:dirty_water_canteen", - "toughasnails:glow_berry_juice", - "toughasnails:sweet_berry_juice" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/hydration/20_hydration_drinks.json b/src/main/resources/data/toughasnails/tags/items/hydration/20_hydration_drinks.json deleted file mode 100644 index 3c619729..00000000 --- a/src/main/resources/data/toughasnails/tags/items/hydration/20_hydration_drinks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:potion", - "toughasnails:water_canteen", - "toughasnails:chorus_fruit_juice" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/hydration/30_hydration_drinks.json b/src/main/resources/data/toughasnails/tags/items/hydration/30_hydration_drinks.json deleted file mode 100644 index f78d5c0b..00000000 --- a/src/main/resources/data/toughasnails/tags/items/hydration/30_hydration_drinks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:milk_bucket", - "toughasnails:pumpkin_juice" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/hydration/40_hydration_drinks.json b/src/main/resources/data/toughasnails/tags/items/hydration/40_hydration_drinks.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/items/hydration/40_hydration_drinks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/hydration/60_hydration_drinks.json b/src/main/resources/data/toughasnails/tags/items/hydration/60_hydration_drinks.json deleted file mode 100644 index d11cd27e..00000000 --- a/src/main/resources/data/toughasnails/tags/items/hydration/60_hydration_drinks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "toughasnails:apple_juice", - "toughasnails:melon_juice" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/hydration/70_hydration_drinks.json b/src/main/resources/data/toughasnails/tags/items/hydration/70_hydration_drinks.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/items/hydration/70_hydration_drinks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/hydration/80_hydration_drinks.json b/src/main/resources/data/toughasnails/tags/items/hydration/80_hydration_drinks.json deleted file mode 100644 index 1e887d81..00000000 --- a/src/main/resources/data/toughasnails/tags/items/hydration/80_hydration_drinks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "toughasnails:cactus_juice" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/hydration/90_hydration_drinks.json b/src/main/resources/data/toughasnails/tags/items/hydration/90_hydration_drinks.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/items/hydration/90_hydration_drinks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/poison_chance/100_poison_chance_drinks.json b/src/main/resources/data/toughasnails/tags/items/poison_chance/100_poison_chance_drinks.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/items/poison_chance/100_poison_chance_drinks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/poison_chance/25_poison_chance_drinks.json b/src/main/resources/data/toughasnails/tags/items/poison_chance/25_poison_chance_drinks.json deleted file mode 100644 index daa0aef2..00000000 --- a/src/main/resources/data/toughasnails/tags/items/poison_chance/25_poison_chance_drinks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:potion", - "toughasnails:water_canteen" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/poison_chance/50_poison_chance_drinks.json b/src/main/resources/data/toughasnails/tags/items/poison_chance/50_poison_chance_drinks.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/items/poison_chance/50_poison_chance_drinks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/thirst/10_thirst_drinks.json b/src/main/resources/data/toughasnails/tags/items/thirst/10_thirst_drinks.json deleted file mode 100644 index 1babdda2..00000000 --- a/src/main/resources/data/toughasnails/tags/items/thirst/10_thirst_drinks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "toughasnails:chorus_fruit_juice" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/thirst/11_thirst_drinks.json b/src/main/resources/data/toughasnails/tags/items/thirst/11_thirst_drinks.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/items/thirst/11_thirst_drinks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/thirst/12_thirst_drinks.json b/src/main/resources/data/toughasnails/tags/items/thirst/12_thirst_drinks.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/items/thirst/12_thirst_drinks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/thirst/13_thirst_drinks.json b/src/main/resources/data/toughasnails/tags/items/thirst/13_thirst_drinks.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/items/thirst/13_thirst_drinks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/thirst/14_thirst_drinks.json b/src/main/resources/data/toughasnails/tags/items/thirst/14_thirst_drinks.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/items/thirst/14_thirst_drinks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/thirst/15_thirst_drinks.json b/src/main/resources/data/toughasnails/tags/items/thirst/15_thirst_drinks.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/items/thirst/15_thirst_drinks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/thirst/16_thirst_drinks.json b/src/main/resources/data/toughasnails/tags/items/thirst/16_thirst_drinks.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/items/thirst/16_thirst_drinks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/thirst/17_thirst_drinks.json b/src/main/resources/data/toughasnails/tags/items/thirst/17_thirst_drinks.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/items/thirst/17_thirst_drinks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/thirst/18_thirst_drinks.json b/src/main/resources/data/toughasnails/tags/items/thirst/18_thirst_drinks.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/items/thirst/18_thirst_drinks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/thirst/19_thirst_drinks.json b/src/main/resources/data/toughasnails/tags/items/thirst/19_thirst_drinks.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/items/thirst/19_thirst_drinks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/thirst/20_thirst_drinks.json b/src/main/resources/data/toughasnails/tags/items/thirst/20_thirst_drinks.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/items/thirst/20_thirst_drinks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/thirst/2_thirst_drinks.json b/src/main/resources/data/toughasnails/tags/items/thirst/2_thirst_drinks.json deleted file mode 100644 index 26c1d9e7..00000000 --- a/src/main/resources/data/toughasnails/tags/items/thirst/2_thirst_drinks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:milk_bucket" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/thirst/3_thirst_drinks.json b/src/main/resources/data/toughasnails/tags/items/thirst/3_thirst_drinks.json deleted file mode 100644 index 90f9d0a7..00000000 --- a/src/main/resources/data/toughasnails/tags/items/thirst/3_thirst_drinks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:potion", - "toughasnails:water_canteen" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/thirst/4_thirst_drinks.json b/src/main/resources/data/toughasnails/tags/items/thirst/4_thirst_drinks.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/items/thirst/4_thirst_drinks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/thirst/6_thirst_drinks.json b/src/main/resources/data/toughasnails/tags/items/thirst/6_thirst_drinks.json deleted file mode 100644 index 9d55b23f..00000000 --- a/src/main/resources/data/toughasnails/tags/items/thirst/6_thirst_drinks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "toughasnails:glow_berry_juice", - "toughasnails:pumpkin_juice", - "toughasnails:sweet_berry_juice" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/thirst/7_thirst_drinks.json b/src/main/resources/data/toughasnails/tags/items/thirst/7_thirst_drinks.json deleted file mode 100644 index 0660adeb..00000000 --- a/src/main/resources/data/toughasnails/tags/items/thirst/7_thirst_drinks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "toughasnails:cactus_juice", - "toughasnails:melon_juice" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/thirst/8_thirst_drinks.json b/src/main/resources/data/toughasnails/tags/items/thirst/8_thirst_drinks.json deleted file mode 100644 index aeb9a836..00000000 --- a/src/main/resources/data/toughasnails/tags/items/thirst/8_thirst_drinks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "toughasnails:apple_juice" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/items/thirst/9_thirst_drinks.json b/src/main/resources/data/toughasnails/tags/items/thirst/9_thirst_drinks.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/items/thirst/9_thirst_drinks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/worldgen/biome/cold_biomes.json b/src/main/resources/data/toughasnails/tags/worldgen/biome/cold_biomes.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/worldgen/biome/cold_biomes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/worldgen/biome/dirty_water_biomes.json b/src/main/resources/data/toughasnails/tags/worldgen/biome/dirty_water_biomes.json deleted file mode 100644 index e0b6eefd..00000000 --- a/src/main/resources/data/toughasnails/tags/worldgen/biome/dirty_water_biomes.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "values": [ - "minecraft:mangrove_swamp", - "minecraft:mushroom_fields", - "minecraft:swamp" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/worldgen/biome/hot_biomes.json b/src/main/resources/data/toughasnails/tags/worldgen/biome/hot_biomes.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/worldgen/biome/hot_biomes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/worldgen/biome/icy_biomes.json b/src/main/resources/data/toughasnails/tags/worldgen/biome/icy_biomes.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/worldgen/biome/icy_biomes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/worldgen/biome/neutral_biomes.json b/src/main/resources/data/toughasnails/tags/worldgen/biome/neutral_biomes.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/worldgen/biome/neutral_biomes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/worldgen/biome/purified_water_biomes.json b/src/main/resources/data/toughasnails/tags/worldgen/biome/purified_water_biomes.json deleted file mode 100644 index d6649e77..00000000 --- a/src/main/resources/data/toughasnails/tags/worldgen/biome/purified_water_biomes.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "values": [ - ] -} \ No newline at end of file diff --git a/src/main/resources/data/toughasnails/tags/worldgen/biome/warm_biomes.json b/src/main/resources/data/toughasnails/tags/worldgen/biome/warm_biomes.json deleted file mode 100644 index a22514f6..00000000 --- a/src/main/resources/data/toughasnails/tags/worldgen/biome/warm_biomes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file