From 63c7a49cea4af5c1841475cda9bee377ee18d166 Mon Sep 17 00:00:00 2001 From: Rime <81419447+Emirlol@users.noreply.github.com> Date: Thu, 11 Jul 2024 20:54:01 +0300 Subject: Add factory method for `EggTypeArgumentType` to match other argument type classes --- .../java/de/hysky/skyblocker/skyblock/chocolatefactory/EggFinder.java | 3 +-- .../skyblocker/utils/command/argumenttypes/EggTypeArgumentType.java | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/main') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/EggFinder.java b/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/EggFinder.java index 63f5dfbd..0dd594af 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/EggFinder.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/EggFinder.java @@ -6,7 +6,6 @@ import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.events.SkyblockEvents; import de.hysky.skyblocker.utils.*; import de.hysky.skyblocker.utils.command.argumenttypes.ClientBlockPosArgumentType; -import de.hysky.skyblocker.utils.command.argumenttypes.ClientPosArgument; import de.hysky.skyblocker.utils.command.argumenttypes.EggTypeArgumentType; import de.hysky.skyblocker.utils.scheduler.MessageScheduler; import de.hysky.skyblocker.utils.waypoint.Waypoint; @@ -55,7 +54,7 @@ public class EggFinder { .then(literal("eggFinder") .then(literal("shareLocation") .then(argument("blockPos", ClientBlockPosArgumentType.blockPos()) - .then(argument("eggType", new EggTypeArgumentType()) + .then(argument("eggType", EggTypeArgumentType.eggType()) .executes(context -> { MessageScheduler.INSTANCE.sendMessageAfterCooldown("[Skyblocker] Chocolate " + context.getArgument("eggType", EggType.class) + " Egg found at " + context.getArgument("blockPos", ClientPosArgument.class).toAbsoluteBlockPos(context.getSource()).toShortString() + "!"); return Command.SINGLE_SUCCESS; diff --git a/src/main/java/de/hysky/skyblocker/utils/command/argumenttypes/EggTypeArgumentType.java b/src/main/java/de/hysky/skyblocker/utils/command/argumenttypes/EggTypeArgumentType.java index 3510e118..5448ad82 100644 --- a/src/main/java/de/hysky/skyblocker/utils/command/argumenttypes/EggTypeArgumentType.java +++ b/src/main/java/de/hysky/skyblocker/utils/command/argumenttypes/EggTypeArgumentType.java @@ -33,4 +33,8 @@ public class EggTypeArgumentType implements ArgumentType { public Collection getExamples() { return EggFinder.EggType.entries.stream().map(EggFinder.EggType::name).map(String::toLowerCase).toList(); } + + public static EggTypeArgumentType eggType() { + return new EggTypeArgumentType(); + } } -- cgit