diff options
Diffstat (limited to 'src/main/kotlin')
29 files changed, 201 insertions, 249 deletions
diff --git a/src/main/kotlin/moe/nea/firmament/Firmament.kt b/src/main/kotlin/moe/nea/firmament/Firmament.kt index a0549fd..03d4576 100644 --- a/src/main/kotlin/moe/nea/firmament/Firmament.kt +++ b/src/main/kotlin/moe/nea/firmament/Firmament.kt @@ -1,5 +1,6 @@ /* * SPDX-FileCopyrightText: 2023 Linnea Gräf <nea@nea.moe> + * SPDX-FileCopyrightText: 2024 Linnea Gräf <nea@nea.moe> * * SPDX-License-Identifier: GPL-3.0-or-later */ @@ -137,8 +138,8 @@ object Firmament { globalJob.cancel() }) registerFirmamentEvents() - ItemTooltipCallback.EVENT.register { a, b, c -> - ItemTooltipEvent.publish(ItemTooltipEvent(a, b, c)) + ItemTooltipCallback.EVENT.register { a, b, c, d -> + ItemTooltipEvent.publish(ItemTooltipEvent(a, b, c, d)) } ScreenEvents.AFTER_INIT.register(ScreenEvents.AfterInit { client, screen, scaledWidth, scaledHeight -> ScreenEvents.afterRender(screen) diff --git a/src/main/kotlin/moe/nea/firmament/events/ItemTooltipEvent.kt b/src/main/kotlin/moe/nea/firmament/events/ItemTooltipEvent.kt index ba597cd..94a1678 100644 --- a/src/main/kotlin/moe/nea/firmament/events/ItemTooltipEvent.kt +++ b/src/main/kotlin/moe/nea/firmament/events/ItemTooltipEvent.kt @@ -1,17 +1,19 @@ /* * SPDX-FileCopyrightText: 2023 Linnea Gräf <nea@nea.moe> + * SPDX-FileCopyrightText: 2024 Linnea Gräf <nea@nea.moe> * * SPDX-License-Identifier: GPL-3.0-or-later */ package moe.nea.firmament.events -import net.minecraft.client.item.TooltipContext +import net.minecraft.client.item.TooltipType +import net.minecraft.item.Item.TooltipContext import net.minecraft.item.ItemStack import net.minecraft.text.Text data class ItemTooltipEvent( - val stack: ItemStack, val context: TooltipContext, val lines: MutableList<Text> + val stack: ItemStack, val context: TooltipContext, val type: TooltipType, val lines: MutableList<Text> ) : FirmamentEvent() { companion object : FirmamentEventBus<ItemTooltipEvent>() } diff --git a/src/main/kotlin/moe/nea/firmament/events/TooltipEvent.kt b/src/main/kotlin/moe/nea/firmament/events/TooltipEvent.kt index 5b82feb..ac827f7 100644 --- a/src/main/kotlin/moe/nea/firmament/events/TooltipEvent.kt +++ b/src/main/kotlin/moe/nea/firmament/events/TooltipEvent.kt @@ -1,5 +1,6 @@ /* * SPDX-FileCopyrightText: 2023 Linnea Gräf <nea@nea.moe> + * SPDX-FileCopyrightText: 2024 Linnea Gräf <nea@nea.moe> * * SPDX-License-Identifier: GPL-3.0-or-later */ @@ -7,14 +8,14 @@ package moe.nea.firmament.events import net.minecraft.client.gui.tooltip.Tooltip -import net.minecraft.client.item.TooltipContext import net.minecraft.entity.player.PlayerEntity +import net.minecraft.item.Item import net.minecraft.item.ItemStack data class TooltipEvent( val itemStack: ItemStack, val tooltip: Tooltip, - val tooltipContext: TooltipContext, + val tooltipContext: Item.TooltipContext, val player: PlayerEntity? ) : FirmamentEvent() { companion object : FirmamentEventBus<TooltipEvent>() diff --git a/src/main/kotlin/moe/nea/firmament/events/WorldRenderLastEvent.kt b/src/main/kotlin/moe/nea/firmament/events/WorldRenderLastEvent.kt index 025d165..b42e9ab 100644 --- a/src/main/kotlin/moe/nea/firmament/events/WorldRenderLastEvent.kt +++ b/src/main/kotlin/moe/nea/firmament/events/WorldRenderLastEvent.kt @@ -1,5 +1,6 @@ /* * SPDX-FileCopyrightText: 2023 Linnea Gräf <nea@nea.moe> + * SPDX-FileCopyrightText: 2024 Linnea Gräf <nea@nea.moe> * * SPDX-License-Identifier: GPL-3.0-or-later */ @@ -25,7 +26,6 @@ data class WorldRenderLastEvent( val camera: Camera, val gameRenderer: GameRenderer, val lightmapTextureManager: LightmapTextureManager, - val positionMatrix: Matrix4f, val vertexConsumers: VertexConsumerProvider.Immediate, ) : FirmamentEvent() { companion object : FirmamentEventBus<WorldRenderLastEvent>() diff --git a/src/main/kotlin/moe/nea/firmament/features/debug/PowerUserTools.kt b/src/main/kotlin/moe/nea/firmament/features/debug/PowerUserTools.kt index 9341dad..99ef0d5 100644 --- a/src/main/kotlin/moe/nea/firmament/features/debug/PowerUserTools.kt +++ b/src/main/kotlin/moe/nea/firmament/features/debug/PowerUserTools.kt @@ -1,5 +1,6 @@ /* * SPDX-FileCopyrightText: 2023 Linnea Gräf <nea@nea.moe> + * SPDX-FileCopyrightText: 2024 Linnea Gräf <nea@nea.moe> * * SPDX-License-Identifier: GPL-3.0-or-later */ @@ -8,9 +9,9 @@ package moe.nea.firmament.features.debug import net.minecraft.block.SkullBlock import net.minecraft.block.entity.SkullBlockEntity +import net.minecraft.component.DataComponentTypes import net.minecraft.item.ItemStack import net.minecraft.item.Items -import net.minecraft.nbt.NbtHelper import net.minecraft.text.Text import net.minecraft.util.hit.BlockHitResult import net.minecraft.util.hit.HitResult @@ -27,7 +28,6 @@ import moe.nea.firmament.mixins.accessor.AccessorHandledScreen import moe.nea.firmament.util.ClipboardUtils import moe.nea.firmament.util.MC import moe.nea.firmament.util.focusedItemStack -import moe.nea.firmament.util.getOrCreateCompoundTag import moe.nea.firmament.util.skyBlockId object PowerUserTools : FirmamentFeature { @@ -120,7 +120,8 @@ object PowerUserTools : FirmamentFeature { lastCopiedStack = Pair(item, Text.stringifiedTranslatable("firmament.tooltip.copied.modelid", model.toString())) } else if (it.matches(TConfig.copyNbtData)) { - val nbt = item.orCreateNbt.toString() + // TODO: copy full nbt + val nbt = item.get(DataComponentTypes.CUSTOM_DATA)?.nbt?.toString() ?: "<empty>" ClipboardUtils.setTextContent(nbt) lastCopiedStack = Pair(item, Text.translatable("firmament.tooltip.copied.nbt")) } else if (it.matches(TConfig.copySkullTexture)) { @@ -128,7 +129,7 @@ object PowerUserTools : FirmamentFeature { lastCopiedStack = Pair(item, Text.translatable("firmament.tooltip.copied.skull-id.fail.no-skull")) return@subscribe } - val profile = NbtHelper.toGameProfile(item.orCreateNbt.getOrCreateCompoundTag("SkullOwner")) + val profile = item.get(DataComponentTypes.PROFILE) if (profile == null) { lastCopiedStack = Pair(item, Text.translatable("firmament.tooltip.copied.skull-id.fail.no-profile")) return@subscribe @@ -140,7 +141,10 @@ object PowerUserTools : FirmamentFeature { } ClipboardUtils.setTextContent(skullTexture.toString()) lastCopiedStack = - Pair(item, Text.stringifiedTranslatable("firmament.tooltip.copied.skull-id", skullTexture.toString())) + Pair( + item, + Text.stringifiedTranslatable("firmament.tooltip.copied.skull-id", skullTexture.toString()) + ) println("Copied skull id: $skullTexture") } } 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 f3af27d..ac53546 100644 --- a/src/main/kotlin/moe/nea/firmament/features/inventory/ItemRarityCosmetics.kt +++ b/src/main/kotlin/moe/nea/firmament/features/inventory/ItemRarityCosmetics.kt @@ -1,5 +1,6 @@ /* * SPDX-FileCopyrightText: 2023 Linnea Gräf <nea@nea.moe> + * SPDX-FileCopyrightText: 2024 Linnea Gräf <nea@nea.moe> * * SPDX-License-Identifier: GPL-3.0-or-later */ @@ -9,7 +10,6 @@ package moe.nea.firmament.features.inventory import java.awt.Color import net.minecraft.client.gui.DrawContext import net.minecraft.item.ItemStack -import net.minecraft.nbt.NbtElement import net.minecraft.util.Formatting import net.minecraft.util.Identifier import moe.nea.firmament.events.HotbarItemRenderEvent @@ -17,6 +17,8 @@ import moe.nea.firmament.events.SlotRenderEvents import moe.nea.firmament.features.FirmamentFeature import moe.nea.firmament.gui.config.ManagedConfig import moe.nea.firmament.util.MC +import moe.nea.firmament.util.item.loreAccordingToNbt +import moe.nea.firmament.util.unformattedString object ItemRarityCosmetics : FirmamentFeature { override val identifier: String @@ -47,9 +49,7 @@ object ItemRarityCosmetics : FirmamentFeature { } private val ItemStack.skyblockLoreRarityColor: Triple<Float, Float, Float>? get() { - val lore = - getOrCreateSubNbt(ItemStack.DISPLAY_KEY).getList(ItemStack.LORE_KEY, NbtElement.STRING_TYPE.toInt()) - val entry = lore.getString(lore.size - 1) + val entry = loreAccordingToNbt.lastOrNull()?.unformattedString ?: "" return rarityToColor.entries.find { (k, v) -> k in entry }?.value } 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 43243f1..9bf2182 100644 --- a/src/main/kotlin/moe/nea/firmament/features/inventory/SlotLocking.kt +++ b/src/main/kotlin/moe/nea/firmament/features/inventory/SlotLocking.kt @@ -1,8 +1,10 @@ /* * SPDX-FileCopyrightText: 2023 Linnea Gräf <nea@nea.moe> + * SPDX-FileCopyrightText: 2024 Linnea Gräf <nea@nea.moe> * * SPDX-License-Identifier: GPL-3.0-or-later */ + @file:UseSerializers(DashlessUUIDSerializer::class) package moe.nea.firmament.features.inventory @@ -90,7 +92,7 @@ object SlotLocking : FirmamentFeature { if (sellItem == null) return false if (sellItem.displayNameAccordingToNbt?.unformattedString == "Sell Item") return true val lore = sellItem.loreAccordingToNbt - return (lore.lastOrNull() ?: return false).value?.unformattedString == "Click to buyback!" + return (lore.lastOrNull() ?: return false).unformattedString == "Click to buyback!" } override fun onLoad() { diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/VirtualInventory.kt b/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/VirtualInventory.kt index 102b197..6b467eb 100644 --- a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/VirtualInventory.kt +++ b/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/VirtualInventory.kt @@ -1,5 +1,6 @@ /* * SPDX-FileCopyrightText: 2023 Linnea Gräf <nea@nea.moe> + * SPDX-FileCopyrightText: 2024 Linnea Gräf <nea@nea.moe> * * SPDX-License-Identifier: GPL-3.0-or-later */ @@ -22,6 +23,7 @@ import net.minecraft.nbt.NbtList import java.io.ByteArrayInputStream import java.io.ByteArrayOutputStream import net.minecraft.nbt.NbtSizeTracker +import moe.nea.firmament.util.MC @Serializable(with = VirtualInventory.Serializer::class) data class VirtualInventory( @@ -44,13 +46,13 @@ data class 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()) - return VirtualInventory(items.map { ItemStack.fromNbt(it as NbtCompound) }) + return VirtualInventory(items.map { ItemStack.fromNbtOrEmpty(MC.defaultRegistries, it as NbtCompound) }) } override fun serialize(encoder: Encoder, value: VirtualInventory) { val list = NbtList() value.stacks.forEach { - list.add(NbtCompound().also(it::writeNbt)) + list.add(it.encode(MC.defaultRegistries)) } val baos = ByteArrayOutputStream() NbtIo.writeCompressed(NbtCompound().also { it.put(INVENTORY, list) }, baos) 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 24a39e0..956ffc3 100644 --- a/src/main/kotlin/moe/nea/firmament/features/mining/PickaxeAbility.kt +++ b/src/main/kotlin/moe/nea/firmament/features/mining/PickaxeAbility.kt @@ -91,11 +91,9 @@ object PickaxeAbility : FirmamentFeature { DurabilityBarEvent.subscribe { if (!TConfig.drillFuelBar) return@subscribe val lore = it.item.loreAccordingToNbt - if (lore.lastOrNull()?.value?.unformattedString?.contains("DRILL") != true) return@subscribe + if (lore.lastOrNull()?.unformattedString?.contains("DRILL") != true) return@subscribe val maxFuel = lore.firstNotNullOfOrNull { - fuelPattern.useMatch( - it.value?.unformattedString ?: return@firstNotNullOfOrNull null - ) { + fuelPattern.useMatch(it.unformattedString) { parseShortNumber(group("maxFuel")) } } ?: return@subscribe @@ -115,7 +113,7 @@ object PickaxeAbility : FirmamentFeature { if (MC.screen?.title?.unformattedString == "Heart of the Mountain") { val name = it.stack.displayNameAccordingToNbt?.unformattedString ?: return@subscribe val cooldown = it.stack.loreAccordingToNbt.firstNotNullOfOrNull { - cooldownPattern.useMatch(it.value?.unformattedString ?: return@firstNotNullOfOrNull null) { + cooldownPattern.useMatch(it.unformattedString) { parseTimePattern(group("cooldown")) } } ?: return@subscribe @@ -134,15 +132,15 @@ object PickaxeAbility : FirmamentFeature { fun getCooldownFromLore(itemStack: ItemStack): PickaxeAbilityData? { val lore = itemStack.loreAccordingToNbt - if (!lore.any { it.value?.unformattedString?.contains("Breaking Power") == true }) + if (!lore.any { it.unformattedString.contains("Breaking Power") == true }) return null val cooldown = lore.firstNotNullOfOrNull { - cooldownPattern.useMatch(it.value?.unformattedString ?: return@firstNotNullOfOrNull null) { + cooldownPattern.useMatch(it.unformattedString) { parseTimePattern(group("cooldown")) } } ?: return null val name = lore.firstNotNullOfOrNull { - abilityPattern.useMatch(it.value?.unformattedString ?: return@firstNotNullOfOrNull null) { + abilityPattern.useMatch(it.unformattedString) { group("name") } } ?: return null 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 3fb5e9c..9c2eafc 100644 --- a/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt +++ b/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt @@ -7,21 +7,20 @@ package moe.nea.firmament.features.texturepack -import com.mojang.authlib.GameProfile import com.mojang.authlib.minecraft.MinecraftProfileTexture +import com.mojang.authlib.properties.Property import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable import net.minecraft.block.SkullBlock import net.minecraft.client.MinecraftClient import net.minecraft.client.render.RenderLayer import net.minecraft.client.util.ModelIdentifier -import net.minecraft.item.ItemStack +import net.minecraft.component.type.ProfileComponent import net.minecraft.util.Identifier import moe.nea.firmament.events.CustomItemModelEvent import moe.nea.firmament.events.TickEvent import moe.nea.firmament.features.FirmamentFeature import moe.nea.firmament.gui.config.ManagedConfig import moe.nea.firmament.util.IdentityCharacteristics -import moe.nea.firmament.util.MC import moe.nea.firmament.util.item.decodeProfileTextureProperty import moe.nea.firmament.util.skyBlockId @@ -53,12 +52,12 @@ object CustomSkyBlockTextures : FirmamentFeature { } } - private val skullTextureCache = mutableMapOf<IdentityCharacteristics<GameProfile>, Any>() + private val skullTextureCache = mutableMapOf<IdentityCharacteristics<ProfileComponent>, Any>() private val sentinelPresentInvalid = Object() private val mcUrlRegex = "https?://textures.minecraft.net/texture/([a-fA-F0-9]+)".toRegex() - fun getSkullId(profile: GameProfile): String? { - val textureProperty = MC.instance.sessionService.getPackedTextures(profile) ?: return null + + fun getSkullId(textureProperty: Property): String? { val texture = decodeProfileTextureProperty(textureProperty) ?: return null val textureUrl = texture.textures[MinecraftProfileTexture.Type.SKIN]?.url ?: return null @@ -66,40 +65,23 @@ object CustomSkyBlockTextures : FirmamentFeature { return mcUrlData.groupValues[1] } - fun getSkullTexture(profile: GameProfile): Identifier? { - val id = getSkullId(profile) ?: return null + fun getSkullTexture(profile: ProfileComponent): Identifier? { + val id = getSkullId(profile.properties["textures"].firstOrNull() ?: return null) ?: return null return Identifier("firmskyblock", "textures/placedskull/$id.png") } - fun getArmorTexture( - itemStack: ItemStack, secondLayer: Boolean, - overlay: String? - ): Identifier? { - val modelIdentifier = CustomItemModelEvent.getModelIdentifier(itemStack) ?: return null - // Vanilla scheme: "textures/models/armor/" + var10000 + "_layer_" + (secondLayer ? 2 : 1) + (overlay == null ? "" : "_" + overlay) + ".png"; - val overlayPart = if (overlay != null) "_$overlay" else "" - val identifier = Identifier( - modelIdentifier.namespace, - "textures/models/armor/${modelIdentifier.path}_layer_${if (secondLayer) 2 else 1}$overlayPart.png" - ) - if (MC.resourceManager.getResource(identifier).isPresent) { - return identifier - } - return null - } - fun modifySkullTexture( type: SkullBlock.SkullType?, - profile: GameProfile?, + component: ProfileComponent?, cir: CallbackInfoReturnable<RenderLayer> ) { if (type != SkullBlock.Type.PLAYER) return if (!TConfig.skullsEnabled) return - if (profile == null) return - val ic = IdentityCharacteristics(profile) + if (component == null) return + val ic = IdentityCharacteristics(component) val n = skullTextureCache.getOrPut(ic) { - val id = getSkullTexture(profile) ?: return@getOrPut sentinelPresentInvalid + val id = getSkullTexture(component) ?: return@getOrPut sentinelPresentInvalid if (!MinecraftClient.getInstance().resourceManager.getResource(id).isPresent) { return@getOrPut sentinelPresentInvalid } diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/DisplayNamePredicate.kt b/src/main/kotlin/moe/nea/firmament/features/texturepack/DisplayNamePredicate.kt index 373910a..7a1255b 100644 --- a/src/main/kotlin/moe/nea/firmament/features/texturepack/DisplayNamePredicate.kt +++ b/src/main/kotlin/moe/nea/firmament/features/texturepack/DisplayNamePredicate.kt @@ -10,14 +10,13 @@ import com.google.gson.JsonElement import net.minecraft.item.ItemStack import net.minecraft.nbt.NbtElement import net.minecraft.nbt.NbtString +import moe.nea.firmament.util.item.displayNameAccordingToNbt +import moe.nea.firmament.util.item.loreAccordingToNbt data class DisplayNamePredicate(val stringMatcher: StringMatcher) : FirmamentModelPredicate { override fun test(stack: ItemStack): Boolean { - val display = stack.getOrCreateSubNbt(ItemStack.DISPLAY_KEY) - return if (display.contains(ItemStack.NAME_KEY, NbtElement.STRING_TYPE.toInt())) - stringMatcher.matches(display.get(ItemStack.NAME_KEY) as NbtString) - else - false + val display = stack.displayNameAccordingToNbt + return stringMatcher.matches(display) } object Parser : FirmamentModelPredicateParser { diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/LorePredicate.kt b/src/main/kotlin/moe/nea/firmament/features/texturepack/LorePredicate.kt index 604d29c..d10814d 100644 --- a/src/main/kotlin/moe/nea/firmament/features/texturepack/LorePredicate.kt +++ b/src/main/kotlin/moe/nea/firmament/features/texturepack/LorePredicate.kt @@ -8,8 +8,7 @@ package moe.nea.firmament.features.texturepack import com.google.gson.JsonElement import net.minecraft.item.ItemStack -import net.minecraft.nbt.NbtElement -import net.minecraft.nbt.NbtString +import moe.nea.firmament.util.item.loreAccordingToNbt class LorePredicate(val matcher: StringMatcher) : FirmamentModelPredicate { object Parser : FirmamentModelPredicateParser { @@ -19,10 +18,7 @@ class LorePredicate(val matcher: StringMatcher) : FirmamentModelPredicate { } override fun test(stack: ItemStack): Boolean { - val display = stack.getOrCreateSubNbt(ItemStack.DISPLAY_KEY) - if (!display.contains(ItemStack.LORE_KEY, NbtElement.LIST_TYPE.toInt())) - return false - val lore = display.getList(ItemStack.LORE_KEY, NbtElement.STRING_TYPE.toInt()) - return lore.any { matcher.matches(it as NbtString)} + val lore = stack.loreAccordingToNbt + return lore.any { matcher.matches(it) } } } diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/StringMatcher.kt b/src/main/kotlin/moe/nea/firmament/features/texturepack/StringMatcher.kt index e9d39a8..8c1ccbc 100644 --- a/src/main/kotlin/moe/nea/firmament/features/texturepack/StringMatcher.kt +++ b/src/main/kotlin/moe/nea/firmament/features/texturepack/StringMatcher.kt @@ -12,6 +12,7 @@ import com.google.gson.JsonPrimitive import java.util.function.Predicate import net.minecraft.nbt.NbtString import net.minecraft.text.Text +import moe.nea.firmament.util.MC import moe.nea.firmament.util.removeColorCodes interface StringMatcher { @@ -27,7 +28,7 @@ interface StringMatcher { val isString = stringStart >= 0 && string.subSequence(0, stringStart).isBlank() val isJson = jsonStart >= 0 && string.subSequence(0, jsonStart).isBlank() if (isString || isJson) - return matches(Text.Serialization.fromJson(string) ?: return false) + return matches(Text.Serialization.fromJson(string, MC.defaultRegistries) ?: return false) return matches(string) } diff --git a/src/main/kotlin/moe/nea/firmament/gui/WTitledItem.kt b/src/main/kotlin/moe/nea/firmament/gui/WTitledItem.kt index 817c099..a1d4d68 100644 --- a/src/main/kotlin/moe/nea/firmament/gui/WTitledItem.kt +++ b/src/main/kotlin/moe/nea/firmament/gui/WTitledItem.kt @@ -1,5 +1,6 @@ /* * SPDX-FileCopyrightText: 2023 Linnea Gräf <nea@nea.moe> + * SPDX-FileCopyrightText: 2024 Linnea Gräf <nea@nea.moe> * * SPDX-License-Identifier: GPL-3.0-or-later */ @@ -11,13 +12,13 @@ import io.github.cottonmc.cotton.gui.client.BackgroundPainter import io.github.cottonmc.cotton.gui.widget.TooltipBuilder import io.github.cottonmc.cotton.gui.widget.WWidget import net.minecraft.client.gui.DrawContext -import net.minecraft.client.item.TooltipContext +import net.minecraft.client.item.TooltipType import net.minecraft.item.ItemStack import net.minecraft.text.Text import moe.nea.firmament.util.MC open class WTitledItem(var stack: ItemStack, val countString: Text = Text.empty()) : WWidget() { - var backgroundPainter:BackgroundPainter = BackgroundPainter.SLOT + var backgroundPainter: BackgroundPainter = BackgroundPainter.SLOT override fun canResize(): Boolean = true override fun paint(context: DrawContext, x: Int, y: Int, mouseX: Int, mouseY: Int) { backgroundPainter.paintBackground(context, x, y, this) @@ -32,7 +33,7 @@ open class WTitledItem(var stack: ItemStack, val countString: Text = Text.empty( } override fun addTooltip(tooltip: TooltipBuilder) { - tooltip.add(*stack.getTooltip(null, TooltipContext.BASIC).toTypedArray()) + tooltip.add(*stack.getTooltip(null, null, TooltipType.BASIC).toTypedArray()) } } diff --git a/src/main/kotlin/moe/nea/firmament/gui/entity/EntityRenderer.kt b/src/main/kotlin/moe/nea/firmament/gui/entity/EntityRenderer.kt index 65b5d7d..44fd538 100644 --- a/src/main/kotlin/moe/nea/firmament/gui/entity/EntityRenderer.kt +++ b/src/main/kotlin/moe/nea/firmament/gui/entity/EntityRenderer.kt @@ -136,7 +136,7 @@ object EntityRenderer { posY, posX + 50, posY + 80, - (minOf(2F / maxSize, 1F) * 30).toInt(), + minOf(2F / maxSize, 1F) * 30, -bottomOffset, mouseX, mouseY, @@ -155,7 +155,7 @@ object EntityRenderer { y1: Int, x2: Int, y2: Int, - size: Int, + size: Float, bottomOffset: Float, mouseX: Float, mouseY: Float, 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 4cdfc45..ac1b33b 100644 --- a/src/main/kotlin/moe/nea/firmament/gui/entity/FakeWorld.kt +++ b/src/main/kotlin/moe/nea/firmament/gui/entity/FakeWorld.kt @@ -16,11 +16,13 @@ import kotlin.jvm.optionals.getOrNull import kotlin.streams.asSequence import net.minecraft.block.Block import net.minecraft.block.BlockState -import net.minecraft.client.world.ClientWorld +import net.minecraft.component.type.MapIdComponent import net.minecraft.entity.Entity import net.minecraft.entity.player.PlayerEntity import net.minecraft.fluid.Fluid import net.minecraft.item.map.MapState +import net.minecraft.recipe.BrewingRecipeRegistry +import net.minecraft.recipe.Ingredient import net.minecraft.recipe.RecipeManager import net.minecraft.registry.BuiltinRegistries import net.minecraft.registry.DynamicRegistryManager @@ -29,10 +31,10 @@ import net.minecraft.registry.RegistryKey import net.minecraft.registry.RegistryKeys import net.minecraft.registry.RegistryWrapper import net.minecraft.registry.entry.RegistryEntry +import net.minecraft.registry.entry.RegistryEntryInfo import net.minecraft.registry.entry.RegistryEntryList import net.minecraft.registry.entry.RegistryEntryOwner import net.minecraft.registry.tag.TagKey -import net.minecraft.resource.featuretoggle.FeatureFlag import net.minecraft.resource.featuretoggle.FeatureFlags import net.minecraft.resource.featuretoggle.FeatureSet import net.minecraft.scoreboard.Scoreboard @@ -119,6 +121,10 @@ fun <T> makeRegistry(registryWrapper: RegistryWrapper.Impl<T>, key: RegistryKey< return key } + override fun getEntryInfo(key: RegistryKey<T>?): Optional<RegistryEntryInfo> { + TODO("Not yet implemented") + } + override fun getLifecycle(): Lifecycle { return Lifecycle.stable() } @@ -194,18 +200,18 @@ fun <T> makeRegistry(registryWrapper: RegistryWrapper.Impl<T>, key: RegistryKey< return registryWrapper.getOptional(key ?: return Optional.empty()) } + override fun getEntry(id: Identifier?): Optional<RegistryEntry.Reference<T>> { + TODO("Not yet implemented") + } + override fun createEntry(value: T): RegistryEntry.Reference<T> { - TODO() + TODO("Not yet implemented") } override fun contains(key: RegistryKey<T>?): Boolean { return getEntry(key).isPresent } - override fun getEntryLifecycle(entry: T): Lifecycle { - return Lifecycle.stable() - } - override fun getId(value: T): Identifier? { return (inverseLookup[value] ?: return null).value } @@ -236,7 +242,9 @@ fun createDynamicRegistry(): DynamicRegistryManager.Immutable { } } -class FakeWorld(registries: DynamicRegistryManager.Immutable = createDynamicRegistry()) : World( +class FakeWorld( + registries: DynamicRegistryManager.Immutable |