refactor(next): command

auioc · Sep 27, 2022 · ce6e370 · ce6e370
1 parent 6aa3dc5
commit ce6e370
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 22 deletions.
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/command/AHCommands.java b/src/main/java/org/auioc/mcmod/arnicalib/game/command/AHCommands.java
@@ -0,0 +1,22 @@
+package org.auioc.mcmod.arnicalib.game.command;
+
+import org.auioc.mcmod.arnicalib.client.command.AHClientCommands;
+import org.auioc.mcmod.arnicalib.server.command.AHServerCommands;
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.tree.CommandNode;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+
+public final class AHCommands {
+
+    public static CommandNode<CommandSourceStack> getServerNode(CommandDispatcher<CommandSourceStack> dispatcher) {
+        return AHServerCommands.getAHNode(dispatcher);
+    }
+
+    @OnlyIn(Dist.CLIENT)
+    public static CommandNode<CommandSourceStack> getClientNode(CommandDispatcher<CommandSourceStack> dispatcher) {
+        return AHClientCommands.getAHNode(dispatcher);
+    }
+
+}
diff --git a/...utils/game/command/CommandExceptions.java → ...calib/game/command/CommandExceptions.java b/...utils/game/command/CommandExceptions.java → ...calib/game/command/CommandExceptions.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.utils.game.command;
+package org.auioc.mcmod.arnicalib.game.command;
 
 import org.auioc.mcmod.arnicalib.ArnicaLib;
 import org.auioc.mcmod.arnicalib.utils.game.TextUtils;

diff --git a/...b/utils/game/command/CommandHandlers.java → ...nicalib/game/command/CommandHandlers.java b/...b/utils/game/command/CommandHandlers.java → ...nicalib/game/command/CommandHandlers.java
@@ -1,7 +1,7 @@
-package org.auioc.mcmod.arnicalib.utils.game.command;
+package org.auioc.mcmod.arnicalib.game.command;
 
-import org.auioc.mcmod.arnicalib.game.command.BiCommandAction;
-import org.auioc.mcmod.arnicalib.game.command.CommandAction;
+import org.auioc.mcmod.arnicalib.game.command.action.BiCommandAction;
+import org.auioc.mcmod.arnicalib.game.command.action.CommandAction;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;

diff --git a/.../utils/game/command/CommandNodeUtils.java → ...icalib/game/command/CommandNodeUtils.java b/.../utils/game/command/CommandNodeUtils.java → ...icalib/game/command/CommandNodeUtils.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.utils.game.command;
+package org.auioc.mcmod.arnicalib.game.command;
 
 import java.util.List;
 import java.util.stream.Collectors;

diff --git a/...tils/game/command/CommandSourceUtils.java → ...alib/game/command/CommandSourceUtils.java b/...tils/game/command/CommandSourceUtils.java → ...alib/game/command/CommandSourceUtils.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.utils.game.command;
+package org.auioc.mcmod.arnicalib.game.command;
 
 import java.util.function.Predicate;
 import org.auioc.mcmod.arnicalib.mixin.common.api.IMixinCommandSourceStack;

diff --git a/...s/game/command/DynamicCommandHandler.java → ...b/game/command/DynamicCommandHandler.java b/...s/game/command/DynamicCommandHandler.java → ...b/game/command/DynamicCommandHandler.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.utils.game.command;
+package org.auioc.mcmod.arnicalib.game.command;
 
 import static org.auioc.mcmod.arnicalib.ArnicaLib.LOGGER;
 import java.lang.reflect.InvocationTargetException;

diff --git a/...nicalib/game/command/BiCommandAction.java → .../game/command/action/BiCommandAction.java b/...nicalib/game/command/BiCommandAction.java → .../game/command/action/BiCommandAction.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.game.command;
+package org.auioc.mcmod.arnicalib.game.command.action;
 
 import org.apache.commons.lang3.function.FailableBiConsumer;
 import org.apache.commons.lang3.function.FailableToIntBiFunction;

diff --git a/...arnicalib/game/command/CommandAction.java → ...ib/game/command/action/CommandAction.java b/...arnicalib/game/command/CommandAction.java → ...ib/game/command/action/CommandAction.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.game.command;
+package org.auioc.mcmod.arnicalib.game.command.action;
 
 import org.apache.commons.lang3.function.FailableConsumer;
 import org.apache.commons.lang3.function.FailableToIntFunction;

diff --git a/...ommand/argument/LanguageInfoArgument.java → ...ommand/argument/LanguageInfoArgument.java b/...ommand/argument/LanguageInfoArgument.java → ...ommand/argument/LanguageInfoArgument.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.client.command.argument;
+package org.auioc.mcmod.arnicalib.game.command.argument;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;

