From 4ea4ef6044b34a295bbaa4d3c59dea7dc3843311 Mon Sep 17 00:00:00 2001 From: MaouXY Date: Sat, 25 Jul 2026 14:33:32 +0800 Subject: [PATCH 1/2] Fix Create 6.0.10 seats and dye compatibility --- .../java/com/aesefficio/interiors/CreateInteriors.java | 4 ---- src/main/java/com/aesefficio/interiors/Utils.java | 3 +-- .../aesefficio/interiors/content/registry/CITags.java | 10 ++-------- src/main/resources/data/create/tags/block/seats.json | 10 ++++++++++ .../interiors/tags/item/internal/dyes/black_dyes.json | 1 + .../interiors/tags/item/internal/dyes/blue_dyes.json | 1 + .../interiors/tags/item/internal/dyes/brown_dyes.json | 1 + .../interiors/tags/item/internal/dyes/cyan_dyes.json | 1 + .../interiors/tags/item/internal/dyes/gray_dyes.json | 1 + .../interiors/tags/item/internal/dyes/green_dyes.json | 1 + .../tags/item/internal/dyes/light_blue_dyes.json | 1 + .../tags/item/internal/dyes/light_gray_dyes.json | 1 + .../interiors/tags/item/internal/dyes/lime_dyes.json | 1 + .../tags/item/internal/dyes/magenta_dyes.json | 1 + .../interiors/tags/item/internal/dyes/orange_dyes.json | 1 + .../interiors/tags/item/internal/dyes/pink_dyes.json | 1 + .../interiors/tags/item/internal/dyes/purple_dyes.json | 1 + .../interiors/tags/item/internal/dyes/red_dyes.json | 1 + .../interiors/tags/item/internal/dyes/white_dyes.json | 1 + .../interiors/tags/item/internal/dyes/yellow_dyes.json | 1 + versions/1.21.1-neoforge/gradle.properties | 4 ++-- 21 files changed, 31 insertions(+), 16 deletions(-) create mode 100644 src/main/resources/data/create/tags/block/seats.json create mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/black_dyes.json create mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/blue_dyes.json create mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/brown_dyes.json create mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/cyan_dyes.json create mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/gray_dyes.json create mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/green_dyes.json create mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/light_blue_dyes.json create mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/light_gray_dyes.json create mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/lime_dyes.json create mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/magenta_dyes.json create mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/orange_dyes.json create mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/pink_dyes.json create mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/purple_dyes.json create mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/red_dyes.json create mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/white_dyes.json create mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/yellow_dyes.json diff --git a/src/main/java/com/aesefficio/interiors/CreateInteriors.java b/src/main/java/com/aesefficio/interiors/CreateInteriors.java index d455d13..ce47368 100644 --- a/src/main/java/com/aesefficio/interiors/CreateInteriors.java +++ b/src/main/java/com/aesefficio/interiors/CreateInteriors.java @@ -29,7 +29,6 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; import io.github.fabricators_of_create.porting_lib.data.ExistingFileHelper; import io.github.fabricators_of_create.porting_lib.data.extensions.MinecraftExtension; -import com.tterrag.registrate.providers.ProviderType; import net.minecraft.client.Minecraft; import net.minecraft.client.main.GameConfig; @@ -99,9 +98,6 @@ public void onInitialize() { public void onInitializeDataGenerator(FabricDataGenerator gen) { LOGGER.info("Initializing data generator"); - REGISTRATE.addDataGenerator(ProviderType.ITEM_TAGS, prov -> - CITags.DYES.values().forEach(prov::addTag)); - Path existingResources = Path.of(System.getProperty(ExistingFileHelper.EXISTING_RESOURCES)); String existingMods = System.getProperty(ExistingFileHelper.EXISTING_MODS); @SuppressWarnings("UnstableApiUsage") diff --git a/src/main/java/com/aesefficio/interiors/Utils.java b/src/main/java/com/aesefficio/interiors/Utils.java index 7261d93..a3afaee 100644 --- a/src/main/java/com/aesefficio/interiors/Utils.java +++ b/src/main/java/com/aesefficio/interiors/Utils.java @@ -70,8 +70,7 @@ public static DyeColor colorFromItem(ItemStack stack) { if (stack.getItem() instanceof DyeItem) { return ((DyeItem)stack.getItem()).getDyeColor(); } else { - for (int x = 0; x < DyeColor.BLACK.getId(); ++x) { - DyeColor color = DyeColor.byId(x); + for (DyeColor color : DyeColor.values()) { if (stack.is(CITags.DYES.get(color))) { return color; } diff --git a/src/main/java/com/aesefficio/interiors/content/registry/CITags.java b/src/main/java/com/aesefficio/interiors/content/registry/CITags.java index dc55399..4e9642a 100755 --- a/src/main/java/com/aesefficio/interiors/content/registry/CITags.java +++ b/src/main/java/com/aesefficio/interiors/content/registry/CITags.java @@ -2,14 +2,12 @@ import net.minecraft.Util; import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.item.DyeColor; import net.minecraft.world.level.block.Block; import net.minecraft.world.item.Item; import com.aesefficio.interiors.CreateInteriors; -import com.aesefficio.interiors.Utils; import java.util.EnumMap; import java.util.Map; @@ -27,12 +25,8 @@ public static final class Items { public static final Map> DYES = Util.make(new EnumMap<>(DyeColor.class), dyes -> { for (DyeColor color : DyeColor.values()) { - #if forge - ResourceLocation rl = Utils.id("forge", "dyes/" + color.getName()); - #else - ResourceLocation rl = Utils.id("c", color.getName() + "_dyes"); - #endif - dyes.put(color, TagKey.create(Registries.ITEM, rl)); + dyes.put(color, TagKey.create(Registries.ITEM, + CreateInteriors.id("internal/dyes/" + color.getName() + "_dyes"))); } }); diff --git a/src/main/resources/data/create/tags/block/seats.json b/src/main/resources/data/create/tags/block/seats.json new file mode 100644 index 0000000..816c6e2 --- /dev/null +++ b/src/main/resources/data/create/tags/block/seats.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "#interiors:chairs", + "#interiors:floor_chairs", + "interiors:kelp_chair", + "interiors:kelp_floor_chair", + "interiors:kelp_seat" + ] +} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/black_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/black_dyes.json new file mode 100644 index 0000000..cec71c1 --- /dev/null +++ b/src/main/resources/data/interiors/tags/item/internal/dyes/black_dyes.json @@ -0,0 +1 @@ +{"values":[{"id":"#c:black_dyes","required":false},{"id":"#forge:dyes/black","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/blue_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/blue_dyes.json new file mode 100644 index 0000000..039decb --- /dev/null +++ b/src/main/resources/data/interiors/tags/item/internal/dyes/blue_dyes.json @@ -0,0 +1 @@ +{"values":[{"id":"#c:blue_dyes","required":false},{"id":"#forge:dyes/blue","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/brown_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/brown_dyes.json new file mode 100644 index 0000000..4072a01 --- /dev/null +++ b/src/main/resources/data/interiors/tags/item/internal/dyes/brown_dyes.json @@ -0,0 +1 @@ +{"values":[{"id":"#c:brown_dyes","required":false},{"id":"#forge:dyes/brown","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/cyan_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/cyan_dyes.json new file mode 100644 index 0000000..8ed0737 --- /dev/null +++ b/src/main/resources/data/interiors/tags/item/internal/dyes/cyan_dyes.json @@ -0,0 +1 @@ +{"values":[{"id":"#c:cyan_dyes","required":false},{"id":"#forge:dyes/cyan","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/gray_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/gray_dyes.json new file mode 100644 index 0000000..f5a1839 --- /dev/null +++ b/src/main/resources/data/interiors/tags/item/internal/dyes/gray_dyes.json @@ -0,0 +1 @@ +{"values":[{"id":"#c:gray_dyes","required":false},{"id":"#forge:dyes/gray","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/green_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/green_dyes.json new file mode 100644 index 0000000..da98781 --- /dev/null +++ b/src/main/resources/data/interiors/tags/item/internal/dyes/green_dyes.json @@ -0,0 +1 @@ +{"values":[{"id":"#c:green_dyes","required":false},{"id":"#forge:dyes/green","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/light_blue_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/light_blue_dyes.json new file mode 100644 index 0000000..64db37c --- /dev/null +++ b/src/main/resources/data/interiors/tags/item/internal/dyes/light_blue_dyes.json @@ -0,0 +1 @@ +{"values":[{"id":"#c:light_blue_dyes","required":false},{"id":"#forge:dyes/light_blue","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/light_gray_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/light_gray_dyes.json new file mode 100644 index 0000000..c10951e --- /dev/null +++ b/src/main/resources/data/interiors/tags/item/internal/dyes/light_gray_dyes.json @@ -0,0 +1 @@ +{"values":[{"id":"#c:light_gray_dyes","required":false},{"id":"#forge:dyes/light_gray","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/lime_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/lime_dyes.json new file mode 100644 index 0000000..dc51ed7 --- /dev/null +++ b/src/main/resources/data/interiors/tags/item/internal/dyes/lime_dyes.json @@ -0,0 +1 @@ +{"values":[{"id":"#c:lime_dyes","required":false},{"id":"#forge:dyes/lime","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/magenta_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/magenta_dyes.json new file mode 100644 index 0000000..fe8dbea --- /dev/null +++ b/src/main/resources/data/interiors/tags/item/internal/dyes/magenta_dyes.json @@ -0,0 +1 @@ +{"values":[{"id":"#c:magenta_dyes","required":false},{"id":"#forge:dyes/magenta","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/orange_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/orange_dyes.json new file mode 100644 index 0000000..a2db1d0 --- /dev/null +++ b/src/main/resources/data/interiors/tags/item/internal/dyes/orange_dyes.json @@ -0,0 +1 @@ +{"values":[{"id":"#c:orange_dyes","required":false},{"id":"#forge:dyes/orange","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/pink_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/pink_dyes.json new file mode 100644 index 0000000..868da00 --- /dev/null +++ b/src/main/resources/data/interiors/tags/item/internal/dyes/pink_dyes.json @@ -0,0 +1 @@ +{"values":[{"id":"#c:pink_dyes","required":false},{"id":"#forge:dyes/pink","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/purple_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/purple_dyes.json new file mode 100644 index 0000000..d7dcc5f --- /dev/null +++ b/src/main/resources/data/interiors/tags/item/internal/dyes/purple_dyes.json @@ -0,0 +1 @@ +{"values":[{"id":"#c:purple_dyes","required":false},{"id":"#forge:dyes/purple","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/red_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/red_dyes.json new file mode 100644 index 0000000..c4d29cc --- /dev/null +++ b/src/main/resources/data/interiors/tags/item/internal/dyes/red_dyes.json @@ -0,0 +1 @@ +{"values":[{"id":"#c:red_dyes","required":false},{"id":"#forge:dyes/red","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/white_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/white_dyes.json new file mode 100644 index 0000000..1c40b25 --- /dev/null +++ b/src/main/resources/data/interiors/tags/item/internal/dyes/white_dyes.json @@ -0,0 +1 @@ +{"values":[{"id":"#c:white_dyes","required":false},{"id":"#forge:dyes/white","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/yellow_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/yellow_dyes.json new file mode 100644 index 0000000..4f2db05 --- /dev/null +++ b/src/main/resources/data/interiors/tags/item/internal/dyes/yellow_dyes.json @@ -0,0 +1 @@ +{"values":[{"id":"#c:yellow_dyes","required":false},{"id":"#forge:dyes/yellow","required":false}]} diff --git a/versions/1.21.1-neoforge/gradle.properties b/versions/1.21.1-neoforge/gradle.properties index 6bff890..e5d4159 100644 --- a/versions/1.21.1-neoforge/gradle.properties +++ b/versions/1.21.1-neoforge/gradle.properties @@ -2,7 +2,7 @@ parchment_version = 2024.11.17 forge_version = 206 # https://wiki.createmod.net/developers/depend-on-create/neoforge-1.21.1 -create_version = 6.0.9-215 +create_version = 6.0.10-217 ponder_version = 1.0.81 flywheel_version = 1.0.6 registrate_version = MC1.21-1.3.0+67 @@ -10,4 +10,4 @@ registrate_version = MC1.21-1.3.0+67 # Better Mods Button - https://www.curseforge.com/minecraft/mc-mods/better-mods-button/files bmb_version = 5710111 # Catalogue - https://www.curseforge.com/minecraft/mc-mods/catalogue/files -catalogue_version = 6458225 \ No newline at end of file +catalogue_version = 6458225 From 61dedfca42a34f0838e498ecd349d21728e4d315 Mon Sep 17 00:00:00 2001 From: MaouXY Date: Mon, 27 Jul 2026 19:16:44 +0800 Subject: [PATCH 2/2] Fix chair dye recipes and datagen --- .../com/aesefficio/interiors/CreateInteriors.java | 8 +++++++- .../interiors/content/registry/CITags.java | 12 ++++++++++-- .../tags/item/internal/dyes/black_dyes.json | 1 - .../interiors/tags/item/internal/dyes/blue_dyes.json | 1 - .../tags/item/internal/dyes/brown_dyes.json | 1 - .../interiors/tags/item/internal/dyes/cyan_dyes.json | 1 - .../interiors/tags/item/internal/dyes/gray_dyes.json | 1 - .../tags/item/internal/dyes/green_dyes.json | 1 - .../tags/item/internal/dyes/light_blue_dyes.json | 1 - .../tags/item/internal/dyes/light_gray_dyes.json | 1 - .../interiors/tags/item/internal/dyes/lime_dyes.json | 1 - .../tags/item/internal/dyes/magenta_dyes.json | 1 - .../tags/item/internal/dyes/orange_dyes.json | 1 - .../interiors/tags/item/internal/dyes/pink_dyes.json | 1 - .../tags/item/internal/dyes/purple_dyes.json | 1 - .../interiors/tags/item/internal/dyes/red_dyes.json | 1 - .../tags/item/internal/dyes/white_dyes.json | 1 - .../tags/item/internal/dyes/yellow_dyes.json | 1 - 18 files changed, 17 insertions(+), 19 deletions(-) delete mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/black_dyes.json delete mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/blue_dyes.json delete mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/brown_dyes.json delete mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/cyan_dyes.json delete mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/gray_dyes.json delete mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/green_dyes.json delete mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/light_blue_dyes.json delete mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/light_gray_dyes.json delete mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/lime_dyes.json delete mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/magenta_dyes.json delete mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/orange_dyes.json delete mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/pink_dyes.json delete mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/purple_dyes.json delete mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/red_dyes.json delete mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/white_dyes.json delete mode 100644 src/main/resources/data/interiors/tags/item/internal/dyes/yellow_dyes.json diff --git a/src/main/java/com/aesefficio/interiors/CreateInteriors.java b/src/main/java/com/aesefficio/interiors/CreateInteriors.java index ce47368..b5b2a70 100644 --- a/src/main/java/com/aesefficio/interiors/CreateInteriors.java +++ b/src/main/java/com/aesefficio/interiors/CreateInteriors.java @@ -20,15 +20,18 @@ #if forge import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.fml.common.Mod; #elif neoforge import net.neoforged.neoforge.data.event.GatherDataEvent; import net.neoforged.bus.api.IEventBus; +import net.neoforged.bus.api.EventPriority; import net.neoforged.fml.common.Mod; #elif fabric import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; import io.github.fabricators_of_create.porting_lib.data.ExistingFileHelper; import io.github.fabricators_of_create.porting_lib.data.extensions.MinecraftExtension; +import com.tterrag.registrate.providers.ProviderType; import net.minecraft.client.Minecraft; import net.minecraft.client.main.GameConfig; @@ -79,7 +82,7 @@ public CreateInteriors(net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContex REGISTRATE.registerEventListeners(modBus); init(); CITab.register(modBus); - modBus.addListener(this::gatherData); + modBus.addListener(EventPriority.HIGH, this::gatherData); } public void gatherData(GatherDataEvent event) { @@ -98,6 +101,9 @@ public void onInitialize() { public void onInitializeDataGenerator(FabricDataGenerator gen) { LOGGER.info("Initializing data generator"); + REGISTRATE.addDataGenerator(ProviderType.ITEM_TAGS, prov -> + CITags.DYES.values().forEach(prov::addTag)); + Path existingResources = Path.of(System.getProperty(ExistingFileHelper.EXISTING_RESOURCES)); String existingMods = System.getProperty(ExistingFileHelper.EXISTING_MODS); @SuppressWarnings("UnstableApiUsage") diff --git a/src/main/java/com/aesefficio/interiors/content/registry/CITags.java b/src/main/java/com/aesefficio/interiors/content/registry/CITags.java index 4e9642a..fd17046 100755 --- a/src/main/java/com/aesefficio/interiors/content/registry/CITags.java +++ b/src/main/java/com/aesefficio/interiors/content/registry/CITags.java @@ -2,12 +2,14 @@ import net.minecraft.Util; import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.item.DyeColor; import net.minecraft.world.level.block.Block; import net.minecraft.world.item.Item; import com.aesefficio.interiors.CreateInteriors; +import com.aesefficio.interiors.Utils; import java.util.EnumMap; import java.util.Map; @@ -25,8 +27,14 @@ public static final class Items { public static final Map> DYES = Util.make(new EnumMap<>(DyeColor.class), dyes -> { for (DyeColor color : DyeColor.values()) { - dyes.put(color, TagKey.create(Registries.ITEM, - CreateInteriors.id("internal/dyes/" + color.getName() + "_dyes"))); + #if forge + ResourceLocation rl = Utils.id("forge", "dyes/" + color.getName()); + #elif neoforge + ResourceLocation rl = Utils.id("c", "dyes/" + color.getName()); + #else + ResourceLocation rl = Utils.id("c", color.getName() + "_dyes"); + #endif + dyes.put(color, TagKey.create(Registries.ITEM, rl)); } }); diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/black_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/black_dyes.json deleted file mode 100644 index cec71c1..0000000 --- a/src/main/resources/data/interiors/tags/item/internal/dyes/black_dyes.json +++ /dev/null @@ -1 +0,0 @@ -{"values":[{"id":"#c:black_dyes","required":false},{"id":"#forge:dyes/black","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/blue_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/blue_dyes.json deleted file mode 100644 index 039decb..0000000 --- a/src/main/resources/data/interiors/tags/item/internal/dyes/blue_dyes.json +++ /dev/null @@ -1 +0,0 @@ -{"values":[{"id":"#c:blue_dyes","required":false},{"id":"#forge:dyes/blue","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/brown_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/brown_dyes.json deleted file mode 100644 index 4072a01..0000000 --- a/src/main/resources/data/interiors/tags/item/internal/dyes/brown_dyes.json +++ /dev/null @@ -1 +0,0 @@ -{"values":[{"id":"#c:brown_dyes","required":false},{"id":"#forge:dyes/brown","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/cyan_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/cyan_dyes.json deleted file mode 100644 index 8ed0737..0000000 --- a/src/main/resources/data/interiors/tags/item/internal/dyes/cyan_dyes.json +++ /dev/null @@ -1 +0,0 @@ -{"values":[{"id":"#c:cyan_dyes","required":false},{"id":"#forge:dyes/cyan","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/gray_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/gray_dyes.json deleted file mode 100644 index f5a1839..0000000 --- a/src/main/resources/data/interiors/tags/item/internal/dyes/gray_dyes.json +++ /dev/null @@ -1 +0,0 @@ -{"values":[{"id":"#c:gray_dyes","required":false},{"id":"#forge:dyes/gray","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/green_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/green_dyes.json deleted file mode 100644 index da98781..0000000 --- a/src/main/resources/data/interiors/tags/item/internal/dyes/green_dyes.json +++ /dev/null @@ -1 +0,0 @@ -{"values":[{"id":"#c:green_dyes","required":false},{"id":"#forge:dyes/green","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/light_blue_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/light_blue_dyes.json deleted file mode 100644 index 64db37c..0000000 --- a/src/main/resources/data/interiors/tags/item/internal/dyes/light_blue_dyes.json +++ /dev/null @@ -1 +0,0 @@ -{"values":[{"id":"#c:light_blue_dyes","required":false},{"id":"#forge:dyes/light_blue","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/light_gray_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/light_gray_dyes.json deleted file mode 100644 index c10951e..0000000 --- a/src/main/resources/data/interiors/tags/item/internal/dyes/light_gray_dyes.json +++ /dev/null @@ -1 +0,0 @@ -{"values":[{"id":"#c:light_gray_dyes","required":false},{"id":"#forge:dyes/light_gray","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/lime_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/lime_dyes.json deleted file mode 100644 index dc51ed7..0000000 --- a/src/main/resources/data/interiors/tags/item/internal/dyes/lime_dyes.json +++ /dev/null @@ -1 +0,0 @@ -{"values":[{"id":"#c:lime_dyes","required":false},{"id":"#forge:dyes/lime","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/magenta_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/magenta_dyes.json deleted file mode 100644 index fe8dbea..0000000 --- a/src/main/resources/data/interiors/tags/item/internal/dyes/magenta_dyes.json +++ /dev/null @@ -1 +0,0 @@ -{"values":[{"id":"#c:magenta_dyes","required":false},{"id":"#forge:dyes/magenta","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/orange_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/orange_dyes.json deleted file mode 100644 index a2db1d0..0000000 --- a/src/main/resources/data/interiors/tags/item/internal/dyes/orange_dyes.json +++ /dev/null @@ -1 +0,0 @@ -{"values":[{"id":"#c:orange_dyes","required":false},{"id":"#forge:dyes/orange","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/pink_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/pink_dyes.json deleted file mode 100644 index 868da00..0000000 --- a/src/main/resources/data/interiors/tags/item/internal/dyes/pink_dyes.json +++ /dev/null @@ -1 +0,0 @@ -{"values":[{"id":"#c:pink_dyes","required":false},{"id":"#forge:dyes/pink","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/purple_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/purple_dyes.json deleted file mode 100644 index d7dcc5f..0000000 --- a/src/main/resources/data/interiors/tags/item/internal/dyes/purple_dyes.json +++ /dev/null @@ -1 +0,0 @@ -{"values":[{"id":"#c:purple_dyes","required":false},{"id":"#forge:dyes/purple","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/red_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/red_dyes.json deleted file mode 100644 index c4d29cc..0000000 --- a/src/main/resources/data/interiors/tags/item/internal/dyes/red_dyes.json +++ /dev/null @@ -1 +0,0 @@ -{"values":[{"id":"#c:red_dyes","required":false},{"id":"#forge:dyes/red","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/white_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/white_dyes.json deleted file mode 100644 index 1c40b25..0000000 --- a/src/main/resources/data/interiors/tags/item/internal/dyes/white_dyes.json +++ /dev/null @@ -1 +0,0 @@ -{"values":[{"id":"#c:white_dyes","required":false},{"id":"#forge:dyes/white","required":false}]} diff --git a/src/main/resources/data/interiors/tags/item/internal/dyes/yellow_dyes.json b/src/main/resources/data/interiors/tags/item/internal/dyes/yellow_dyes.json deleted file mode 100644 index 4f2db05..0000000 --- a/src/main/resources/data/interiors/tags/item/internal/dyes/yellow_dyes.json +++ /dev/null @@ -1 +0,0 @@ -{"values":[{"id":"#c:yellow_dyes","required":false},{"id":"#forge:dyes/yellow","required":false}]}