ref!: structure loader, management and conversion

Author: emyfops

common/src/main/java/com/lambda/mixin/world/StructureTemplateMixin.java

@@ -0,0 +1,36 @@
+package com.lambda.mixin.world;
+
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import net.minecraft.block.Block;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.registry.RegistryEntryLookup;
+import net.minecraft.structure.StructureTemplate;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Objects;
+
+@Mixin(StructureTemplate.class)
+public class StructureTemplateMixin {
+    @Shadow
+    private String author;
+
+    @ModifyReturnValue(method = "getAuthor()Ljava/lang/String;", at = @At("RETURN"))
+    public String getAuthor(String original) {
+        return Objects.equals(original, "?") || Objects.equals(original, "") ? "Unknown" : original;
+    }
+
+    @Inject(method = "writeNbt(Lnet/minecraft/nbt/NbtCompound;)Lnet/minecraft/nbt/NbtCompound;", at = @At("TAIL"))
+    public void writeNbt(NbtCompound nbt, CallbackInfoReturnable<NbtCompound> cir) {
+        nbt.putString("author", author);
+    }
+
+    @Inject(method = "readNbt(Lnet/minecraft/registry/RegistryEntryLookup;Lnet/minecraft/nbt/NbtCompound;)V", at = @At("TAIL"))
+    public void readNbt(RegistryEntryLookup<Block> blockLookup, NbtCompound nbt, CallbackInfo ci) {
+        author = nbt.getString("author");
+    }
+}

common/src/main/kotlin/com/lambda/command/commands/BuildCommand.kt

@@ -2,17 +2,16 @@ package com.lambda.command.commands
 
 import com.lambda.brigadier.CommandResult
 import com.lambda.brigadier.argument.boolean
-import com.lambda.brigadier.argument.identifier
 import com.lambda.brigadier.argument.literal
+import com.lambda.brigadier.argument.string
 import com.lambda.brigadier.argument.value
 import com.lambda.brigadier.executeWithResult
 import com.lambda.brigadier.optional
 import com.lambda.brigadier.required
 import com.lambda.command.LambdaCommand
-import com.lambda.interaction.construction.blueprint.DynamicBlueprint.Companion.toBlueprint
-import com.lambda.interaction.construction.blueprint.StaticBlueprint.Companion.toBlueprint
 import com.lambda.interaction.construction.StructureRegistry
 import com.lambda.interaction.construction.blueprint.Blueprint.Companion.toStructure
+import com.lambda.interaction.construction.blueprint.StaticBlueprint.Companion.toBlueprint
 import com.lambda.task.tasks.BuildTask.Companion.build
 import com.lambda.threading.runSafe
 import com.lambda.util.Communication.info
@@ -26,10 +25,10 @@ object BuildCommand : LambdaCommand(
 ) {
     override fun CommandBuilder.create() {
         required(literal("place")) {
-            required(identifier("structure")) { structure ->
+            required(string("structure")) { structure ->
                 suggests { _, builder ->
-                    StructureRegistry.streamTemplates()
-                        .forEach { builder.suggest(it.path) }
+                    StructureRegistry
+                        .forEach { key, _ -> builder.suggest(key) }
 
                     builder.buildFuture()
                 }
@@ -38,19 +37,21 @@ object BuildCommand : LambdaCommand(
                         val id = structure().value()
                         val path = if (pathing != null) pathing().value() else false
                         runSafe<Unit> {
-                            StructureRegistry.loadStructure(id)?.let { template ->
-                                info("Building structure ${id.path} with dimensions ${template.size.toShortString()} by ${template.author}")
-                                template.toStructure()
-                                    .move(player.blockPos)
-                                    .toBlueprint()
-                                    .build(pathing = path)
-                                    .start(null)
+                            StructureRegistry
+                                .loadStructureByName(id)
+                                ?.let { template ->
+                                    info("Building structure $id with dimensions ${template.size.toShortString()} created by ${template.author}")
+                                    template.toStructure()
+                                        .move(player.blockPos)
+                                        .toBlueprint()
+                                        .build(pathing = path)
+                                        .start(null)
 
-                                return@executeWithResult CommandResult.success()
-                            }
+                                    return@executeWithResult CommandResult.success()
+                                }
                         }
 
-                        CommandResult.failure("Structure ${id.path} not found")
+                        CommandResult.failure("Structure $id not found")
                     }
                 }
             }

common/src/main/kotlin/com/lambda/core/Loader.kt

@@ -10,6 +10,7 @@ import com.lambda.gui.GuiConfigurable
 import com.lambda.gui.HudGuiConfigurable
 import com.lambda.interaction.PlayerPacketManager
 import com.lambda.interaction.RotationManager
+import com.lambda.interaction.construction.StructureRegistry
 import com.lambda.interaction.material.ContainerManager
 import com.lambda.module.ModuleRegistry
 import com.lambda.sound.SoundRegistry
@@ -38,6 +39,7 @@ object Loader {
         TimerManager,
         PingManager,
         ContainerManager,
+        StructureRegistry
     )
 
     fun initialize() {