Separate functional-style get methods

ME1312 · Oct 24, 2021 · b11b6a1 · b11b6a1
1 parent dc64459
commit b11b6a1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 76 deletions.
diff --git a/GalaxiAPI/global/src/net/ME1312/Galaxi/Library/Try.java b/GalaxiAPI/global/src/net/ME1312/Galaxi/Library/Try.java
@@ -128,7 +128,7 @@ public <T> T get(Supplier<T> value, java.util.function.Consumer<Throwable> fallb
      * @param fallback Code to run for handling exceptions
      * @return The return value of that code (or null in the event of an exception)
      */
-    public <T> T getEither(Supplier<T> value, java.util.function.Consumer<Throwable> fallback) {
+    public <T> T getOrHandle(Supplier<T> value, java.util.function.Consumer<Throwable> fallback) {
         Util.nullpo(fallback);
         try {
             return value.run();
@@ -146,7 +146,7 @@ public <T> T getEither(Supplier<T> value, java.util.function.Consumer<Throwable>
      * @param def Code to run for generating the default value in the event of an exception
      * @return The return value of either code block
      */
-    public <T> T getEither(Supplier<T> value, java.util.function.Supplier<? extends T> def) {
+    public <T> T getOrSupply(Supplier<T> value, java.util.function.Supplier<? extends T> def) {
         Util.nullpo(def);
         try {
             return value.run();
@@ -163,7 +163,7 @@ public <T> T getEither(Supplier<T> value, java.util.function.Supplier<? extends
      * @param def Code to run for handling exceptions and/or generating the default value in the event of an exception
      * @return The return value of either code block
      */
-    public <T> T getEither(Supplier<T> value, java.util.function.Function<Throwable, ? extends T> def) {
+    public <T> T getOrFunction(Supplier<T> value, java.util.function.Function<Throwable, ? extends T> def) {
         Util.nullpo(def);
         try {
             return value.run();
@@ -181,7 +181,7 @@ public <T> T getEither(Supplier<T> value, java.util.function.Function<Throwable,
      * @param def Code to run for generating the default value in the event of an exception
      * @return The return value of either code block
      */
-    public <T> T getEither(Supplier<T> value, java.util.function.Consumer<Throwable> fallback, java.util.function.Supplier<? extends T> def) {
+    public <T> T getOrFunction(Supplier<T> value, java.util.function.Consumer<Throwable> fallback, java.util.function.Supplier<? extends T> def) {
         Util.nullpo(fallback, def);
         try {
             return value.run();

diff --git a/GalaxiAPI/global/src/net/ME1312/Galaxi/Library/UniversalFile.java b/GalaxiAPI/global/src/net/ME1312/Galaxi/Library/UniversalFile.java
diff --git a/GalaxiAPI/src/net/ME1312/Galaxi/Plugin/PluginManager.java b/GalaxiAPI/src/net/ME1312/Galaxi/Plugin/PluginManager.java
@@ -10,7 +10,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.*;
-import java.util.function.Supplier;
 
 public abstract class PluginManager {
     private final Map<Class<? extends Event>, Map<Short, Map<PluginInfo, Map<Object, List<BakedListener>>>>> listeners = new HashMap<>();
@@ -298,7 +297,7 @@ public <T extends Event> void executeEvent(Class<T> type, T event) {
         List<BakedListener> listeners = this.baked.get(type);
 
         if (listeners != null && listeners.size() != 0) {
-            Container<PluginInfo> plugin = Try.all.getEither(() -> Util.reflect(Event.class.getDeclaredField("plugin"), event), (Supplier<Container<PluginInfo>>) Container::new);
+            Container<PluginInfo> plugin = Try.all.getOrSupply(() -> Util.reflect(Event.class.getDeclaredField("plugin"), event), Container::new);
             for (BakedListener listener : listeners) {
                 plugin.value = listener.plugin;
                 if (!(event instanceof Cancellable) || !((Cancellable) event).isCancelled() || listener.override) {