Use the splicing table block name in the casting button tooltip

Author: object-Object

Common/src/generated/resources/data/hexdebug/loot_tables/blocks/enlightened_splicing_table.json

@@ -11,6 +11,12 @@
       "entries": [
         {
           "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_name",
+              "source": "block_entity"
+            }
+          ],
           "name": "hexdebug:enlightened_splicing_table"
         }
       ],

Common/src/generated/resources/data/hexdebug/loot_tables/blocks/splicing_table.json

@@ -11,6 +11,12 @@
       "entries": [
         {
           "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_name",
+              "source": "block_entity"
+            }
+          ],
           "name": "hexdebug:splicing_table"
         }
       ],

Common/src/main/java/gay/object/hexdebug/mixin/MixinOpBrainsweepSpell.java

@@ -0,0 +1,41 @@
+package gay.object.hexdebug.mixin;
+
+import at.petrak.hexcasting.api.casting.RenderedSpell;
+import at.petrak.hexcasting.api.casting.eval.CastingEnvironment;
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import gay.object.hexdebug.blocks.splicing.SplicingTableBlockEntity;
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.Mob;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(targets = "at.petrak.hexcasting.common.casting.actions.spells.great.OpBrainsweep$Spell")
+public abstract class MixinOpBrainsweepSpell implements RenderedSpell {
+    @Invoker
+    public abstract BlockPos callGetPos();
+
+    @Invoker
+    public abstract Mob callGetSacrifice();
+
+    @WrapMethod(method = "cast(Lat/petrak/hexcasting/api/casting/eval/CastingEnvironment;)V", remap = false)
+    private void hexdebug$copyVillagerNameToSplicingTable(CastingEnvironment env, Operation<Void> original) {
+        Component customName = null;
+        if (callGetSacrifice().hasCustomName()) {
+            customName = callGetSacrifice().getCustomName();
+        } else if (env.getWorld().getBlockEntity(callGetPos()) instanceof SplicingTableBlockEntity table) {
+            customName = table.getCustomName();
+        }
+
+        original.call(env);
+
+        if (
+            env.getWorld().getBlockEntity(callGetPos()) instanceof SplicingTableBlockEntity table
+            && customName != null
+        ) {
+            table.setCustomName(customName);
+            table.sync();
+        }
+    }
+}

Common/src/main/kotlin/gay/object/hexdebug/blocks/splicing/SplicingTableBlock.kt

@@ -7,7 +7,9 @@ import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.Containers
 import net.minecraft.world.InteractionHand
 import net.minecraft.world.InteractionResult
+import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
+import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.context.BlockPlaceContext
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.block.*
@@ -48,6 +50,12 @@ class SplicingTableBlock(properties: Properties, val enlightened: Boolean) : Bas
 
     override fun getRenderShape(state: BlockState) = RenderShape.MODEL
 
