mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2025-07-01 02:46:41 +00:00
Upstream changes, prefix changes, formatting changes, variable name changes
I think that draining waterlogged items also works now?
This commit is contained in:
@ -142,7 +142,7 @@ public class SimpleDispatcher implements Dispatcher {
|
||||
|
||||
}
|
||||
|
||||
throw new InvalidUsageException(BBC.getPrefix() + "Please choose a sub-command.", this, true);
|
||||
throw new InvalidUsageException("Please choose a sub-command.", this, true);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -275,14 +275,14 @@ public class FunctionParametricCallable extends AParametricCallable {
|
||||
}
|
||||
return result;
|
||||
} catch (MissingParameterException e) {
|
||||
throw new InvalidUsageException(BBC.getPrefix() + "Too few parameters!", this, true);
|
||||
throw new InvalidUsageException("Too few parameters!", this, true);
|
||||
} catch (UnconsumedParameterException e) {
|
||||
throw new InvalidUsageException(BBC.getPrefix() + "Too many parameters! Unused parameters: " + e.getUnconsumed(), this, true);
|
||||
throw new InvalidUsageException("Too many parameters! Unused parameters: " + e.getUnconsumed(), this, true);
|
||||
} catch (ParameterException e) {
|
||||
assert parameter != null;
|
||||
String name = parameter.getName();
|
||||
|
||||
throw new InvalidUsageException(BBC.getPrefix() + "For parameter '" + name + "': " + e.getMessage(), this, true);
|
||||
throw new InvalidUsageException("For parameter '" + name + "': " + e.getMessage(), this, true);
|
||||
} catch (InvocationTargetException e) {
|
||||
if (e.getCause() instanceof CommandException) {
|
||||
throw (CommandException) e.getCause();
|
||||
|
@ -271,9 +271,9 @@ public class ParametricCallable extends AParametricCallable {
|
||||
}
|
||||
return result;
|
||||
} catch (MissingParameterException e) {
|
||||
throw new InvalidUsageException(BBC.getPrefix() + "Too few parameters!", this, true);
|
||||
throw new InvalidUsageException("Too few parameters!", this, true);
|
||||
} catch (UnconsumedParameterException e) {
|
||||
throw new InvalidUsageException(BBC.getPrefix() + "Too many parameters! Unused parameters: " + e.getUnconsumed(), this, true);
|
||||
throw new InvalidUsageException("Too many parameters! Unused parameters: " + e.getUnconsumed(), this, true);
|
||||
} catch (ParameterException e) {
|
||||
assert parameter != null;
|
||||
String name = parameter.getName();
|
||||
|
Reference in New Issue
Block a user