From 4d9f121cd06e013a855eed4882ad72fe160bc1ea Mon Sep 17 00:00:00 2001 From: Drex Date: Sat, 9 Mar 2024 23:06:34 +0100 Subject: [PATCH] Update to 24w10a --- libs.versions.toml | 6 +++--- .../ledger/actions/AbstractActionType.kt | 9 +++++---- .../quiltservertools/ledger/actions/ActionType.kt | 5 +++-- .../ledger/actions/BlockBreakActionType.kt | 3 ++- .../ledger/actions/BlockChangeActionType.kt | 3 ++- .../ledger/actions/BlockPlaceActionType.kt | 3 ++- .../ledger/actions/EntityChangeActionType.kt | 3 ++- .../ledger/actions/ItemChangeActionType.kt | 10 +++++----- .../ledger/actions/ItemDropActionType.kt | 6 +++--- .../ledger/actions/ItemPickUpActionType.kt | 6 +++--- .../ledger/actionutils/ActionFactory.kt | 3 +-- .../quiltservertools/ledger/utility/MessageUtils.kt | 2 +- 12 files changed, 32 insertions(+), 27 deletions(-) diff --git a/libs.versions.toml b/libs.versions.toml index a20b0cd7..b0e58d42 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -1,9 +1,9 @@ [versions] -minecraft = "24w09a" -yarn-mappings = "24w09a+build.9" +minecraft = "24w10a" +yarn-mappings = "24w10a+build.7" fabric-loader = "0.15.7" -fabric-api = "0.96.6+1.20.5" +fabric-api = "0.96.8+1.20.5" # Kotlin kotlin = "1.9.4" diff --git a/src/main/kotlin/com/github/quiltservertools/ledger/actions/AbstractActionType.kt b/src/main/kotlin/com/github/quiltservertools/ledger/actions/AbstractActionType.kt index 02ca1d95..1d3616f4 100644 --- a/src/main/kotlin/com/github/quiltservertools/ledger/actions/AbstractActionType.kt +++ b/src/main/kotlin/com/github/quiltservertools/ledger/actions/AbstractActionType.kt @@ -5,7 +5,9 @@ import com.github.quiltservertools.ledger.utility.Sources import com.github.quiltservertools.ledger.utility.TextColorPallet import com.github.quiltservertools.ledger.utility.literal import com.mojang.authlib.GameProfile +import java.time.Instant import net.minecraft.server.MinecraftServer +import net.minecraft.server.command.ServerCommandSource import net.minecraft.server.network.ServerPlayerEntity import net.minecraft.text.ClickEvent import net.minecraft.text.HoverEvent @@ -15,7 +17,6 @@ import net.minecraft.util.Identifier import net.minecraft.util.Util import net.minecraft.util.math.BlockPos import net.minecraft.world.World -import java.time.Instant import kotlin.time.ExperimentalTime abstract class AbstractActionType : ActionType { @@ -37,13 +38,13 @@ abstract class AbstractActionType : ActionType { override fun restore(server: MinecraftServer): Boolean = false @ExperimentalTime - override fun getMessage(): Text { + override fun getMessage(source: ServerCommandSource): Text { val message = Text.translatable( "text.ledger.action_message", getTimeMessage(), getSourceMessage(), getActionMessage(), - getObjectMessage(), + getObjectMessage(source), getLocationMessage() ) message.style = TextColorPallet.light @@ -80,7 +81,7 @@ abstract class AbstractActionType : ActionType { ) } - open fun getObjectMessage(): Text = Text.translatable( + open fun getObjectMessage(source: ServerCommandSource): Text = Text.translatable( Util.createTranslationKey( this.getTranslationType(), objectIdentifier diff --git a/src/main/kotlin/com/github/quiltservertools/ledger/actions/ActionType.kt b/src/main/kotlin/com/github/quiltservertools/ledger/actions/ActionType.kt index d8e4239c..947f83b0 100644 --- a/src/main/kotlin/com/github/quiltservertools/ledger/actions/ActionType.kt +++ b/src/main/kotlin/com/github/quiltservertools/ledger/actions/ActionType.kt @@ -3,12 +3,13 @@ package com.github.quiltservertools.ledger.actions import com.github.quiltservertools.ledger.config.ActionsSpec import com.github.quiltservertools.ledger.config.config import com.mojang.authlib.GameProfile +import java.time.Instant import net.minecraft.server.MinecraftServer +import net.minecraft.server.command.ServerCommandSource import net.minecraft.server.network.ServerPlayerEntity import net.minecraft.text.Text import net.minecraft.util.Identifier import net.minecraft.util.math.BlockPos -import java.time.Instant import kotlin.time.ExperimentalTime interface ActionType { @@ -32,7 +33,7 @@ interface ActionType { fun getTranslationType(): String @ExperimentalTime - fun getMessage(): Text + fun getMessage(source: ServerCommandSource): Text fun isBlacklisted() = config[ActionsSpec.typeBlacklist].contains(identifier) || config[ActionsSpec.objectBlacklist].contains(objectIdentifier) || diff --git a/src/main/kotlin/com/github/quiltservertools/ledger/actions/BlockBreakActionType.kt b/src/main/kotlin/com/github/quiltservertools/ledger/actions/BlockBreakActionType.kt index 4ee9e30a..e6a7052c 100644 --- a/src/main/kotlin/com/github/quiltservertools/ledger/actions/BlockBreakActionType.kt +++ b/src/main/kotlin/com/github/quiltservertools/ledger/actions/BlockBreakActionType.kt @@ -2,6 +2,7 @@ package com.github.quiltservertools.ledger.actions import com.github.quiltservertools.ledger.utility.TextColorPallet import com.github.quiltservertools.ledger.utility.literal +import net.minecraft.server.command.ServerCommandSource import net.minecraft.text.HoverEvent import net.minecraft.text.Text import net.minecraft.util.Util @@ -9,7 +10,7 @@ import net.minecraft.util.Util class BlockBreakActionType : BlockChangeActionType() { override val identifier = "block-break" - override fun getObjectMessage(): Text = Text.translatable( + override fun getObjectMessage(source: ServerCommandSource): Text = Text.translatable( Util.createTranslationKey( this.getTranslationType(), oldObjectIdentifier diff --git a/src/main/kotlin/com/github/quiltservertools/ledger/actions/BlockChangeActionType.kt b/src/main/kotlin/com/github/quiltservertools/ledger/actions/BlockChangeActionType.kt index 7502095d..f7ae8182 100644 --- a/src/main/kotlin/com/github/quiltservertools/ledger/actions/BlockChangeActionType.kt +++ b/src/main/kotlin/com/github/quiltservertools/ledger/actions/BlockChangeActionType.kt @@ -11,6 +11,7 @@ import net.minecraft.nbt.StringNbtReader import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket import net.minecraft.registry.Registries import net.minecraft.server.MinecraftServer +import net.minecraft.server.command.ServerCommandSource import net.minecraft.server.network.ServerPlayerEntity import net.minecraft.text.HoverEvent import net.minecraft.text.Text @@ -50,7 +51,7 @@ open class BlockChangeActionType : AbstractActionType() { override fun getTranslationType() = "block" - override fun getObjectMessage(): Text { + override fun getObjectMessage(source: ServerCommandSource): Text { val text = Text.literal("") text.append( Text.translatable( diff --git a/src/main/kotlin/com/github/quiltservertools/ledger/actions/BlockPlaceActionType.kt b/src/main/kotlin/com/github/quiltservertools/ledger/actions/BlockPlaceActionType.kt index 8f346aa6..19c93d7b 100644 --- a/src/main/kotlin/com/github/quiltservertools/ledger/actions/BlockPlaceActionType.kt +++ b/src/main/kotlin/com/github/quiltservertools/ledger/actions/BlockPlaceActionType.kt @@ -5,6 +5,7 @@ import com.github.quiltservertools.ledger.utility.getWorld import com.github.quiltservertools.ledger.utility.literal import net.minecraft.nbt.StringNbtReader import net.minecraft.server.MinecraftServer +import net.minecraft.server.command.ServerCommandSource import net.minecraft.text.HoverEvent import net.minecraft.text.Text import net.minecraft.util.Util @@ -31,7 +32,7 @@ class BlockPlaceActionType : BlockChangeActionType() { return true } - override fun getObjectMessage(): Text = Text.translatable( + override fun getObjectMessage(source: ServerCommandSource): Text = Text.translatable( Util.createTranslationKey( this.getTranslationType(), objectIdentifier diff --git a/src/main/kotlin/com/github/quiltservertools/ledger/actions/EntityChangeActionType.kt b/src/main/kotlin/com/github/quiltservertools/ledger/actions/EntityChangeActionType.kt index ac8f9041..16e12634 100644 --- a/src/main/kotlin/com/github/quiltservertools/ledger/actions/EntityChangeActionType.kt +++ b/src/main/kotlin/com/github/quiltservertools/ledger/actions/EntityChangeActionType.kt @@ -13,6 +13,7 @@ import net.minecraft.item.ItemStack import net.minecraft.nbt.StringNbtReader import net.minecraft.registry.Registries import net.minecraft.server.MinecraftServer +import net.minecraft.server.command.ServerCommandSource import net.minecraft.text.HoverEvent import net.minecraft.text.Text import net.minecraft.util.Identifier @@ -30,7 +31,7 @@ class EntityChangeActionType : AbstractActionType() { } } - override fun getObjectMessage(): Text { + override fun getObjectMessage(source: ServerCommandSource): Text { val text = Text.literal("") text.append( Text.translatable( diff --git a/src/main/kotlin/com/github/quiltservertools/ledger/actions/ItemChangeActionType.kt b/src/main/kotlin/com/github/quiltservertools/ledger/actions/ItemChangeActionType.kt index 89f55e59..52484d7f 100644 --- a/src/main/kotlin/com/github/quiltservertools/ledger/actions/ItemChangeActionType.kt +++ b/src/main/kotlin/com/github/quiltservertools/ledger/actions/ItemChangeActionType.kt @@ -14,9 +14,9 @@ import net.minecraft.item.BlockItem import net.minecraft.item.ItemStack import net.minecraft.item.Items import net.minecraft.nbt.StringNbtReader -import net.minecraft.registry.DynamicRegistryManager import net.minecraft.registry.Registries import net.minecraft.server.MinecraftServer +import net.minecraft.server.command.ServerCommandSource import net.minecraft.server.world.ServerWorld import net.minecraft.text.HoverEvent import net.minecraft.text.Text @@ -32,8 +32,8 @@ abstract class ItemChangeActionType : AbstractActionType() { } } - override fun getObjectMessage(): Text { - val stack = ItemStack.fromNbtOrEmpty(DynamicRegistryManager.EMPTY, StringNbtReader.parse(extraData)) + override fun getObjectMessage(source: ServerCommandSource): Text { + val stack = ItemStack.fromNbtOrEmpty(source.registryManager, StringNbtReader.parse(extraData)) return "${stack.count} ".literal().append( Text.translatable( @@ -76,7 +76,7 @@ abstract class ItemChangeActionType : AbstractActionType() { val inventory = world?.let { getInventory(it) } if (world != null && inventory != null) { - val rollbackStack = ItemStack.fromNbtOrEmpty(DynamicRegistryManager.EMPTY, StringNbtReader.parse(extraData)) + val rollbackStack = ItemStack.fromNbtOrEmpty(server.registryManager, StringNbtReader.parse(extraData)) if (inventory != null) { for (i in 0 until inventory.size()) { @@ -104,7 +104,7 @@ abstract class ItemChangeActionType : AbstractActionType() { val inventory = world?.let { getInventory(it) } if (world != null) { - val rollbackStack = ItemStack.fromNbtOrEmpty(DynamicRegistryManager.EMPTY, StringNbtReader.parse(extraData)) + val rollbackStack = ItemStack.fromNbtOrEmpty(server.registryManager, StringNbtReader.parse(extraData)) if (inventory != null) { for (i in 0 until inventory.size()) { diff --git a/src/main/kotlin/com/github/quiltservertools/ledger/actions/ItemDropActionType.kt b/src/main/kotlin/com/github/quiltservertools/ledger/actions/ItemDropActionType.kt index 13362d50..357a0132 100644 --- a/src/main/kotlin/com/github/quiltservertools/ledger/actions/ItemDropActionType.kt +++ b/src/main/kotlin/com/github/quiltservertools/ledger/actions/ItemDropActionType.kt @@ -11,9 +11,9 @@ import net.minecraft.item.AliasedBlockItem import net.minecraft.item.BlockItem import net.minecraft.item.ItemStack import net.minecraft.nbt.StringNbtReader -import net.minecraft.registry.DynamicRegistryManager import net.minecraft.registry.Registries import net.minecraft.server.MinecraftServer +import net.minecraft.server.command.ServerCommandSource import net.minecraft.text.HoverEvent import net.minecraft.text.Text import net.minecraft.util.Util @@ -30,8 +30,8 @@ open class ItemDropActionType : AbstractActionType() { } } - override fun getObjectMessage(): Text { - val stack = ItemStack.fromNbtOrEmpty(DynamicRegistryManager.EMPTY, StringNbtReader.parse(extraData)) + override fun getObjectMessage(source: ServerCommandSource): Text { + val stack = ItemStack.fromNbtOrEmpty(source.registryManager, StringNbtReader.parse(extraData)) return "${stack.count} ".literal().append( Text.translatable( diff --git a/src/main/kotlin/com/github/quiltservertools/ledger/actions/ItemPickUpActionType.kt b/src/main/kotlin/com/github/quiltservertools/ledger/actions/ItemPickUpActionType.kt index a8881632..d66425f4 100644 --- a/src/main/kotlin/com/github/quiltservertools/ledger/actions/ItemPickUpActionType.kt +++ b/src/main/kotlin/com/github/quiltservertools/ledger/actions/ItemPickUpActionType.kt @@ -11,9 +11,9 @@ import net.minecraft.item.AliasedBlockItem import net.minecraft.item.BlockItem import net.minecraft.item.ItemStack import net.minecraft.nbt.StringNbtReader -import net.minecraft.registry.DynamicRegistryManager import net.minecraft.registry.Registries import net.minecraft.server.MinecraftServer +import net.minecraft.server.command.ServerCommandSource import net.minecraft.text.HoverEvent import net.minecraft.text.Text import net.minecraft.util.Util @@ -30,8 +30,8 @@ open class ItemPickUpActionType : AbstractActionType() { } } - override fun getObjectMessage(): Text { - val stack = ItemStack.fromNbtOrEmpty(DynamicRegistryManager.EMPTY, StringNbtReader.parse(extraData)) + override fun getObjectMessage(source: ServerCommandSource): Text { + val stack = ItemStack.fromNbtOrEmpty(source.registryManager, StringNbtReader.parse(extraData)) return "${stack.count} ".literal().append( Text.translatable( diff --git a/src/main/kotlin/com/github/quiltservertools/ledger/actionutils/ActionFactory.kt b/src/main/kotlin/com/github/quiltservertools/ledger/actionutils/ActionFactory.kt index 3388adb2..a00104bd 100644 --- a/src/main/kotlin/com/github/quiltservertools/ledger/actionutils/ActionFactory.kt +++ b/src/main/kotlin/com/github/quiltservertools/ledger/actionutils/ActionFactory.kt @@ -21,7 +21,6 @@ import net.minecraft.entity.damage.DamageSource import net.minecraft.entity.player.PlayerEntity import net.minecraft.item.ItemStack import net.minecraft.nbt.NbtCompound -import net.minecraft.registry.DynamicRegistryManager import net.minecraft.registry.Registries import net.minecraft.util.math.BlockPos import net.minecraft.world.World @@ -194,7 +193,7 @@ object ActionFactory { action.world = world.registryKey.value action.objectIdentifier = Registries.ITEM.getId(stack.item) action.sourceName = source - action.extraData = stack.encode(DynamicRegistryManager.EMPTY)?.asString() + action.extraData = stack.encode(world.registryManager)?.asString() } fun entityKillAction(world: World, pos: BlockPos, entity: Entity, cause: DamageSource): EntityKillActionType { diff --git a/src/main/kotlin/com/github/quiltservertools/ledger/utility/MessageUtils.kt b/src/main/kotlin/com/github/quiltservertools/ledger/utility/MessageUtils.kt index d1052218..a5233c72 100644 --- a/src/main/kotlin/com/github/quiltservertools/ledger/utility/MessageUtils.kt +++ b/src/main/kotlin/com/github/quiltservertools/ledger/utility/MessageUtils.kt @@ -38,7 +38,7 @@ object MessageUtils { source.sendFeedback({ header }, false) results.actions.forEach { actionType -> - source.sendFeedback({ actionType.getMessage() }, false) + source.sendFeedback({ actionType.getMessage(source) }, false) } source.sendFeedback(