diff --git a/src/main/java/com/minelittlepony/unicopia/UTags.java b/src/main/java/com/minelittlepony/unicopia/UTags.java index cee89cf2..e8c3a65f 100644 --- a/src/main/java/com/minelittlepony/unicopia/UTags.java +++ b/src/main/java/com/minelittlepony/unicopia/UTags.java @@ -22,6 +22,8 @@ public interface UTags { TagKey POLEARMS = item("polearms"); TagKey APPLE_SEEDS = item("apple_seeds"); + TagKey ACORNS = item("acorns"); + TagKey GLASS_PANES = block("glass_panes"); TagKey GLASS_BLOCKS = block("glass_blocks"); TagKey FRAGILE = block("fragile"); diff --git a/src/main/java/com/minelittlepony/unicopia/ability/data/tree/TreeTypeLoader.java b/src/main/java/com/minelittlepony/unicopia/ability/data/tree/TreeTypeLoader.java index d7937e76..032b6ad5 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/data/tree/TreeTypeLoader.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/data/tree/TreeTypeLoader.java @@ -4,6 +4,8 @@ import java.util.*; import java.util.function.Supplier; import java.util.stream.Collectors; +import org.jetbrains.annotations.Nullable; + import com.google.gson.JsonElement; import com.google.gson.JsonParseException; import com.minelittlepony.unicopia.Unicopia; @@ -11,6 +13,7 @@ import com.minelittlepony.unicopia.util.Resources; import com.minelittlepony.unicopia.util.Weighted; import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketByteBuf; import net.minecraft.resource.JsonDataLoader; @@ -18,6 +21,9 @@ import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; import net.minecraft.util.profiler.Profiler; import net.minecraft.registry.Registries; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.registry.tag.TagKey; public class TreeTypeLoader extends JsonDataLoader implements IdentifiableResourceReloadListener { private static final Identifier ID = Unicopia.id("data/tree_type"); @@ -73,7 +79,7 @@ public class TreeTypeLoader extends JsonDataLoader implements IdentifiableResour wideTrunk, Objects.requireNonNull(logs, "TreeType must have logs"), Objects.requireNonNull(leaves, "TreeType must have leaves"), - Weighted.of(weighted -> drops.forEach(drop -> drop.appendDrop(weighted))), + Weighted.of(drops), rarity ); } @@ -86,24 +92,38 @@ public class TreeTypeLoader extends JsonDataLoader implements IdentifiableResour buffer.writeInt(rarity); } - static class Drop { + static class Drop implements Weighted.Buildable> { final int weight; - final Identifier item; + final @Nullable Identifier tag; + final @Nullable Identifier item; public Drop(PacketByteBuf buffer) { weight = buffer.readInt(); - item = buffer.readIdentifier(); + tag = buffer.readOptional(PacketByteBuf::readIdentifier).orElse(null); + item = buffer.readOptional(PacketByteBuf::readIdentifier).orElse(null); } - void appendDrop(Weighted.Builder> weighted) { - Registries.ITEM.getOrEmpty(item).ifPresent(item -> { - weighted.put(weight, item::getDefaultStack); - }); + @Override + public void appendTo(Weighted.Builder> weighted) { + if (item != null) { + Registries.ITEM.getOrEmpty(item).ifPresent(item -> { + weighted.put(weight, item::getDefaultStack); + }); + } else { + weighted.put(weight, () -> { + return Registries.ITEM.getOrCreateEntryList(TagKey.of(RegistryKeys.ITEM, tag)) + .getRandom(Weighted.getRng()) + .map(RegistryEntry::value) + .map(Item::getDefaultStack) + .orElse(ItemStack.EMPTY); + }); + } } public void write(PacketByteBuf buffer) { buffer.writeInt(weight); - buffer.writeIdentifier(item); + buffer.writeOptional(Optional.ofNullable(tag), PacketByteBuf::writeIdentifier); + buffer.writeOptional(Optional.ofNullable(item), PacketByteBuf::writeIdentifier); } } } diff --git a/src/main/java/com/minelittlepony/unicopia/util/Weighted.java b/src/main/java/com/minelittlepony/unicopia/util/Weighted.java index 398c06a2..693fd405 100644 --- a/src/main/java/com/minelittlepony/unicopia/util/Weighted.java +++ b/src/main/java/com/minelittlepony/unicopia/util/Weighted.java @@ -7,6 +7,7 @@ import java.util.function.Supplier; import org.jetbrains.annotations.NotNull; import net.minecraft.util.Pair; +import net.minecraft.util.math.random.Random; public final class Weighted { private static final Supplier> EMPTY = Optional::empty; @@ -22,8 +23,16 @@ public final class Weighted { return result.build(); } + public static Supplier> of(Collection> entries) { + return of(builder -> entries.forEach(entry -> entry.appendTo(builder))); + } + + public static Random getRng() { + return Builder.RANDOM; + } + public final static class Builder { - private static final Random RANDOM = new Random(); + public static final Random RANDOM = Random.create(); private float totalWeight = 0; @@ -83,4 +92,8 @@ public final class Weighted { } } } + + public interface Buildable { + void appendTo(Weighted.Builder weighted); + } } diff --git a/src/main/resources/data/c/tags/blocks/glass_blocks.json b/src/main/resources/data/c/tags/blocks/glass_blocks.json new file mode 100644 index 00000000..f55e9719 --- /dev/null +++ b/src/main/resources/data/c/tags/blocks/glass_blocks.json @@ -0,0 +1,24 @@ +{ + "replace": false, + "values": [ + "minecraft:glass", + "minecraft:white_stained_glass", + "minecraft:orange_stained_glass", + "minecraft:magenta_stained_glass", + "minecraft:light_blue_stained_glass", + "minecraft:yellow_stained_glass", + "minecraft:lime_stained_glass", + "minecraft:pink_stained_glass", + "minecraft:gray_stained_glass", + "minecraft:light_gray_stained_glass", + "minecraft:cyan_stained_glass", + "minecraft:purple_stained_glass", + "minecraft:blue_stained_glass", + "minecraft:brown_stained_glass", + "minecraft:green_stained_glass", + "minecraft:red_stained_glass", + "minecraft:black_stained_glass", + { "id": "#c:glass", "required": false }, + { "id": "#c:glass_blocks", "required": false } + ] +} diff --git a/src/main/resources/data/c/tags/blocks/glass_panes.json b/src/main/resources/data/c/tags/blocks/glass_panes.json new file mode 100644 index 00000000..ff9176f7 --- /dev/null +++ b/src/main/resources/data/c/tags/blocks/glass_panes.json @@ -0,0 +1,22 @@ +{ + "replace": false, + "values": [ + "minecraft:glass_pane", + "minecraft:white_stained_glass_pane", + "minecraft:orange_stained_glass_pane", + "minecraft:magenta_stained_glass_pane", + "minecraft:light_blue_stained_glass_pane", + "minecraft:yellow_stained_glass_pane", + "minecraft:lime_stained_glass_pane", + "minecraft:pink_stained_glass_pane", + "minecraft:gray_stained_glass_pane", + "minecraft:light_gray_stained_glass_pane", + "minecraft:cyan_stained_glass_pane", + "minecraft:purple_stained_glass_pane", + "minecraft:blue_stained_glass_pane", + "minecraft:brown_stained_glass_pane", + "minecraft:green_stained_glass_pane", + "minecraft:red_stained_glass_pane", + "minecraft:black_stained_glass_pane" + ] +} diff --git a/src/main/resources/data/c/tags/blocks/ores.json b/src/main/resources/data/c/tags/blocks/ores.json new file mode 100644 index 00000000..1a53e7a3 --- /dev/null +++ b/src/main/resources/data/c/tags/blocks/ores.json @@ -0,0 +1,78 @@ +{ + "replace": false, + "values": [ + "minecraft:coal_ore", + "minecraft:iron_ore", + "minecraft:gold_ore", + "minecraft:emerald_ore", + "minecraft:lapis_ore", + "minecraft:copper_ore", + "minecraft:diamond_ore", + "minecraft:nether_gold_ore", + "minecraft:nether_quartz_ore", + { "id": "#c:iron_ores", "required": false }, + { "id": "#c:gold_ores", "required": false }, + { "id": "#c:diamond_ores", "required": false }, + { "id": "#c:emerald_ores", "required": false }, + { "id": "#c:copper_ores", "required": false }, + { "id": "#c:quartz_ores", "required": false }, + { "id": "#c:lapis_ores", "required": false }, + { "id": "#c:aluminium_ores", "required": false }, + { "id": "#c:methyst_ores", "required": false }, + { "id": "#c:antimony_ores", "required": false }, + { "id": "#c:aquarium_ores", "required": false }, + { "id": "#c:asterite_ores", "required": false }, + { "id": "#c:banglum_ores", "required": false }, + { "id": "#c:bauxite_ores", "required": false }, + { "id": "#c:carmot_ores", "required": false }, + { "id": "#c:certus_quartz_ores", "required": false }, + { "id": "#c:cinnabar_ores", "required": false }, + { "id": "#c:cobalt_ores", "required": false }, + { "id": "#c:galaxium_ores", "required": false }, + { "id": "#c:galena_ores", "required": false }, + { "id": "#c:iridium_ores", "required": false }, + { "id": "#c:kyber_ores", "required": false }, + { "id": "#c:lunum_ores", "required": false }, + { "id": "#c:lutetium_ores", "required": false }, + { "id": "#c:menganese_ores", "required": false }, + { "id": "#c:metite_ores", "required": false }, + { "id": "#c:midas_gold_ores", "required": false }, + { "id": "#c:moon_lunum_ores", "required": false }, + { "id": "#c:mozanite_ores", "required": false }, + { "id": "#c:mythril_ores", "required": false }, + { "id": "#c:nickle_ores", "required": false }, + { "id": "#c:nikolite_ores", "required": false }, + { "id": "#c:orichalcum_ores", "required": false }, + { "id": "#c:osmium_ores", "required": false }, + { "id": "#c:palladium_ores", "required": false }, + { "id": "#c:peridot_ores", "required": false }, + { "id": "#c:platinum_ores", "required": false }, + { "id": "#c:plutonium_blocks", "required": false }, + { "id": "#c:prometheum_ores", "required": false }, + { "id": "#c:pyrite_ores", "required": false }, + { "id": "#c:quadrillium_ores", "required": false }, + { "id": "#c:ruby_ores", "required": false }, + { "id": "#c:runite_ores", "required": false }, + { "id": "#c:sapphire_ores", "required": false }, + { "id": "#c:sheldonite_ores", "required": false }, + { "id": "#c:silver_ores", "required": false }, + { "id": "#c:sodalite_ores", "required": false }, + { "id": "#c:sphalerite_ores", "required": false }, + { "id": "#c:starrite_ores", "required": false }, + { "id": "#c:stellum_ores", "required": false }, + { "id": "#c:stormyx_ores", "required": false }, + { "id": "#c:sulfur_ores", "required": false }, + { "id": "#c:tantalite_ores", "required": false }, + { "id": "#c:tin_ore", "required": false }, + { "id": "#c:tin_ores", "required": false }, + { "id": "#c:titanium_ores", "required": false }, + { "id": "#c:topaz_ores", "required": false }, + { "id": "#c:truesilver_ores", "required": false }, + { "id": "#c:tungsten_ores", "required": false }, + { "id": "#c:unobtainium_ores", "required": false }, + { "id": "#c:ur_ores", "required": false }, + { "id": "#c:uranium_ores", "required": false }, + { "id": "#c:vermiculite_ores", "required": false }, + { "id": "#c:zinc_ores", "required": false } + ] +} diff --git a/src/main/resources/data/c/tags/items/acorns.json b/src/main/resources/data/c/tags/items/acorns.json new file mode 100644 index 00000000..c88adc74 --- /dev/null +++ b/src/main/resources/data/c/tags/items/acorns.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "unicopia:acorn" + ] +} diff --git a/src/main/resources/data/c/tags/items/apples.json b/src/main/resources/data/c/tags/items/apples.json new file mode 100644 index 00000000..2e326fee --- /dev/null +++ b/src/main/resources/data/c/tags/items/apples.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "minecraft:apple", + "minecraft:golden_apple", + { "id": "#c:pyrite_apples", "required": false }, + "#unicopia:fresh_apples" + ] +} diff --git a/src/main/resources/data/c/tags/items/cooked_fish.json b/src/main/resources/data/c/tags/items/cooked_fish.json new file mode 100644 index 00000000..1e41161c --- /dev/null +++ b/src/main/resources/data/c/tags/items/cooked_fish.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:cooked_cod", + "minecraft:cooked_salmon" + ] +} diff --git a/src/main/resources/data/c/tags/items/cooked_insects.json b/src/main/resources/data/c/tags/items/cooked_insects.json new file mode 100644 index 00000000..1a241c36 --- /dev/null +++ b/src/main/resources/data/c/tags/items/cooked_insects.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:fermented_spider_eye", + { "id": "#c:cooked_insect", "required": false } + ] +} diff --git a/src/main/resources/data/c/tags/items/cooked_meats.json b/src/main/resources/data/c/tags/items/cooked_meats.json new file mode 100644 index 00000000..e321f8e4 --- /dev/null +++ b/src/main/resources/data/c/tags/items/cooked_meats.json @@ -0,0 +1,18 @@ +{ + "replace": false, + "values": [ + "minecraft:cooked_porkchop", + "minecraft:cooked_beef", + "minecraft:cooked_mutton", + "minecraft:cooked_rabbit", + "minecraft:rabbit_stew", + "minecraft:cooked_chicken", + { "id": "#c:cooked_meat", "required": false }, + { "id": "#c:fried_chickens", "required": false }, + { "id": "#c:hamburgers", "required": false }, + { "id": "#c:pork_and_beanss", "required": false }, + { "id": "#c:pork_and_beans", "required": false }, + { "id": "#c:pork_jerkies", "required": false }, + { "id": "#c:protein", "required": false } + ] +} diff --git a/src/main/resources/data/c/tags/items/foraging/edibles.json b/src/main/resources/data/c/tags/items/foraging/edibles.json new file mode 100644 index 00000000..6150dbdf --- /dev/null +++ b/src/main/resources/data/c/tags/items/foraging/edibles.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + { "id": "#c:mushrooms", "required": false }, + { "id": "#c:saplings", "required": false } + ] +} diff --git a/src/main/resources/data/c/tags/items/foraging/risky.json b/src/main/resources/data/c/tags/items/foraging/risky.json new file mode 100644 index 00000000..6947dbaf --- /dev/null +++ b/src/main/resources/data/c/tags/items/foraging/risky.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + { "id": "#c:meads", "required": false } + ] +} diff --git a/src/main/resources/data/c/tags/items/love.json b/src/main/resources/data/c/tags/items/love.json new file mode 100644 index 00000000..213d70aa --- /dev/null +++ b/src/main/resources/data/c/tags/items/love.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "unicopia:love_bottle", + "unicopia:love_bucket", + "unicopia:love_mug" + ] +} diff --git a/src/main/resources/data/c/tags/items/muffins.json b/src/main/resources/data/c/tags/items/muffins.json new file mode 100644 index 00000000..9b8b4a32 --- /dev/null +++ b/src/main/resources/data/c/tags/items/muffins.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "unicopia:muffin" + ] +} diff --git a/src/main/resources/data/c/tags/items/mushrooms.json b/src/main/resources/data/c/tags/items/mushrooms.json new file mode 100644 index 00000000..ea2bc32c --- /dev/null +++ b/src/main/resources/data/c/tags/items/mushrooms.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:red_mushroom", + "minecraft:brown_mushroom" + ] +} diff --git a/src/main/resources/data/c/tags/items/oatmeals.json b/src/main/resources/data/c/tags/items/oatmeals.json new file mode 100644 index 00000000..043eecbf --- /dev/null +++ b/src/main/resources/data/c/tags/items/oatmeals.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "unicopia:oatmeal" + ] +} diff --git a/src/main/resources/data/c/tags/items/pinecones.json b/src/main/resources/data/c/tags/items/pinecones.json new file mode 100644 index 00000000..36eac177 --- /dev/null +++ b/src/main/resources/data/c/tags/items/pinecones.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "unicopia:pinecone" + ] +} diff --git a/src/main/resources/data/c/tags/items/raw_fish.json b/src/main/resources/data/c/tags/items/raw_fish.json new file mode 100644 index 00000000..902fad0f --- /dev/null +++ b/src/main/resources/data/c/tags/items/raw_fish.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:pufferfish", + "minecraft:cod", + "minecraft:salmon", + "minecraft:tropical_fish", + { "id": "#c:mollusks", "required": false } + ] +} diff --git a/src/main/resources/data/c/tags/items/raw_insects.json b/src/main/resources/data/c/tags/items/raw_insects.json new file mode 100644 index 00000000..4a791552 --- /dev/null +++ b/src/main/resources/data/c/tags/items/raw_insects.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "minecraft:spider_eye", + "unicopia:wheat_worms", + "unicopia:butterfly" + ] +} diff --git a/src/main/resources/data/c/tags/items/raw_meats.json b/src/main/resources/data/c/tags/items/raw_meats.json new file mode 100644 index 00000000..9c5bcc72 --- /dev/null +++ b/src/main/resources/data/c/tags/items/raw_meats.json @@ -0,0 +1,12 @@ +{ + "replace": false, + "values": [ + "minecraft:porkchop", + "minecraft:beef", + "minecraft:mutton", + "minecraft:rabbit", + "minecraft:chicken", + { "id": "#c:raw_meat", "required": false }, + { "id": "#c:lemon_chickens", "required": false } + ] +} diff --git a/src/main/resources/data/c/tags/items/rocks.json b/src/main/resources/data/c/tags/items/rocks.json new file mode 100644 index 00000000..9ab866dd --- /dev/null +++ b/src/main/resources/data/c/tags/items/rocks.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "unicopia:rock" + ] +} diff --git a/src/main/resources/data/c/tags/items/rotten_meats.json b/src/main/resources/data/c/tags/items/rotten_meats.json new file mode 100644 index 00000000..560ab8ee --- /dev/null +++ b/src/main/resources/data/c/tags/items/rotten_meats.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:rotten_flesh", + { "id": "c:rotten_meat", "required": false } + ] +} diff --git a/src/main/resources/data/c/tags/items/seeds.json b/src/main/resources/data/c/tags/items/seeds.json new file mode 100644 index 00000000..d0c9c06a --- /dev/null +++ b/src/main/resources/data/c/tags/items/seeds.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "unicopia:oat_seeds", + "unicopia:green_apple_seeds", + "unicopia:sweet_apple_seeds", + "unicopia:sour_apple_seeds" + ] +} diff --git a/src/main/resources/data/c/tags/items/sticks.json b/src/main/resources/data/c/tags/items/sticks.json new file mode 100644 index 00000000..90f5f079 --- /dev/null +++ b/src/main/resources/data/c/tags/items/sticks.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:stick" + ] +} diff --git a/src/main/resources/data/c/tags/items/worms.json b/src/main/resources/data/c/tags/items/worms.json new file mode 100644 index 00000000..9c8b8692 --- /dev/null +++ b/src/main/resources/data/c/tags/items/worms.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "unicopia:wheat_worms" + ] +} diff --git a/src/main/resources/data/unicopia/tags/blocks/glass_blocks.json b/src/main/resources/data/unicopia/tags/blocks/glass_blocks.json index c65024b7..0c79fc76 100644 --- a/src/main/resources/data/unicopia/tags/blocks/glass_blocks.json +++ b/src/main/resources/data/unicopia/tags/blocks/glass_blocks.json @@ -1,22 +1,6 @@ { "replace": false, "values": [ - "minecraft:glass", - "minecraft:white_stained_glass", - "minecraft:orange_stained_glass", - "minecraft:magenta_stained_glass", - "minecraft:light_blue_stained_glass", - "minecraft:yellow_stained_glass", - "minecraft:lime_stained_glass", - "minecraft:pink_stained_glass", - "minecraft:gray_stained_glass", - "minecraft:light_gray_stained_glass", - "minecraft:cyan_stained_glass", - "minecraft:purple_stained_glass", - "minecraft:blue_stained_glass", - "minecraft:brown_stained_glass", - "minecraft:green_stained_glass", - "minecraft:red_stained_glass", - "minecraft:black_stained_glass" + "#c:glass_blocks" ] } diff --git a/src/main/resources/data/unicopia/tags/blocks/glass_panes.json b/src/main/resources/data/unicopia/tags/blocks/glass_panes.json index ff9176f7..7c6b6dd9 100644 --- a/src/main/resources/data/unicopia/tags/blocks/glass_panes.json +++ b/src/main/resources/data/unicopia/tags/blocks/glass_panes.json @@ -1,22 +1,6 @@ { "replace": false, "values": [ - "minecraft:glass_pane", - "minecraft:white_stained_glass_pane", - "minecraft:orange_stained_glass_pane", - "minecraft:magenta_stained_glass_pane", - "minecraft:light_blue_stained_glass_pane", - "minecraft:yellow_stained_glass_pane", - "minecraft:lime_stained_glass_pane", - "minecraft:pink_stained_glass_pane", - "minecraft:gray_stained_glass_pane", - "minecraft:light_gray_stained_glass_pane", - "minecraft:cyan_stained_glass_pane", - "minecraft:purple_stained_glass_pane", - "minecraft:blue_stained_glass_pane", - "minecraft:brown_stained_glass_pane", - "minecraft:green_stained_glass_pane", - "minecraft:red_stained_glass_pane", - "minecraft:black_stained_glass_pane" + "#c:glass_panes" ] } diff --git a/src/main/resources/data/unicopia/tags/blocks/interesting.json b/src/main/resources/data/unicopia/tags/blocks/interesting.json index 24f185cc..4662a940 100644 --- a/src/main/resources/data/unicopia/tags/blocks/interesting.json +++ b/src/main/resources/data/unicopia/tags/blocks/interesting.json @@ -1,18 +1,11 @@ { "replace": false, "values": [ - "minecraft:coal_ore", - "minecraft:iron_ore", - "minecraft:gold_ore", - "minecraft:emerald_ore", - "minecraft:lapis_ore", - "minecraft:diamond_ore", - "minecraft:nether_gold_ore", - "minecraft:nether_quartz_ore", "minecraft:sea_lantern", "minecraft:ender_chest", "minecraft:end_portal_frame", "minecraft:jukebox", - "minecraft:spawner" + "minecraft:spawner", + "#c:ores" ] } diff --git a/src/main/resources/data/unicopia/tags/items/acorns.json b/src/main/resources/data/unicopia/tags/items/acorns.json new file mode 100644 index 00000000..64e40b98 --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/acorns.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#c:acorns" + ] +} diff --git a/src/main/resources/data/unicopia/tags/items/apples.json b/src/main/resources/data/unicopia/tags/items/apples.json index 5907d9c4..7a54d955 100644 --- a/src/main/resources/data/unicopia/tags/items/apples.json +++ b/src/main/resources/data/unicopia/tags/items/apples.json @@ -1,13 +1,6 @@ { "replace": false, "values": [ - "minecraft:apple", - "minecraft:golden_apple", - "unicopia:green_apple", - "unicopia:sweet_apple", - "unicopia:sour_apple", - "unicopia:rotten_apple", - "unicopia:zap_apple", - "unicopia:cooked_zap_apple" + "#c:apples" ] } diff --git a/src/main/resources/data/unicopia/tags/items/food_types/cooked_fish.json b/src/main/resources/data/unicopia/tags/items/food_types/cooked_fish.json index 1e41161c..4e154515 100644 --- a/src/main/resources/data/unicopia/tags/items/food_types/cooked_fish.json +++ b/src/main/resources/data/unicopia/tags/items/food_types/cooked_fish.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "minecraft:cooked_cod", - "minecraft:cooked_salmon" + "#c:cooked_fish" ] } diff --git a/src/main/resources/data/unicopia/tags/items/food_types/cooked_insect.json b/src/main/resources/data/unicopia/tags/items/food_types/cooked_insect.json index 98efdfb9..8e23aa37 100644 --- a/src/main/resources/data/unicopia/tags/items/food_types/cooked_insect.json +++ b/src/main/resources/data/unicopia/tags/items/food_types/cooked_insect.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:fermented_spider_eye" + "#c:cooked_insects" ] } diff --git a/src/main/resources/data/unicopia/tags/items/food_types/cooked_meat.json b/src/main/resources/data/unicopia/tags/items/food_types/cooked_meat.json index e3ffaea2..09f0bddb 100644 --- a/src/main/resources/data/unicopia/tags/items/food_types/cooked_meat.json +++ b/src/main/resources/data/unicopia/tags/items/food_types/cooked_meat.json @@ -1,11 +1,6 @@ { "replace": false, "values": [ - "minecraft:cooked_porkchop", - "minecraft:cooked_beef", - "minecraft:cooked_mutton", - "minecraft:cooked_rabbit", - "minecraft:rabbit_stew", - "minecraft:cooked_chicken" + "#c:cooked_meats" ] } diff --git a/src/main/resources/data/unicopia/tags/items/food_types/forage_edible.json b/src/main/resources/data/unicopia/tags/items/food_types/forage_edible.json index bbce8360..570aafda 100644 --- a/src/main/resources/data/unicopia/tags/items/food_types/forage_edible.json +++ b/src/main/resources/data/unicopia/tags/items/food_types/forage_edible.json @@ -10,6 +10,7 @@ "minecraft:dandelion", "minecraft:tall_grass", "minecraft:hay_block", - "minecraft:wheat" + "minecraft:wheat", + "#c:foraging/edibles" ] } diff --git a/src/main/resources/data/unicopia/tags/items/food_types/forage_risky.json b/src/main/resources/data/unicopia/tags/items/food_types/forage_risky.json index ebb35bf7..533231e1 100644 --- a/src/main/resources/data/unicopia/tags/items/food_types/forage_risky.json +++ b/src/main/resources/data/unicopia/tags/items/food_types/forage_risky.json @@ -3,6 +3,7 @@ "values": [ "minecraft:allium", "minecraft:white_tulip", - "unicopia:burned_juice" + "unicopia:burned_juice", + "#c:foraging/risky" ] } diff --git a/src/main/resources/data/unicopia/tags/items/food_types/love.json b/src/main/resources/data/unicopia/tags/items/food_types/love.json index 213d70aa..72d0be9d 100644 --- a/src/main/resources/data/unicopia/tags/items/food_types/love.json +++ b/src/main/resources/data/unicopia/tags/items/food_types/love.json @@ -1,8 +1,6 @@ { "replace": false, "values": [ - "unicopia:love_bottle", - "unicopia:love_bucket", - "unicopia:love_mug" + "#c:love" ] } diff --git a/src/main/resources/data/unicopia/tags/items/food_types/pinecone.json b/src/main/resources/data/unicopia/tags/items/food_types/pinecone.json index 36eac177..9ad60d14 100644 --- a/src/main/resources/data/unicopia/tags/items/food_types/pinecone.json +++ b/src/main/resources/data/unicopia/tags/items/food_types/pinecone.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "unicopia:pinecone" + "#c:pinecones" ] } diff --git a/src/main/resources/data/unicopia/tags/items/food_types/raw_fish.json b/src/main/resources/data/unicopia/tags/items/food_types/raw_fish.json index 5a5329f4..a0e048fe 100644 --- a/src/main/resources/data/unicopia/tags/items/food_types/raw_fish.json +++ b/src/main/resources/data/unicopia/tags/items/food_types/raw_fish.json @@ -1,9 +1,6 @@ { "replace": false, "values": [ - "minecraft:pufferfish", - "minecraft:cod", - "minecraft:salmon", - "minecraft:tropical_fish" + "#c:raw_fish" ] } diff --git a/src/main/resources/data/unicopia/tags/items/food_types/raw_insect.json b/src/main/resources/data/unicopia/tags/items/food_types/raw_insect.json index 4a791552..24b2cff4 100644 --- a/src/main/resources/data/unicopia/tags/items/food_types/raw_insect.json +++ b/src/main/resources/data/unicopia/tags/items/food_types/raw_insect.json @@ -1,8 +1,6 @@ { "replace": false, "values": [ - "minecraft:spider_eye", - "unicopia:wheat_worms", - "unicopia:butterfly" + "#c:raw_insects" ] } diff --git a/src/main/resources/data/unicopia/tags/items/food_types/raw_meat.json b/src/main/resources/data/unicopia/tags/items/food_types/raw_meat.json index fa7160e1..04745d88 100644 --- a/src/main/resources/data/unicopia/tags/items/food_types/raw_meat.json +++ b/src/main/resources/data/unicopia/tags/items/food_types/raw_meat.json @@ -1,10 +1,6 @@ { "replace": false, "values": [ - "minecraft:porkchop", - "minecraft:beef", - "minecraft:mutton", - "minecraft:rabbit", - "minecraft:chicken" + "#c:raw_meats" ] } diff --git a/src/main/resources/data/unicopia/tags/items/food_types/rotten_meat.json b/src/main/resources/data/unicopia/tags/items/food_types/rotten_meat.json index 3f3bc662..4dee31d1 100644 --- a/src/main/resources/data/unicopia/tags/items/food_types/rotten_meat.json +++ b/src/main/resources/data/unicopia/tags/items/food_types/rotten_meat.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:rotten_flesh" + "#c:rotten_meats" ] } diff --git a/src/main/resources/data/unicopia/tree_types/oak.json b/src/main/resources/data/unicopia/tree_types/oak.json index ddf48c5b..4b00e555 100644 --- a/src/main/resources/data/unicopia/tree_types/oak.json +++ b/src/main/resources/data/unicopia/tree_types/oak.json @@ -4,7 +4,7 @@ "rarity": 3, "drops": [ { "weight": 1, "item": "unicopia:rotten_apple" }, - { "weight": 2, "item": "unicopia:acorn" }, - { "weight": 3, "item": "minecraft:stick" } + { "weight": 2, "tag": "c:acorns" }, + { "weight": 3, "tag": "c:stick" } ] } \ No newline at end of file diff --git a/src/main/resources/data/unicopia/tree_types/spruce.json b/src/main/resources/data/unicopia/tree_types/spruce.json index 350a7a83..d4f074d4 100644 --- a/src/main/resources/data/unicopia/tree_types/spruce.json +++ b/src/main/resources/data/unicopia/tree_types/spruce.json @@ -4,7 +4,7 @@ "wideTrunk": true, "rarity": 3, "drops": [ - { "weight": 1, "item": "unicopia:pinecone" }, - { "weight": 4, "item": "unicopia:stick" } + { "weight": 1, "tag": "c:pinecones" }, + { "weight": 4, "tag": "c:sticks" } ] } \ No newline at end of file