Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
e4b1b40104
|
|||
|
73f044ab8b
|
|||
|
001cc6d2ce
|
|||
|
45dc6b86b4
|
|||
|
72c858db2d
|
|||
|
32b868df22
|
|||
|
3a66dffa10
|
|||
|
1bb5eee5cf
|
|||
|
a34145a621
|
|||
|
0a5fd7a155
|
|||
|
481fd84ecb
|
|||
|
603aec8e45
|
|||
|
fa0159e7c7
|
|||
|
4e4a6272ba
|
@@ -14,6 +14,7 @@ repositories {
|
|||||||
mavenLocal()
|
mavenLocal()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven { url 'https://hub.spigotmc.org/nexus/content/groups/public' }
|
maven { url 'https://hub.spigotmc.org/nexus/content/groups/public' }
|
||||||
|
maven { url 'https://dmx-mc-project.gitlab.io/maven-repository/' }
|
||||||
}
|
}
|
||||||
|
|
||||||
ext {
|
ext {
|
||||||
@@ -24,7 +25,9 @@ ext {
|
|||||||
'commons-lang:commons-lang',
|
'commons-lang:commons-lang',
|
||||||
'org.yaml:snakeyaml'
|
'org.yaml:snakeyaml'
|
||||||
]],
|
]],
|
||||||
lombok: 'org.projectlombok:lombok:1.18.12'
|
commons_text: 'org.apache.commons:commons-text:1.9',
|
||||||
|
lombok: 'org.projectlombok:lombok:1.18.12',
|
||||||
|
reflection_object: 'ru.dmitriymx:reflection-object:1.0-BETA'
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -42,4 +45,6 @@ dependencies {
|
|||||||
annotationProcessor libs.lombok
|
annotationProcessor libs.lombok
|
||||||
|
|
||||||
compileOnly2 libs.bukkit
|
compileOnly2 libs.bukkit
|
||||||
|
implementation libs.commons_text
|
||||||
|
implementation libs.reflection_object
|
||||||
}
|
}
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
projectGroup=ghast
|
projectGroup=ghast
|
||||||
projectName=ghast-tools
|
projectName=ghast-tools
|
||||||
projectVersion=1.4
|
projectVersion=1.6
|
||||||
@@ -3,6 +3,7 @@ package ghast;
|
|||||||
import lombok.AccessLevel;
|
import lombok.AccessLevel;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.event.Cancellable;
|
||||||
import org.bukkit.event.Event;
|
import org.bukkit.event.Event;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
@@ -17,6 +18,7 @@ import java.util.function.Consumer;
|
|||||||
public class EventContext implements Listener {
|
public class EventContext implements Listener {
|
||||||
|
|
||||||
private static final BooleanSupplier EMPTY_FILTER = () -> true;
|
private static final BooleanSupplier EMPTY_FILTER = () -> true;
|
||||||
|
private static final Consumer<Cancellable> CANCEL_EVENT = event -> event.setCancelled(true);
|
||||||
|
|
||||||
private final Map<Class<? extends Event>, Consumer<?>> eventMap = new HashMap<>();
|
private final Map<Class<? extends Event>, Consumer<?>> eventMap = new HashMap<>();
|
||||||
private BooleanSupplier filter = EMPTY_FILTER;
|
private BooleanSupplier filter = EMPTY_FILTER;
|
||||||
@@ -31,8 +33,7 @@ public class EventContext implements Listener {
|
|||||||
eventMap.remove(eventType);
|
eventMap.remove(eventType);
|
||||||
} else {
|
} else {
|
||||||
eventMap.put(eventType, consumer);
|
eventMap.put(eventType, consumer);
|
||||||
Bukkit.getPluginManager().registerEvent(eventType, this, eventPriority,
|
bukkitRegisterEvent(eventType, eventPriority);
|
||||||
this::eventExecute, GhastTools.getPlugin());
|
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -41,6 +42,21 @@ public class EventContext implements Listener {
|
|||||||
return onEvent(eventType, EventPriority.NORMAL, consumer);
|
return onEvent(eventType, EventPriority.NORMAL, consumer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public <T extends Event & Cancellable> EventContext cancelEvent(Class<T> eventType, EventPriority eventPriority) {
|
||||||
|
eventMap.put(eventType, CANCEL_EVENT);
|
||||||
|
bukkitRegisterEvent(eventType, eventPriority);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends Event & Cancellable> EventContext cancelEvent(Class<T> eventType) {
|
||||||
|
return cancelEvent(eventType, EventPriority.NORMAL);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void bukkitRegisterEvent(Class<? extends Event> eventType, EventPriority eventPriority) {
|
||||||
|
Bukkit.getPluginManager().registerEvent(eventType, this, eventPriority,
|
||||||
|
this::eventExecute, GhastTools.getPlugin());
|
||||||
|
}
|
||||||
|
|
||||||
@SuppressWarnings({ "unchecked", "rawtypes" })
|
@SuppressWarnings({ "unchecked", "rawtypes" })
|
||||||
private void eventExecute(Listener listener, Event event) {
|
private void eventExecute(Listener listener, Event event) {
|
||||||
Consumer consumer = eventMap.get(event.getClass());
|
Consumer consumer = eventMap.get(event.getClass());
|
||||||
|
|||||||
@@ -23,6 +23,20 @@ public class GhastTools {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("java:S112")
|
||||||
|
public Plugin getPlugin() {
|
||||||
|
if (refPlugin == null) {
|
||||||
|
throw new RuntimeException("Plugin not set.");
|
||||||
|
}
|
||||||
|
|
||||||
|
Plugin plugin = refPlugin.get();
|
||||||
|
if (plugin == null) {
|
||||||
|
throw new RuntimeException("Plugin not set.");
|
||||||
|
}
|
||||||
|
|
||||||
|
return plugin;
|
||||||
|
}
|
||||||
|
|
||||||
@SuppressWarnings("java:S112")
|
@SuppressWarnings("java:S112")
|
||||||
public YamlConfiguration loadConfig(boolean saveDefault) {
|
public YamlConfiguration loadConfig(boolean saveDefault) {
|
||||||
if (saveDefault) {
|
if (saveDefault) {
|
||||||
@@ -39,18 +53,4 @@ public class GhastTools {
|
|||||||
public YamlConfiguration loadConfig() {
|
public YamlConfiguration loadConfig() {
|
||||||
return loadConfig(true);
|
return loadConfig(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("java:S112")
|
|
||||||
Plugin getPlugin() {
|
|
||||||
if (refPlugin == null) {
|
|
||||||
throw new RuntimeException("Plugin not set.");
|
|
||||||
}
|
|
||||||
|
|
||||||
Plugin plugin = refPlugin.get();
|
|
||||||
if (plugin == null) {
|
|
||||||
throw new RuntimeException("Plugin not set.");
|
|
||||||
}
|
|
||||||
|
|
||||||
return plugin;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
91
src/main/java/ghast/I18n.java
Normal file
91
src/main/java/ghast/I18n.java
Normal file
@@ -0,0 +1,91 @@
|
|||||||
|
package ghast;
|
||||||
|
|
||||||
|
import com.google.common.collect.HashBasedTable;
|
||||||
|
import com.google.common.collect.Table;
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
import lombok.experimental.UtilityClass;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
import org.apache.commons.text.StringSubstitutor;
|
||||||
|
|
||||||
|
import java.io.BufferedReader;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.Reader;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@UtilityClass
|
||||||
|
@SuppressWarnings("unused")
|
||||||
|
public class I18n {
|
||||||
|
|
||||||
|
private final String DEFAULT_LANG = "en";
|
||||||
|
private final Table<String/*Lang*/, String/*Key*/, String/*Template|Message*/> messagesMap = HashBasedTable.create();
|
||||||
|
|
||||||
|
//region Load messages
|
||||||
|
@SuppressWarnings("java:S112")
|
||||||
|
public void loadMessages(String lang, Reader reader) {
|
||||||
|
Map<String, String> map = messagesMap.row(lang.toLowerCase());
|
||||||
|
|
||||||
|
try {
|
||||||
|
BufferedReader bufferedReader = new BufferedReader(reader);
|
||||||
|
String line;
|
||||||
|
while ((line = bufferedReader.readLine()) != null) {
|
||||||
|
String[] split = line.split("=", 2);
|
||||||
|
map.put(split[0].trim().toLowerCase(), split[1].trim());
|
||||||
|
}
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new RuntimeException("Error load messages: " + e.getMessage(), e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void loadMessages(String lang, Map<String, String> messages) {
|
||||||
|
Map<String, String> map = messagesMap.row(lang.toLowerCase());
|
||||||
|
messages.forEach((k, v) -> map.put(k.toLowerCase(), v));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void loadMessages(Reader reader) {
|
||||||
|
loadMessages(DEFAULT_LANG, reader);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void loadMessages(Map<String, String> messages) {
|
||||||
|
loadMessages(DEFAULT_LANG, messages);
|
||||||
|
}
|
||||||
|
//endregion
|
||||||
|
|
||||||
|
//region Get message
|
||||||
|
public String get(String lang, String key) {
|
||||||
|
return messagesMap.row(lang.toLowerCase()).getOrDefault(key.toLowerCase(), StringUtils.EMPTY);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String get(String lang, String key, Map<String, Object> params) {
|
||||||
|
return StringSubstitutor.replace(get(lang, key.toLowerCase()), params, "{", "}");
|
||||||
|
}
|
||||||
|
|
||||||
|
public String get(String key) {
|
||||||
|
return get(DEFAULT_LANG, key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String get(String key, Map<String, Object> params) {
|
||||||
|
return get(DEFAULT_LANG, key, params);
|
||||||
|
}
|
||||||
|
//endregion
|
||||||
|
|
||||||
|
public ParamBuilder paramBuilder() {
|
||||||
|
return new ParamBuilder();
|
||||||
|
}
|
||||||
|
|
||||||
|
@NoArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
|
public static class ParamBuilder {
|
||||||
|
|
||||||
|
private final Map<String, Object> params = new HashMap<>();
|
||||||
|
|
||||||
|
public ParamBuilder add(String key, Object value) {
|
||||||
|
params.put(key, value);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Map<String, Object> build() {
|
||||||
|
return params;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,6 +7,7 @@ import java.util.logging.Level;
|
|||||||
import static java.text.MessageFormat.format;
|
import static java.text.MessageFormat.format;
|
||||||
|
|
||||||
@UtilityClass
|
@UtilityClass
|
||||||
|
@SuppressWarnings("unused")
|
||||||
public class XLog {
|
public class XLog {
|
||||||
|
|
||||||
//region Debug
|
//region Debug
|
||||||
|
|||||||
8
src/main/java/ghast/command/CommandExecuter.java
Normal file
8
src/main/java/ghast/command/CommandExecuter.java
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
package ghast.command;
|
||||||
|
|
||||||
|
import org.bukkit.command.CommandSender;
|
||||||
|
|
||||||
|
public interface CommandExecuter {
|
||||||
|
|
||||||
|
void execute(CommandSender sender, String[] args);
|
||||||
|
}
|
||||||
71
src/main/java/ghast/command/CommandManager.java
Normal file
71
src/main/java/ghast/command/CommandManager.java
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
package ghast.command;
|
||||||
|
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.experimental.UtilityClass;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.command.Command;
|
||||||
|
import ru.dmitriymx.reflection.ReflectionObject;
|
||||||
|
|
||||||
|
@UtilityClass
|
||||||
|
@SuppressWarnings("unused")
|
||||||
|
public class CommandManager {
|
||||||
|
|
||||||
|
public Builder create(String name) {
|
||||||
|
return new Builder(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void register(String name, CommandExecuter executer) {
|
||||||
|
create(name).executer(executer).register();
|
||||||
|
}
|
||||||
|
|
||||||
|
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
|
public static class Builder {
|
||||||
|
|
||||||
|
private final String name;
|
||||||
|
private CommandExecuter executer;
|
||||||
|
private ErrorConsumer errorConsumer;
|
||||||
|
private Boolean onlyPlayer;
|
||||||
|
private String deniedMessage;
|
||||||
|
|
||||||
|
public Builder executer(CommandExecuter executer) {
|
||||||
|
this.executer = executer;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder onError(ErrorConsumer errorConsumer) {
|
||||||
|
this.errorConsumer = errorConsumer;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder useOnlyPlayer(String deniedMessage) {
|
||||||
|
this.onlyPlayer = true;
|
||||||
|
this.deniedMessage = deniedMessage;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder useOnlyPlayer() {
|
||||||
|
return useOnlyPlayer(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder useOnlyConsole(String deniedMessage) {
|
||||||
|
this.onlyPlayer = false;
|
||||||
|
this.deniedMessage = deniedMessage;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder useOnlyConsole() {
|
||||||
|
return useOnlyConsole(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void register() {
|
||||||
|
//TODO для Paper такие "извращения" не требуются. Нужно продумать.
|
||||||
|
new ReflectionObject(Bukkit.getServer())
|
||||||
|
.method("getCommandMap").invoke()
|
||||||
|
.method("register", String.class, Command.class).invoke(
|
||||||
|
name, new CommandWrapper(name, this.onlyPlayer, this.deniedMessage,
|
||||||
|
this.executer, this.errorConsumer)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
71
src/main/java/ghast/command/CommandWrapper.java
Normal file
71
src/main/java/ghast/command/CommandWrapper.java
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
package ghast.command;
|
||||||
|
|
||||||
|
import ghast.XLog;
|
||||||
|
import org.bukkit.ChatColor;
|
||||||
|
import org.bukkit.command.CommandSender;
|
||||||
|
import org.bukkit.command.defaults.BukkitCommand;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
|
class CommandWrapper extends BukkitCommand {
|
||||||
|
|
||||||
|
private static final String DEFAULT_DENIED_MESSAGE_PLAYERS = ChatColor.RED + "This command use only players";
|
||||||
|
private static final String DEFAULT_DENIED_MESSAGE_CONSOLE = ChatColor.RED + "This command use only in console";
|
||||||
|
|
||||||
|
private static final ErrorConsumer DEFAULT_ERROR_CONSUMER =
|
||||||
|
(sender, commandName, args, exception) -> {
|
||||||
|
sender.sendMessage(String.format("%sError execute command '%s'!", ChatColor.RED, commandName));
|
||||||
|
XLog.error("Error execute command ''{0}'' with args ''{1}''",
|
||||||
|
commandName, String.join(" ", args), exception);
|
||||||
|
};
|
||||||
|
|
||||||
|
private final CommandExecuter executer;
|
||||||
|
private final ErrorConsumer errorConsumer;
|
||||||
|
private final Boolean onlyPlayer;
|
||||||
|
private String deniedMessage;
|
||||||
|
|
||||||
|
protected CommandWrapper(String name, Boolean onlyPlayer, String deniedMessage,
|
||||||
|
CommandExecuter executer, ErrorConsumer errorConsumer) {
|
||||||
|
super(name);
|
||||||
|
this.onlyPlayer = onlyPlayer;
|
||||||
|
this.executer = executer;
|
||||||
|
|
||||||
|
if (onlyPlayer != null) {
|
||||||
|
if (deniedMessage == null) {
|
||||||
|
this.deniedMessage = Boolean.TRUE.equals(onlyPlayer) ? DEFAULT_DENIED_MESSAGE_PLAYERS
|
||||||
|
: DEFAULT_DENIED_MESSAGE_CONSOLE;
|
||||||
|
} else {
|
||||||
|
this.deniedMessage = deniedMessage;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(errorConsumer == null) {
|
||||||
|
this.errorConsumer = DEFAULT_ERROR_CONSUMER;
|
||||||
|
} else {
|
||||||
|
this.errorConsumer = errorConsumer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@SuppressWarnings("java:S1066")
|
||||||
|
public boolean execute(CommandSender commandSender, String commandName, String[] args) {
|
||||||
|
if (Boolean.TRUE.equals(onlyPlayer)) {
|
||||||
|
if (!(commandSender instanceof Player)) {
|
||||||
|
commandSender.sendMessage(deniedMessage);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
} else if (Boolean.FALSE.equals(onlyPlayer)) { // use console only
|
||||||
|
if (commandSender instanceof Player) {
|
||||||
|
commandSender.sendMessage(deniedMessage);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
executer.execute(commandSender, args);
|
||||||
|
return true;
|
||||||
|
} catch (Exception e) {
|
||||||
|
errorConsumer.accept(commandSender, commandName, args, e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
8
src/main/java/ghast/command/ErrorConsumer.java
Normal file
8
src/main/java/ghast/command/ErrorConsumer.java
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
package ghast.command;
|
||||||
|
|
||||||
|
import org.bukkit.command.CommandSender;
|
||||||
|
|
||||||
|
public interface ErrorConsumer {
|
||||||
|
|
||||||
|
void accept(CommandSender sender, String commandName, String[] args, Exception exception);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user