diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricUtil.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricUtil.java index 209a951e8..7d245f65c 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricUtil.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricUtil.java @@ -9,10 +9,8 @@ import com.dfsek.terra.config.pack.ConfigPack; import com.dfsek.terra.config.templates.BiomeTemplate; import com.dfsek.terra.fabric.config.PackFeatureOptionsTemplate; import com.dfsek.terra.fabric.mixin.access.BiomeEffectsAccessor; -import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.RequiredArgumentBuilder; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback; import net.minecraft.block.Blocks; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.text.LiteralText; @@ -33,31 +31,11 @@ import java.util.Locale; import java.util.Map; import java.util.function.Supplier; -import static net.minecraft.server.command.CommandManager.argument; -import static net.minecraft.server.command.CommandManager.literal; - public final class FabricUtil { public static String createBiomeID(ConfigPack pack, String biomeID) { return pack.getTemplate().getID().toLowerCase() + "/" + biomeID.toLowerCase(Locale.ROOT); } - protected static void registerCommands(CommandManager manager) { - CommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> { - int max = manager.getMaxArgumentDepth(); - RequiredArgumentBuilder arg = argument("arg" + (max - 1), StringArgumentType.word()); - for(int i = 0; i < max; i++) { - RequiredArgumentBuilder next = argument("arg" + (max - i - 1), StringArgumentType.word()); - - arg = next.then(FabricUtil.assemble(arg, manager)); - } - - dispatcher.register(literal("terra").executes(context -> 1).then(FabricUtil.assemble(arg, manager))); - dispatcher.register(literal("te").executes(context -> 1).then(FabricUtil.assemble(arg, manager))); - //dispatcher.register(literal("te").redirect(root)); - } - ); - } - private static RequiredArgumentBuilder assemble(RequiredArgumentBuilder in, CommandManager manager) { return in.suggests((context, builder) -> { List args = parseCommand(context.getInput()); diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java index b031cc56f..5ba23cee3 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java @@ -71,9 +71,7 @@ import org.apache.logging.log4j.LogManager; import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; import java.util.HashMap; -import java.util.Locale; import java.util.Map; @@ -292,8 +290,6 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer { } catch(MalformedCommandException e) { e.printStackTrace(); // TODO do something here even though this should literally never happen } - FabricUtil.registerCommands(manager); - logger.info("Finished initialization."); }