Basic command to create portals

raevendev · Jul 28, 2024 · f7401d8 · f7401d8
1 parent d30c484
commit f7401d8
Show file tree

Hide file tree

Showing 9 changed files with 106 additions and 39 deletions.
diff --git a/src/main/java/fr/unreal852/quantum/QuantumManager.kt b/src/main/java/fr/unreal852/quantum/QuantumManager.kt
@@ -5,7 +5,8 @@ package fr.unreal852.quantum
 import fr.unreal852.quantum.utils.Extensions.getWorldByIdentifier
 import fr.unreal852.quantum.world.QuantumWorld
 import fr.unreal852.quantum.world.QuantumWorldData
-import fr.unreal852.quantum.world.states.QuantumPersistentState
+import fr.unreal852.quantum.world.state.QuantumPersistentState
+import net.kyrptonaught.customportalapi.api.CustomPortalBuilder
 import net.minecraft.server.MinecraftServer
 import net.minecraft.util.Identifier
 import net.minecraft.world.GameRules
@@ -89,6 +90,10 @@ object QuantumManager {
         }
     }
 
+    fun createPortal() {
+        CustomPortalBuilder.beginPortal()
+    }
+
     // Old Portal code. =====================================
     //    public static PortalLink createPortal(MinecraftServer server, QuantumWorldPortalConfig portalConfig, boolean saveToDisk) {
     //        class_1792 item = (class_1792)class_2378.field_11142.method_10223(portalConfig.getPortalIgniteItemId());

diff --git a/src/main/java/fr/unreal852/quantum/callback/PlayerRespawnHandler.kt b/src/main/java/fr/unreal852/quantum/callback/PlayerRespawnHandler.kt
@@ -1,6 +1,6 @@
 package fr.unreal852.quantum.callback
 
-import fr.unreal852.quantum.world.states.QuantumWorldPersistentState
+import fr.unreal852.quantum.world.state.QuantumWorldPersistentState
 import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents.AfterRespawn
 import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket
 import net.minecraft.network.packet.s2c.play.PositionFlag

diff --git a/src/main/java/fr/unreal852/quantum/command/CommandRegistration.kt b/src/main/java/fr/unreal852/quantum/command/CommandRegistration.kt
@@ -18,6 +18,8 @@ object CommandRegistration {
             TeleportToWorldCommand.register(dispatcher)
             SetWorldSpawnCommand.register(dispatcher)
             SetTeleportSignCommand.register(dispatcher)
+
+            CreatePortalCommand.register(dispatcher)
         })
     }
 }
