From 672dd72d629adbf471b281bee23e8dc99de38bb8 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 19 Mar 2024 20:46:29 +0000 Subject: [PATCH] Move a whole bunch of item tags to datagen --- .../unicopia/UConventionalTags.java | 38 ++++++ .../com/minelittlepony/unicopia/UTags.java | 29 ++++- .../unicopia/datagen/Datagen.java | 5 + .../datagen/providers/UBlockTagProvider.java | 50 ++++---- .../datagen/providers/UItemTagProvider.java | 117 +++++++++++++++++- .../unicopia/entity/player/PlayerPhysics.java | 5 +- .../unicopia/item/ZapAppleItem.java | 4 +- .../resources/data/c/tags/items/acorns.json | 6 - .../resources/data/c/tags/items/apples.json | 9 -- .../resources/data/c/tags/items/bananas.json | 6 - .../resources/data/c/tags/items/boats.json | 15 --- .../data/c/tags/items/cooked_fish.json | 8 -- .../resources/data/c/tags/items/fruits.json | 9 -- .../resources/data/c/tags/items/grain.json | 6 - .../resources/data/c/tags/items/mangoes.json | 6 - .../resources/data/c/tags/items/muffins.json | 6 - .../data/c/tags/items/mushrooms.json | 7 -- .../resources/data/c/tags/items/nuts.json | 6 - .../resources/data/c/tags/items/oatmeals.json | 6 - .../data/c/tags/items/pineapples.json | 6 - .../data/c/tags/items/pinecones.json | 6 - .../data/c/tags/items/rotten_meats.json | 3 +- .../resources/data/c/tags/items/seeds.json | 11 -- .../resources/data/c/tags/items/sticks.json | 6 - .../tags/items/cabbage_roll_ingredients.json | 8 -- .../tags/items/comfort_foods.json | 8 -- .../data/unicopia/tags/items/acorns.json | 6 - .../data/unicopia/tags/items/apple_seeds.json | 8 -- .../data/unicopia/tags/items/apples.json | 6 - .../data/unicopia/tags/items/badges.json | 13 -- .../data/unicopia/tags/items/baskets.json | 15 --- .../data/unicopia/tags/items/bed_sheets.json | 31 ----- .../data/unicopia/tags/items/can_cut_pie.json | 7 -- .../data/unicopia/tags/items/chitin.json | 12 -- .../data/unicopia/tags/items/cloud_beds.json | 6 - .../data/unicopia/tags/items/cloud_jars.json | 7 -- .../data/unicopia/tags/items/cloud_slabs.json | 10 -- .../unicopia/tags/items/cloud_stairs.json | 11 -- .../data/unicopia/tags/items/clouds.json | 13 -- .../unicopia/tags/items/cools_off_kirins.json | 9 -- .../unicopia/tags/items/falls_slowly.json | 8 -- .../unicopia/tags/items/floats_on_clouds.json | 12 -- .../unicopia/tags/items/fresh_apples.json | 9 -- .../unicopia/tags/items/has_no_traits.json | 21 ---- .../tags/items/is_delivered_aggressively.json | 6 - .../unicopia/tags/items/magic_feathers.json | 7 -- .../data/unicopia/tags/items/palm_logs.json | 9 -- .../data/unicopia/tags/items/pies.json | 7 -- .../tags/items/spooked_mob_drops.json | 6 - .../data/unicopia/tags/items/zap_logs.json | 9 -- 50 files changed, 216 insertions(+), 418 deletions(-) create mode 100644 src/main/java/com/minelittlepony/unicopia/UConventionalTags.java delete mode 100644 src/main/resources/data/c/tags/items/acorns.json delete mode 100644 src/main/resources/data/c/tags/items/apples.json delete mode 100644 src/main/resources/data/c/tags/items/bananas.json delete mode 100644 src/main/resources/data/c/tags/items/boats.json delete mode 100644 src/main/resources/data/c/tags/items/cooked_fish.json delete mode 100644 src/main/resources/data/c/tags/items/fruits.json delete mode 100644 src/main/resources/data/c/tags/items/grain.json delete mode 100644 src/main/resources/data/c/tags/items/mangoes.json delete mode 100644 src/main/resources/data/c/tags/items/muffins.json delete mode 100644 src/main/resources/data/c/tags/items/mushrooms.json delete mode 100644 src/main/resources/data/c/tags/items/nuts.json delete mode 100644 src/main/resources/data/c/tags/items/oatmeals.json delete mode 100644 src/main/resources/data/c/tags/items/pineapples.json delete mode 100644 src/main/resources/data/c/tags/items/pinecones.json delete mode 100644 src/main/resources/data/c/tags/items/seeds.json delete mode 100644 src/main/resources/data/c/tags/items/sticks.json delete mode 100644 src/main/resources/data/farmersdelight/tags/items/cabbage_roll_ingredients.json delete mode 100644 src/main/resources/data/farmersdelight/tags/items/comfort_foods.json delete mode 100644 src/main/resources/data/unicopia/tags/items/acorns.json delete mode 100644 src/main/resources/data/unicopia/tags/items/apple_seeds.json delete mode 100644 src/main/resources/data/unicopia/tags/items/apples.json delete mode 100644 src/main/resources/data/unicopia/tags/items/badges.json delete mode 100644 src/main/resources/data/unicopia/tags/items/baskets.json delete mode 100644 src/main/resources/data/unicopia/tags/items/bed_sheets.json delete mode 100644 src/main/resources/data/unicopia/tags/items/can_cut_pie.json delete mode 100644 src/main/resources/data/unicopia/tags/items/chitin.json delete mode 100644 src/main/resources/data/unicopia/tags/items/cloud_beds.json delete mode 100644 src/main/resources/data/unicopia/tags/items/cloud_jars.json delete mode 100644 src/main/resources/data/unicopia/tags/items/cloud_slabs.json delete mode 100644 src/main/resources/data/unicopia/tags/items/cloud_stairs.json delete mode 100644 src/main/resources/data/unicopia/tags/items/clouds.json delete mode 100644 src/main/resources/data/unicopia/tags/items/cools_off_kirins.json delete mode 100644 src/main/resources/data/unicopia/tags/items/falls_slowly.json delete mode 100644 src/main/resources/data/unicopia/tags/items/floats_on_clouds.json delete mode 100644 src/main/resources/data/unicopia/tags/items/fresh_apples.json delete mode 100644 src/main/resources/data/unicopia/tags/items/has_no_traits.json delete mode 100644 src/main/resources/data/unicopia/tags/items/is_delivered_aggressively.json delete mode 100644 src/main/resources/data/unicopia/tags/items/magic_feathers.json delete mode 100644 src/main/resources/data/unicopia/tags/items/palm_logs.json delete mode 100644 src/main/resources/data/unicopia/tags/items/pies.json delete mode 100644 src/main/resources/data/unicopia/tags/items/spooked_mob_drops.json delete mode 100644 src/main/resources/data/unicopia/tags/items/zap_logs.json diff --git a/src/main/java/com/minelittlepony/unicopia/UConventionalTags.java b/src/main/java/com/minelittlepony/unicopia/UConventionalTags.java new file mode 100644 index 00000000..e1a0a0b1 --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/UConventionalTags.java @@ -0,0 +1,38 @@ +package com.minelittlepony.unicopia; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; + +public interface UConventionalTags { + TagKey APPLES = item("apples"); + TagKey ACORNS = item("acorns"); + TagKey PINECONES = item("pinecones"); + TagKey PINEAPPLES = item("pineapples"); + TagKey BANANAS = item("bananas"); + TagKey STICKS = item("sticks"); + TagKey SEEDS = item("seeds"); + TagKey GRAIN = item("grain"); + TagKey NUTS = item("nuts"); + TagKey MUSHROOMS = item("mushrooms"); + TagKey MUFFINS = item("muffins"); + TagKey MANGOES = item("mangoes"); + TagKey OEATMEALS = item("oatmeals"); + + TagKey FRUITS = item("fruits"); + + TagKey COOKED_FISH = item("cooked_fish"); + + TagKey CROPS_PEANUTS = item("crops/peanuts"); + TagKey TOOL_KNIVES = item("tools/knives"); + + static TagKey item(String name) { + return TagKey.of(RegistryKeys.ITEM, new Identifier("c", name)); + } + + static TagKey block(String name) { + return TagKey.of(RegistryKeys.BLOCK, new Identifier("c", name)); + } +} diff --git a/src/main/java/com/minelittlepony/unicopia/UTags.java b/src/main/java/com/minelittlepony/unicopia/UTags.java index 2524d64a..b95d8350 100644 --- a/src/main/java/com/minelittlepony/unicopia/UTags.java +++ b/src/main/java/com/minelittlepony/unicopia/UTags.java @@ -11,7 +11,6 @@ import net.minecraft.util.Identifier; import net.minecraft.world.dimension.DimensionType; public interface UTags { - TagKey APPLES = item("apples"); TagKey FRESH_APPLES = item("fresh_apples"); TagKey FALLS_SLOWLY = item("falls_slowly"); @@ -34,11 +33,11 @@ public interface UTags { TagKey HORSE_SHOES = item("horse_shoes"); TagKey APPLE_SEEDS = item("apple_seeds"); - TagKey ACORNS = item("acorns"); TagKey BASKETS = item("baskets"); + TagKey BADGES = item("badges"); + TagKey BED_SHEETS = item("bed_sheets"); + TagKey CLOUD_JARS = item("cloud_jars"); - TagKey GLASS_PANES = block("glass_panes"); - TagKey GLASS_BLOCKS = block("glass_blocks"); TagKey FRAGILE = block("fragile"); TagKey INTERESTING = block("interesting"); TagKey CATAPULT_IMMUNE = block("catapult_immune"); @@ -59,6 +58,28 @@ public interface UTags { TagKey HAS_NO_ATMOSPHERE = dimension("has_no_atmosphere"); + interface Items { + TagKey ZAP_LOGS = item("zap_logs"); + TagKey WAXED_ZAP_LOGS = item("waxed_zap_logs"); + TagKey PALM_LOGS = item("palm_logs"); + TagKey CLOUD_BEDS = item("cloud_beds"); + TagKey CLOUD_SLABS = item("cloud_slabs"); + TagKey CLOUD_STAIRS = item("cloud_stairs"); + TagKey CLOUD_BLOCKS = item("cloud_blocks"); + TagKey CHITIN_BLOCKS = item("chitin_blocks"); + } + + interface Blocks { + TagKey ZAP_LOGS = block("zap_logs"); + TagKey WAXED_ZAP_LOGS = block("waxed_zap_logs"); + TagKey PALM_LOGS = block("palm_logs"); + TagKey CLOUD_BEDS = block("cloud_beds"); + TagKey CLOUD_SLABS = block("cloud_slabs"); + TagKey CLOUD_STAIRS = block("cloud_stairs"); + TagKey CLOUD_BLOCKS = block("cloud_blocks"); + TagKey CHITIN_BLOCKS = block("chitin_blocks"); + } + static TagKey item(String name) { return TagKey.of(RegistryKeys.ITEM, Unicopia.id(name)); } diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java b/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java index 378a8d79..9cfcbe8b 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java @@ -1,5 +1,8 @@ package com.minelittlepony.unicopia.datagen; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import com.minelittlepony.unicopia.datagen.providers.UBlockTagProvider; import com.minelittlepony.unicopia.datagen.providers.UItemTagProvider; import com.minelittlepony.unicopia.datagen.providers.UModelProvider; @@ -19,6 +22,8 @@ import net.minecraft.world.gen.carver.ConfiguredCarver; import net.minecraft.world.gen.feature.PlacedFeature; public class Datagen implements DataGeneratorEntrypoint { + public static final Logger LOGGER = LogManager.getLogger(); + @Override public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { final FabricDataGenerator.Pack pack = fabricDataGenerator.createPack(); diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockTagProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockTagProvider.java index 5995a6d8..2deff29f 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockTagProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockTagProvider.java @@ -16,6 +16,7 @@ import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.RegistryWrapper.WrapperLookup; import net.minecraft.registry.tag.BlockTags; +import net.minecraft.registry.tag.TagBuilder; import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; @@ -24,6 +25,11 @@ public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider { super(output, registriesFuture); } + @Override + protected TagBuilder getTagBuilder(TagKey tag) { + return super.getTagBuilder(tag); + } + @Override protected void configure(WrapperLookup registries) { Block[] crops = { @@ -47,7 +53,6 @@ public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider { addPalmWoodset(); addCloudBlocksets(); addChitinBlocksets(); - addHayBlocks(); addFruitTrees(); getOrCreateTagBuilder(UTags.CRYSTAL_HEART_BASE).add( @@ -107,13 +112,10 @@ public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider { UBlocks.ZAP_STAIRS ); - TagKey logsTag = UTags.block("zap_logs"); - TagKey waxedLogsTag = UTags.block("waxed_zap_logs"); - - getOrCreateTagBuilder(logsTag).add(UBlocks.ZAP_LOG, UBlocks.ZAP_WOOD, UBlocks.STRIPPED_ZAP_LOG, UBlocks.STRIPPED_ZAP_WOOD); - getOrCreateTagBuilder(waxedLogsTag).add(UBlocks.WAXED_ZAP_LOG, UBlocks.WAXED_ZAP_WOOD, UBlocks.WAXED_STRIPPED_ZAP_LOG, UBlocks.WAXED_STRIPPED_ZAP_WOOD); - getOrCreateTagBuilder(BlockTags.LOGS).forceAddTag(logsTag).forceAddTag(waxedLogsTag); - getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN).forceAddTag(logsTag); + getOrCreateTagBuilder(UTags.Blocks.ZAP_LOGS).add(UBlocks.ZAP_LOG, UBlocks.ZAP_WOOD, UBlocks.STRIPPED_ZAP_LOG, UBlocks.STRIPPED_ZAP_WOOD); + getOrCreateTagBuilder(UTags.Blocks.WAXED_ZAP_LOGS).add(UBlocks.WAXED_ZAP_LOG, UBlocks.WAXED_ZAP_WOOD, UBlocks.WAXED_STRIPPED_ZAP_LOG, UBlocks.WAXED_STRIPPED_ZAP_WOOD); + getOrCreateTagBuilder(BlockTags.LOGS).forceAddTag(UTags.Blocks.ZAP_LOGS).forceAddTag(UTags.Blocks.WAXED_ZAP_LOGS); + getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN).forceAddTag(UTags.Blocks.ZAP_LOGS); getOrCreateTagBuilder(BlockTags.PLANKS).add(UBlocks.ZAP_PLANKS, UBlocks.WAXED_ZAP_PLANKS); //getOrCreateTagBuilder(BlockTags.WOODEN_BUTTONS).add(UBlocks.ZAP_BUTTON); @@ -133,12 +135,9 @@ public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider { private void addPalmWoodset() { getOrCreateTagBuilder(BlockTags.LEAVES).add(UBlocks.PALM_LEAVES); getOrCreateTagBuilder(BlockTags.HOE_MINEABLE).add(UBlocks.PALM_LEAVES); - - TagKey logsTag = UTags.block("palm_logs"); - - getOrCreateTagBuilder(logsTag).add(UBlocks.PALM_LOG, UBlocks.PALM_WOOD, UBlocks.STRIPPED_PALM_LOG, UBlocks.STRIPPED_PALM_WOOD); - getOrCreateTagBuilder(BlockTags.LOGS).forceAddTag(logsTag); - getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN).forceAddTag(logsTag); + getOrCreateTagBuilder(UTags.Blocks.PALM_LOGS).add(UBlocks.PALM_LOG, UBlocks.PALM_WOOD, UBlocks.STRIPPED_PALM_LOG, UBlocks.STRIPPED_PALM_WOOD); + getOrCreateTagBuilder(BlockTags.LOGS).forceAddTag(UTags.Blocks.PALM_LOGS); + getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN).forceAddTag(UTags.Blocks.PALM_LOGS); getOrCreateTagBuilder(BlockTags.PLANKS).add(UBlocks.PALM_PLANKS); addSign(UBlocks.PALM_SIGN, UBlocks.PALM_WALL_SIGN, UBlocks.PALM_HANGING_SIGN, UBlocks.PALM_WALL_HANGING_SIGN); getOrCreateTagBuilder(BlockTags.WOODEN_BUTTONS).add(UBlocks.PALM_BUTTON); @@ -163,24 +162,31 @@ public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider { UBlocks.CLOUD_PLANKS, UBlocks.CLOUD_PLANK_SLAB, UBlocks.CLOUD_PLANK_STAIRS, UBlocks.COMPACTED_CLOUD_PLANKS ); - getOrCreateTagBuilder(UTags.block("cloud_beds")).add(UBlocks.CLOUD_BED); - getOrCreateTagBuilder(UTags.block("cloud_slabs")).add( + getOrCreateTagBuilder(UTags.Blocks.CLOUD_BEDS).add(UBlocks.CLOUD_BED); + getOrCreateTagBuilder(UTags.Blocks.CLOUD_SLABS).add( UBlocks.CLOUD_SLAB, UBlocks.SOGGY_CLOUD_SLAB, UBlocks.DENSE_CLOUD_SLAB, UBlocks.ETCHED_CLOUD_SLAB, UBlocks.CLOUD_PLANK_SLAB, UBlocks.CLOUD_BRICK_SLAB ); - getOrCreateTagBuilder(UTags.block("cloud_stairs")).add( + getOrCreateTagBuilder(UTags.Blocks.CLOUD_STAIRS).add( UBlocks.CLOUD_STAIRS, UBlocks.SOGGY_CLOUD_STAIRS, UBlocks.DENSE_CLOUD_STAIRS, UBlocks.ETCHED_CLOUD_STAIRS, UBlocks.CLOUD_PLANK_STAIRS, UBlocks.CLOUD_BRICK_STAIRS ); - getOrCreateTagBuilder(UTags.block("clouds")).add( + getOrCreateTagBuilder(UTags.Blocks.CLOUD_BLOCKS).add( UBlocks.CLOUD, UBlocks.CLOUD_PLANKS, UBlocks.CLOUD_BRICKS, UBlocks.DENSE_CLOUD, - UBlocks.ETCHED_CLOUD, UBlocks.CARVED_CLOUD, + UBlocks.ETCHED_CLOUD, UBlocks.CARVED_CLOUD, UBlocks.CLOUD_PILLAR, UBlocks.COMPACTED_CLOUD, UBlocks.COMPACTED_CLOUD_PLANKS, UBlocks.COMPACTED_CLOUD_BRICKS, - UBlocks.UNSTABLE_CLOUD, UBlocks.SOGGY_CLOUD + UBlocks.UNSTABLE_CLOUD, UBlocks.SOGGY_CLOUD, UBlocks.SHAPING_BENCH ); } private void addChitinBlocksets() { + getOrCreateTagBuilder(UTags.Blocks.CHITIN_BLOCKS).add( + UBlocks.CHITIN, UBlocks.SURFACE_CHITIN, + UBlocks.CHISELLED_CHITIN, UBlocks.CHISELLED_CHITIN_HULL, UBlocks.CHISELLED_CHITIN_SLAB, UBlocks.CHISELLED_CHITIN_STAIRS, + UBlocks.CHITIN_SPIKES + ); + + getOrCreateTagBuilder(BlockTags.PICKAXE_MINEABLE).add( UBlocks.CHITIN_SPIKES, UBlocks.CHISELLED_CHITIN, UBlocks.CHISELLED_CHITIN_HULL, UBlocks.CHISELLED_CHITIN_SLAB, UBlocks.CHISELLED_CHITIN_STAIRS @@ -195,8 +201,4 @@ public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider { getOrCreateTagBuilder(BlockTags.CEILING_HANGING_SIGNS).add(hanging); getOrCreateTagBuilder(BlockTags.WALL_HANGING_SIGNS).add(wallHanging); } - - private void addHayBlocks() { - - } } diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java index 22104b6a..72b6e5a7 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java @@ -1,26 +1,57 @@ package com.minelittlepony.unicopia.datagen.providers; +import java.util.Objects; import java.util.concurrent.CompletableFuture; +import com.minelittlepony.unicopia.Race; +import com.minelittlepony.unicopia.UConventionalTags; import com.minelittlepony.unicopia.UTags; import com.minelittlepony.unicopia.block.UBlocks; +import com.minelittlepony.unicopia.datagen.Datagen; +import com.minelittlepony.unicopia.item.BedsheetsItem; import com.minelittlepony.unicopia.item.UItems; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalItemTags; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.Items; +import net.minecraft.registry.Registries; +import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.RegistryWrapper.WrapperLookup; import net.minecraft.registry.tag.BlockTags; import net.minecraft.registry.tag.ItemTags; +import net.minecraft.registry.tag.TagBuilder; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; public class UItemTagProvider extends FabricTagProvider.ItemTagProvider { - public UItemTagProvider(FabricDataOutput output, CompletableFuture registriesFuture, BlockTagProvider blockTagProvider) { + private final UBlockTagProvider blockTagProvider; + + public UItemTagProvider(FabricDataOutput output, CompletableFuture registriesFuture, UBlockTagProvider blockTagProvider) { super(output, registriesFuture, blockTagProvider); + this.blockTagProvider = blockTagProvider; + } + + @Override + public void copy(TagKey blockTag, TagKey itemTag) { + TagBuilder blockTagBuilder = Objects.requireNonNull(blockTagProvider, "Pass Block tag provider via constructor to use copy").getTagBuilder(blockTag); + TagBuilder itemTagBuilder = getTagBuilder(itemTag); + blockTagBuilder.build().forEach(entry -> { + if (entry.canAdd(Registries.ITEM::containsId, tagId -> getTagBuilder(TagKey.of(RegistryKeys.ITEM, tagId)) != null)) { + itemTagBuilder.add(entry); + } else { + Datagen.LOGGER.warn("Cannot copy missing entry {} to item tag {}", entry, itemTag.id()); + } + }); } @Override protected void configure(WrapperLookup arg) { copyBlockTags(); + exportConventionalTags(); getOrCreateTagBuilder(ItemTags.BOOKSHELF_BOOKS).add(UItems.SPELLBOOK); getOrCreateTagBuilder(ItemTags.BEDS).add(UItems.CLOTH_BED, UItems.CLOUD_BED); @@ -36,6 +67,44 @@ public class UItemTagProvider extends FabricTagProvider.ItemTagProvider { getOrCreateTagBuilder(UTags.POLEARMS).add(UItems.WOODEN_POLEARM, UItems.STONE_POLEARM, UItems.IRON_POLEARM, UItems.GOLDEN_POLEARM, UItems.DIAMOND_POLEARM, UItems.NETHERITE_POLEARM); getOrCreateTagBuilder(ItemTags.TOOLS).addTag(UTags.HORSE_SHOES).addTag(UTags.POLEARMS); + + getOrCreateTagBuilder(UTags.BASKETS).add( + UItems.ACACIA_BASKET, UItems.BAMBOO_BASKET, UItems.BIRCH_BASKET, UItems.CHERRY_BASKET, UItems.DARK_OAK_BASKET, + UItems.JUNGLE_BASKET, UItems.MANGROVE_BASKET, UItems.OAK_BASKET, UItems.PALM_BASKET, UItems.SPRUCE_BASKET + ); + getOrCreateTagBuilder(UTags.BADGES).add(Race.REGISTRY.stream() + .map(race -> race.getId().withPath(p -> p + "_badge")) + .flatMap(id -> Registries.ITEM.getOrEmpty(id).stream()) + .toArray(Item[]::new)); + getOrCreateTagBuilder(UTags.BED_SHEETS).add(BedsheetsItem.ITEMS.values().stream().toArray(Item[]::new)); + getOrCreateTagBuilder(UTags.APPLE_SEEDS).add(UItems.GREEN_APPLE_SEEDS, UItems.SWEET_APPLE_SEEDS, UItems.SOUR_APPLE_SEEDS); + getOrCreateTagBuilder(UTags.MAGIC_FEATHERS).add(UItems.PEGASUS_FEATHER, UItems.GRYPHON_FEATHER); + getOrCreateTagBuilder(UTags.FRESH_APPLES).add(Items.APPLE, UItems.GREEN_APPLE, UItems.SWEET_APPLE, UItems.SOUR_APPLE); + getOrCreateTagBuilder(UTags.CLOUD_JARS).add(UItems.RAIN_CLOUD_JAR, UItems.STORM_CLOUD_JAR); + getOrCreateTagBuilder(UTags.PIES).add(UItems.APPLE_PIE, UItems.APPLE_PIE_HOOF); + + // technical tags + getOrCreateTagBuilder(ItemTags.VILLAGER_PLANTABLE_SEEDS).addTag(UTags.APPLE_SEEDS); + getOrCreateTagBuilder(UTags.CAN_CUT_PIE).forceAddTag(ConventionalItemTags.SHEARS).addOptionalTag(UConventionalTags.TOOL_KNIVES); + getOrCreateTagBuilder(UTags.COOLS_OFF_KIRINS).add(Items.MELON_SLICE, UItems.JUICE).forceAddTag(ConventionalItemTags.WATER_BUCKETS); + getOrCreateTagBuilder(UTags.FALLS_SLOWLY).add(Items.FEATHER, UItems.CLOUD_LUMP).forceAddTag(UTags.MAGIC_FEATHERS); + getOrCreateTagBuilder(UTags.IS_DELIVERED_AGGRESSIVELY).forceAddTag(ItemTags.ANVIL); + getOrCreateTagBuilder(UTags.SPOOKED_MOB_DROPS).add(Items.BRICK); + getOrCreateTagBuilder(UTags.FLOATS_ON_CLOUDS) + .forceAddTag(UTags.Items.CLOUD_BEDS) + .forceAddTag(UTags.Items.CLOUD_SLABS) + .forceAddTag(UTags.Items.CLOUD_STAIRS) + .forceAddTag(UTags.Items.CLOUD_BLOCKS) + .add(UItems.CLOUD_LUMP); + getOrCreateTagBuilder(UTags.HAS_NO_TRAITS).add( + Items.AIR, Items.SPAWNER, Items.STRUCTURE_VOID, Items.STRUCTURE_BLOCK, + Items.COMMAND_BLOCK, Items.CHAIN_COMMAND_BLOCK, Items.REPEATING_COMMAND_BLOCK, + Items.LIGHT, Items.JIGSAW, Items.BARRIER, Items.BEDROCK, Items.END_PORTAL_FRAME, + Items.DEBUG_STICK, Items.COMMAND_BLOCK_MINECART, + UItems.PLUNDER_VINE + ).forceAddTag(UTags.BADGES); + + exportFarmersDelightItems(); } private void copyBlockTags() { @@ -55,5 +124,51 @@ public class UItemTagProvider extends FabricTagProvider.ItemTagProvider { copy(BlockTags.TRAPDOORS, ItemTags.TRAPDOORS); copy(BlockTags.WOODEN_TRAPDOORS, ItemTags.WOODEN_TRAPDOORS); copy(BlockTags.SAPLINGS, ItemTags.SAPLINGS); + + copy(UTags.Blocks.ZAP_LOGS, UTags.Items.ZAP_LOGS); + copy(UTags.Blocks.WAXED_ZAP_LOGS, UTags.Items.WAXED_ZAP_LOGS); + copy(UTags.Blocks.PALM_LOGS, UTags.Items.PALM_LOGS); + copy(UTags.Blocks.CLOUD_BEDS, UTags.Items.CLOUD_BEDS); + copy(UTags.Blocks.CLOUD_SLABS, UTags.Items.CLOUD_SLABS); + copy(UTags.Blocks.CLOUD_STAIRS, UTags.Items.CLOUD_STAIRS); + copy(UTags.Blocks.CLOUD_BLOCKS, UTags.Items.CLOUD_BLOCKS); + copy(UTags.Blocks.CHITIN_BLOCKS, UTags.Items.CHITIN_BLOCKS); + } + + private void exportConventionalTags() { + getOrCreateTagBuilder(UConventionalTags.ACORNS).add(UItems.ACORN); + getOrCreateTagBuilder(UConventionalTags.APPLES) + .add(Items.APPLE, Items.GOLDEN_APPLE, Items.ENCHANTED_GOLDEN_APPLE, UItems.ROTTEN_APPLE) + .forceAddTag(UTags.FRESH_APPLES) + .addOptionalTag(new Identifier("c", "pyrite_apples")) // no idea which mod add pyrite apples + ; + getOrCreateTagBuilder(UConventionalTags.BANANAS).add(UItems.BANANA); + getOrCreateTagBuilder(UConventionalTags.COOKED_FISH).add(Items.COOKED_COD, Items.COOKED_SALMON); + getOrCreateTagBuilder(UConventionalTags.STICKS).add(Items.STICK); + getOrCreateTagBuilder(UConventionalTags.PINECONES).add(UItems.PINECONE); + getOrCreateTagBuilder(UConventionalTags.PINEAPPLES).add(UItems.PINEAPPLE); + getOrCreateTagBuilder(UConventionalTags.MANGOES).add(UItems.MANGO); + getOrCreateTagBuilder(UConventionalTags.MUSHROOMS).add(Items.RED_MUSHROOM, Items.BROWN_MUSHROOM); + getOrCreateTagBuilder(UConventionalTags.MUFFINS).add(UItems.MUFFIN); + getOrCreateTagBuilder(UConventionalTags.SEEDS).add(Items.BEETROOT_SEEDS, Items.MELON_SEEDS, Items.PUMPKIN_SEEDS, Items.TORCHFLOWER_SEEDS, Items.WHEAT_SEEDS) + .add(UItems.OAT_SEEDS) + .forceAddTag(UTags.APPLE_SEEDS); + getOrCreateTagBuilder(UConventionalTags.OEATMEALS).add(UItems.OATMEAL); + getOrCreateTagBuilder(UConventionalTags.GRAIN).add(Items.WHEAT, UItems.OATS); + getOrCreateTagBuilder(UConventionalTags.NUTS).addOptionalTag(UConventionalTags.CROPS_PEANUTS); + + getOrCreateTagBuilder(UConventionalTags.FRUITS) + .forceAddTag(UConventionalTags.MANGOES) + .forceAddTag(UConventionalTags.PINEAPPLES) + .forceAddTag(UConventionalTags.APPLES) + .forceAddTag(UConventionalTags.BANANAS); + } + + private void exportFarmersDelightItems() { + getOrCreateTagBuilder(UTags.COOLS_OFF_KIRINS) + .addOptional(new Identifier("farmersdelight:melon_popsicle")) + .addOptional(new Identifier("farmersdelight:melon_juice")); + getOrCreateTagBuilder(TagKey.of(RegistryKeys.ITEM, new Identifier("farmersdelight:cabbage_roll_ingredients"))).add(UItems.OATS, UItems.ROCK, UItems.WHEAT_WORMS); + getOrCreateTagBuilder(TagKey.of(RegistryKeys.ITEM, new Identifier("farmersdelight:comfort_foods"))).add(UItems.OATMEAL, UItems.ROCK_STEW, UItems.MUFFIN); } } diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java index 6005489a..a857cc73 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java @@ -29,6 +29,7 @@ import com.minelittlepony.unicopia.server.world.UGameRules; import com.minelittlepony.unicopia.server.world.WeatherConditions; import com.minelittlepony.unicopia.util.*; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags; import net.minecraft.block.*; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityPose; @@ -759,9 +760,9 @@ public class PlayerPhysics extends EntityPhysics implements Tickab entity.addVelocity(orientation.x, orientation.y, orientation.z); boolean isEarthPonySmash = pony.getObservedSpecies().canUseEarth() && !isFlying(); - int damage = TraceHelper.findBlocks(entity, speed + 4, 1, state -> (isEarthPonySmash && !state.isAir()) || state.isIn(UTags.GLASS_PANES)).stream() + int damage = TraceHelper.findBlocks(entity, speed + 4, 1, state -> (isEarthPonySmash && !state.isAir()) || state.isIn(ConventionalBlockTags.GLASS_PANES)).stream() .flatMap(pos -> BlockPos.streamOutwards(pos, 2, 2, 2)) - .filter(pos -> (isEarthPonySmash && !entity.getWorld().isAir(pos)) || entity.getWorld().getBlockState(pos).isIn(UTags.GLASS_PANES)) + .filter(pos -> (isEarthPonySmash && !entity.getWorld().isAir(pos)) || entity.getWorld().getBlockState(pos).isIn(ConventionalBlockTags.GLASS_PANES)) .reduce(0, (u, pos) -> { if (pony.canModifyAt(pos, ModificationType.PHYSICAL)) { if (isEarthPonySmash) { diff --git a/src/main/java/com/minelittlepony/unicopia/item/ZapAppleItem.java b/src/main/java/com/minelittlepony/unicopia/item/ZapAppleItem.java index 711cbec8..63cfb026 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/ZapAppleItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/ZapAppleItem.java @@ -2,7 +2,7 @@ package com.minelittlepony.unicopia.item; import java.util.List; -import com.minelittlepony.unicopia.UTags; +import com.minelittlepony.unicopia.UConventionalTags; import com.minelittlepony.unicopia.Unicopia; import com.minelittlepony.unicopia.advancement.UCriteria; import com.minelittlepony.unicopia.entity.Living; @@ -103,7 +103,7 @@ public class ZapAppleItem extends Item implements ChameleonItem, MultiItem { public List getDefaultStacks() { return Unicopia.SIDE.getPony().map(Pony::asWorld) .stream() - .flatMap(world -> RegistryUtils.valuesForTag(world, UTags.APPLES)) + .flatMap(world -> RegistryUtils.valuesForTag(world, UConventionalTags.APPLES)) .filter(a -> a != this).map(item -> { ItemStack stack = new ItemStack(this); stack.getOrCreateNbt().putString("appearance", Registries.ITEM.getId(item).toString()); diff --git a/src/main/resources/data/c/tags/items/acorns.json b/src/main/resources/data/c/tags/items/acorns.json deleted file mode 100644 index c88adc74..00000000 --- a/src/main/resources/data/c/tags/items/acorns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 2e326fee..00000000 --- a/src/main/resources/data/c/tags/items/apples.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "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/bananas.json b/src/main/resources/data/c/tags/items/bananas.json deleted file mode 100644 index f2e0bcc6..00000000 --- a/src/main/resources/data/c/tags/items/bananas.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:banana" - ] -} diff --git a/src/main/resources/data/c/tags/items/boats.json b/src/main/resources/data/c/tags/items/boats.json deleted file mode 100644 index dde2408d..00000000 --- a/src/main/resources/data/c/tags/items/boats.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:oak_boat", - "minecraft:bamboo_raft", - "minecraft:spruce_boat", - "minecraft:birch_boat", - "minecraft:jungle_boat", - "minecraft:acacia_boat", - "minecraft:dark_oak_boat", - "minecraft:mangrove_boat", - "minecraft:cherry_boat", - "unicopia:palm_boat" - ] -} diff --git a/src/main/resources/data/c/tags/items/cooked_fish.json b/src/main/resources/data/c/tags/items/cooked_fish.json deleted file mode 100644 index 5027c0a3..00000000 --- a/src/main/resources/data/c/tags/items/cooked_fish.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:cooked_cod", - "minecraft:cooked_salmon", - { "id": "#c:cooked_fishes", "required": false } - ] -} diff --git a/src/main/resources/data/c/tags/items/fruits.json b/src/main/resources/data/c/tags/items/fruits.json deleted file mode 100644 index 696b1906..00000000 --- a/src/main/resources/data/c/tags/items/fruits.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:mango", - "#c:pineapples", - "#c:apples", - "#c:bananas" - ] -} diff --git a/src/main/resources/data/c/tags/items/grain.json b/src/main/resources/data/c/tags/items/grain.json deleted file mode 100644 index e33c2c96..00000000 --- a/src/main/resources/data/c/tags/items/grain.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:oats" - ] -} diff --git a/src/main/resources/data/c/tags/items/mangoes.json b/src/main/resources/data/c/tags/items/mangoes.json deleted file mode 100644 index 2f6d5efe..00000000 --- a/src/main/resources/data/c/tags/items/mangoes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:mango" - ] -} diff --git a/src/main/resources/data/c/tags/items/muffins.json b/src/main/resources/data/c/tags/items/muffins.json deleted file mode 100644 index 9b8b4a32..00000000 --- a/src/main/resources/data/c/tags/items/muffins.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index ea2bc32c..00000000 --- a/src/main/resources/data/c/tags/items/mushrooms.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:red_mushroom", - "minecraft:brown_mushroom" - ] -} diff --git a/src/main/resources/data/c/tags/items/nuts.json b/src/main/resources/data/c/tags/items/nuts.json deleted file mode 100644 index 7fb489da..00000000 --- a/src/main/resources/data/c/tags/items/nuts.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - { "id": "#c:crops/peanuts", "require": false } - ] -} diff --git a/src/main/resources/data/c/tags/items/oatmeals.json b/src/main/resources/data/c/tags/items/oatmeals.json deleted file mode 100644 index 043eecbf..00000000 --- a/src/main/resources/data/c/tags/items/oatmeals.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:oatmeal" - ] -} diff --git a/src/main/resources/data/c/tags/items/pineapples.json b/src/main/resources/data/c/tags/items/pineapples.json deleted file mode 100644 index 60c5a61e..00000000 --- a/src/main/resources/data/c/tags/items/pineapples.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:pineapple" - ] -} diff --git a/src/main/resources/data/c/tags/items/pinecones.json b/src/main/resources/data/c/tags/items/pinecones.json deleted file mode 100644 index 36eac177..00000000 --- a/src/main/resources/data/c/tags/items/pinecones.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:pinecone" - ] -} diff --git a/src/main/resources/data/c/tags/items/rotten_meats.json b/src/main/resources/data/c/tags/items/rotten_meats.json index 560ab8ee..3f3bc662 100644 --- a/src/main/resources/data/c/tags/items/rotten_meats.json +++ b/src/main/resources/data/c/tags/items/rotten_meats.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "minecraft:rotten_flesh", - { "id": "c:rotten_meat", "required": false } + "minecraft:rotten_flesh" ] } diff --git a/src/main/resources/data/c/tags/items/seeds.json b/src/main/resources/data/c/tags/items/seeds.json deleted file mode 100644 index d61f66fb..00000000 --- a/src/main/resources/data/c/tags/items/seeds.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:pumpkin_seeds", - "minecraft:melon_seeds", - "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 deleted file mode 100644 index 90f5f079..00000000 --- a/src/main/resources/data/c/tags/items/sticks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:stick" - ] -} diff --git a/src/main/resources/data/farmersdelight/tags/items/cabbage_roll_ingredients.json b/src/main/resources/data/farmersdelight/tags/items/cabbage_roll_ingredients.json deleted file mode 100644 index 5324cab8..00000000 --- a/src/main/resources/data/farmersdelight/tags/items/cabbage_roll_ingredients.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:oats", - "unicopia:rock", - "unicopia:wheat_worms" - ] -} diff --git a/src/main/resources/data/farmersdelight/tags/items/comfort_foods.json b/src/main/resources/data/farmersdelight/tags/items/comfort_foods.json deleted file mode 100644 index 00184e6a..00000000 --- a/src/main/resources/data/farmersdelight/tags/items/comfort_foods.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:oatmeal", - "unicopia:rock_stew", - "unicopia:muffin" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/acorns.json b/src/main/resources/data/unicopia/tags/items/acorns.json deleted file mode 100644 index 64e40b98..00000000 --- a/src/main/resources/data/unicopia/tags/items/acorns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#c:acorns" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/apple_seeds.json b/src/main/resources/data/unicopia/tags/items/apple_seeds.json deleted file mode 100644 index 7ed8c23a..00000000 --- a/src/main/resources/data/unicopia/tags/items/apple_seeds.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:green_apple_seeds", - "unicopia:sweet_apple_seeds", - "unicopia:sour_apple_seeds" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/apples.json b/src/main/resources/data/unicopia/tags/items/apples.json deleted file mode 100644 index 7a54d955..00000000 --- a/src/main/resources/data/unicopia/tags/items/apples.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#c:apples" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/badges.json b/src/main/resources/data/unicopia/tags/items/badges.json deleted file mode 100644 index 16481fc4..00000000 --- a/src/main/resources/data/unicopia/tags/items/badges.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:earth_badge", - "unicopia:unicorn_badge", - "unicopia:pegasus_badge", - "unicopia:changeling_badge", - "unicopia:bat_badge", - "unicopia:kirin_badge", - "unicopia:alicorn_badge", - "unicopia:hippogriff_badge" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/baskets.json b/src/main/resources/data/unicopia/tags/items/baskets.json deleted file mode 100644 index 41231c85..00000000 --- a/src/main/resources/data/unicopia/tags/items/baskets.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:oak_basket", - "unicopia:spruce_basket", - "unicopia:birch_basket", - "unicopia:jungle_basket", - "unicopia:acacia_basket", - "unicopia:cherry_basket", - "unicopia:dark_oak_basket", - "unicopia:mangrove_basket", - "unicopia:bamboo_basket", - "unicopia:palm_basket" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/bed_sheets.json b/src/main/resources/data/unicopia/tags/items/bed_sheets.json deleted file mode 100644 index 295c3f4d..00000000 --- a/src/main/resources/data/unicopia/tags/items/bed_sheets.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:light_gray_bed_sheets", - "unicopia:gray_bed_sheets", - "unicopia:black_bed_sheets", - "unicopia:brown_bed_sheets", - "unicopia:red_bed_sheets", - "unicopia:orange_bed_sheets", - "unicopia:yellow_bed_sheets", - "unicopia:lime_bed_sheets", - "unicopia:green_bed_sheets", - "unicopia:cyan_bed_sheets", - "unicopia:light_blue_bed_sheets", - "unicopia:blue_bed_sheets", - "unicopia:purple_bed_sheets", - "unicopia:magenta_bed_sheets", - "unicopia:pink_bed_sheets", - - - "unicopia:apple_bed_sheets", - "unicopia:barred_bed_sheets", - "unicopia:checkered_bed_sheets", - "unicopia:kelp_bed_sheets", - "unicopia:rainbow_bed_sheets", - "unicopia:rainbow_bpw_bed_sheets", - "unicopia:rainbow_bpy_bed_sheets", - "unicopia:rainbow_pbg_bed_sheets", - "unicopia:rainbow_pwr_bed_sheets" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/can_cut_pie.json b/src/main/resources/data/unicopia/tags/items/can_cut_pie.json deleted file mode 100644 index 588dbe99..00000000 --- a/src/main/resources/data/unicopia/tags/items/can_cut_pie.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "#c:shears", - { "id": "#c:tools/knives", "required": false } - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/chitin.json b/src/main/resources/data/unicopia/tags/items/chitin.json deleted file mode 100644 index aff5bfad..00000000 --- a/src/main/resources/data/unicopia/tags/items/chitin.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:chitin", - "unicopia:surface_chitin", - "unicopia:chiselled_chitin", - "unicopia:chiselled_chitin_slab", - "unicopia:chiselled_chitin_stairs", - "unicopia:chiselled_chitin_hull", - "unicopia:chitin_spikes" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/cloud_beds.json b/src/main/resources/data/unicopia/tags/items/cloud_beds.json deleted file mode 100644 index 4338e8fd..00000000 --- a/src/main/resources/data/unicopia/tags/items/cloud_beds.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:cloud_bed" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/cloud_jars.json b/src/main/resources/data/unicopia/tags/items/cloud_jars.json deleted file mode 100644 index 3dad874d..00000000 --- a/src/main/resources/data/unicopia/tags/items/cloud_jars.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:rain_cloud_jar", - "unicopia:storm_cloud_jar" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/cloud_slabs.json b/src/main/resources/data/unicopia/tags/items/cloud_slabs.json deleted file mode 100644 index d17c86ae..00000000 --- a/src/main/resources/data/unicopia/tags/items/cloud_slabs.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:cloud_slab", - "unicopia:dense_cloud_slab", - "unicopia:cloud_brick_slab", - "unicopia:etched_cloud_slab", - "unicopia:cloud_plank_slab" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/cloud_stairs.json b/src/main/resources/data/unicopia/tags/items/cloud_stairs.json deleted file mode 100644 index 49b0d346..00000000 --- a/src/main/resources/data/unicopia/tags/items/cloud_stairs.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:cloud_stairs", - "unicopia:dense_cloud_stairs", - "unicopia:cloud_brick_stairs", - "unicopia:etched_cloud_stairs", - "unicopia:cloud_plank_stairs", - "unicopia:cloud_chest" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/clouds.json b/src/main/resources/data/unicopia/tags/items/clouds.json deleted file mode 100644 index 7fe9a915..00000000 --- a/src/main/resources/data/unicopia/tags/items/clouds.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:cloud_lump", - "unicopia:cloud", - "unicopia:cloud_planks", - "unicopia:cloud_bricks", - "unicopia:dense_cloud", - "unicopia:etched_cloud", - "unicopia:unstable_cloud", - "unicopia:cloud_door" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/cools_off_kirins.json b/src/main/resources/data/unicopia/tags/items/cools_off_kirins.json deleted file mode 100644 index 15e752ad..00000000 --- a/src/main/resources/data/unicopia/tags/items/cools_off_kirins.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:melon_slice", - "unicopia:juice", - { "id": "farmersdelight:melon_popsicle", "required": false }, - { "id": "farmersdelight:melon_juice", "required": false } - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/falls_slowly.json b/src/main/resources/data/unicopia/tags/items/falls_slowly.json deleted file mode 100644 index 49ac7cee..00000000 --- a/src/main/resources/data/unicopia/tags/items/falls_slowly.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:feather", - "#unicopia:magic_feathers", - "unicopia:cloud_lump" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/floats_on_clouds.json b/src/main/resources/data/unicopia/tags/items/floats_on_clouds.json deleted file mode 100644 index cc18beba..00000000 --- a/src/main/resources/data/unicopia/tags/items/floats_on_clouds.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "replace": false, - "values": [ - "#unicopia:clouds", - "#unicopia:cloud_slabs", - "#unicopia:cloud_stairs", - "#unicopia:cloud_beds", - "unicopia:cloud_pillar", - "unicopia:carved_cloud", - "unicopia:shaping_bench" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/fresh_apples.json b/src/main/resources/data/unicopia/tags/items/fresh_apples.json deleted file mode 100644 index e693b8f9..00000000 --- a/src/main/resources/data/unicopia/tags/items/fresh_apples.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:apple", - "unicopia:green_apple", - "unicopia:sweet_apple", - "unicopia:sour_apple" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/has_no_traits.json b/src/main/resources/data/unicopia/tags/items/has_no_traits.json deleted file mode 100644 index 1a300515..00000000 --- a/src/main/resources/data/unicopia/tags/items/has_no_traits.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:air", - "minecraft:spawner", - "minecraft:structure_void", - "minecraft:structure_block", - "minecraft:command_block", - "minecraft:chain_command_block", - "minecraft:repeating_command_block", - "minecraft:light", - "minecraft:jigsaw", - "minecraft:barrier", - "minecraft:bedrock", - "minecraft:end_portal_frame", - "minecraft:debug_stick", - "minecraft:command_block_minecart", - "unicopia:plunder_vine", - "#unicopia:badges" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/is_delivered_aggressively.json b/src/main/resources/data/unicopia/tags/items/is_delivered_aggressively.json deleted file mode 100644 index 22543754..00000000 --- a/src/main/resources/data/unicopia/tags/items/is_delivered_aggressively.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:anvil" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/magic_feathers.json b/src/main/resources/data/unicopia/tags/items/magic_feathers.json deleted file mode 100644 index d1af83d6..00000000 --- a/src/main/resources/data/unicopia/tags/items/magic_feathers.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:pegasus_feather", - "unicopia:gryphon_feather" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/palm_logs.json b/src/main/resources/data/unicopia/tags/items/palm_logs.json deleted file mode 100644 index 38397972..00000000 --- a/src/main/resources/data/unicopia/tags/items/palm_logs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_log", - "unicopia:palm_wood", - "unicopia:stripped_palm_log", - "unicopia:stripped_palm_wood" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/pies.json b/src/main/resources/data/unicopia/tags/items/pies.json deleted file mode 100644 index 995f7d85..00000000 --- a/src/main/resources/data/unicopia/tags/items/pies.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:apple_pie", - "unicopia:apple_pie_hoof" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/spooked_mob_drops.json b/src/main/resources/data/unicopia/tags/items/spooked_mob_drops.json deleted file mode 100644 index 5bca236a..00000000 --- a/src/main/resources/data/unicopia/tags/items/spooked_mob_drops.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:brick" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/zap_logs.json b/src/main/resources/data/unicopia/tags/items/zap_logs.json deleted file mode 100644 index 37a121dc..00000000 --- a/src/main/resources/data/unicopia/tags/items/zap_logs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:zap_log", - "unicopia:zap_wood", - "unicopia:stripped_zap_log", - "unicopia:stripped_zap_wood" - ] -}