Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main/java/com/aesefficio/interiors/CreateInteriors.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/aesefficio/interiors/Utils.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions src/main/resources/data/create/tags/block/seats.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"replace": false,
"values": [
"#interiors:chairs",
"#interiors:floor_chairs",
"interiors:kelp_chair",
"interiors:kelp_floor_chair",
"interiors:kelp_seat"
]
}
4 changes: 2 additions & 2 deletions versions/1.21.1-neoforge/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ 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

# 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
catalogue_version = 6458225
Loading