Merge Dev to master and UPDATE to v1.5 by EasterGhost · Pull Request #8 · EasterGhost/TeleportCommandsFabric

EasterGhost · 2026-03-20T19:03:56Z

No description provided.

…ement

…d manage method. Add all new command to whitelist

…te waypoint operation.

…agement - Introduced new classes for handling visibility actions and command support for both warp and home functionalities. - Separated mutation actions for warp and home commands into distinct classes for better organization. - Enhanced visibility handling by implementing a generic VisibilityCommandSupport class. - Updated existing warp and home commands to utilize the new structure, improving code readability and maintainability. - Added silent visibility update options for both warp and home commands. - Refactored command execution logic to streamline player interactions and feedback.

Copilot

Pull request overview

This PR updates the mod to v1.5 and merges in a large refactor that expands Xaero integration (visibility + deletion/teleport flows), adds “previous teleport” backtracking, and introduces new storage/config migration + autosave behavior.

Changes:

Added per-player and global Xaero waypoint visibility management for warps/homes (including delete-to-hide behavior and new /mapwarp, /maphome, /gwarpmap commands).
Added /back tp support by recording the player’s pre-teleport location and integrating Xaero death-waypoint teleport into /back death.
Refactored commands into dedicated packages/services, and introduced storage/config migration utilities plus periodic autosaving.

Reviewed changes

Copilot reviewed 79 out of 83 changed files in this pull request and generated 7 comments.

Show a summary per file

