WIP: Port some 1.21.5 thingsmc1.21.5

41 files changed, 246 insertions, 612 deletions

diff --git a/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBReforgeRecipe.kt b/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBReforgeRecipe.kt
index b8313a6..c5b4fb6 100644
--- a/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBReforgeRecipe.kt
+++ b/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBReforgeRecipe.kt
@@ -19,6 +19,7 @@ import me.shedaniel.rei.api.common.entry.EntryIngredient
 import me.shedaniel.rei.api.common.entry.EntryStack
 import net.minecraft.entity.EntityType
 import net.minecraft.entity.SpawnReason
+import net.minecraft.registry.entry.RegistryEntry
 import net.minecraft.text.Text
 import net.minecraft.util.Identifier
 import net.minecraft.village.VillagerProfession
@@ -33,6 +34,7 @@ import moe.nea.firmament.repo.RepoManager
 import moe.nea.firmament.repo.SBItemStack
 import moe.nea.firmament.util.AprilFoolsUtil
 import moe.nea.firmament.util.FirmFormatters
+import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.SkyblockId
 import moe.nea.firmament.util.gold
 import moe.nea.firmament.util.grey
@@ -92,7 +94,7 @@ class SBReforgeRecipe(
 				list.add(Widgets.withTooltip(
 					EntityWidget(
 						EntityType.VILLAGER.create(EntityRenderer.fakeWorld, SpawnReason.COMMAND)
-							?.also { it.villagerData = it.villagerData.withProfession(VillagerProfession.WEAPONSMITH) },
+							?.also { it.villagerData = it.villagerData.withProfession(MC.currentOrDefaultRegistries.getEntryOrThrow(VillagerProfession.WEAPONSMITH)) },
 						Point(bounds.minX + 10 + 24 + 8 - dimension.width / 2, bounds.centerY - dimension.height / 2),
 						dimension
 					),
diff --git a/src/main/java/moe/nea/firmament/init/SectionBuilderRiser.java b/src/main/java/moe/nea/firmament/init/SectionBuilderRiser.java
index f2c6c53..2c40b08 100644
--- a/src/main/java/moe/nea/firmament/init/SectionBuilderRiser.java
+++ b/src/main/java/moe/nea/firmament/init/SectionBuilderRiser.java
@@ -3,10 +3,8 @@ package moe.nea.firmament.init;
 import me.shedaniel.mm.api.ClassTinkerers;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.block.BlockState;
-import net.minecraft.client.render.block.BlockModels;
 import net.minecraft.client.render.block.BlockRenderManager;
 import net.minecraft.client.render.chunk.SectionBuilder;
-import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.util.math.BlockPos;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
@@ -28,8 +26,8 @@ public class SectionBuilderRiser extends RiserUtils {
     String BlockRenderManager;
     @IntermediaryName(BlockState.class)
     String BlockState;
-    @IntermediaryName(BakedModel.class)
-    String BakedModel;
+//    @IntermediaryName(BakedModel.class)
+//    String BakedModel;
     String CustomBlockTextures = "moe.nea.firmament.features.texturepack.CustomBlockTextures";
 
     Type getModelDesc = Type.getMethodType(
@@ -41,7 +39,8 @@ public class SectionBuilderRiser extends RiserUtils {
         Intermediary.<BlockRenderManager>className(),
         Intermediary.methodName(net.minecraft.client.render.block.BlockRenderManager::getModel),
         Type.getMethodDescriptor(
-            getTypeForClassName(Intermediary.<BakedModel>className()),
+			// TODO: fix this riser
+//            getTypeForClassName(Intermediary.<BakedModel>className()),
             getTypeForClassName(Intermediary.<BlockState>className())
         )
     );
@@ -105,8 +104,9 @@ public class SectionBuilderRiser extends RiserUtils {
                 Opcodes.INVOKESTATIC,
                 getTypeForClassName(CustomBlockTextures).getInternalName(),
                 "patchIndigo",
-                Type.getMethodDescriptor(getTypeForClassName(BakedModel),
-                                         getTypeForClassName(BakedModel),
+                Type.getMethodDescriptor(
+//					getTypeForClassName(BakedModel),
+//                                         getTypeForClassName(BakedModel),
                                          getTypeForClassName(BlockPos),
                                          getTypeForClassName(BlockState)),
                 false
diff --git a/src/main/java/moe/nea/firmament/mixins/PlayerDropEventPatch.java b/src/main/java/moe/nea/firmament/mixins/PlayerDropEventPatch.java
index b20c223..f07604e 100644
--- a/src/main/java/moe/nea/firmament/mixins/PlayerDropEventPatch.java
+++ b/src/main/java/moe/nea/firmament/mixins/PlayerDropEventPatch.java
@@ -20,7 +20,7 @@ public abstract class PlayerDropEventPatch extends PlayerEntity {
 
 	@Inject(method = "dropSelectedItem", at = @At("HEAD"), cancellable = true)
 	public void onDropSelectedItem(boolean entireStack, CallbackInfoReturnable<Boolean> cir) {
-		Slot fakeSlot = new Slot(getInventory(), getInventory().selectedSlot, 0, 0);
+		Slot fakeSlot = new Slot(getInventory(), getInventory().getSelectedSlot(), 0, 0);
 		if (IsSlotProtectedEvent.shouldBlockInteraction(fakeSlot, SlotActionType.THROW, IsSlotProtectedEvent.MoveOrigin.DROP_FROM_HOTBAR)) {
 			cir.setReturnValue(false);
 		}
diff --git a/src/main/java/moe/nea/firmament/mixins/SlotUpdateListener.java b/src/main/java/moe/nea/firmament/mixins/SlotUpdateListener.java
index 06ecbd4..a4ae931 100644
--- a/src/main/java/moe/nea/firmament/mixins/SlotUpdateListener.java
+++ b/src/main/java/moe/nea/firmament/mixins/SlotUpdateListener.java
@@ -43,11 +43,11 @@ public abstract class SlotUpdateListener extends ClientCommonNetworkHandler {
 	private void onMultiSlotUpdate(InventoryS2CPacket packet, CallbackInfo ci) {
 		var player = this.client.player;
 		assert player != null;
-		if (packet.getSyncId() == 0) {
-			PlayerInventoryUpdate.Companion.publish(new PlayerInventoryUpdate.Multi(packet.getContents()));
-		} else if (packet.getSyncId() == player.currentScreenHandler.syncId) {
+		if (packet.syncId() == 0) {
+			PlayerInventoryUpdate.Companion.publish(new PlayerInventoryUpdate.Multi(packet.contents()));
+		} else if (packet.syncId() == player.currentScreenHandler.syncId) {
 			ChestInventoryUpdateEvent.Companion.publish(
-				new ChestInventoryUpdateEvent.Multi(packet.getContents())
+				new ChestInventoryUpdateEvent.Multi(packet.contents())
 			);
 		}
 	}
diff --git a/src/main/java/moe/nea/firmament/mixins/SoundReceiveEventPatch.java b/src/main/java/moe/nea/firmament/mixins/SoundReceiveEventPatch.java
index 5c52d70..b8cba80 100644
--- a/src/main/java/moe/nea/firmament/mixins/SoundReceiveEventPatch.java
+++ b/src/main/java/moe/nea/firmament/mixins/SoundReceiveEventPatch.java
@@ -1,30 +1,32 @@
 
 package moe.nea.firmament.mixins;
 
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import moe.nea.firmament.events.SoundReceiveEvent;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.entity.Entity;
+import net.minecraft.registry.entry.RegistryEntry;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvent;
 import net.minecraft.util.math.Vec3d;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ClientPlayNetworkHandler.class)
 public class SoundReceiveEventPatch {
-    @Inject(method = "onPlaySound", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;playSound(Lnet/minecraft/entity/player/PlayerEntity;DDDLnet/minecraft/registry/entry/RegistryEntry;Lnet/minecraft/sound/SoundCategory;FFJ)V"), cancellable = true)
-    private void postEventWhenSoundIsPlayed(PlaySoundS2CPacket packet, CallbackInfo ci) {
+    @WrapWithCondition(method = "onPlaySound", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;playSound(Lnet/minecraft/entity/Entity;DDDLnet/minecraft/registry/entry/RegistryEntry;Lnet/minecraft/sound/SoundCategory;FFJ)V"))
+    private boolean postEventWhenSoundIsPlayed(ClientWorld instance, @Nullable Entity source, double x, double y, double z, RegistryEntry<SoundEvent> sound, SoundCategory category, float volume, float pitch, long seed) {
         var event = new SoundReceiveEvent(
-            packet.getSound(),
-            packet.getCategory(),
-            new Vec3d(packet.getX(), packet.getY(), packet.getZ()),
-            packet.getPitch(),
-            packet.getVolume(),
-            packet.getSeed()
+            sound,
+            category,
+            new Vec3d(x,y,z),
+            pitch,
+            volume,
+            seed
         );
         SoundReceiveEvent.Companion.publish(event);
-        if (event.getCancelled()) {
-            ci.cancel();
-        }
+		return !event.getCancelled();
     }
 }
diff --git a/src/main/kotlin/features/chat/ChatLinks.kt b/src/main/kotlin/features/chat/ChatLinks.kt
index f85825b..a084234 100644
--- a/src/main/kotlin/features/chat/ChatLinks.kt
+++ b/src/main/kotlin/features/chat/ChatLinks.kt
@@ -3,6 +3,7 @@ package moe.nea.firmament.features.chat
 import io.ktor.client.request.get
 import io.ktor.client.statement.bodyAsChannel
 import io.ktor.utils.io.jvm.javaio.toInputStream
+import java.net.URI
 import java.net.URL
 import java.util.Collections
 import java.util.concurrent.atomic.AtomicInteger
@@ -78,7 +79,7 @@ object ChatLinks : FirmamentFeature {
 					val texId = Firmament.identifier("dynamic_image_preview${nextTexId.getAndIncrement()}")
 					MC.textureManager.registerTexture(
 						texId,
-						NativeImageBackedTexture(image)
+						NativeImageBackedTexture({ texId.path }, image)
 					)
 					Image(texId, image.width, image.height)
 				} else
@@ -102,8 +103,8 @@ object ChatLinks : FirmamentFeature {
 		if (it.screen !is ChatScreen) return
 		val hoveredComponent =
 			MC.inGameHud.chatHud.getTextStyleAt(it.mouseX.toDouble(), it.mouseY.toDouble()) ?: return
-		val hoverEvent = hoveredComponent.hoverEvent ?: return
-		val value = hoverEvent.getValue(HoverEvent.Action.SHOW_TEXT) ?: return
+		val hoverEvent = hoveredComponent.hoverEvent as? HoverEvent.ShowText ?: return
+		val value = hoverEvent.value
 		val url = urlRegex.matchEntire(value.unformattedString)?.groupValues?.get(0) ?: return
 		if (!isImageUrl(url)) return
 		val imageFuture = imageCache[url] ?: return
@@ -149,8 +150,8 @@ object ChatLinks : FirmamentFeature {
 					Text.literal(url).setStyle(
 						Style.EMPTY.withUnderline(true).withColor(
 							Formatting.AQUA
-						).withHoverEvent(HoverEvent(HoverEvent.Action.SHOW_TEXT, Text.literal(url)))
-							.withClickEvent(ClickEvent(ClickEvent.Action.OPEN_URL, url))
+						).withHoverEvent(HoverEvent.ShowText(Text.literal(url)))
+							.withClickEvent(ClickEvent.OpenUrl(URI(url)))
 					)
 				)
 				if (isImageUrl(url))
diff --git a/src/main/kotlin/features/debug/PowerUserTools.kt b/src/main/kotlin/features/debug/PowerUserTools.kt
index 8be5d5d..251fc8b 100644
--- a/src/main/kotlin/features/debug/PowerUserTools.kt
+++ b/src/main/kotlin/features/debug/PowerUserTools.kt
@@ -43,6 +43,7 @@ import moe.nea.firmament.util.mc.IntrospectableItemModelManager
 import moe.nea.firmament.util.mc.SNbtFormatter
 import moe.nea.firmament.util.mc.SNbtFormatter.Companion.toPrettyString
 import moe.nea.firmament.util.mc.displayNameAccordingToNbt
+import moe.nea.firmament.util.mc.iterableArmorItems
 import moe.nea.firmament.util.mc.loreAccordingToNbt
 import moe.nea.firmament.util.skyBlockId
 
@@ -108,7 +109,7 @@ object PowerUserTools : FirmamentFeature {
 		MC.sendChat(Text.stringifiedTranslatable("firmament.poweruser.entity.position", target.pos))
 		if (target is LivingEntity) {
 			MC.sendChat(Text.translatable("firmament.poweruser.entity.armor"))
-			for (armorItem in target.armorItems) {
+			for ((slot, armorItem) in target.iterableArmorItems) {
 				MC.sendChat(Text.translatable("firmament.poweruser.entity.armor.item", debugFormat(armorItem)))
 			}
 		}
diff --git a/src/main/kotlin/features/events/carnival/MinesweeperHelper.kt b/src/main/kotlin/features/events/carnival/MinesweeperHelper.kt
index 1824225..cfc05cc 100644
--- a/src/main/kotlin/features/events/carnival/MinesweeperHelper.kt
+++ b/src/main/kotlin/features/events/carnival/MinesweeperHelper.kt
@@ -222,7 +222,7 @@ object MinesweeperHelper {
     fun onChat(event: ProcessChatEvent) {
         if (CarnivalFeatures.TConfig.displayTutorials && event.unformattedString == startGameQuestion) {
             MC.sendChat(Text.translatable("firmament.carnival.tutorial.minesweeper").styled {
-                it.withClickEvent(ClickEvent(ClickEvent.Action.RUN_COMMAND, "/firm minesweepertutorial"))
+                it.withClickEvent(ClickEvent.RunCommand("/firm minesweepertutorial"))
             })
         }
         if (!CarnivalFeatures.TConfig.enableBombSolver) {
@@ -259,7 +259,7 @@ object MinesweeperHelper {
         val boardPosition = BoardPosition.fromBlockPos(event.blockPos)
         log.log { "Breaking block at ${event.blockPos} ($boardPosition)" }
         gs.lastClickedPosition = boardPosition
-        gs.lastDowsingMode = DowsingMode.fromItem(event.player.inventory.mainHandStack)
+        gs.lastDowsingMode = DowsingMode.fromItem(event.player.mainHandStack)
     }
 
     @Subscribe
diff --git a/src/main/kotlin/features/inventory/REIDependencyWarner.kt b/src/main/kotlin/features/inventory/REIDependencyWarner.kt
index 1e9b1b8..7d88dd1 100644
--- a/src/main/kotlin/features/inventory/REIDependencyWarner.kt
+++ b/src/main/kotlin/features/inventory/REIDependencyWarner.kt
@@ -1,5 +1,6 @@
 package moe.nea.firmament.features.inventory
 
+import java.net.URI
 import net.fabricmc.loader.api.FabricLoader
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -38,7 +39,7 @@ object REIDependencyWarner {
 			.white()
 			.append(Text.literal("[").aqua())
 			.append(Text.translatable("firmament.download", modName)
-				        .styled { it.withClickEvent(ClickEvent(ClickEvent.Action.OPEN_URL, modrinthLink(slug))) }
+				        .styled { it.withClickEvent(ClickEvent.OpenUrl(URI (modrinthLink(slug)))) }
 				        .yellow()
 				        .also {
 					        if (alreadyDownloaded)
diff --git a/src/main/kotlin/features/inventory/SlotLocking.kt b/src/main/kotlin/features/inventory/SlotLocking.kt
index 0083c40..d3348a2 100644
--- a/src/main/kotlin/features/inventory/SlotLocking.kt
+++ b/src/main/kotlin/features/inventory/SlotLocking.kt
@@ -4,6 +4,7 @@ package moe.nea.firmament.features.inventory
 
 import java.util.UUID
 import org.lwjgl.glfw.GLFW
+import util.render.CustomRenderLayers
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers
@@ -17,6 +18,9 @@ import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.int
 import kotlinx.serialization.serializer
 import net.minecraft.client.gui.screen.ingame.HandledScreen
+import net.minecraft.client.render.RenderLayer
+import net.minecraft.client.render.RenderLayers
+import net.minecraft.client.render.TexturedRenderLayers
 import net.minecraft.entity.player.PlayerInventory
 import net.minecraft.screen.GenericContainerScreenHandler
 import net.minecraft.screen.slot.Slot
@@ -45,7 +49,6 @@ import moe.nea.firmament.util.mc.ScreenUtil.getSlotByIndex
 import moe.nea.firmament.util.mc.SlotUtils.swapWithHotBar
 import moe.nea.firmament.util.mc.displayNameAccordingToNbt
 import moe.nea.firmament.util.mc.loreAccordingToNbt
-import moe.nea.firmament.util.render.GuiRenderLayers
 import moe.nea.firmament.util.render.drawLine
 import moe.nea.firmament.util.skyblock.DungeonUtil
 import moe.nea.firmament.util.skyblockUUID
@@ -445,7 +448,7 @@ object SlotLocking : FirmamentFeature {
 		val isUUIDLocked = (it.slot.stack?.skyblockUUID) in (lockedUUIDs ?: setOf())
 		if (isSlotLocked || isUUIDLocked) {
 			it.context.drawGuiTexture(
-				GuiRenderLayers.GUI_TEXTURED_NO_DEPTH,
+				RenderLayer::getGuiTexturedOverlay,
 				when {
 					isSlotLocked ->
 						(Identifier.of("firmament:slot_locked"))
diff --git a/src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt b/src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt
index 63a2f54..22f4dab 100644
--- a/src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt
+++ b/src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt
@@ -218,7 +218,7 @@ class StorageOverlayScreen : Screen(Text.literal("")) {
 	}
 
 	fun drawPlayerInventory(context: DrawContext, mouseX: Int, mouseY: Int, delta: Float) {
-		val items = MC.player?.inventory?.main ?: return
+		val items = MC.player?.inventory?.mainStacks ?: return
 		items.withIndex().forEach { (index, item) ->
 			val (x, y) = getPlayerInventorySlotPosition(index)
 			context.drawItem(item, x, y, 0)
diff --git a/src/main/kotlin/features/inventory/storageoverlay/VirtualInventory.kt b/src/main/kotlin/features/inventory/storageoverlay/VirtualInventory.kt
index 3b86184..d99acd7 100644
--- a/src/main/kotlin/features/inventory/storageoverlay/VirtualInventory.kt
+++ b/src/main/kotlin/features/inventory/storageoverlay/VirtualInventory.kt
@@ -11,6 +11,7 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
+import kotlin.jvm.optionals.getOrNull
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NbtCompound
 import net.minecraft.nbt.NbtIo
@@ -42,15 +43,15 @@ data class VirtualInventory(
 		override fun deserialize(decoder: Decoder): VirtualInventory {
 			val s = decoder.decodeString()
 			val n = NbtIo.readCompressed(ByteArrayInputStream(s.decodeBase64Bytes()), NbtSizeTracker.of(100_000_000))
-			val items = n.getList(INVENTORY, NbtCompound.COMPOUND_TYPE.toInt())
+			val items = n.getList(INVENTORY).getOrNull()
 			val ops = getOps()
-			return VirtualInventory(items.map {
+			return VirtualInventory(items?.map {
 				it as NbtCompound
 				if (it.isEmpty) ItemStack.EMPTY
 				else ErrorUtil.catch("Could not deserialize item") {
 					ItemStack.CODEC.parse(ops, it).orThrow
 				}.or { ItemStack.EMPTY }
-			})
+			} ?: listOf())
 		}
 
 		fun getOps() = TolerantRegistriesOps(NbtOps.INSTANCE, MC.currentOrDefaultRegistries)
diff --git a/src/main/kotlin/features/mining/PickaxeAbility.kt b/src/main/kotlin/features/mining/PickaxeAbility.kt
index 1737969..2e1c59d 100644
--- a/src/main/kotlin/features/mining/PickaxeAbility.kt
+++ b/src/main/kotlin/features/mining/PickaxeAbility.kt
@@ -1,6 +1,7 @@
 package moe.nea.firmament.features.mining
 
 import java.util.regex.Pattern
+import kotlin.jvm.optionals.getOrNull
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 import net.minecraft.item.ItemStack
@@ -140,8 +141,7 @@ object PickaxeAbility : FirmamentFeature {
 			}
 		} ?: return
 		val extra = it.item.extraAttributes
-		if (!extra.contains("drill_fuel")) return
-		val fuel = extra.getInt("drill_fuel")
+		val fuel = extra.getInt("drill_fuel").getOrNull() ?: return
 		val percentage = fuel / maxFuel.toFloat()
 		it.barOverride = DurabilityBarEvent.DurabilityBar(
 			lerp(
diff --git a/src/main/kotlin/gui/entity/EntityRenderer.kt b/src/main/kotlin/gui/entity/EntityRenderer.kt
index fd7a0c4..b4c1c7f 100644
--- a/src/main/kotlin/gui/entity/EntityRenderer.kt
+++ b/src/main/kotlin/gui/entity/EntityRenderer.kt
@@ -169,13 +169,13 @@ object EntityRenderer {
 		val oldBodyYaw = entity.bodyYaw
 		val oldYaw = entity.yaw
 		val oldPitch = entity.pitch
-		val oldPrevHeadYaw = entity.prevHeadYaw
+		val oldPrevHeadYaw = entity.lastHeadYaw
 		val oldHeadYaw = entity.headYaw
 		entity.bodyYaw = 180.0f + targetYaw * 20.0f
 		entity.yaw = 180.0f + targetYaw * 40.0f
 		entity.pitch = -targetPitch * 20.0f
 		entity.headYaw = entity.yaw
-		entity.prevHeadYaw = entity.yaw
+		entity.lastHeadYaw = entity.yaw
 		val vector3f = Vector3f(0.0f, (entity.height / 2.0f + bottomOffset).toFloat(), 0.0f)
 		InventoryScreen.drawEntity(
 			context,
@@ -190,7 +190,7 @@ object EntityRenderer {
 		entity.bodyYaw = oldBodyYaw
 		entity.yaw = oldYaw
 		entity.pitch = oldPitch
-		entity.prevHeadYaw = oldPrevHeadYaw
+		entity.lastHeadYaw = oldPrevHeadYaw
 		entity.headYaw = oldHeadYaw
 		context.disableScissor()
 	}
diff --git a/src/main/kotlin/gui/entity/FakeWorld.kt b/src/main/kotlin/gui/entity/FakeWorld.kt
deleted file mode 100644
index ccf6b60..0000000
--- a/src/main/kotlin/gui/entity/FakeWorld.kt
+++ /dev/null
@@ -1,343 +0,0 @@
-package moe.nea.firmament.gui.entity
-
-import java.util.UUID
-import java.util.function.BooleanSupplier
-import java.util.function.Consumer
-import net.minecraft.block.Block
-import net.minecraft.block.BlockState
-import net.minecraft.client.gui.screen.world.SelectWorldScreen
-import net.minecraft.component.type.MapIdComponent
-import net.minecraft.entity.Entity
-import net.minecraft.entity.boss.dragon.EnderDragonPart
-import net.minecraft.entity.damage.DamageSource
-import net.minecraft.entity.player.PlayerEntity
-import net.minecraft.fluid.Fluid
-import net.minecraft.item.FuelRegistry
-import net.minecraft.item.map.MapState
-import net.minecraft.particle.ParticleEffect
-import net.minecraft.recipe.BrewingRecipeRegistry
-import net.minecraft.recipe.RecipeManager
-import net.minecraft.recipe.RecipePropertySet
-import net.minecraft.recipe.StonecuttingRecipe
-import net.minecraft.recipe.display.CuttingRecipeDisplay
-import net.minecraft.registry.DynamicRegistryManager
-import net.minecraft.registry.Registries
-import net.minecraft.registry.RegistryKey
-import net.minecraft.registry.RegistryKeys
-import net.minecraft.registry.ServerDynamicRegistryType
-import net.minecraft.registry.entry.RegistryEntry
-import net.minecraft.resource.DataConfiguration
-import net.minecraft.resource.ResourcePackManager
-import net.minecraft.resource.featuretoggle.FeatureFlags
-import net.minecraft.resource.featuretoggle.FeatureSet
-import net.minecraft.scoreboard.Scoreboard
-import net.minecraft.server.SaveLoading
-import net.minecraft.server.command.CommandManager
-import net.minecraft.sound.SoundCategory
-import net.minecraft.sound.SoundEvent
-import net.minecraft.util.Identifier
-import net.minecraft.util.TypeFilter
-import net.minecraft.util.function.LazyIterationConsumer
-import net.minecraft.util.math.BlockPos
-import net.minecraft.util.math.Box
-import net.minecraft.util.math.ChunkPos
-import net.minecraft.util.math.Direction
-import net.minecraft.util.math.Vec3d
-import net.minecraft.world.BlockView
-import net.minecraft.world.Difficulty
-import net.minecraft.world.MutableWorldProperties
-import net.minecraft.world.World
-import net.minecraft.world.biome.Biome
-import net.minecraft.world.biome.BiomeKeys
-import net.minecraft.world.chunk.Chunk
-import net.minecraft.world.chunk.ChunkManager
-import net.minecraft.world.chunk.ChunkStatus
-import net.minecraft.world.chunk.EmptyChunk
-import net.minecraft.world.chunk.light.LightingProvider
-import net.minecraft.world.entity.EntityLookup
-import net.minecraft.world.event.GameEvent
-import net.minecraft.world.explosion.ExplosionBehavior
-import net.minecraft.world.tick.OrderedTick
-import net.minecraft.world.tick.QueryableTickScheduler
-import net.minecraft.world.tick.TickManager
-import moe.nea.firmament.util.MC
-
-fun createDynamicRegistry(): DynamicRegistryManager.Immutable {
-	// TODO: use SaveLoading.load() to properly load a full registry
-	return DynamicRegistryManager.of(Registries.REGISTRIES)
-}
-
-class FakeWorld(
-	registries: DynamicRegistryManager.Immutable = createDynamicRegistry(),
-) : World(
-	Properties,
-	RegistryKey.of(RegistryKeys.WORLD, Identifier.of("firmament", "fakeworld")),
-	registries,
-	MC.defaultRegistries.getOrThrow(RegistryKeys.DIMENSION_TYPE)
-		.getOrThrow(RegistryKey.of(RegistryKeys.DIMENSION_TYPE, Identifier.of("minecraft", "overworld"))),
-	true,
-	false,
-	0L,
-	0
-) {
-	object Properties : MutableWorldProperties {
-		override fun getSpawnPos(): BlockPos {
-			return BlockPos.ORIGIN
-		}
-
-		override fun getSpawnAngle(): Float {
-			return 0F
-		}
-
-		override f