diff --git a/...ommand/ExceptionCommandExceptionType.java → ...eption/ExceptionCommandExceptionType.java b/...ommand/ExceptionCommandExceptionType.java → ...eption/ExceptionCommandExceptionType.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.game.command;
+package org.auioc.mcmod.arnicalib.game.command.exception;
 
 import java.util.function.Function;
 import org.apache.logging.log4j.Logger;

diff --git a/...b/common/command/impl/VersionCommand.java → ...game/command/node/VersionCommandNode.java b/...b/common/command/impl/VersionCommand.java → ...game/command/node/VersionCommandNode.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.common.command.impl;
+package org.auioc.mcmod.arnicalib.game.command.node;
 
 import static net.minecraft.commands.Commands.literal;
 import static org.auioc.mcmod.arnicalib.ArnicaLib.LOGGER;
@@ -16,9 +16,9 @@
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.MutableComponent;
 
-public class VersionCommand {
+public class VersionCommandNode {
 
-    private static final Marker MARKER = LogUtil.getMarker(VersionCommand.class);
+    private static final Marker MARKER = LogUtil.getMarker(VersionCommandNode.class);
 
     private static final SimpleCommandExceptionType GET_VERSION_REFLECTION_ERROR = new SimpleCommandExceptionType(i18n("failure.reflection"));
 

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/server/command/AHServerCommands.java b/src/main/java/org/auioc/mcmod/arnicalib/server/command/AHServerCommands.java
@@ -3,10 +3,10 @@
 import static net.minecraft.commands.Commands.literal;
 import java.util.List;
 import org.auioc.mcmod.arnicalib.ArnicaLib;
-import org.auioc.mcmod.arnicalib.common.command.impl.VersionCommand;
+import org.auioc.mcmod.arnicalib.game.command.DynamicCommandHandler;
+import org.auioc.mcmod.arnicalib.game.command.node.VersionCommandNode;
 import org.auioc.mcmod.arnicalib.server.command.impl.RtpCommand;
 import org.auioc.mcmod.arnicalib.utils.game.EnvironmentUtils;
-import org.auioc.mcmod.arnicalib.utils.game.command.DynamicCommandHandler;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.tree.CommandNode;
 import net.minecraft.commands.CommandSourceStack;
@@ -16,7 +16,7 @@ public final class AHServerCommands {
     public static final CommandNode<CommandSourceStack> NODE = literal(ArnicaLib.MOD_ID).build();
 
     public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
-        VersionCommand.addVersionNode(NODE, ArnicaLib.class);
+        VersionCommandNode.addVersionNode(NODE, ArnicaLib.class);
         NODE.addChild(RtpCommand.NODE);
         if (EnvironmentUtils.IS_DEV) addTestNode(NODE);
 

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/server/command/impl/RtpCommand.java b/src/main/java/org/auioc/mcmod/arnicalib/server/command/impl/RtpCommand.java
@@ -4,9 +4,9 @@
 import static net.minecraft.commands.Commands.literal;
 import java.util.List;
 import java.util.Optional;
+import org.auioc.mcmod.arnicalib.game.command.CommandSourceUtils;
 import org.auioc.mcmod.arnicalib.utils.game.EntityUtils;
 import org.auioc.mcmod.arnicalib.utils.game.RandomTeleporter;
-import org.auioc.mcmod.arnicalib.utils.game.command.CommandSourceUtils;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.arguments.BoolArgumentType;
 import com.mojang.brigadier.arguments.DoubleArgumentType;

diff --git a/...ioc/mcmod/arnicalib/base/log/Loggers.java → .../auioc/mcmod/arnicalib/utils/Loggers.java b/...ioc/mcmod/arnicalib/base/log/Loggers.java → .../auioc/mcmod/arnicalib/utils/Loggers.java
@@ -1,8 +1,9 @@
-package org.auioc.mcmod.arnicalib.base.log;
+package org.auioc.mcmod.arnicalib.utils;
 
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.auioc.mcmod.arnicalib.base.log.LogUtil;
 
 /**
  * @deprecated Use {@link LogUtil} instead

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/CommandUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/CommandUtils.java
@@ -2,9 +2,9 @@
 
 import java.util.List;
 import java.util.function.Predicate;
-import org.auioc.mcmod.arnicalib.utils.game.command.CommandExceptions;
-import org.auioc.mcmod.arnicalib.utils.game.command.CommandNodeUtils;
-import org.auioc.mcmod.arnicalib.utils.game.command.CommandSourceUtils;
+import org.auioc.mcmod.arnicalib.game.command.CommandExceptions;
+import org.auioc.mcmod.arnicalib.game.command.CommandNodeUtils;
+import org.auioc.mcmod.arnicalib.game.command.CommandSourceUtils;
 import com.mojang.brigadier.context.ParsedCommandNode;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;