File	Description
src/main/resources/teleportcommandsfabric.mixins.json	Registers new Xaero delete-related mixins
src/main/resources/assets/teleport_commands_fabric/lang/zh_cn.json	Adds new v1.5 translation keys
src/main/resources/assets/teleport_commands_fabric/lang/en_us.json	Adds new v1.5 translation keys
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/xaero/XaeroSyncServer.java	Filters synced entries based on visibility + per-player hidden warps
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/utils/WorldResolver.java	Simplifies dimension id resolution
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/utils/TranslationHelper.java	Adds fallback-on-missing-language + placeholder bounds safety
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/utils/TeleportSafety.java	Removes old TeleportSafety from utils
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/utils/CommandHelper.java	Adds shared command-argument quoting helper
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/storage/TeleportCooldownManager.java	Switches cooldown keys to UUID + adds cleanup
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/storage/StorageMigratorUtil.java	New storage migration helper (v3 schema updates)
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/storage/StorageManager.java	Adds dirty tracking + periodic autosave + async IO
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/storage/StorageClass.java	Extracts storage model + adds player cache + cleanup logic
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/storage/PreviousTeleportLocationStorage.java	Stores pre-teleport location per player
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/storage/LogoutCacheManager.java	Schedules delayed cache cleanup after logout
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/storage/DeathLocationStorage.java	Makes death location storage concurrent + modernizes updates
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/storage/ConfigMigratorUtil.java	New config migration helper
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/storage/ConfigManager.java	Adds atomic temp-write saves + async IO path
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/storage/ConfigClass.java	Extracts config model + adds storage autosave settings
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/services/TpaService.java	Extracts TPA request logic into service
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/services/TeleportService.java	Moves teleport service to services + records previous location
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/services/TeleportSafety.java	Reintroduces TeleportSafety under services package
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/services/RtpService.java	Extracts RTP tick/search implementation into service
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/services/NamedLocationTeleportService.java	Centralizes named-location teleport helpers
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/services/LocationResolver.java	Centralizes name normalization + lookup by name/UUID
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/mixin/client/WaypointTeleportMixin.java	Routes Xaero waypoint teleport to mod commands (+ death → back)
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/mixin/client/WaypointDeleteMixin.java	Converts Xaero minimap deletes into silent hide commands
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/mixin/client/MapWaypointDeleteMixin.java	Converts Xaero world map deletes into silent hide commands
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/mixin/client/GuiMapMixin.java	Limits right-click teleport interception to tagged waypoints
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/mixin/client/ClientPlayNetworkHandlerMixin.java	Expands trusted-command allowlist for new commands
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/mixin/ServerStartMixin.java	Formatting-only change
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/mixin/PlayerDeathMixin.java	Formatting-only change
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/mixin/CommandsMixin.java	Formatting-only change
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/common/PreviousTeleportLocation.java	Adds model for pre-teleport location
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/common/Player.java	Adds default-home UUID + per-player hidden warp UUIDs
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/common/NamedLocation.java	Adds UUID + Xaero visibility flag + ensures UUID
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/common/DeathLocation.java	Comment cleanup only
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/worldspawn/worldspawn.java	Refactors worldspawn command into package
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/worldspawn/WorldSpawnMessages.java	Extracts worldspawn messaging helpers
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/worldspawn.java	Removes old worldspawn command implementation
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/warp/warp.java	Refactors warp commands + adds visibility/admin map list
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/warp/WarpVisibilityActions.java	Implements per-player/global warp visibility updates
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/warp/WarpTeleportActions.java	Refactors warp teleport behavior
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/warp/WarpSuggestionProvider.java	Moves suggestion provider into warp package
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/warp/WarpMutationActions.java	Refactors warp create/delete/rename
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/warp/WarpMessages.java	Extracts warp messaging helpers
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/warp/WarpFormatter.java	Adds clickable warp list + map toggle UI
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/warp/WarpCommandSupport.java	Shared warp printing + resolving helpers
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/warp/WarpAdminFormatter.java	Adds admin global visibility list formatter
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/warp.java	Removes old warp command implementation
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/tpa/tpa.java	Refactors tpa commands to use TpaService
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/tpa/TpaSuggestionProvider.java	Refactors suggestion provider for new request model
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/tpa/TpaMessages.java	Extracts tpa messaging helpers
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/tpa.java	Removes old tpa command implementation
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/rtp/rtp.java	Refactors rtp commands to use RtpService
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/rtp/RtpMessages.java	Extracts rtp messaging helpers
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/home/home.java	Refactors home commands + adds map visibility toggles
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/home/HomeVisibilityActions.java	Implements home Xaero visibility toggles
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/home/HomeTeleportActions.java	Refactors home teleport behavior
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/home/HomeSuggestionProvider.java	Moves suggestion provider into home package
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/home/HomeMutationActions.java	Refactors home create/delete/rename/default
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/home/HomeMessages.java	Extracts home messaging helpers
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/home/HomeFormatter.java	Adds clickable homes list + map toggle UI
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/home/HomeCommandSupport.java	Shared home printing + resolving helpers
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/common/VisibilityCommandSupport.java	Shared visibility toggle orchestration
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/back/back.java	Refactors /back + adds /back tp mode
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/back/BackMessages.java	Extracts back messaging helpers
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/back/BackCommandSupport.java	Shared safe-teleport + prompt logic for back
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/back.java	Removes old back command implementation
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/admin/AdminStatusFormatter.java	Simplifies status listing + refresh divider
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/admin/AdminModuleRegistry.java	Adds module list/entries helpers
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/admin/AdminMessages.java	Switches admin save to async ConfigSaver
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/admin/AdminHelpFormatter.java	Builds module list dynamically
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/admin/AdminCommands.java	Adds storage config node + status refresh behavior
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/client/XaeroWaypointCommandHelper.java	Generates hide commands from Xaero waypoint context
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/client/XaeroCompat.java	Tracks current set names + refactors waypoint creation
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/TeleportCommands.java	Adds autosave tick + shutdown save + logout cache hooks
src/main/java/org/AndrewElizabeth/teleportcommandsfabric/Constants.java	Bumps version to 1.5 + storage schema to v3
gradle.properties	Bumps mod_version to 1.5
TODO.md	Updates roadmap items
CHANGELOG.md	Adds v1.5 unreleased notes
.gitignore	Formatting-only change

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-20T19:10:16Z

src/main/java/org/AndrewElizabeth/teleportcommandsfabric/TeleportCommands.java

+		ServerPlayConnectionEvents.DISCONNECT.register((handler, s) -> {
+			UUID playerUuid = handler.player.getUUID();
+			LogoutCacheManager.scheduleCleanup(playerUuid);
+		});
+
+		ServerPlayConnectionEvents.JOIN.register((handler, sender, s) -> {
+			UUID playerUuid = handler.player.getUUID();
+			LogoutCacheManager.cancelCleanup(playerUuid);
+		});


ServerPlayConnectionEvents.DISCONNECT/JOIN handlers are registered inside initializeMod() with no guard. Since initializeMod() is invoked from a MinecraftServer#runServer mixin, this can register duplicate handlers if a server is started more than once in the same JVM (e.g., opening multiple singleplayer worlds), causing cleanup to schedule/cancel multiple times per event. Consider registering these once in onInitialize() or add a static boolean guard.

Copilot · 2026-03-20T19:10:16Z

src/main/java/org/AndrewElizabeth/teleportcommandsfabric/storage/ConfigManager.java

