From e447669a66e65e7e7169d7e49be054761a6e8583 Mon Sep 17 00:00:00 2001 From: Cephelo <79186646+Cephelo@users.noreply.github.com> Date: Sat, 17 Aug 2024 04:43:02 -0500 Subject: [PATCH 1/5] Update EscapeTarget.java Repairing changes --- .../dimdev/dimdoors/rift/targets/EscapeTarget.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/org/dimdev/dimdoors/rift/targets/EscapeTarget.java b/common/src/main/java/org/dimdev/dimdoors/rift/targets/EscapeTarget.java index 569bc1e0..c1e37959 100644 --- a/common/src/main/java/org/dimdev/dimdoors/rift/targets/EscapeTarget.java +++ b/common/src/main/java/org/dimdev/dimdoors/rift/targets/EscapeTarget.java @@ -4,8 +4,10 @@ import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.core.BlockPos; import net.minecraft.core.Rotations; +import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.util.RandomSource; import net.minecraft.world.entity.Entity; @@ -63,11 +65,11 @@ public boolean receiveEntity(Entity entity, Vec3 relativePos, Rotations relative } Location destLoc; - if (((ServerPlayer) entity.level().getPlayerByUUID(uuid)).getRespawnPosition() != null && DimensionalDoors.getConfig().getLimboConfig().escapeTargetWorld == null && !DimensionalDoors.getConfig().getLimboConfig().escapeToWorldSpawn) { - LOGGER.log(Level.INFO, "Sending player from limbo to their spawnpoint, good luck!"); - destLoc = new Location(((ServerPlayer) entity.level().getPlayerByUUID(uuid)).getRespawnDimension(), ((ServerPlayer) entity.level().getPlayerByUUID(uuid)).getRespawnPosition()); - } else if (DimensionalDoors.getConfig().getLimboConfig().escapeTargetWorld != null && !DimensionalDoors.getConfig().getLimboConfig().escapeToWorldSpawn) { - targetWorldResourceKey = DimensionalDoors.getConfig().getLimboConfig().escapeTargetWorld; + if (((ServerPlayer) entity.level().getPlayerByUUID(uuid)).getRespawnPosition() != null && DimensionalDoors.getConfig().getLimboConfig().escapeTargetWorld == "" && !DimensionalDoors.getConfig().getLimboConfig().escapeToWorldSpawn) { + LOGGER.log(Level.INFO, "Sending player from limbo to their spawnpoint, good luck!"); + destLoc = new Location(((ServerPlayer) entity.level().getPlayerByUUID(uuid)).getRespawnDimension(), ((ServerPlayer) entity.level().getPlayerByUUID(uuid)).getRespawnPosition()); + } else if (DimensionalDoors.getConfig().getLimboConfig().escapeTargetWorld != "" && !DimensionalDoors.getConfig().getLimboConfig().escapeToWorldSpawn) { + targetWorldResourceKey = ResourceKey.create(Registries.DIMENSION, new ResourceLocation(DimensionalDoors.getConfig().getLimboConfig().escapeTargetWorld.split(":")[0], DimensionalDoors.getConfig().getLimboConfig().escapeTargetWorld.split(":")[1])); if (DimensionalDoors.getWorld(targetWorldResourceKey) != null) { LOGGER.log(Level.INFO, "Sending player from limbo to the exit dimension, good luck!"); destLoc = new Location(DimensionalDoors.getWorld(targetWorldResourceKey), new BlockPos(entity.blockPosition().getX(), DimensionalDoors.getConfig().getLimboConfig().escapeTargetWorldYSpawn, entity.blockPosition().getZ())); From 6e2cddfe9ba11fd9ece288ede85329c59dd909d3 Mon Sep 17 00:00:00 2001 From: Cephelo <79186646+Cephelo@users.noreply.github.com> Date: Sat, 17 Aug 2024 04:44:25 -0500 Subject: [PATCH 2/5] Update ModConfig.java Repairing changes --- common/src/main/java/org/dimdev/dimdoors/ModConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/org/dimdev/dimdoors/ModConfig.java b/common/src/main/java/org/dimdev/dimdoors/ModConfig.java index 5f2d4a2a..81fc6d90 100644 --- a/common/src/main/java/org/dimdev/dimdoors/ModConfig.java +++ b/common/src/main/java/org/dimdev/dimdoors/ModConfig.java @@ -181,7 +181,7 @@ public static class Limbo { @Tooltip public boolean hardcoreLimbo = false; @Tooltip public int limboReturnDistance = 5000; @Tooltip public float limboBlocksCorruptingExitWorldAmount = 5; - @Tooltip @Nullable public ResourceKey escapeTargetWorld = Level.OVERWORLD; + @Tooltip public String escapeTargetWorld = ""; @Tooltip public int escapeTargetWorldYSpawn = 64; @Tooltip public boolean escapeToWorldSpawn = false; public boolean shouldUseLimbo(ResourceKey level) { From 3c43500abe63c4783f40acb1196cbb0470e29f40 Mon Sep 17 00:00:00 2001 From: Cephelo <79186646+Cephelo@users.noreply.github.com> Date: Sun, 1 Sep 2024 15:44:55 -0400 Subject: [PATCH 3/5] Update EscapeTarget.java --- .../java/org/dimdev/dimdoors/rift/targets/EscapeTarget.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/org/dimdev/dimdoors/rift/targets/EscapeTarget.java b/common/src/main/java/org/dimdev/dimdoors/rift/targets/EscapeTarget.java index c1e37959..c98c01c8 100644 --- a/common/src/main/java/org/dimdev/dimdoors/rift/targets/EscapeTarget.java +++ b/common/src/main/java/org/dimdev/dimdoors/rift/targets/EscapeTarget.java @@ -69,7 +69,7 @@ public boolean receiveEntity(Entity entity, Vec3 relativePos, Rotations relative LOGGER.log(Level.INFO, "Sending player from limbo to their spawnpoint, good luck!"); destLoc = new Location(((ServerPlayer) entity.level().getPlayerByUUID(uuid)).getRespawnDimension(), ((ServerPlayer) entity.level().getPlayerByUUID(uuid)).getRespawnPosition()); } else if (DimensionalDoors.getConfig().getLimboConfig().escapeTargetWorld != "" && !DimensionalDoors.getConfig().getLimboConfig().escapeToWorldSpawn) { - targetWorldResourceKey = ResourceKey.create(Registries.DIMENSION, new ResourceLocation(DimensionalDoors.getConfig().getLimboConfig().escapeTargetWorld.split(":")[0], DimensionalDoors.getConfig().getLimboConfig().escapeTargetWorld.split(":")[1])); + targetWorldResourceKey = ResourceKey.create(Registries.DIMENSION, ResourceLocation.tryParse(DimensionalDoors.getConfig().getLimboConfig().escapeTargetWorld); if (DimensionalDoors.getWorld(targetWorldResourceKey) != null) { LOGGER.log(Level.INFO, "Sending player from limbo to the exit dimension, good luck!"); destLoc = new Location(DimensionalDoors.getWorld(targetWorldResourceKey), new BlockPos(entity.blockPosition().getX(), DimensionalDoors.getConfig().getLimboConfig().escapeTargetWorldYSpawn, entity.blockPosition().getZ())); From 199d70088aa16da610872d6b4d6385e491c253cb Mon Sep 17 00:00:00 2001 From: Cephelo <79186646+Cephelo@users.noreply.github.com> Date: Sat, 21 Dec 2024 12:32:31 -0600 Subject: [PATCH 4/5] Remove escapeTargetWorldYSpawn config option --- common/src/main/java/org/dimdev/dimdoors/ModConfig.java | 1 - 1 file changed, 1 deletion(-) diff --git a/common/src/main/java/org/dimdev/dimdoors/ModConfig.java b/common/src/main/java/org/dimdev/dimdoors/ModConfig.java index 81fc6d90..7bccd5e9 100644 --- a/common/src/main/java/org/dimdev/dimdoors/ModConfig.java +++ b/common/src/main/java/org/dimdev/dimdoors/ModConfig.java @@ -182,7 +182,6 @@ public static class Limbo { @Tooltip public int limboReturnDistance = 5000; @Tooltip public float limboBlocksCorruptingExitWorldAmount = 5; @Tooltip public String escapeTargetWorld = ""; - @Tooltip public int escapeTargetWorldYSpawn = 64; @Tooltip public boolean escapeToWorldSpawn = false; public boolean shouldUseLimbo(ResourceKey level) { return worldsLeadingToLimbo.blacklist != worldsLeadingToLimbo.list.contains(level.location().toString()); From bde741e0e84ed51d554a8930cff35c5132a7d4ba Mon Sep 17 00:00:00 2001 From: Cephelo <79186646+Cephelo@users.noreply.github.com> Date: Sat, 21 Dec 2024 12:33:18 -0600 Subject: [PATCH 5/5] Remove escapeTargetWorldYSpawn option lang --- common/src/main/resources/assets/dimdoors/lang/en_us.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/common/src/main/resources/assets/dimdoors/lang/en_us.json b/common/src/main/resources/assets/dimdoors/lang/en_us.json index e48cf3c6..b8790c52 100644 --- a/common/src/main/resources/assets/dimdoors/lang/en_us.json +++ b/common/src/main/resources/assets/dimdoors/lang/en_us.json @@ -366,8 +366,6 @@ "text.autoconfig.dimdoors.option.limbo.limboReturnDistance": "Limbo Return Radius", "text.autoconfig.dimdoors.option.limbo.escapeTargetWorld": "Escape To World", "text.autoconfig.dimdoors.option.limbo.escapeTargetWorld.@Tooltip": "Defines the id of the world players will spawn in upon exiting Limbo. Leaving this blank will spawn players in the world their respawn point is in.", - "text.autoconfig.dimdoors.option.limbo.escapeTargetWorldYSpawn": "Escape To World Y Level", - "text.autoconfig.dimdoors.option.limbo.escapeTargetWorldYSpawn.@Tooltip": "Defines the Y coordinate the player will spawn at when using \"Escape To World\"", "text.autoconfig.dimdoors.option.limbo.escapeToWorldSpawn": "Escape to World Spawn", "text.autoconfig.dimdoors.option.limbo.escapeToWorldSpawn.@Tooltip": "Boolean that determines if players exiting limbo will return relative to the worldspawn instead. If true, escapeTargetWorld has no effect.",