diff --git a/src/main/java/fr/unreal852/quantum/command/CreatePortalCommand.kt b/src/main/java/fr/unreal852/quantum/command/CreatePortalCommand.kt
@@ -0,0 +1,65 @@
+package fr.unreal852.quantum.command
+
+import com.mojang.brigadier.Command
+import com.mojang.brigadier.CommandDispatcher
+import com.mojang.brigadier.context.CommandContext
+import fr.unreal852.quantum.Quantum
+import fr.unreal852.quantum.command.suggestion.BlocksSuggestionProvider
+import fr.unreal852.quantum.command.suggestion.WorldsDimensionSuggestionProvider
+import net.kyrptonaught.customportalapi.api.CustomPortalBuilder
+import net.minecraft.command.argument.DimensionArgumentType
+import net.minecraft.command.argument.IdentifierArgumentType
+import net.minecraft.item.Items
+import net.minecraft.server.command.CommandManager
+import net.minecraft.server.command.ServerCommandSource
+
+class CreatePortalCommand : Command<ServerCommandSource> {
+    override fun run(context: CommandContext<ServerCommandSource>): Int {
+
+        if (context.source == null)
+            return 0
+
+        try {
+
+            val portalBlock = IdentifierArgumentType.getIdentifier(context, PORTAL_BLOCK_ARG)
+            val destinationWorld = IdentifierArgumentType.getIdentifier(context, PORTAL_DESTINATION_ARG)
+
+            CustomPortalBuilder.beginPortal()
+                .frameBlock(portalBlock)
+                .lightWithItem(Items.DIAMOND)
+                .destDimID(destinationWorld)
+                .tintColor(255, 0, 0)
+                .registerPortal()
+
+        } catch (e: Exception) {
+            Quantum.LOGGER.error("An error occurred while creating the world.", e)
+        }
+
+        return 1
+    }
+
+    companion object {
+
+        private const val PORTAL_BLOCK_ARG = "portalFrameBlock"
+        private const val PORTAL_DESTINATION_ARG = "destinationWorld"
+
+        fun register(dispatcher: CommandDispatcher<ServerCommandSource>) {
+            dispatcher.register(CommandManager.literal("qt")
+                .then(CommandManager.literal("createportal")
+                    .requires { commandSource: ServerCommandSource -> commandSource.hasPermissionLevel(4) }
+                    .then(
+                        CommandManager.argument(PORTAL_BLOCK_ARG, IdentifierArgumentType.identifier())
+                            .suggests(BlocksSuggestionProvider())
+                            .executes(CreatePortalCommand())
+                            .then(
+                                CommandManager.argument(PORTAL_DESTINATION_ARG, DimensionArgumentType.dimension())
+                                    .suggests(WorldsDimensionSuggestionProvider())
+                                    .executes(CreatePortalCommand())
+                            )
+                    )
+                )
+            )
+        }
+    }
+}
+
diff --git a/src/main/java/fr/unreal852/quantum/portal/QuantumPortalData.kt b/src/main/java/fr/unreal852/quantum/portal/QuantumPortalData.kt
@@ -0,0 +1,29 @@
+package fr.unreal852.quantum.portal
+
+import net.minecraft.util.Identifier
+
+class QuantumPortalData {
+
+    val isEnabled: Boolean = true
+
+    lateinit var destinationId: Identifier
+        private set
+
+    lateinit var portalBlockId: Identifier
+        private set
+
+    lateinit var portalIgniteItemId: Identifier
+        private set
+
+    var portalColor: Int = 0
+        private set
+
+    constructor()
+
+    constructor(destId: Identifier, portalBlockId: Identifier, portalIgniteItemId: Identifier, color: Int) {
+        this.destinationId = destId
+        this.portalBlockId = portalBlockId
+        this.portalIgniteItemId = portalIgniteItemId
+        this.portalColor = color
+    }
+}
diff --git a/src/main/java/fr/unreal852/quantum/utils/Extensions.kt b/src/main/java/fr/unreal852/quantum/utils/Extensions.kt
@@ -2,7 +2,7 @@
 
 package fr.unreal852.quantum.utils
 
-import fr.unreal852.quantum.world.states.QuantumWorldPersistentState
+import fr.unreal852.quantum.world.state.QuantumWorldPersistentState
 import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.nbt.NbtCompound
 import net.minecraft.registry.RegistryKey

diff --git a/src/main/java/fr/unreal852/quantum/world/config/QuantumPortalConfig.kt b/src/main/java/fr/unreal852/quantum/world/config/QuantumPortalConfig.kt
diff --git a/...um/world/states/QuantumPersistentState.kt → ...tum/world/state/QuantumPersistentState.kt b/...um/world/states/QuantumPersistentState.kt → ...tum/world/state/QuantumPersistentState.kt
@@ -1,4 +1,4 @@
-package fr.unreal852.quantum.world.states
+package fr.unreal852.quantum.world.state
 
 import fr.unreal852.quantum.Quantum
 import fr.unreal852.quantum.world.QuantumWorldData

diff --git a/...rld/states/QuantumWorldPersistentState.kt → ...orld/state/QuantumWorldPersistentState.kt b/...rld/states/QuantumWorldPersistentState.kt → ...orld/state/QuantumWorldPersistentState.kt
@@ -1,4 +1,4 @@
-package fr.unreal852.quantum.world.states
+package fr.unreal852.quantum.world.state
 
 import fr.unreal852.quantum.Quantum
 import net.minecraft.nbt.NbtCompound