+	private static void ConfigMigrator() throws Exception {
 		try (BufferedReader reader = Files.newBufferedReader(CONFIG_FILE, StandardCharsets.UTF_8)) {
-			jsonObject = GSON.fromJson(reader, JsonObject.class);
-		}
-		if (jsonObject == null) {
-			jsonObject = new JsonObject();
-		}
-
-		int version = jsonObject.has("version") ? jsonObject.get("version").getAsInt() : 0;
-
-		if (version < defaultVersion) {
-			Constants.LOGGER.warn("Config file is v{}, migrating to v{}!", version, defaultVersion);
-
-			// Rename legacy "wild" section to "rtp" if needed.
-			if (jsonObject.has("wild") && !jsonObject.has("rtp")) {
-				jsonObject.add("rtp", jsonObject.get("wild"));
-				jsonObject.remove("wild");
+			JsonObject jsonObject = com.google.gson.JsonParser.parseReader(reader).getAsJsonObject();
+			int version = jsonObject.has("version") ? jsonObject.get("version").getAsInt() : 0;
+			if (version < defaultVersion) {
+				ConfigMigratorUtil.ConfigMigrator(CONFIG_FILE, GSON, defaultVersion);
 			}
-
-			normalizeXaeroSetNames(jsonObject);
-
-			// Always bump to the latest supported schema version after migrations.
-			jsonObject.addProperty("version", defaultVersion);
-
-			// Save the config
-			byte[] json = GSON.toJson(jsonObject).getBytes(StandardCharsets.UTF_8);
-			Files.write(CONFIG_FILE, json, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING,
-					StandardOpenOption.CREATE);
-
-			Constants.LOGGER.info("Config file migrated to v{} successfully!", defaultVersion);
-		} else if (version > defaultVersion) {
-			String message = String.format(
-					"Teleport Commands: The config file's version is newer than the supported version, found v%s, expected <= v%s.\n"
-							+
-							"If you intentionally backported then you can attempt to downgrade the config file located at this location: \"%s\".\n",
-					version, defaultVersion, CONFIG_FILE.toAbsolutePath());
-
-			throw new IllegalStateException(message);
-		}
-	}
-
-	private static void normalizeXaeroSetNames(JsonObject root) {
-		if (!root.has("xaero") || !root.get("xaero").isJsonObject()) {
-			return;
 		}


ConfigMigrator() uses JsonParser.parseReader(reader).getAsJsonObject() without handling malformed JSON or non-object roots, which will throw and abort startup rather than falling back to defaults. Consider catching parse/illegal-state exceptions here and either reset to defaults (with a warning) or delegate to ConfigMigratorUtil using gson.fromJson like the storage migrator does.

Copilot · 2026-03-20T19:10:17Z

src/main/java/org/AndrewElizabeth/teleportcommandsfabric/commands/admin/AdminMessages.java

 		try {
 			setter.run();
-			ConfigManager.saveConfigChanges();
+			ConfigManager.ConfigSaver();


ConfigManager.ConfigSaver() is asynchronous and does not propagate IO failures, but setAndSave() reports success immediately. This can lead to user-visible inconsistencies (command says saved, but the file write fails). Consider using a synchronous save here (or waiting on the submitted Future) so the command result reflects the actual outcome.

Suggested change

ConfigManager.ConfigSaver();

ConfigManager.ConfigSaver().get();

Copilot · 2026-03-20T19:10:17Z

src/main/java/org/AndrewElizabeth/teleportcommandsfabric/storage/ConfigClass.java

+		public int getAutoSaveIntervalSeconds() {
+			return autoSaveIntervalSeconds;
+		}


Storage#getAutoSaveIntervalSeconds() returns the raw deserialized value. If a user edits the JSON to an out-of-range value (0/negative/very large), the autosave cadence in StorageManager.tick() can become pathological. Consider clamping in the getter (similar to Rtp#getRadius()), or normalizing after load by calling the setter once.

Copilot · 2026-03-20T19:10:17Z

src/main/java/org/AndrewElizabeth/teleportcommandsfabric/client/XaeroWaypointCommandHelper.java

+	private static String buildHideCommandLiteral(String command, String name) {
+		return command + " " + quoteCommandArgument(name) + " false";
+	}
+
+	private static String normalizeSetName(String setName) {
+		return setName == null ? "" : setName.trim().toLowerCase(Locale.ROOT);
+	}
+
+	private static String quoteCommandArgument(String value) {
+		return "\"" + value.replace("\\", "\\\\").replace("\"", "\\\"") + "\"";
+	}


XaeroWaypointCommandHelper duplicates the command-argument quoting logic that now exists in utils.CommandHelper. Keeping multiple implementations increases the chance of escaping drifting over time. Consider reusing CommandHelper.quoteCommandArgument(...) here and in the mixins that currently have their own quoting helpers.

Copilot · 2026-03-20T19:10:18Z

src/main/java/org/AndrewElizabeth/teleportcommandsfabric/storage/StorageManager.java

 	public static StorageClass STORAGE;
 	private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
 	private static final int defaultVersion = new StorageClass().getVersion();
+	private static final ExecutorService IO_EXECUTOR = Executors.newSingleThreadExecutor();


IO_EXECUTOR is created with the default thread factory (non-daemon, unnamed) and is never shut down. This can keep the JVM alive on shutdown and makes it harder to diagnose thread dumps. Consider using a custom ThreadFactory to name the thread and set it to daemon, and ensure the executor is shut down during server stop.

Copilot · 2026-03-20T19:10:18Z

src/main/java/org/AndrewElizabeth/teleportcommandsfabric/storage/StorageManager.java

+	public static void forceSaveOnShutdown() {
+		Constants.LOGGER.info("Forcing synchronous save on server shutdown...");
+		saveStorageSync();
+		isDirty = false;
+		ticksSinceLastSave = 0;


forceSaveOnShutdown() writes synchronously, but any previously queued async StorageSaver() tasks can still run afterwards and overwrite the file with an older serialized snapshot. To avoid data loss, shut down/drain the IO executor (e.g., shutdown() + awaitTermination() / shutdownNow() and/or block on the last submitted Future) before the final sync save, or route the final write through the same single-threaded executor with proper ordering.

EasterGhost added 30 commits March 13, 2026 05:56

Merge branch 'master' into dev

e27a0c5

Add Xaero map visibility feature

41ed638

feat: add uuid identity for named locations

0476d3c

Refactor command

c4d9fb9

Update gitignore

289280f

Add warp map visibility commands and player-specific visibility manag…

da5f114

…ement

Fix a confusing issue

99dc7b5

Add /gwarpmap to manage global warp visibility on map and delete ol…

01fda19

…d manage method. Add all new command to whitelist

Add /gwarpmap to manage global warp visibility on map and delete ol…

359957c

…d manage method. Add all new command to whitelist

Merge branch 'dev' of https://github.com/EasterGhost/TeleportCommands…

29dd3c5

…Fabric into dev

Optimize /gwarpmap interact

d3490bd

Merge branch 'dev' of https://github.com/EasterGhost/TeleportCommands…

79a3f21

…Fabric into dev

Fix a slight key val error

f6151c4

Enhance CLI interact

1b600c7

Edit color and update gitignore

28b1431

Add /back tp to teleport back to location of last command executation

77a5410

Mount the /mapwarp and /maphome commands silently to xaero's dele…

9ac9484

…te waypoint operation.

Mount /back death command to xaero's death waypoint teleport

f0efc56

Restrict name check

f784790

Update CHANGELOG

0efa892

Add parse for escaped character for rename, delete, etc.

22ac723

Format code

bb54c7f

Merge branch 'master' into dev

ade0055

Code clean and format

7f5294f

Translation not found now fallback to en_us immediately

2d96a22

Add cleanup for tp scheduler and previous tp location

d8d6af6

Edit WorldResolver

6565c3d

Async write config

fcc5202

Synchronize asynchrous file io

0d6e9a9

EasterGhost added 11 commits March 20, 2026 22:16

Delete unused comments

53b5a5f

Delete unused comments

4e1cf67

Remove import static

50b72a8

Delete unused comments

8839110

Change hashmap to concurrenthashmap

b6b3b7e

Change unsafe block checker

ec1276a

Format code

630af37

Split ConfigManager

ce8dc80

Format code

db2a51c

Synchronize asynchronous read

6182730

Fix a bug that thread terminated unexpectedly when closing

4053784

Copilot AI review requested due to automatic review settings March 20, 2026 19:03

Copilot started reviewing on behalf of EasterGhost March 20, 2026 19:04 View session

Copilot AI reviewed Mar 20, 2026

View reviewed changes

EasterGhost merged commit 61fccdb into master Mar 20, 2026
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge Dev to master and UPDATE to v1.5#8

Merge Dev to master and UPDATE to v1.5#8
EasterGhost merged 41 commits intomasterfrom
dev

EasterGhost commented Mar 20, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Mar 20, 2026

Uh oh!

Copilot AI Mar 20, 2026

Uh oh!

Copilot AI Mar 20, 2026

Uh oh!

Copilot AI Mar 20, 2026

Uh oh!

Copilot AI Mar 20, 2026

Uh oh!

Copilot AI Mar 20, 2026

Uh oh!

Copilot AI Mar 20, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	ConfigManager.ConfigSaver();
	ConfigManager.ConfigSaver().get();

Conversation

EasterGhost commented Mar 20, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Mar 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 20, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants