Port to 1.21

29 files changed, 109 insertions, 97 deletions

diff --git a/src/main/java/moe/nea/firmament/mixins/CustomModelBakerPatch.java b/src/main/java/moe/nea/firmament/mixins/CustomModelBakerPatch.java
index 012a215..baffa4c 100644
--- a/src/main/java/moe/nea/firmament/mixins/CustomModelBakerPatch.java
+++ b/src/main/java/moe/nea/firmament/mixins/CustomModelBakerPatch.java
@@ -30,21 +30,21 @@ import java.util.function.BiFunction;
 public abstract class CustomModelBakerPatch {
 
     @Shadow
-    protected abstract void addModel(ModelIdentifier modelId);
+    protected abstract void loadItemModel(ModelIdentifier id);
 
     @Shadow
-    @Final
-    private Map<Identifier, UnbakedModel> modelsToBake;
+    abstract UnbakedModel getOrLoadModel(Identifier id);
 
     @Shadow
-    public abstract UnbakedModel getOrLoadModel(Identifier id);
+    @Final
+    private Map<ModelIdentifier, UnbakedModel> modelsToBake;
 
     @Inject(method = "bake", at = @At("HEAD"))
-    public void onBake(BiFunction<Identifier, SpriteIdentifier, Sprite> spriteLoader, CallbackInfo ci) {
-        BakeExtraModelsEvent.Companion.publish(new BakeExtraModelsEvent(this::addModel));
+    public void onBake(ModelLoader.SpriteGetter spliteGetter, CallbackInfo ci) {
+        BakeExtraModelsEvent.Companion.publish(new BakeExtraModelsEvent(this::loadItemModel));
         modelsToBake.values().forEach(model -> model.setParents(this::getOrLoadModel));
-        modelsToBake.keySet().stream()
-            .filter(it -> !it.getNamespace().equals("minecraft"))
-            .forEach(it -> System.out.println("Non minecraft texture is being loaded: " + it));
+//        modelsToBake.keySet().stream()
+//            .filter(it -> !it.id().getNamespace().equals("minecraft"))
+//            .forEach(it -> System.out.println("Non minecraft texture is being loaded: " + it));
     }
 }
diff --git a/src/main/java/moe/nea/firmament/mixins/HudRenderEventsPatch.java b/src/main/java/moe/nea/firmament/mixins/HudRenderEventsPatch.java
index 6618e95..d1b7d92 100644
--- a/src/main/java/moe/nea/firmament/mixins/HudRenderEventsPatch.java
+++ b/src/main/java/moe/nea/firmament/mixins/HudRenderEventsPatch.java
@@ -11,6 +11,7 @@ import moe.nea.firmament.events.HotbarItemRenderEvent;
 import moe.nea.firmament.events.HudRenderEvent;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.hud.InGameHud;
+import net.minecraft.client.render.RenderTickCounter;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
@@ -21,13 +22,13 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(InGameHud.class)
 public class HudRenderEventsPatch {
     @Inject(method = "renderSleepOverlay", at = @At(value = "HEAD"))
-    public void renderCallBack(DrawContext context, float tickDelta, CallbackInfo ci) {
-        HudRenderEvent.Companion.publish(new HudRenderEvent(context, tickDelta));
+    public void renderCallBack(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci) {
+        HudRenderEvent.Companion.publish(new HudRenderEvent(context, tickCounter));
     }
 
     @Inject(method = "renderHotbarItem", at = @At("HEAD"))
-    public void onRenderHotbarItem(DrawContext context, int x, int y, float tickDelta, PlayerEntity player, ItemStack stack, int seed, CallbackInfo ci) {
+    public void onRenderHotbarItem(DrawContext context, int x, int y, RenderTickCounter tickCounter, PlayerEntity player, ItemStack stack, int seed, CallbackInfo ci) {
         if (stack != null && !stack.isEmpty())
-            HotbarItemRenderEvent.Companion.publish(new HotbarItemRenderEvent(stack, context, x, y, tickDelta));
+            HotbarItemRenderEvent.Companion.publish(new HotbarItemRenderEvent(stack, context, x, y, tickCounter));
     }
 }
diff --git a/src/main/java/moe/nea/firmament/mixins/WorldRenderLastEventPatch.java b/src/main/java/moe/nea/firmament/mixins/WorldRenderLastEventPatch.java
index 1ad1ae8..f3ebba9 100644
--- a/src/main/java/moe/nea/firmament/mixins/WorldRenderLastEventPatch.java
+++ b/src/main/java/moe/nea/firmament/mixins/WorldRenderLastEventPatch.java
@@ -11,6 +11,7 @@ import com.llamalad7.mixinextras.sugar.Local;
 import moe.nea.firmament.events.WorldRenderLastEvent;
 import net.minecraft.client.render.*;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.world.tick.TickManager;
 import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -26,10 +27,13 @@ public class WorldRenderLastEventPatch {
     private BufferBuilderStorage bufferBuilders;
 
     @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;renderChunkDebugInfo(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/client/render/Camera;)V", shift = At.Shift.BEFORE))
-    public void onWorldRenderLast(float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightmapTextureManager lightmapTextureManager, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci
-        , @Local MatrixStack matrixStack) {
+    public void onWorldRenderLast(
+        RenderTickCounter tickCounter, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer,
+        LightmapTextureManager lightmapTextureManager, Matrix4f matrix4f, Matrix4f matrix4f2,
+        CallbackInfo ci, @Local MatrixStack matrixStack
+    ) {
         var event = new WorldRenderLastEvent(
-            matrixStack, tickDelta, renderBlockOutline,
+            matrixStack, tickCounter, renderBlockOutline,
             camera, gameRenderer, lightmapTextureManager,
             this.bufferBuilders.getEntityVertexConsumers()
         );
diff --git a/src/main/java/moe/nea/firmament/mixins/accessor/AccessorHandledScreen.java b/src/main/java/moe/nea/firmament/mixins/accessor/AccessorHandledScreen.java
index f61aca3..2e9879d 100644
--- a/src/main/java/moe/nea/firmament/mixins/accessor/AccessorHandledScreen.java
+++ b/src/main/java/moe/nea/firmament/mixins/accessor/AccessorHandledScreen.java
@@ -6,7 +6,6 @@
 
 package moe.nea.firmament.mixins.accessor;
 
-import kotlin.Deprecated;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.screen.slot.Slot;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/kotlin/moe/nea/firmament/Firmament.kt b/src/main/kotlin/moe/nea/firmament/Firmament.kt
index 630950a..9a04db1 100644
--- a/src/main/kotlin/moe/nea/firmament/Firmament.kt
+++ b/src/main/kotlin/moe/nea/firmament/Firmament.kt
@@ -145,8 +145,8 @@ object Firmament {
             globalJob.cancel()
         })
         registerFirmamentEvents()
-        ItemTooltipCallback.EVENT.register { a, b, c, d ->
-            ItemTooltipEvent.publish(ItemTooltipEvent(a, b, c, d))
+        ItemTooltipCallback.EVENT.register { stack, context, type, lines ->
+            ItemTooltipEvent.publish(ItemTooltipEvent(stack, context, type, lines))
         }
         ScreenEvents.AFTER_INIT.register(ScreenEvents.AfterInit { client, screen, scaledWidth, scaledHeight ->
             ScreenEvents.afterRender(screen)
@@ -157,7 +157,7 @@ object Firmament {
     }
 
 
-    fun identifier(path: String) = Identifier(MOD_ID, path)
+    fun identifier(path: String) = Identifier.of(MOD_ID, path)
     inline fun <reified T : Any> tryDecodeJsonFromStream(inputStream: InputStream): Result<T> {
         return runCatching {
             json.decodeFromStream<T>(inputStream)
diff --git a/src/main/kotlin/moe/nea/firmament/apis/ingame/packets/PartyInfoRequest.kt b/src/main/kotlin/moe/nea/firmament/apis/ingame/packets/PartyInfoRequest.kt
index 2b3d234..4f34e8d 100644
--- a/src/main/kotlin/moe/nea/firmament/apis/ingame/packets/PartyInfoRequest.kt
+++ b/src/main/kotlin/moe/nea/firmament/apis/ingame/packets/PartyInfoRequest.kt
@@ -12,6 +12,7 @@ import net.minecraft.network.PacketByteBuf
 import net.minecraft.network.codec.PacketCodec
 import net.minecraft.network.codec.PacketCodecs
 import net.minecraft.network.packet.CustomPayload
+import net.minecraft.util.Identifier
 import net.minecraft.util.Uuids
 import moe.nea.firmament.apis.ingame.FirmamentCustomPayload
 
@@ -19,6 +20,10 @@ interface FirmamentCustomPayloadMeta<T : FirmamentCustomPayload> {
     val ID: CustomPayload.Id<T>
     val CODEC: PacketCodec<PacketByteBuf, T>
 
+    fun id(name: String): CustomPayload.Id<T> {
+        return CustomPayload.Id<T>(Identifier.of(name))
+    }
+
     fun intoType(): CustomPayload.Type<PacketByteBuf, T> {
         return CustomPayload.Type(ID, CODEC)
     }
@@ -26,7 +31,7 @@ interface FirmamentCustomPayloadMeta<T : FirmamentCustomPayload> {
 
 data class PartyInfoRequest(val version: Int) : FirmamentCustomPayload {
     companion object : FirmamentCustomPayloadMeta<PartyInfoRequest> {
-        override val ID = CustomPayload.id<PartyInfoRequest>("hypixel:party_info")
+        override val ID = id("hypixel:party_info")
         override val CODEC =
             PacketCodecs.VAR_INT.cast<PacketByteBuf>()
                 .xmap(::PartyInfoRequest, PartyInfoRequest::version)
@@ -116,7 +121,7 @@ data class PartyInfoResponseV1(
 
 data class PartyInfoResponse(val data: HypixelVersionedPacketData<PartyInfoResponseV>) : FirmamentCustomPayload {
     companion object : FirmamentCustomPayloadMeta<PartyInfoResponse> {
-        override val ID: CustomPayload.Id<PartyInfoResponse> = CustomPayload.id("hypixel:party_info")
+        override val ID = id("hypixel:party_info")
         override val CODEC =
             CodecUtils
                 .dispatchVersioned<PacketByteBuf, PartyInfoResponseV>(
diff --git a/src/main/kotlin/moe/nea/firmament/events/HotbarItemRenderEvent.kt b/src/main/kotlin/moe/nea/firmament/events/HotbarItemRenderEvent.kt
index 59660ce..d105737 100644
--- a/src/main/kotlin/moe/nea/firmament/events/HotbarItemRenderEvent.kt
+++ b/src/main/kotlin/moe/nea/firmament/events/HotbarItemRenderEvent.kt
@@ -7,14 +7,15 @@
 package moe.nea.firmament.events
 
 import net.minecraft.client.gui.DrawContext
+import net.minecraft.client.render.RenderTickCounter
 import net.minecraft.item.ItemStack
 
 data class HotbarItemRenderEvent(
-    val item: ItemStack,
-    val context: DrawContext,
-    val x: Int,
-    val y: Int,
-    val tickDelta: Float,
+	val item: ItemStack,
+	val context: DrawContext,
+	val x: Int,
+	val y: Int,
+	val tickDelta: RenderTickCounter,
 ) : FirmamentEvent() {
     companion object : FirmamentEventBus<HotbarItemRenderEvent>()
 }
diff --git a/src/main/kotlin/moe/nea/firmament/events/HudRenderEvent.kt b/src/main/kotlin/moe/nea/firmament/events/HudRenderEvent.kt
index bf008d3..8b8e31d 100644
--- a/src/main/kotlin/moe/nea/firmament/events/HudRenderEvent.kt
+++ b/src/main/kotlin/moe/nea/firmament/events/HudRenderEvent.kt
@@ -7,10 +7,11 @@
 package moe.nea.firmament.events
 
 import net.minecraft.client.gui.DrawContext
+import net.minecraft.client.render.RenderTickCounter
 
 /**
  * Called when hud elements should be rendered, before the screen, but after the world.
  */
-data class HudRenderEvent(val context: DrawContext, val tickDelta: Float) : FirmamentEvent() {
+data class HudRenderEvent(val context: DrawContext, val tickDelta: RenderTickCounter) : FirmamentEvent() {
     companion object : FirmamentEventBus<HudRenderEvent>()
 }
diff --git a/src/main/kotlin/moe/nea/firmament/events/ItemTooltipEvent.kt b/src/main/kotlin/moe/nea/firmament/events/ItemTooltipEvent.kt
index 94a1678..be9a659 100644
--- a/src/main/kotlin/moe/nea/firmament/events/ItemTooltipEvent.kt
+++ b/src/main/kotlin/moe/nea/firmament/events/ItemTooltipEvent.kt
@@ -7,9 +7,9 @@
 
 package moe.nea.firmament.events
 
-import net.minecraft.client.item.TooltipType
 import net.minecraft.item.Item.TooltipContext
 import net.minecraft.item.ItemStack
+import net.minecraft.item.tooltip.TooltipType
 import net.minecraft.text.Text
 
 data class ItemTooltipEvent(
diff --git a/src/main/kotlin/moe/nea/firmament/events/WorldRenderLastEvent.kt b/src/main/kotlin/moe/nea/firmament/events/WorldRenderLastEvent.kt
index b42e9ab..7ba9b9f 100644
--- a/src/main/kotlin/moe/nea/firmament/events/WorldRenderLastEvent.kt
+++ b/src/main/kotlin/moe/nea/firmament/events/WorldRenderLastEvent.kt
@@ -7,10 +7,10 @@
 
 package moe.nea.firmament.events
 
-import org.joml.Matrix4f
 import net.minecraft.client.render.Camera
 import net.minecraft.client.render.GameRenderer
 import net.minecraft.client.render.LightmapTextureManager
+import net.minecraft.client.render.RenderTickCounter
 import net.minecraft.client.render.VertexConsumerProvider
 import net.minecraft.client.util.math.MatrixStack
 import net.minecraft.util.math.Position
@@ -21,7 +21,7 @@ import net.minecraft.util.math.Vec3d
  */
 data class WorldRenderLastEvent(
     val matrices: MatrixStack,
-    val tickDelta: Float,
+    val tickCounter: RenderTickCounter,
     val renderBlockOutline: Boolean,
     val camera: Camera,
     val gameRenderer: GameRenderer,
@@ -29,8 +29,4 @@ data class WorldRenderLastEvent(
     val vertexConsumers: VertexConsumerProvider.Immediate,
 ) : FirmamentEvent() {
     companion object : FirmamentEventBus<WorldRenderLastEvent>()
-    data class TextRenderCall(val string: String, val position: Position)
-
-    val toRender = mutableListOf<TextRenderCall>(TextRenderCall("Test String", Vec3d(0.0, 0.0, 0.0)))
-
 }
diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/ItemRarityCosmetics.kt b/src/main/kotlin/moe/nea/firmament/features/inventory/ItemRarityCosmetics.kt
index de37748..0ed5c9a 100644
--- a/src/main/kotlin/moe/nea/firmament/features/inventory/ItemRarityCosmetics.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/inventory/ItemRarityCosmetics.kt
@@ -68,7 +68,7 @@ object ItemRarityCosmetics : FirmamentFeature {
             x, y,
             0,
             16, 16,
-            MC.guiAtlasManager.getSprite(Identifier("firmament:item_rarity_background")),
+            MC.guiAtlasManager.getSprite(Identifier.of("firmament:item_rarity_background")),
             r, g, b, 1F
         )
     }
diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/SlotLocking.kt b/src/main/kotlin/moe/nea/firmament/features/inventory/SlotLocking.kt
index b0fb57b..70b887c 100644
--- a/src/main/kotlin/moe/nea/firmament/features/inventory/SlotLocking.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/inventory/SlotLocking.kt
@@ -190,10 +190,10 @@ object SlotLocking : FirmamentFeature {
                 MC.guiAtlasManager.getSprite(
                     when {
                         isSlotLocked ->
-                            (Identifier("firmament:slot_locked"))
+                            (Identifier.of("firmament:slot_locked"))
 
                         isUUIDLocked ->
-                            (Identifier("firmament:uuid_locked"))
+                            (Identifier.of("firmament:uuid_locked"))
 
                         else ->
                             error("unreachable")
diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/buttons/InventoryButton.kt b/src/main/kotlin/moe/nea/firmament/features/inventory/buttons/InventoryButton.kt
index 5ff1768..51993af 100644
--- a/src/main/kotlin/moe/nea/firmament/features/inventory/buttons/InventoryButton.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/inventory/buttons/InventoryButton.kt
@@ -42,7 +42,7 @@ data class InventoryButton(
             0,
             dimensions.width,
             dimensions.height,
-            MC.guiAtlasManager.getSprite(Identifier("firmament:inventory_button_background"))
+            MC.guiAtlasManager.getSprite(Identifier.of("firmament:inventory_button_background"))
         )
         context.drawItem(getItem(), 1, 1)
     }
diff --git a/src/main/kotlin/moe/nea/firmament/features/mining/PickaxeAbility.kt b/src/main/kotlin/moe/nea/firmament/features/mining/PickaxeAbility.kt
index 8e62172..33bf578 100644
--- a/src/main/kotlin/moe/nea/firmament/features/mining/PickaxeAbility.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/mining/PickaxeAbility.kt
@@ -172,7 +172,7 @@ object PickaxeAbility : FirmamentFeature {
         event.context.matrices.translate(MC.window.scaledWidth / 2F, MC.window.scaledHeight / 2F, 0F)
         event.context.matrices.scale(TConfig.cooldownScale.toFloat(), TConfig.cooldownScale.toFloat(), 1F)
         RenderCircleProgress.renderCircle(
-            event.context, Identifier("firmament", "textures/gui/circle.png"),
+            event.context, Identifier.of("firmament", "textures/gui/circle.png"),
             getCooldownPercentage(ability.name, ability.cooldown).toFloat(),
             0f, 1f, 0f, 1f
         )
diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomGlobalTextures.kt b/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomGlobalTextures.kt
index 147697b..24aa6ef 100644
--- a/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomGlobalTextures.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomGlobalTextures.kt
@@ -117,7 +117,7 @@ object CustomGlobalTextures : SinglePreparationResourceReloader<CustomGlobalText
             .mapNotNull {
                 val key = it.key
                 val guiClassResource =
-                    manager.getResource(Identifier(key.namespace, "filters/screen/${key.path}.json"))
+                    manager.getResource(Identifier.of(key.namespace, "filters/screen/${key.path}.json"))
                         .getOrNull()
                         ?: return@mapNotNull runNull {
                             logger.error("Failed to locate screen filter at $key")
diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomModelOverrideParser.kt b/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomModelOverrideParser.kt
index 458f8ff..4ae73e8 100644
--- a/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomModelOverrideParser.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomModelOverrideParser.kt
@@ -34,7 +34,7 @@ object CustomModelOverrideParser {
 
 
     fun registerPredicateParser(name: String, parser: FirmamentModelPredicateParser) {
-        predicateParsers[Identifier("firmament", name)] = parser
+        predicateParsers[Identifier.of("firmament", name)] = parser
     }
 
     init {
@@ -59,7 +59,7 @@ object CustomModelOverrideParser {
         val parsedPredicates = mutableListOf<FirmamentModelPredicate>()
         for (predicateName in predicates.keySet()) {
             if (!predicateName.startsWith("firmament:")) continue
-            val identifier = Identifier(predicateName)
+            val identifier = Identifier.of(predicateName)
             val parser = predicateParsers[identifier] ?: return neverPredicate
             val parsedPredicate = parser.parse(predicates[predicateName]) ?: return neverPredicate
             parsedPredicates.add(parsedPredicate)
diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt b/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt
index 82989e4..f37e3ea 100644
--- a/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt
@@ -9,7 +9,6 @@ package moe.nea.firmament.features.texturepack
 
 import com.mojang.authlib.minecraft.MinecraftProfileTexture
 import com.mojang.authlib.properties.Property
-import net.fabricmc.fabric.api.entity.event.v1.EntityElytraEvents.Custom
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
 import net.minecraft.block.SkullBlock
 import net.minecraft.client.MinecraftClient
@@ -62,10 +61,13 @@ object CustomSkyBlockTextures : FirmamentFeature {
                     .endsWith(".json")
             }
         for (identifier in resources.keys) {
-            val modelId = ModelIdentifier("firmskyblock",
-                                          identifier.path.substring("models/item/".length,
-                                                                    identifier.path.length - ".json".length),
-                                          "inventory")
+            val modelId = ModelIdentifier.ofInventoryVariant(
+                Identifier.of(
+                    "firmskyblock",
+                    identifier.path.substring(
+                        "models/item/".length,
+                        identifier.path.length - ".json".length),
+                ))
             event.addModel(modelId)
         }
     }
@@ -74,7 +76,7 @@ object CustomSkyBlockTextures : FirmamentFeature {
     fun onCustomModelId(it: CustomItemModelEvent) {
         if (!TConfig.enabled) return
         val id = it.itemStack.skyBlockId ?: return
-        it.overrideModel = ModelIdentifier("firmskyblock", id.identifier.path, "inventory")
+        it.overrideModel = ModelIdentifier.ofInventoryVariant(Identifier.of("firmskyblock", id.identifier.path))
     }
 
     private val skullTextureCache = mutableMapOf<IdentityCharacteristics<ProfileComponent>, Any>()
@@ -92,7 +94,7 @@ object CustomSkyBlockTextures : FirmamentFeature {
 
     fun getSkullTexture(profile: ProfileComponent): Identifier? {
         val id = getSkullId(profile.properties["textures"].firstOrNull() ?: return null) ?: return null
-        return Identifier("firmskyblock", "textures/placedskull/$id.png")
+        return Identifier.of("firmskyblock", "textures/placedskull/$id.png")
     }
 
     fun modifySkullTexture(
diff --git a/src/main/kotlin/moe/nea/firmament/gui/entity/FakeWorld.kt b/src/main/kotlin/moe/nea/firmament/gui/entity/FakeWorld.kt
index ac1b33b..c838922 100644
--- a/src/main/kotlin/moe/nea/firmament/gui/entity/FakeWorld.kt
+++ b/src/main/kotlin/moe/nea/firmament/gui/entity/FakeWorld.kt
@@ -129,6 +129,10 @@ fun <T> makeRegistry(registryWrapper: RegistryWrapper.Impl<T>, key: RegistryKey<
             return Lifecycle.stable()
         }
 
+        override fun getDefaultEntry(): Optional<RegistryEntry.Reference<T>> {
+            return Optional.empty()
+        }
+
         override fun getIds(): MutableSet<Identifier> {
             return idLookup.keys.mapTo(mutableSetOf()) { it.value }
         }
@@ -251,7 +255,7 @@ class FakeWorld(
     registries[RegistryKeys.DIMENSION_TYPE].entryOf(
         RegistryKey.of(
             RegistryKeys.DIMENSION_TYPE,
-            Identifier("minecraft", "overworld")
+            Identifier.of("minecraft", "overworld")
         )
     ),
     { DummyProfiler.INSTANCE },
@@ -436,7 +440,7 @@ class FakeWorld(
     override fun putMapState(id: MapIdComponent?, state: MapState?) {
     }
 
-    override fun getNextMapId(): MapIdComponent {
+    override fun increaseAndGetMapId(): MapIdComponent {
         return MapIdComponent(0)
     }
 
diff --git a/src/main/kotlin/moe/nea/firmament/gui/entity/ModifyPlayerSkin.kt b/src/main/kotlin/moe/nea/firmament/gui/entity/ModifyPlayerSkin.kt
index 886a17e..b382fe2 100644
--- a/src/main/kotlin/moe/nea/firmament/gui/entity/ModifyPlayerSkin.kt
+++ b/src/main/kotlin/moe/nea/firmament/gui/entity/ModifyPlayerSkin.kt
@@ -15,10 +15,10 @@ object ModifyPlayerSkin : EntityModifier {
     override fun apply(entity: LivingEntity, info: JsonObject): LivingEntity {
         require(entity is GuiPlayer)
         info["cape"]?.let {
-            entity.capeTexture = Identifier(it.asString)
+            entity.capeTexture = Identifier.of(it.asString)
         }
         info["skin"]?.let {
-            entity.skinTexture = Identifier(it.asString)
+            entity.skinTexture = Identifier.of(it.asString)
         }
         info["slim"]?.let {
             entity.model = if (it.asBoolean) SkinTextures.Model.SLIM else SkinTextures.Model.WIDE
diff --git a/src/main/kotlin/moe/nea/firmament/rei/FirmamentReiPlugin.kt b/src/main/kotlin/moe/nea/firmament/rei/FirmamentReiPlugin.kt
index 7e22a1e..a916b3e 100644
--- a/src/main/kotlin/moe/nea/firmament/rei/FirmamentReiPlugin.kt
+++ b/src/main/kotlin/moe/nea/firmament/rei/FirmamentReiPlugin.kt
@@ -42,7 +42,7 @@ class FirmamentReiPlugin : REIClientPlugin {
             return EntryStack.of(VanillaEntryTypes.ITEM, value.asImmutableItemStack())
         }
 
-        val SKYBLOCK_ITEM_TYPE_ID = Identifier("firmament", "skyblockitems")
+        val SKYBLOCK_ITEM_TYPE_ID = Identifier.of("firmament", "skyblockitems")
     }
     override fun registerTransferHandlers(registry: TransferHandlerRegistry) {
         registry.register(TransferHandler { context ->
diff --git a/src/main/kotlin/moe/nea/firmament/rei/NEUItemEntryRenderer.kt b/src/main/kotlin/moe/nea/firmament/rei/NEUItemEntryRenderer.kt
index fb608be..6b5e3fe 100644
--- a/src/main/kotlin/moe/nea/firmament/rei/NEUItemEntryRenderer.kt
+++ b/src/main/kotlin/moe/nea/firmament/rei/NEUItemEntryRenderer.kt
@@ -20,7 +20,6 @@ import me.shedaniel.rei.api.client.gui.widgets.TooltipContext
 import me.shedaniel.rei.api.common.entry.EntryStack
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.gui.DrawContext
-import net.minecraft.client.item.TooltipType
 import net.minecraft.client.render.DiffuseLighting
 import net.minecraft.client.render.LightmapTextureManager
 import net.minecraft.client.render.OverlayTexture
@@ -30,6 +29,7 @@ import net.minecraft.client.render.model.json.ModelTransformationMode
 import net.minecraft.client.texture.SpriteAtlasTexture
 import net.minecraft.item.Item
 import net.minecraft.item.ItemStack
+import net.minecraft.item.tooltip.TooltipType
 import moe.nea.firmament.rei.FirmamentReiPlugin.Companion.asItemEntry
 
 object NEUItemEntryRenderer : EntryRenderer<SBItemStack>, BatchedEntryRenderer<SBItemStack, BakedModel> {
diff --git a/src/main/kotlin/moe/nea/firmament/rei/recipes/SBMobDropRecipe.kt b/src/main/kotlin/moe/nea/firmament/rei/recipes/SBMobDropRecipe.kt
index 5af1f9e..f0f8a6d 100644
--- a/src/main/kotlin/moe/nea/firmament/rei/recipes/SBMobDropRecipe.kt
+++ b/src/main/kotlin/moe/nea/firmament/rei/recipes/SBMobDropRecipe.kt
@@ -41,7 +41,7 @@ class SBMobDropRecipe(override val neuRecipe: NEUMobDropRecipe) : SBRecipe() {
                 add(Widgets.createRecipeBase(bounds))
                 val source = display.neuRecipe.render
                 val entity = if (source.startsWith("@")) {
-                    EntityRenderer.constructEntity(Identifier(source.substring(1)))
+                    EntityRenderer.constructEntity(Identifier.of(source.substring(1)))
                 } else {
                     EntityRenderer.applyModifiers(source, listOf())
                 }
diff --git a/src/main/kotlin/moe/nea/firmament/util/CommonSoundEffects.kt b/src/main/kotlin/moe/nea/firmament/util/CommonSoundEffects.kt
index 10e9249..d2d9881 100644
--- a/src/main/kotlin/moe/nea/firmament/util/CommonSoundEffects.kt
+++ b/