Skip to content

Commit 6d7d6a3

Browse files
author
yitzy299
committed
Fix portal placement on axis
Signed-off-by: yitzy299 <yitzy299@users.noreply.github.com>
1 parent e736c03 commit 6d7d6a3

3 files changed

Lines changed: 19 additions & 23 deletions

File tree

portals-api/src/main/java/net/quiltservertools/interdimensional/portals/PortalBlock.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
package net.quiltservertools.interdimensional.portals;
22

33
import eu.pb4.polymer.block.VirtualBlock;
4-
import net.minecraft.block.Block;
5-
import net.minecraft.block.BlockState;
6-
import net.minecraft.block.Blocks;
7-
import net.minecraft.block.ShapeContext;
4+
import net.minecraft.block.*;
85
import net.minecraft.entity.Entity;
96
import net.minecraft.server.network.ServerPlayerEntity;
107
import net.minecraft.state.StateManager;
@@ -27,6 +24,11 @@ public Block getVirtualBlock() {
2724
return Blocks.NETHER_PORTAL;
2825
}
2926

27+
@Override
28+
public BlockState getVirtualBlockState(BlockState state) {
29+
return Blocks.NETHER_PORTAL.getDefaultState().with(NetherPortalBlock.AXIS, state.get(PortalBlock.AXIS));
30+
}
31+
3032
@Override
3133
public void sendPacketsAfterCreation(ServerPlayerEntity player, BlockPos pos, BlockState blockState) {
3234
VirtualBlock.super.sendPacketsAfterCreation(player, pos, blockState);

src/main/kotlin/net/quiltservertools/interdimensional/command/DeleteCommand.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
package net.quiltservertools.interdimensional.command
22

3-
import net.quiltservertools.interdimensional.world.RuntimeWorldManager.getHandle
4-
import net.quiltservertools.interdimensional.world.RuntimeWorldManager.remove
53
import com.mojang.brigadier.context.CommandContext
64
import com.mojang.brigadier.tree.LiteralCommandNode
75
import me.lucko.fabric.api.permissions.v0.Permissions
8-
import net.minecraft.command.argument.DimensionArgumentType
96
import net.minecraft.server.command.CommandManager
107
import net.minecraft.server.command.ServerCommandSource
118
import net.minecraft.server.world.ServerWorld
9+
import net.quiltservertools.interdimensional.command.argument.ServerDimensionArgument
10+
import net.quiltservertools.interdimensional.world.RuntimeWorldManager.getHandle
11+
import net.quiltservertools.interdimensional.world.RuntimeWorldManager.remove
1212

1313
object DeleteCommand : Command {
1414
override fun register(): LiteralCommandNode<ServerCommandSource> {
1515
return CommandManager.literal("delete")
16-
.then(CommandManager.argument("dimension", DimensionArgumentType.dimension())
16+
.then(ServerDimensionArgument.dimension("dimension")
1717
.requires(Permissions.require("interdimensional.commands.delete", 4))
1818
.executes { ctx: CommandContext<ServerCommandSource> ->
1919
delete(
20-
DimensionArgumentType.getDimensionArgument(ctx, "dimension"),
20+
ServerDimensionArgument.get(ctx, "dimension"),
2121
ctx.source
2222
)
2323
})

src/main/kotlin/net/quiltservertools/interdimensional/command/PortalCommand.kt

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
package net.quiltservertools.interdimensional.command
22

3-
import net.quiltservertools.interdimensional.command.InterdimensionalCommand.success
4-
import net.quiltservertools.interdimensional.world.Portal
5-
import net.quiltservertools.interdimensional.world.PortalManager
6-
import com.mojang.brigadier.arguments.BoolArgumentType
73
import com.mojang.brigadier.arguments.StringArgumentType
84
import com.mojang.brigadier.tree.LiteralCommandNode
95
import me.lucko.fabric.api.permissions.v0.Permissions
10-
import net.quiltservertools.interdimensional.portals.portal.PortalIgnitionSource
116
import net.minecraft.command.argument.BlockStateArgument
127
import net.minecraft.command.argument.BlockStateArgumentType
13-
import net.minecraft.command.argument.ColorArgumentType
14-
import net.minecraft.command.argument.DimensionArgumentType
158
import net.minecraft.server.command.CommandManager.argument
169
import net.minecraft.server.command.CommandManager.literal
1710
import net.minecraft.server.command.ServerCommandSource
18-
import net.minecraft.server.world.ServerWorld
1911
import net.minecraft.util.Formatting
2012
import net.minecraft.util.Identifier
13+
import net.quiltservertools.interdimensional.command.InterdimensionalCommand.success
2114
import net.quiltservertools.interdimensional.command.argument.PortalOptionsArgumentType
15+
import net.quiltservertools.interdimensional.command.argument.ServerDimensionArgument
16+
import net.quiltservertools.interdimensional.portals.portal.PortalIgnitionSource
17+
import net.quiltservertools.interdimensional.world.Portal
18+
import net.quiltservertools.interdimensional.world.PortalManager
2219

2320
object PortalCommand : Command {
2421
override fun register(): LiteralCommandNode<ServerCommandSource> {
@@ -27,10 +24,7 @@ object PortalCommand : Command {
2724
.then(
2825
literal("add").then(
2926
argument("name", StringArgumentType.string()).then(
30-
argument(
31-
"destination",
32-
DimensionArgumentType.dimension()
33-
)
27+
ServerDimensionArgument.dimension("dimension")
3428
.then(
3529
argument(
3630
"frame_block",
@@ -40,7 +34,7 @@ object PortalCommand : Command {
4034
return@executes add(
4135
it.source,
4236
StringArgumentType.getString(it, "name"),
43-
DimensionArgumentType.getDimensionArgument(it, "destination").registryKey.value,
37+
ServerDimensionArgument.get(it, "destination").registryKey.value,
4438
BlockStateArgumentType.getBlockState(it, "frame_block"),
4539
""
4640
)
@@ -52,7 +46,7 @@ object PortalCommand : Command {
5246
return@executes add(
5347
it.source,
5448
StringArgumentType.getString(it, "name"),
55-
DimensionArgumentType.getDimensionArgument(it, "destination").registryKey.value,
49+
ServerDimensionArgument.get(it, "destination").registryKey.value,
5650
BlockStateArgumentType.getBlockState(it, "frame_block"),
5751
StringArgumentType.getString(it, "options")
5852
)

0 commit comments

Comments
 (0)