[26.1] Support Registree V2

build.gradle.kts

@@ -23,7 +23,7 @@ repositories {
         }
     }
 
-    maven("https://maven.apexstudios.dev/prs/Registree/pr17") {
+    maven("https://maven.apexstudios.dev/prs/Registree/pr19") {
         content {
             includeModule("dev.apexstudios", "registree")
         }

settings.gradle.kts

@@ -17,7 +17,7 @@ dependencyResolutionManagement {
     versionCatalogs.create("libs") {
         version("neoforge", "26.1.0.0-alpha.11+snapshot-7")
 
-        library("registree", "dev.apexstudios", "registree").version("26.1.16-beta-pr-17")
+        library("registree", "dev.apexstudios", "registree").version("26.1.37-beta-pr-19")
     }
 }
 

src/main/java/dev/apexstudios/apexcore/api/block/Dyeable.java

@@ -1,13 +1,12 @@
 package dev.apexstudios.apexcore.api.block;
 
 import com.mojang.serialization.Codec;
-import dev.apexstudios.registree.api.Registree;
+import dev.apexstudios.registree.Registree;
 import java.util.stream.Stream;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.component.DataComponentGetter;
 import net.minecraft.core.component.DataComponentType;
 import net.minecraft.core.component.DataComponents;
-import net.minecraft.core.registries.Registries;
 import net.minecraft.util.CommonColors;
 import net.minecraft.util.StringRepresentable;
 import net.minecraft.world.InteractionHand;
@@ -100,7 +99,7 @@ default void appendDyedColor(MutableDataComponentHolder components, BlockState b
     }
 
     static Stream<Block> dyeableBlocks(Registree registree) {
-        return registree.stream(Registries.BLOCK).filter(Dyeable.class::isInstance);
+        return registree.blocks().stream().filter(Dyeable.class::isInstance);
     }
 
     static Stream<Item> dyeableItems(Registree registree) {

src/main/java/dev/apexstudios/apexcore/api/data/provider/LanguageProvider.java

@@ -2,6 +2,7 @@
 
 import dev.apexstudios.apexcore.api.data.ProviderType;
 import dev.apexstudios.apexcore.common.data.provider.LanguageProviderImpl;
+import dev.apexstudios.registree.registrar.CreativeModeTabRegistrar;
 import java.util.function.Supplier;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.tags.TagKey;
@@ -64,7 +65,7 @@ default LanguageProvider addDimension(ResourceKey<Level> dimension, String value
     }
 
     default LanguageProvider addCreativeModeTab(ResourceKey<CreativeModeTab> creativeModeTab, String value) {
-        return add(creativeModeTab, "itemGroup", value);
+        return add(CreativeModeTabRegistrar.descriptionId(creativeModeTab), value);
     }
 
     default LanguageProvider add(GameRule<?> gameRule, String value, String descriptionValue) {

src/main/java/dev/apexstudios/apexcore/api/data/provider/loot/LootTableProvider.java

@@ -2,7 +2,6 @@
 
 import dev.apexstudios.apexcore.api.data.ProviderType;
 import dev.apexstudios.apexcore.common.data.provider.loot.LootTableProviderImpl;
-import dev.apexstudios.registree.api.Registree;
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
@@ -36,15 +35,6 @@ default LootTableProvider entity(Consumer<EntityLootSubProvider> consumer) {
 
     <TRegistry> LootTableProvider elementFilter(ResourceKey<? extends Registry<TRegistry>> registryType, Predicate<Holder<TRegistry>> filter);
 
-    default <TRegistry> LootTableProvider fromRegistree(Registree registree, ResourceKey<? extends Registry<TRegistry>> registryType) {
-        return knownElements(registryType, () -> registree.listElements(registryType));
-    }
-
-    default LootTableProvider fromRegistree(Registree registree) {
-        registree.listRegistries().forEach(registryType -> fromRegistree(registree, (ResourceKey) registryType));
-        return this;
-    }
-
     default <TRegistry> LootTableProvider knownElements(DeferredHolder<TRegistry, ?>... elements) {
         Objects.checkIndex(0, elements.length);
         var registryType = elements[0].getKey().registryKey();

src/main/java/dev/apexstudios/apexcore/api/data/provider/model/ModelProvider.java

@@ -1,13 +1,11 @@
 package dev.apexstudios.apexcore.api.data.provider.model;
 
-import dev.apexstudios.registree.api.Registree;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 import net.minecraft.client.data.models.BlockModelGenerators;
 import net.minecraft.client.data.models.ItemModelGenerators;
 import net.minecraft.core.Holder;
-import net.minecraft.core.registries.Registries;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
@@ -34,18 +32,6 @@ default ModelProvider noBlocks() {
         return knownBlocks(Stream::empty);
     }
 
-    default ModelProvider fromRegistree(Registree registree) {
-        return itemsFromRegistree(registree).blocksFromRegistree(registree);
-    }
-
-    default ModelProvider itemsFromRegistree(Registree registree) {
-        return knownItems(() -> registree.listElements(Registries.ITEM));
-    }
-
-    default ModelProvider blocksFromRegistree(Registree registree) {
-        return knownBlocks(() -> registree.listElements(Registries.BLOCK));
-    }
-
     default ModelProvider knownItems(DeferredHolder<Item, ?>... items) {
         return knownItems(() -> Stream.of(items));
     }

src/main/java/dev/apexstudios/apexcore/api/util/ApexTags.java

@@ -1,23 +1,22 @@
 package dev.apexstudios.apexcore.api.util;
 
 import dev.apexstudios.apexcore.common.ApexCore;
-import net.minecraft.core.registries.Registries;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.block.Block;
 
 public interface ApexTags {
     interface Blocks {
-        TagKey<Block> SEAT_PER_BLOCK = ApexCore.REGISTREE.tag(Registries.BLOCK, "seat_per_block");
-        TagKey<Block> SHEARS_EFFICIENT = ApexCore.REGISTREE.tag(Registries.BLOCK, "shears_efficient");
+        TagKey<Block> SEAT_PER_BLOCK = ApexCore.BLOCKS.tag("seat_per_block");
+        TagKey<Block> SHEARS_EFFICIENT = ApexCore.BLOCKS.tag("shears_efficient");
 
         private static void register() {
 
         }
     }
 
     interface EntityTypes {
-        TagKey<EntityType<?>> SEAT_BLACKLIST = ApexCore.REGISTREE.tag(Registries.ENTITY_TYPE, "seat_blacklist");
+        TagKey<EntityType<?>> SEAT_BLACKLIST = ApexCore.ENTITY_TYPES.tag("seat_blacklist");
 
         private static void register() {
 

src/main/java/dev/apexstudios/apexcore/common/ApexCore.java

@@ -2,7 +2,9 @@
 
 import dev.apexstudios.apexcore.api.util.ApexTags;
 import dev.apexstudios.apexcore.common.seat.SeatSetup;
-import dev.apexstudios.registree.api.Registree;
+import dev.apexstudios.registree.Registree;
+import dev.apexstudios.registree.registrar.BlockRegistrar;
+import dev.apexstudios.registree.registrar.EntityTypeRegistrar;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.Identifier;
 import net.minecraft.server.packs.PackType;
@@ -16,12 +18,14 @@
 public final class ApexCore {
     public static final String ID = "apexcore";
     public static final Registree REGISTREE = Registree.create(ID);
+    public static final BlockRegistrar BLOCKS = REGISTREE.blocks();
+    public static final EntityTypeRegistrar ENTITY_TYPES = REGISTREE.entityTypes();
 
     public ApexCore(IEventBus modBus) {
         REGISTREE.registerEvents(modBus);
 
         ApexTags.register();
-        SeatSetup.register(modBus);
+        SeatSetup.register();
 
         modBus.addListener(AddPackFindersEvent.class, event ->  event.addPackFinders(
                 identifier("packs/visual_vanilla"),

src/main/java/dev/apexstudios/apexcore/common/seat/SeatSetup.java

@@ -2,26 +2,29 @@
 
 import dev.apexstudios.apexcore.api.block.Seat;
 import dev.apexstudios.apexcore.common.ApexCore;
-import dev.apexstudios.registree.api.holder.DeferredEntity;
+import dev.apexstudios.registree.holder.DeferredEntityType;
 import net.minecraft.client.renderer.entity.NoopRenderer;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.MobCategory;
 import net.minecraft.world.entity.ai.memory.MemoryModuleType;
 import net.minecraft.world.entity.player.Player;
-import net.neoforged.bus.api.IEventBus;
 import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
-import net.neoforged.neoforge.client.event.EntityRenderersEvent;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent;
 
 public interface SeatSetup {
-    DeferredEntity<SeatEntity> ENTITY = ApexCore.REGISTREE.registerEntity("seat", SeatEntity::new, MobCategory.MISC, builder -> builder.sized(1F, 1F).noLootTable());
-
-    static void register(IEventBus modBus) {
-        modBus.addListener(EntityRenderersEvent.RegisterRenderers.class, event -> event.registerEntityRenderer(ENTITY.value(), NoopRenderer::new));
-
-        modBus.addListener(RegisterCapabilitiesEvent.class, event -> {
+    DeferredEntityType<SeatEntity> ENTITY = ApexCore.ENTITY_TYPES
+            .builder("seat", SeatEntity::new, MobCategory.MISC)
+            .properties(properties -> properties
+                    .sized(1F, 1F)
+                    .noLootTable()
+            )
+            .renderer(() -> () -> NoopRenderer::new)
+            .register();
+
+    static void register() {
+        ApexCore.REGISTREE.event(RegisterCapabilitiesEvent.class, event -> {
             Seat.registerCapabilities(event, EntityType.CAMEL, (camel, pos, blockState) -> camel.sitDown(), (camel, pos, blockState) -> camel.standUp());
             Seat.registerCapabilities(event, EntityType.FOX, (fox, pos, blockState) -> fox.setSitting(true), (fox, pos, blockState) -> fox.setSitting(false));