Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
cfd68bb45e
|
|||
|
97d6ef8b47
|
|||
|
6441ddb3a5
|
@@ -1,3 +1,3 @@
|
|||||||
projectGroup=ghast
|
projectGroup=ghast
|
||||||
projectName=ghast-tools
|
projectName=ghast-tools
|
||||||
projectVersion=1.2
|
projectVersion=1.4
|
||||||
@@ -136,6 +136,7 @@ public class AssetsManager {
|
|||||||
while ((count = inputStream.read(buffer)) != -1) {
|
while ((count = inputStream.read(buffer)) != -1) {
|
||||||
outputStream.write(buffer, 0, count);
|
outputStream.write(buffer, 0, count);
|
||||||
}
|
}
|
||||||
|
outputStream.flush();
|
||||||
}
|
}
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
throw new AssetsException(format("Error save asset \"{0}\" to \"{1}\": {2}",
|
throw new AssetsException(format("Error save asset \"{0}\" to \"{1}\": {2}",
|
||||||
|
|||||||
55
src/main/java/ghast/EventContext.java
Normal file
55
src/main/java/ghast/EventContext.java
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
package ghast;
|
||||||
|
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.event.Event;
|
||||||
|
import org.bukkit.event.EventPriority;
|
||||||
|
import org.bukkit.event.Listener;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.function.BooleanSupplier;
|
||||||
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
|
@NoArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
|
@SuppressWarnings("unused")
|
||||||
|
public class EventContext implements Listener {
|
||||||
|
|
||||||
|
private static final BooleanSupplier EMPTY_FILTER = () -> true;
|
||||||
|
|
||||||
|
private final Map<Class<? extends Event>, Consumer<?>> eventMap = new HashMap<>();
|
||||||
|
private BooleanSupplier filter = EMPTY_FILTER;
|
||||||
|
|
||||||
|
public EventContext filter(BooleanSupplier filter) {
|
||||||
|
this.filter = (filter != null ? filter : EMPTY_FILTER);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends Event> EventContext onEvent(Class<T> eventType, EventPriority eventPriority, Consumer<T> consumer) {
|
||||||
|
if (consumer == null) {
|
||||||
|
eventMap.remove(eventType);
|
||||||
|
} else {
|
||||||
|
eventMap.put(eventType, consumer);
|
||||||
|
Bukkit.getPluginManager().registerEvent(eventType, this, eventPriority,
|
||||||
|
this::eventExecute, GhastTools.getPlugin());
|
||||||
|
}
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T extends Event> EventContext onEvent(Class<T> eventType, Consumer<T> consumer) {
|
||||||
|
return onEvent(eventType, EventPriority.NORMAL, consumer);
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings({ "unchecked", "rawtypes" })
|
||||||
|
private void eventExecute(Listener listener, Event event) {
|
||||||
|
Consumer consumer = eventMap.get(event.getClass());
|
||||||
|
if (consumer != null && filter.getAsBoolean()) {
|
||||||
|
consumer.accept(event);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static EventContext create() {
|
||||||
|
return new EventContext();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,66 +0,0 @@
|
|||||||
package ghast;
|
|
||||||
|
|
||||||
import lombok.AccessLevel;
|
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import lombok.Setter;
|
|
||||||
import lombok.experimental.UtilityClass;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.event.Event;
|
|
||||||
import org.bukkit.event.EventPriority;
|
|
||||||
import org.bukkit.event.Listener;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.function.BooleanSupplier;
|
|
||||||
import java.util.function.Consumer;
|
|
||||||
|
|
||||||
@UtilityClass
|
|
||||||
@SuppressWarnings("unused")
|
|
||||||
public class EventManager {
|
|
||||||
|
|
||||||
public Builder createContext() {
|
|
||||||
return new Builder();
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
|
|
||||||
public static class Builder {
|
|
||||||
|
|
||||||
private static final BooleanSupplier EMPTY_FILTER = () -> true;
|
|
||||||
|
|
||||||
private final EventContext eventContext = new EventContext();
|
|
||||||
|
|
||||||
public Builder filter(BooleanSupplier filter) {
|
|
||||||
eventContext.setFilter(filter != null ? filter : EMPTY_FILTER);
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public <T extends Event> Builder onEvent(Class<T> eventType, EventPriority eventPriority, Consumer<T> consumer) {
|
|
||||||
eventContext.getEventMap().put(eventType, consumer);
|
|
||||||
Bukkit.getPluginManager().registerEvent(eventType, eventContext, eventPriority,
|
|
||||||
eventContext::eventExecute, GhastTools.getPlugin());
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public <T extends Event> Builder onEvent(Class<T> eventType, Consumer<T> consumer) {
|
|
||||||
return onEvent(eventType, EventPriority.NORMAL, consumer);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
|
|
||||||
@Getter(AccessLevel.PRIVATE)
|
|
||||||
@Setter(AccessLevel.PRIVATE)
|
|
||||||
private static class EventContext implements Listener {
|
|
||||||
|
|
||||||
private final Map<Class<? extends Event>, Consumer<?>> eventMap = new HashMap<>();
|
|
||||||
private BooleanSupplier filter;
|
|
||||||
|
|
||||||
@SuppressWarnings({ "unchecked", "rawtypes" })
|
|
||||||
private void eventExecute(Listener listener, Event event) {
|
|
||||||
Consumer consumer = eventMap.get(event.getClass());
|
|
||||||
if (consumer != null && filter.getAsBoolean()) {
|
|
||||||
consumer.accept(event);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
76
src/main/java/ghast/XLog.java
Normal file
76
src/main/java/ghast/XLog.java
Normal file
@@ -0,0 +1,76 @@
|
|||||||
|
package ghast;
|
||||||
|
|
||||||
|
import lombok.experimental.UtilityClass;
|
||||||
|
|
||||||
|
import java.util.logging.Level;
|
||||||
|
|
||||||
|
import static java.text.MessageFormat.format;
|
||||||
|
|
||||||
|
@UtilityClass
|
||||||
|
public class XLog {
|
||||||
|
|
||||||
|
//region Debug
|
||||||
|
public void debug(String pattern, Object... objects) {
|
||||||
|
if (objects.length > 1 && objects[objects.length - 1] instanceof Throwable) {
|
||||||
|
Throwable throwable = (Throwable) objects[objects.length - 1];
|
||||||
|
Object[] values = new Object[objects.length - 1];
|
||||||
|
System.arraycopy(objects, 0, values, 0, values.length);
|
||||||
|
|
||||||
|
debug(format(pattern, values), throwable);
|
||||||
|
} else {
|
||||||
|
debug(format(pattern, objects));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void debug(String message, Throwable throwable) {
|
||||||
|
GhastTools.getPlugin().getLogger().log(Level.FINE, message, throwable);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void debug(String message) {
|
||||||
|
GhastTools.getPlugin().getLogger().fine(message);
|
||||||
|
}
|
||||||
|
//endregion
|
||||||
|
|
||||||
|
//region Info
|
||||||
|
public void info(String pattern, Object... objects) {
|
||||||
|
info(format(pattern, objects));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void info(String message) {
|
||||||
|
GhastTools.getPlugin().getLogger().info(message);
|
||||||
|
}
|
||||||
|
//endregion
|
||||||
|
|
||||||
|
//region Warning
|
||||||
|
public void warn(String pattern, Object... objects) {
|
||||||
|
warn(format(pattern, objects));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void warn(String message) {
|
||||||
|
GhastTools.getPlugin().getLogger().warning(message);
|
||||||
|
}
|
||||||
|
//endregion
|
||||||
|
|
||||||
|
//region Error
|
||||||
|
public void error(String pattern, Object... objects) {
|
||||||
|
if (objects.length > 1 && objects[objects.length - 1] instanceof Throwable) {
|
||||||
|
Throwable throwable = (Throwable) objects[objects.length - 1];
|
||||||
|
Object[] values = new Object[objects.length - 1];
|
||||||
|
System.arraycopy(objects, 0, values, 0, values.length);
|
||||||
|
|
||||||
|
error(format(pattern, values), throwable);
|
||||||
|
} else {
|
||||||
|
error(format(pattern, objects));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void error(String message) {
|
||||||
|
GhastTools.getPlugin().getLogger().severe(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void error(String message, Throwable throwable) {
|
||||||
|
GhastTools.getPlugin().getLogger().log(Level.SEVERE, message, throwable);
|
||||||
|
}
|
||||||
|
//endregion
|
||||||
|
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user