switch to porting lib deferred holder

build.gradle

@@ -1,7 +1,7 @@
 //file:noinspection GroovyAssignabilityCheck
 //file:noinspection GroovyAccessibility
 plugins {
-    id "fabric-loom" version "1.6.+"
+    id "fabric-loom" version "1.7.+"
     id "io.freefair.lombok" version "8.10"
     id "maven-publish"
 }
@@ -34,11 +34,12 @@ dependencies {
 
     modImplementation("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
     modApi(include(fabricApi.module("fabric-data-generation-api-v1", project.fabric_version))) // include datagen api
-    modApi(include("io.github.fabricators_of_create.Porting-Lib:tags:${project.porting_lib_version}")) { exclude(group: "io.vram") }
-    modApi(include("io.github.fabricators_of_create.Porting-Lib:models:${project.porting_lib_version}")) { exclude(group: "io.vram") }
-    modApi(include("io.github.fabricators_of_create.Porting-Lib:data:${project.porting_lib_version}")) { exclude(group: "io.vram") }
 
-    compileOnly("org.projectlombok:lombok:1.18.34")
+    for (String module in porting_lib_modules.split(",")) {
+        modApi(include("io.github.fabricators_of_create.Porting-Lib:$module:$porting_lib_version")) { exclude(group: "io.vram") }
+    }
+
+    compileOnly(annotationProcessor("org.projectlombok:lombok:1.18.34"))
 
     implementation(include("com.google.code.findbugs:jsr305:3.0.2"))
     implementation("javax.annotation:javax.annotation-api:1.3.2")

gradle.properties

@@ -8,7 +8,9 @@ mod_version = 1.3.<patch>
 minecraft_version = 1.21.1
 loader_version = 0.16.5
 fabric_version = 0.104.0+1.21.1
-porting_lib_version = 3.1.0-beta-beta.35+1.21
+
+porting_lib_version = 3.1.0-beta.39+1.21.1
+porting_lib_modules = tags,models,data,lazy_registration
 
 # Mappings
 # https://parchmentmc.org/docs/getting-started

src/main/java/com/tterrag/registrate/AbstractRegistrate.java

@@ -6,7 +6,6 @@
 import com.tterrag.registrate.builders.MenuBuilder.ForgeMenuFactory;
 import com.tterrag.registrate.builders.MenuBuilder.MenuFactory;
 import com.tterrag.registrate.builders.MenuBuilder.ScreenFactory;
-import com.tterrag.registrate.fabric.DeferredHolder;
 import com.tterrag.registrate.fabric.RegistryUtil;
 import com.tterrag.registrate.fabric.SimpleFlowableFluid;
 import com.tterrag.registrate.providers.ProviderType;
@@ -33,6 +32,7 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Table;
 import com.tterrag.registrate.providers.*;
+import io.github.fabricators_of_create.porting_lib.util.DeferredHolder;
 import net.minecraft.Util;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.MenuAccess;

src/main/java/com/tterrag/registrate/builders/AbstractBuilder.java

@@ -3,7 +3,6 @@
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import com.tterrag.registrate.AbstractRegistrate;
-import com.tterrag.registrate.fabric.DeferredHolder;
 import com.tterrag.registrate.providers.ProviderType;
 import com.tterrag.registrate.providers.RegistrateLangProvider;
 import com.tterrag.registrate.providers.RegistrateTagsProvider;
@@ -13,6 +12,7 @@
 import com.tterrag.registrate.util.nullness.NonNullFunction;
 import com.tterrag.registrate.util.nullness.NonNullSupplier;
 import com.tterrag.registrate.util.nullness.NonnullType;
+import io.github.fabricators_of_create.porting_lib.util.DeferredHolder;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

src/main/java/com/tterrag/registrate/builders/BlockBuilder.java

@@ -3,7 +3,6 @@
 import com.google.gson.JsonElement;
 import com.tterrag.registrate.AbstractRegistrate;
 import com.tterrag.registrate.builders.BlockEntityBuilder.BlockEntityFactory;
-import com.tterrag.registrate.fabric.DeferredHolder;
 import com.tterrag.registrate.fabric.EnvExecutor;
 import com.tterrag.registrate.providers.*;
 import com.tterrag.registrate.providers.loot.RegistrateBlockLootTables;
@@ -12,6 +11,7 @@
 import com.tterrag.registrate.util.entry.RegistryEntry;
 import com.tterrag.registrate.util.nullness.*;
 import io.github.fabricators_of_create.porting_lib.models.generators.BlockStateProvider;
+import io.github.fabricators_of_create.porting_lib.util.DeferredHolder;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
 import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;

src/main/java/com/tterrag/registrate/builders/BlockEntityBuilder.java

@@ -6,13 +6,13 @@
 import java.util.function.Function;
 
 import com.tterrag.registrate.AbstractRegistrate;
-import com.tterrag.registrate.fabric.DeferredHolder;
 import com.tterrag.registrate.fabric.EnvExecutor;
 import com.tterrag.registrate.mixin.accessor.BlockEntityRenderersAccessor;
 import com.tterrag.registrate.util.entry.BlockEntityEntry;
 import com.tterrag.registrate.util.entry.RegistryEntry;
 import com.tterrag.registrate.util.nullness.NonNullFunction;
 import com.tterrag.registrate.util.nullness.NonNullSupplier;
+import io.github.fabricators_of_create.porting_lib.util.DeferredHolder;
 import net.fabricmc.api.EnvType;
 import org.jetbrains.annotations.Nullable;
 

src/main/java/com/tterrag/registrate/builders/Builder.java

@@ -205,7 +205,7 @@ default <R2, T2 extends R2, P2, S2 extends Builder<R2, T2, P2, S2>> S2 transform
     }
 
     /**
-     * Register the entry and return the parent object. The {@link com.tterrag.registrate.fabric.DeferredHolder} will be created but not returned. It can be retrieved later with {@link AbstractRegistrate#get(ResourceKey)} or
+     * Register the entry and return the parent object. The {@link io.github.fabricators_of_create.porting_lib.util.DeferredHolder} will be created but not returned. It can be retrieved later with {@link AbstractRegistrate#get(ResourceKey)} or
      * {@link AbstractRegistrate#get(String, ResourceKey)}.
      * 
      * @return the parent object

src/main/java/com/tterrag/registrate/builders/BuilderCallback.java

@@ -1,11 +1,11 @@
 package com.tterrag.registrate.builders;
 
 import com.tterrag.registrate.AbstractRegistrate;
-import com.tterrag.registrate.fabric.DeferredHolder;
 import com.tterrag.registrate.util.entry.RegistryEntry;
 import com.tterrag.registrate.util.nullness.NonNullFunction;
 import com.tterrag.registrate.util.nullness.NonNullSupplier;
 
+import io.github.fabricators_of_create.porting_lib.util.DeferredHolder;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
 

src/main/java/com/tterrag/registrate/builders/EntityBuilder.java

@@ -3,7 +3,6 @@
 import java.util.function.Supplier;
 
 import com.tterrag.registrate.AbstractRegistrate;
-import com.tterrag.registrate.fabric.DeferredHolder;
 import com.tterrag.registrate.fabric.EnvExecutor;
 import com.tterrag.registrate.mixin.accessor.SpawnPlacementsAccessor;
 import com.tterrag.registrate.providers.DataGenContext;
@@ -18,6 +17,7 @@
 import com.tterrag.registrate.util.nullness.NonNullFunction;
 import com.tterrag.registrate.util.nullness.NonNullSupplier;
 
+import io.github.fabricators_of_create.porting_lib.util.DeferredHolder;
 import net.minecraft.client.renderer.entity.EntityRenderer;
 import net.minecraft.client.renderer.entity.EntityRendererProvider;
 import net.minecraft.core.registries.Registries;

src/main/java/com/tterrag/registrate/builders/FluidBuilder.java

@@ -10,7 +10,6 @@
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import com.tterrag.registrate.AbstractRegistrate;
-import com.tterrag.registrate.fabric.DeferredHolder;
 import com.tterrag.registrate.fabric.EnvExecutor;
 import com.tterrag.registrate.fabric.FluidHelper;
 import com.tterrag.registrate.fabric.SimpleFlowableFluid;
@@ -24,6 +23,7 @@
 import com.tterrag.registrate.util.nullness.NonNullFunction;
 import com.tterrag.registrate.util.nullness.NonNullSupplier;
 
+import io.github.fabricators_of_create.porting_lib.util.DeferredHolder;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;

src/main/java/com/tterrag/registrate/builders/ItemBuilder.java

@@ -6,7 +6,6 @@
 
 import com.google.common.collect.Maps;
 import com.tterrag.registrate.AbstractRegistrate;
-import com.tterrag.registrate.fabric.DeferredHolder;
 import com.tterrag.registrate.fabric.EnvExecutor;
 import com.tterrag.registrate.providers.*;
 import com.tterrag.registrate.util.CreativeModeTabModifier;
@@ -16,6 +15,7 @@
 import com.tterrag.registrate.util.nullness.NonNullFunction;
 import com.tterrag.registrate.util.nullness.NonNullSupplier;
 import com.tterrag.registrate.util.nullness.NonNullUnaryOperator;
+import io.github.fabricators_of_create.porting_lib.util.DeferredHolder;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
 import net.fabricmc.fabric.api.registry.CompostingChanceRegistry;

src/main/java/com/tterrag/registrate/builders/MenuBuilder.java

@@ -1,13 +1,13 @@
 package com.tterrag.registrate.builders;
 
 import com.tterrag.registrate.AbstractRegistrate;
-import com.tterrag.registrate.fabric.DeferredHolder;
 import com.tterrag.registrate.fabric.EnvExecutor;
 import com.tterrag.registrate.util.entry.MenuEntry;
 import com.tterrag.registrate.util.entry.RegistryEntry;
 import com.tterrag.registrate.util.nullness.NonNullSupplier;
 import com.tterrag.registrate.util.nullness.NonnullType;
 
+import io.github.fabricators_of_create.porting_lib.util.DeferredHolder;
 import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerType;
 import net.minecraft.client.gui.screens.MenuScreens;
 import net.minecraft.client.gui.screens.Screen;