+    override fun setPlacedBy(level: Level, pos: BlockPos, state: BlockState, placer: LivingEntity?, stack: ItemStack) {
+        if (stack.hasCustomHoverName()) {
+            getBlockEntity(level, pos)?.customName = stack.hoverName
+        }
+    }
+
     override fun use(
         state: BlockState,
         level: Level,

Common/src/main/kotlin/gay/object/hexdebug/blocks/splicing/SplicingTableBlockEntity.kt

@@ -13,10 +13,7 @@ import at.petrak.hexcasting.api.casting.iota.ListIota
 import at.petrak.hexcasting.api.casting.iota.PatternIota
 import at.petrak.hexcasting.api.casting.math.HexPattern
 import at.petrak.hexcasting.api.pigment.FrozenPigment
-import at.petrak.hexcasting.api.utils.asCompound
-import at.petrak.hexcasting.api.utils.extractMedia
-import at.petrak.hexcasting.api.utils.getInt
-import at.petrak.hexcasting.api.utils.getList
+import at.petrak.hexcasting.api.utils.*
 import at.petrak.hexcasting.xplat.IXplatAbstractions
 import gay.`object`.hexdebug.api.HexDebugTags
 import gay.`object`.hexdebug.blocks.base.BaseContainer
@@ -35,12 +32,12 @@ import gay.`object`.hexdebug.utils.setPropertyIfChanged
 import net.minecraft.core.BlockPos
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.ListTag
-import net.minecraft.nbt.Tag
 import net.minecraft.network.chat.Component
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.ContainerHelper
 import net.minecraft.world.MenuProvider
+import net.minecraft.world.Nameable
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.inventory.SimpleContainerData
@@ -53,7 +50,7 @@ import kotlin.math.min
 
 class SplicingTableBlockEntity(pos: BlockPos, state: BlockState) :
     HexBlockEntity(HexDebugBlockEntities.SPLICING_TABLE.value, pos, state),
-    ISplicingTable, BaseContainer, MenuProvider, ADIotaHolder, ADMediaHolder
+    ISplicingTable, BaseContainer, MenuProvider, Nameable, ADIotaHolder, ADMediaHolder
 {
     override val stacks = BaseContainer.withSize(SplicingTableItemSlot.container_size)
 
@@ -105,6 +102,9 @@ class SplicingTableBlockEntity(pos: BlockPos, state: BlockState) :
 
     var pigment: FrozenPigment? = null
 
+    // https://youtrack.jetbrains.com/issue/KT-6653
+    private var customNameInner: Component? = null
+
     val enlightened get() = (blockState.block as? SplicingTableBlock)?.enlightened ?: false
 
     init {
@@ -134,8 +134,9 @@ class SplicingTableBlockEntity(pos: BlockPos, state: BlockState) :
             to = tag.getInt("selectionTo", -1),
         )
         viewStartIndex = tag.getInt("viewStartIndex")
-        hexTag = if (tag.contains("hex")) tag.getList("hex", Tag.TAG_COMPOUND) else null
-        pigment = if (tag.contains("pigment")) FrozenPigment.fromNBT(tag.getCompound("pigment")) else null
+        hexTag = tag.get("hex")?.asList
+        pigment = tag.get("pigment")?.asCompound?.let(FrozenPigment::fromNBT)
+        customNameInner = tag.get("CustomName")?.asString?.let(Component.Serializer::fromJson)
     }
 
     override fun saveModData(tag: CompoundTag) {
@@ -146,12 +147,27 @@ class SplicingTableBlockEntity(pos: BlockPos, state: BlockState) :
         tag.putInt("viewStartIndex", viewStartIndex)
         hexTag?.let { tag.put("hex", it) }
         pigment?.let { tag.put("pigment", it.serializeToNBT()) }
+        customNameInner?.let { tag.putString("CustomName", Component.Serializer.toJson(it)) }
     }
 
+    // MenuProvider
+
     override fun createMenu(i: Int, inventory: Inventory, player: Player) =
         SplicingTableMenu(i, inventory, this, containerData)
 
-    override fun getDisplayName() = Component.translatable(blockState.block.descriptionId)
+    override fun getDisplayName() = name
+
+    // Nameable
+
+    override fun getName() = customName ?: blockState.block.descriptionId.asTranslatedComponent
+
+    override fun getCustomName() = customNameInner
+
+    fun setCustomName(value: Component?) {
+        customNameInner = value
+    }
+
+    // more BE stuff
 
     override fun setChanged() {
         super.setChanged()

Common/src/main/kotlin/gay/object/hexdebug/gui/splicing/SplicingTableScreen.kt

@@ -394,7 +394,11 @@ class SplicingTableScreen(
                 vOffset = 392,
                 width = castButtonWidth,
                 height = castButtonHeight,
-                message = buttonText("cast", HexDebugClientConfig.config.splicingTableKeybinds.enlightened.cast),
+                message = buttonText(
+                    "cast.named",
+                    HexDebugClientConfig.config.splicingTableKeybinds.enlightened.cast,
+                    title,
+                ),
                 onPress = {
                     menu.table.castHex(null)
                     castingCooldown = maxCastingCooldown
@@ -841,8 +845,8 @@ class SplicingTableScreen(
             guiGraphics.blit(TEXTURE, x, y, uOffset.toFloat(), vOffset.toFloat(), width, height, 512, 512)
         }
 
-        fun buttonText(name: String, key: ConfigModifierKey?): Component {
-            val text = buttonKey(name).asTranslatedComponent
+        fun buttonText(name: String, key: ConfigModifierKey?, vararg args: Any): Component {
+            val text = buttonKey(name).asTranslatedComponent(*args)
             if (key == null) return text
             return text.append("\n").append(key.inner.localizedName.copy().gray.italic)
         }

Common/src/main/resources/assets/hexdebug/lang/en_us.flatten.json5

@@ -49,7 +49,10 @@
           paste_verbatim: "Paste (Verbatim)",
           paste_splat: "Paste (Flattened)",
           export: "Export as .hexpattern",
-          cast: "Activate Table",
+          cast: {
+            "": "Activate Mindsplice Table",
+            named: "Activate %s",
+          },
         },
         tooltip: {
           index: "Index: %d",

Common/src/main/resources/hexdebug-common.mixins.json

@@ -10,6 +10,7 @@
   "mixins": [
     "MixinDatagenMain",
     "MixinMsgShiftScrollC2S",
+    "MixinOpBrainsweepSpell",
     "MixinOpEval",
     "MixinOpImpetusDir",
     "MixinOpImpetusPos",

Forge/src/main/kotlin/gay/object/hexdebug/forge/datagen/HexDebugBlockLootTables.kt

@@ -7,12 +7,16 @@ import net.minecraft.world.level.block.Block
 
 class HexDebugBlockLootTables : BlockLootSubProvider(setOf(), FeatureFlags.DEFAULT_FLAGS) {
     override fun generate() {
-        dropSelf(HexDebugBlocks.SPLICING_TABLE.value)
-        dropSelf(HexDebugBlocks.ENLIGHTENED_SPLICING_TABLE.value)
+        nameableBlockEntity(HexDebugBlocks.SPLICING_TABLE.value)
+        nameableBlockEntity(HexDebugBlocks.ENLIGHTENED_SPLICING_TABLE.value)
         dropSelf(HexDebugBlocks.FOCUS_HOLDER.value)
     }
 
     override fun getKnownBlocks(): MutableIterable<Block> {
         return HexDebugBlocks.entries.map { it.value }.toMutableList()
     }
+
+    private fun nameableBlockEntity(block: Block) {
+        add(block, createNameableBlockEntityTable(block))
+    }
 }