Fail silently when the Sponge Server is not available - closes #367

2017-07-10 09:18:58 +01:00
parent fce5b8430d
commit 1bb1f5ebb3
5 changed files with 126 additions and 68 deletions
@@ -32,26 +32,19 @@ import lombok.Setter;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableSet;

-import me.lucko.luckperms.api.Tristate;
 import me.lucko.luckperms.common.commands.CommandManager;
 import me.lucko.luckperms.common.commands.CommandResult;
 import me.lucko.luckperms.common.commands.sender.Sender;
 import me.lucko.luckperms.common.commands.utils.Util;
-import me.lucko.luckperms.common.constants.Constants;
-import me.lucko.luckperms.common.constants.Permission;
 import me.lucko.luckperms.common.locale.Message;
-import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.DateUtil;
-
-import net.kyori.text.Component;
-import net.kyori.text.serializer.ComponentSerializer;
+import me.lucko.luckperms.common.utils.FakeSender;

 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;

@@ -89,7 +82,7 @@ public class Importer implements Runnable {
                .collect(Collectors.toList());

        this.cmdResult = new HashMap<>();
-        this.fake = new FakeSender();
+        this.fake = new FakeSender(commandManager.getPlugin(), this::logMessage);
    }

    @Override
@@ -182,59 +175,6 @@ public class Importer implements Runnable {
        }
    }

-    private class FakeSender implements Sender {
-
-        @Override
-        public LuckPermsPlugin getPlatform() {
-            return commandManager.getPlugin();
-        }
-
-        @Override
-        public String getName() {
-            return Constants.IMPORT_NAME;
-        }
-
-        @Override
-        public UUID getUuid() {
-            return Constants.IMPORT_UUID;
-        }
-
-        @Override
-        public void sendMessage(String s) {
-            logMessage(s);
-        }
-
-        @Override
-        public void sendMessage(Component message) {
-            logMessage(ComponentSerializer.toLegacy(message, Constants.COLOR_CHAR));
-        }
-
-        @Override
-        public Tristate getPermissionValue(String permission) {
-            return Tristate.TRUE;
-        }
-
-        @Override
-        public boolean hasPermission(String permission) {
-            return true;
-        }
-
-        @Override
-        public boolean hasPermission(Permission permission) {
-            return true;
-        }
-
-        @Override
-        public boolean isConsole() {
-            return true;
-        }
-
-        @Override
-        public boolean isImport() {
-            return true;
-        }
-    }
-
    @Getter
    @Setter
    private static class Result {
@@ -0,0 +1,96 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.common.utils;
+
+import lombok.AllArgsConstructor;
+
+import me.lucko.luckperms.api.Tristate;
+import me.lucko.luckperms.common.commands.sender.Sender;
+import me.lucko.luckperms.common.constants.Constants;
+import me.lucko.luckperms.common.constants.Permission;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
+
+import net.kyori.text.Component;
+import net.kyori.text.serializer.ComponentSerializer;
+
+import java.util.UUID;
+import java.util.function.Consumer;
+
+@AllArgsConstructor
+public class FakeSender implements Sender {
+    private final LuckPermsPlugin plugin;
+    private final Consumer<String> messageConsumer;
+
+    @Override
+    public LuckPermsPlugin getPlatform() {
+        return plugin;
+    }
+
+    @Override
+    public String getName() {
+        return Constants.IMPORT_NAME;
+    }
+
+    @Override
+    public UUID getUuid() {
+        return Constants.IMPORT_UUID;
+    }
+
+    @Override
+    public void sendMessage(String s) {
+        messageConsumer.accept(s);
+    }
+
+    @Override
+    public void sendMessage(Component message) {
+        messageConsumer.accept(ComponentSerializer.toLegacy(message, Constants.COLOR_CHAR));
+    }
+
+    @Override
+    public Tristate getPermissionValue(String permission) {
+        return Tristate.TRUE;
+    }
+
+    @Override
+    public boolean hasPermission(String permission) {
+        return true;
+    }
+
+    @Override
+    public boolean hasPermission(Permission permission) {
+        return true;
+    }
+
+    @Override
+    public boolean isConsole() {
+        return true;
+    }
+
+    @Override
+    public boolean isImport() {
+        return true;
+    }
+}