diff --git a/src/main/java/com/aesefficio/interiors/CreateInteriors.java b/src/main/java/com/aesefficio/interiors/CreateInteriors.java index d455d13..b5b2a70 100644 --- a/src/main/java/com/aesefficio/interiors/CreateInteriors.java +++ b/src/main/java/com/aesefficio/interiors/CreateInteriors.java @@ -20,10 +20,12 @@ #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; @@ -80,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) { 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..fd17046 100755 --- a/src/main/java/com/aesefficio/interiors/content/registry/CITags.java +++ b/src/main/java/com/aesefficio/interiors/content/registry/CITags.java @@ -29,6 +29,8 @@ public static final class Items { for (DyeColor color : DyeColor.values()) { #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 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/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