From 41f9989eefa798d5cf5f3d4ddc188f6cbddb3028 Mon Sep 17 00:00:00 2001 From: Ben Woo <30431861+benwoo1110@users.noreply.github.com> Date: Fri, 22 Sep 2023 16:09:04 +0800 Subject: [PATCH] Fix more checkstyles and use LinkedHashMap for info command --- .../multiverse/core/commands/InfoCommand.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/InfoCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/InfoCommand.java index 511e2873..b3136cef 100644 --- a/src/main/java/org/mvplugins/multiverse/core/commands/InfoCommand.java +++ b/src/main/java/org/mvplugins/multiverse/core/commands/InfoCommand.java @@ -1,6 +1,6 @@ package org.mvplugins.multiverse.core.commands; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import co.aikar.commands.InvalidCommandArgument; @@ -31,7 +31,6 @@ import org.mvplugins.multiverse.core.display.handlers.PagedSendHandler; import org.mvplugins.multiverse.core.display.parsers.MapContentProvider; import org.mvplugins.multiverse.core.economy.MVEconomist; import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld; -import org.mvplugins.multiverse.core.world.WorldManager; @Service @CommandAlias("mv") @@ -61,18 +60,15 @@ class InfoCommand extends MultiverseCommand { }) .build()); - private final WorldManager worldManager; private final LocationManipulation locationManipulation; private final MVEconomist economist; @Inject InfoCommand( @NotNull MVCommandManager commandManager, - @NotNull WorldManager worldManager, @NotNull LocationManipulation locationManipulation, @NotNull MVEconomist economist) { super(commandManager); - this.worldManager = worldManager; this.locationManipulation = locationManipulation; this.economist = economist; } @@ -82,7 +78,7 @@ class InfoCommand extends MultiverseCommand { @CommandCompletion("@mvworlds:scope=both") @Syntax("") @Description("{@@mv-core.info.description") - public void onImportCommand( + public void onInfoCommand( @NotNull MVCommandIssuer issuer, @@ -110,7 +106,7 @@ class InfoCommand extends MultiverseCommand { } private Map getInfo(LoadedMultiverseWorld world) { - Map outMap = new HashMap<>(); + Map outMap = new LinkedHashMap<>(); outMap.put("World Name", world.getName()); outMap.put("World Alias", world.getAlias()); @@ -139,8 +135,8 @@ class InfoCommand extends MultiverseCommand { return "tmp"; } - private Map getAnimalMap(LoadedMultiverseWorld world) { - Map outMap = new HashMap<>(); + private Map getAnimalMap(LoadedMultiverseWorld world) { + Map outMap = new LinkedHashMap<>(); if (world.getSpawningAnimals()) { outMap.put("Spawning Animals", "ALL"); @@ -156,7 +152,7 @@ class InfoCommand extends MultiverseCommand { } private Map getMonsterMap(LoadedMultiverseWorld world) { - Map outMap = new HashMap<>(); + Map outMap = new LinkedHashMap<>(); if (world.getSpawningMonsters()) { outMap.put("Spawning Monsters", "ALL"); @@ -172,7 +168,7 @@ class InfoCommand extends MultiverseCommand { } private Map getPriceMap(LoadedMultiverseWorld world) { - Map outMap = new HashMap<>(); + Map outMap = new LinkedHashMap<>(); double price = world.getPrice(); if (price == 0) {