Merge remote-tracking branch 'origin/fabric' into fabric

Author: Earthcomputer

src/main/java/net/earthcomputer/clientcommands/command/CEnchantCommand.java

@@ -1,7 +1,6 @@
 package net.earthcomputer.clientcommands.command;
 
 import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.tree.LiteralCommandNode;
 import net.earthcomputer.clientcommands.TempRules;
 import net.earthcomputer.clientcommands.command.arguments.ItemAndEnchantmentsPredicateArgumentType.ItemAndEnchantmentsPredicate;
 import net.earthcomputer.clientcommands.features.EnchantmentCracker;

src/main/java/net/earthcomputer/clientcommands/command/CHelpCommand.java

@@ -2,15 +2,11 @@
 
 import com.google.common.collect.Iterables;
 import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.ParseResults;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
-import com.mojang.brigadier.tree.CommandNode;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.TranslatableText;
 
-import java.util.Map;
-
 import static com.mojang.brigadier.arguments.StringArgumentType.*;
 import static net.earthcomputer.clientcommands.command.ClientCommandManager.*;
 import static net.minecraft.server.command.CommandManager.*;

src/main/java/net/earthcomputer/clientcommands/command/CParticleCommand.java

@@ -3,7 +3,6 @@
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
-import com.mojang.brigadier.tree.LiteralCommandNode;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.particle.ParticleEffect;
 import net.minecraft.particle.ParticleTypes;

src/main/java/net/earthcomputer/clientcommands/command/CPlaySoundCommand.java

@@ -8,7 +8,6 @@
 
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.*;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.sound.*;

src/main/java/net/earthcomputer/clientcommands/command/CStopSoundCommand.java

@@ -6,7 +6,6 @@
 
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.suggestion.SuggestionProvider;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.command.suggestion.SuggestionProviders;

src/main/java/net/earthcomputer/clientcommands/command/CalcCommand.java

@@ -3,7 +3,6 @@
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
-import com.mojang.brigadier.tree.LiteralCommandNode;
 
 import net.earthcomputer.clientcommands.TempRules;
 import net.earthcomputer.clientcommands.command.arguments.ExpressionArgumentType;

src/main/java/net/earthcomputer/clientcommands/command/CheatCrackRNGCommand.java

@@ -9,9 +9,8 @@
 
 import java.util.OptionalLong;
 
-import static net.earthcomputer.clientcommands.command.ClientCommandManager.addClientSideCommand;
-import static net.earthcomputer.clientcommands.command.ClientCommandManager.sendFeedback;
-import static net.minecraft.server.command.CommandManager.literal;
+import static net.earthcomputer.clientcommands.command.ClientCommandManager.*;
+import static net.minecraft.server.command.CommandManager.*;
 
 public class CheatCrackRNGCommand {
 

src/main/java/net/earthcomputer/clientcommands/command/ChorusCommand.java

@@ -9,11 +9,9 @@
 
 import java.util.EnumSet;
 
-import static net.earthcomputer.clientcommands.command.ClientCommandManager.addClientSideCommand;
-import static net.minecraft.command.argument.Vec3ArgumentType.getVec3;
-import static net.minecraft.command.argument.Vec3ArgumentType.vec3;
-import static net.minecraft.server.command.CommandManager.argument;
-import static net.minecraft.server.command.CommandManager.literal;
+import static net.earthcomputer.clientcommands.command.ClientCommandManager.*;
+import static net.minecraft.command.argument.Vec3ArgumentType.*;
+import static net.minecraft.server.command.CommandManager.*;
 
 public class ChorusCommand {
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {

src/main/java/net/earthcomputer/clientcommands/command/CrackRNGCommand.java

@@ -8,9 +8,8 @@
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.TranslatableText;
 
-import static net.earthcomputer.clientcommands.command.ClientCommandManager.addClientSideCommand;
-import static net.earthcomputer.clientcommands.command.ClientCommandManager.sendFeedback;
-import static net.minecraft.server.command.CommandManager.literal;
+import static net.earthcomputer.clientcommands.command.ClientCommandManager.*;
+import static net.minecraft.server.command.CommandManager.*;
 
 public class CrackRNGCommand {
 

src/main/java/net/earthcomputer/clientcommands/command/FindCommand.java

@@ -1,7 +1,6 @@
 package net.earthcomputer.clientcommands.command;
 
 import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.tree.LiteralCommandNode;
 import net.earthcomputer.clientcommands.task.LongTask;
 import net.earthcomputer.clientcommands.task.TaskManager;
 import net.minecraft.client.MinecraftClient;