From 56e91629b1114255c39de9752787c19598b04c39 Mon Sep 17 00:00:00 2001 From: Sollace Date: Fri, 5 Apr 2024 15:07:07 +0100 Subject: [PATCH] Fix some tag references and fix diets not loading --- .../unicopia/diet/DietsLoader.java | 4 ++-- .../unicopia/tags/items/groups/foraging.json | 22 +++++++++---------- .../unicopia/tags/items/groups/sea_pony.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/diet/DietsLoader.java b/src/main/java/com/minelittlepony/unicopia/diet/DietsLoader.java index 7da493ea..0c4eb7f5 100644 --- a/src/main/java/com/minelittlepony/unicopia/diet/DietsLoader.java +++ b/src/main/java/com/minelittlepony/unicopia/diet/DietsLoader.java @@ -35,7 +35,7 @@ public class DietsLoader implements IdentifiableResourceReloadListener { CompletableFuture> foodGroupsFuture = CompletableFuture.supplyAsync(() -> { Map foodGroups = new HashMap<>(); - for (var group : loadData(manager, prepareExecutor, "diets/food_groups").entrySet()) { + for (var group : loadData(manager, prepareExecutor, "diet/food_groups").entrySet()) { try { FoodGroup.CODEC.parse(JsonOps.INSTANCE, group.getValue()) .resultOrPartial(error -> LOGGER.error("Could not load food group {}: {}", group.getKey(), error)) @@ -50,7 +50,7 @@ public class DietsLoader implements IdentifiableResourceReloadListener { }, prepareExecutor); CompletableFuture> profilesFuture = CompletableFuture.supplyAsync(() -> { Map profiles = new HashMap<>(); - for (var entry : loadData(manager, prepareExecutor, "diets/races").entrySet()) { + for (var entry : loadData(manager, prepareExecutor, "diet/races").entrySet()) { Identifier id = entry.getKey(); try { Race.REGISTRY.getOrEmpty(id).ifPresentOrElse(race -> { diff --git a/src/main/resources/data/unicopia/tags/items/groups/foraging.json b/src/main/resources/data/unicopia/tags/items/groups/foraging.json index f50de618..92eb5eee 100644 --- a/src/main/resources/data/unicopia/tags/items/groups/foraging.json +++ b/src/main/resources/data/unicopia/tags/items/groups/foraging.json @@ -1,16 +1,16 @@ { "replace": false, "values": [ - "#unicopia:food_types/forage_dangerous", - "#unicopia:food_types/forage_edible_filling", - "#unicopia:food_types/forage_edible", - "#unicopia:food_types/forage_nauseating", - "#unicopia:food_types/forage_blinding", - "#unicopia:food_types/forage_prickly", - "#unicopia:food_types/forage_radioactive", - "#unicopia:food_types/forage_risky", - "#unicopia:food_types/forage_severely_nauseating", - "#unicopia:food_types/forage_severely_prickly", - "#unicopia:food_types/forage_strengthening" + "#unicopia:forage/dangerous", + "#unicopia:forage/filling", + "#unicopia:forage/safe", + "#unicopia:forage/nauseating", + "#unicopia:forage/blinding", + "#unicopia:forage/prickly", + "#unicopia:forage/glowing", + "#unicopia:forage/risky", + "#unicopia:forage/severe/nauseating", + "#unicopia:forage/severe/prickly", + "#unicopia:forage/strenghtening" ] } diff --git a/src/main/resources/data/unicopia/tags/items/groups/sea_pony.json b/src/main/resources/data/unicopia/tags/items/groups/sea_pony.json index 5d2c981b..9aeefc68 100644 --- a/src/main/resources/data/unicopia/tags/items/groups/sea_pony.json +++ b/src/main/resources/data/unicopia/tags/items/groups/sea_pony.json @@ -4,7 +4,7 @@ "unicopia:pearl_necklace", "#unicopia:shells", "#unicopia:special_shells", - "#unicopia:food_types/raw_sea_vegitable", - "#unicopia:food_types/cooked_sea_vegitable" + "#unicopia:food_types/low_quality_sea_vegetables", + "#unicopia:food_types/high_quality_sea_vegetables" ] }