mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-17 22:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix commands on forge

Browse Source
This commit is contained in:
dfsek
2021-05-14 22:36:55 -07:00
parent e86f37fdfb
commit d974a72cb9
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/forge/src/main/java/com/dfsek/terra/forge/listener/ForgeListener.java
+12 -1
View File
@@ -3,10 +3,12 @@ package com.dfsek.terra.forge.listener;
import com.dfsek.terra.api.command.CommandManager; import com.dfsek.terra.api.command.CommandManager;
import com.dfsek.terra.api.command.exception.CommandException; import com.dfsek.terra.api.command.exception.CommandException;
import com.dfsek.terra.api.platform.CommandSender; import com.dfsek.terra.api.platform.CommandSender;
import com.dfsek.terra.api.platform.entity.Entity;
import com.dfsek.terra.forge.TerraForgePlugin; import com.dfsek.terra.forge.TerraForgePlugin;
import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.builder.ArgumentBuilder; import com.mojang.brigadier.builder.ArgumentBuilder;
import com.mojang.brigadier.builder.RequiredArgumentBuilder; import com.mojang.brigadier.builder.RequiredArgumentBuilder;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.command.CommandSource; import net.minecraft.command.CommandSource;
import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.StringTextComponent;
import net.minecraftforge.event.RegisterCommandsEvent; import net.minecraftforge.event.RegisterCommandsEvent;
@@ -43,6 +45,10 @@ public class ForgeListener {
return in.suggests((context, builder) -> { return in.suggests((context, builder) -> {
List<String> args = parseCommand(context.getInput()); List<String> args = parseCommand(context.getInput());
CommandSender sender = (CommandSender) context.getSource(); CommandSender sender = (CommandSender) context.getSource();
try {
sender = (Entity) context.getSource().getEntityOrException();
} catch(CommandSyntaxException ignore) {
}
try { try {
manager.tabComplete(args.remove(0), sender, args).forEach(builder::suggest); manager.tabComplete(args.remove(0), sender, args).forEach(builder::suggest);
} catch(CommandException e) { } catch(CommandException e) {
@@ -52,7 +58,12 @@ public class ForgeListener {
}).executes(context -> { }).executes(context -> {
List<String> args = parseCommand(context.getInput()); List<String> args = parseCommand(context.getInput());
try { try {
manager.execute(args.remove(0), (CommandSender) context.getSource(), args); CommandSender sender = (CommandSender) context.getSource();
try {
sender = (Entity) context.getSource().getEntityOrException();
} catch(CommandSyntaxException ignore) {
}
manager.execute(args.remove(0), sender, args);
} catch(CommandException e) { } catch(CommandException e) {
context.getSource().sendFailure(new StringTextComponent(e.getMessage())); context.getSource().sendFailure(new StringTextComponent(e.getMessage()));
} }