remove placeholder expansion from main project

bukkit-placeholders/pom.xml

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>luckperms</artifactId>
-        <groupId>me.lucko.luckperms</groupId>
-        <version>3.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>luckperms-bukkit-placeholders</artifactId>
-    <build>
-        <finalName>LuckPermsPlaceholderExpansion</finalName>
-        <resources>
-            <resource>
-                <directory>../</directory>
-                <filtering>false</filtering>
-                <includes>
-                    <include>LICENSE.txt</include>
-                </includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <!-- LuckPerms API -->
-        <dependency>
-            <groupId>me.lucko.luckperms</groupId>
-            <artifactId>luckperms-api</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- BukkitAPI -->
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>1.8.8-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- PlaceholderAPI -->
-        <dependency>
-            <groupId>me.clip</groupId>
-            <artifactId>placeholderapi</artifactId>
-            <version>2.2.0</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-</project>

bukkit-placeholders/src/main/java/me/lucko/luckperms/api/placeholders/LuckPermsPlaceholderExpansion.java

@@ -1,294 +0,0 @@
-/*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
- *
- *  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.api.placeholders;
-
-import com.google.common.base.Splitter;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-
-import me.clip.placeholderapi.PlaceholderAPIPlugin;
-import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import me.clip.placeholderapi.util.TimeUtil;
-import me.lucko.luckperms.api.Contexts;
-import me.lucko.luckperms.api.Group;
-import me.lucko.luckperms.api.LuckPermsApi;
-import me.lucko.luckperms.api.Node;
-import me.lucko.luckperms.api.Track;
-import me.lucko.luckperms.api.User;
-import me.lucko.luckperms.api.caching.PermissionData;
-import me.lucko.luckperms.api.caching.UserData;
-import me.lucko.luckperms.api.context.MutableContextSet;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-/*
- * PlaceholderAPI Expansion for LuckPerms, implemented using the LuckPerms API.
- */
-public class LuckPermsPlaceholderExpansion extends PlaceholderExpansion {
-    private static final String IDENTIFIER = "luckperms";
-    private static final String PLUGIN_NAME = "LuckPerms";
-    private static final String AUTHOR = "Luck";
-    private static final String VERSION = "3.0";
-
-    private LuckPermsApi api = null;
-
-    @Override
-    public boolean canRegister() {
-        return Bukkit.getServicesManager().isProvidedFor(LuckPermsApi.class);
-    }
-
-    @Override
-    public boolean register() {
-        if (!canRegister()) {
-            return false;
-        }
-
-        api = Bukkit.getServicesManager().getRegistration(LuckPermsApi.class).getProvider();
-        return super.register();
-    }
-
-    private Contexts makeContexts(Player player) {
-        MutableContextSet contextSet = new MutableContextSet();
-        contextSet.add("server", api.getConfiguration().getVaultServer());
-        contextSet.add("world", player.getWorld().getName());// ignore world?
-        return Contexts.of(contextSet.makeImmutable(), api.getConfiguration().getVaultIncludeGlobal(), true, true, true, true, player.isOp());
-    }
-
-    @Override
-    public String onPlaceholderRequest(Player player, String identifier) {
-        if (player == null || api == null) {
-            return "";
-        }
-
-        User user = api.getUserSafe(api.getUuidCache().getUUID(player.getUniqueId())).orElse(null);
-        if (user == null) {
-            return "";
-        }
-
-        UserData data = user.getUserDataCache().orElse(null);
-        if (data == null) {
-            return "";
-        }
-
-        identifier = identifier.toLowerCase();
-
-        if (identifier.equals("group_name")) {
-            return user.getPrimaryGroup();
-        }
-
-        if (identifier.startsWith("context_") && identifier.length() > "context_".length()) {
-            String key = identifier.substring("context_".length());
-            return api.getContextForUser(user)
-                    .map(Contexts::getContexts)
-                    .map(c -> c.getValues(key))
-                    .map(s -> Iterables.getFirst(s, ""))
-                    .orElse("");
-        }
-
-        if (identifier.equals("groups")) {
-            return user.getGroupNames().stream().collect(Collectors.joining(", "));
-        }
-
-        if (identifier.startsWith("has_permission_") && identifier.length() > "has_permission_".length()) {
-            String node = identifier.substring("has_permission_".length());
-            return formatBoolean(user.hasPermission(node, true));
-        }
-
-        if (identifier.startsWith("inherits_permission_") && identifier.length() > "inherits_permission_".length()) {
-            String node = identifier.substring("inherits_permission_".length());
-            return formatBoolean(data.getPermissionData(makeContexts(player)).getPermissionValue(node).asBoolean());
-        }
-
-        if (identifier.startsWith("check_permission_") && identifier.length() > "check_permission_".length()) {
-            String node = identifier.substring("check_permission_".length());
-            return formatBoolean(data.getPermissionData(makeContexts(player)).getPermissionValue(node).asBoolean());
-        }
-
-        if (identifier.startsWith("in_group_") && identifier.length() > "in_group_".length()) {
-            String groupName = identifier.substring("in_group_".length());
-            return formatBoolean(user.getGroupNames().contains(groupName));
-        }
-
-        if (identifier.startsWith("inherits_group_") && identifier.length() > "inherits_group_".length()) {
-            String groupName = identifier.substring("inherits_group_".length());
-            return formatBoolean(data.getPermissionData(makeContexts(player)).getPermissionValue("group." + groupName).asBoolean());
-        }
-
-        if (identifier.startsWith("on_track_") && identifier.length() > "on_track_".length()) {
-            String trackName = identifier.substring("on_track_".length());
-            return api.getTrackSafe(trackName)
-                    .map(t -> formatBoolean(t.containsGroup(user.getPrimaryGroup())))
-                    .orElse("");
-        }
-
-        if (identifier.startsWith("has_groups_on_track_") && identifier.length() > "has_groups_on_track_".length()) {
-            String trackName = identifier.substring("has_groups_on_track_".length());
-            return api.getTrackSafe(trackName).map(t -> {
-                for (String group : user.getGroupNames()) {
-                    if (t.containsGroup(group)) {
-                        return formatBoolean(true);
-                    }
-                }
-                return formatBoolean(false);
-            }).orElse("");
-        }
-
-        if (identifier.equals("highest_group_by_weight")) {
-            return user.getPermissions().stream()
-                    .filter(Node::isGroupNode)
-                    .map(Node::getGroupName)
-                    .map(s -> api.getGroupSafe(s))
-                    .filter(Optional::isPresent)
-                    .map(Optional::get)
-                    .sorted((o1, o2) -> {
-                        int ret = Integer.compare(o1.getWeight().orElse(0), o2.getWeight().orElse(0));
-                        return ret == 1 ? 1 : -1;
-                    })
-                    .findFirst()
-                    .map(Group::getName)
-                    .orElse("");
-        }
-
-        if (identifier.equals("lowest_group_by_weight")) {
-            return user.getPermissions().stream()
-                    .filter(Node::isGroupNode)
-                    .map(Node::getGroupName)
-                    .map(s -> api.getGroupSafe(s))
-                    .filter(Optional::isPresent)
-                    .map(Optional::get)
-                    .sorted((o1, o2) -> {
-                        int ret = Integer.compare(o1.getWeight().orElse(0), o2.getWeight().orElse(0));
-                        return ret == 1 ? -1 : 1;
-                    })
-                    .findFirst()
-                    .map(Group::getName)
-                    .orElse("");
-        }
-
-        if (identifier.startsWith("first_group_on_tracks_") && identifier.length() > "first_group_on_tracks_".length()) {
-            List<String> tracks = Splitter.on(',').trimResults().splitToList(identifier.substring("first_group_on_tracks_".length()));
-            PermissionData permData = data.getPermissionData(makeContexts(player));
-            return tracks.stream()
-                    .map(t -> api.getTrackSafe(t))
-                    .filter(Optional::isPresent)
-                    .map(Optional::get)
-                    .map(Track::getGroups)
-                    .map(groups -> groups.stream()
-                            .filter(s -> permData.getPermissionValue("group." + s).asBoolean())
-                            .findFirst()
-                    )
-                    .filter(Optional::isPresent)
-                    .map(Optional::get)
-                    .findFirst()
-                    .orElse("");
-        }
-
-        if (identifier.startsWith("last_group_on_tracks_") && identifier.length() > "last_group_on_tracks_".length()) {
-            List<String> tracks = Splitter.on(',').trimResults().splitToList(identifier.substring("last_group_on_tracks_".length()));
-            PermissionData permData = data.getPermissionData(makeContexts(player));
-            return tracks.stream()
-                    .map(t -> api.getTrackSafe(t))
-                    .filter(Optional::isPresent)
-                    .map(Optional::get)
-                    .map(Track::getGroups)
-                    .map(Lists::reverse)
-                    .map(groups -> groups.stream()
-                            .filter(s -> permData.getPermissionValue("group." + s).asBoolean())
-                            .findFirst()
-                    )
-                    .filter(Optional::isPresent)
-                    .map(Optional::get)
-                    .findFirst()
-                    .orElse("");
-        }
-
-        if (identifier.startsWith("expiry_time_") && identifier.length() > "expiry_time_".length()) {
-            String node = identifier.substring("expiry_time_".length());
-            long currentTime = System.currentTimeMillis() / 1000L;
-            return user.getPermissions().stream()
-                    .filter(Node::isTemporary)
-                    .filter(n -> n.toSerializedNode().equals(node))
-                    .map(Node::getExpiryUnixTime)
-                    .findAny()
-                    .map(e -> TimeUtil.getTime((int) (e - currentTime)))
-                    .orElse("");
-        }
-
-        if (identifier.startsWith("group_expiry_time_") && identifier.length() > "group_expiry_time_".length()) {
-            String group = identifier.substring("group_expiry_time_".length());
-            long currentTime = System.currentTimeMillis() / 1000L;
-            return user.getPermissions().stream()
-                    .filter(Node::isTemporary)
-                    .filter(Node::isGroupNode)
-                    .filter(n -> n.getGroupName().equals(group))
-                    .map(Node::getExpiryUnixTime)
-                    .findAny()
-                    .map(e -> TimeUtil.getTime((int) (e - currentTime)))
-                    .orElse("");
-        }
-
-        if (identifier.equalsIgnoreCase("prefix")) {
-            return Optional.ofNullable(data.calculateMeta(makeContexts(player)).getPrefix()).orElse("");
-        }
-
-        if (identifier.equalsIgnoreCase("suffix")) {
-            return Optional.ofNullable(data.calculateMeta(makeContexts(player)).getSuffix()).orElse("");
-        }
-
-        if (identifier.startsWith("meta_") && identifier.length() > "meta_".length()) {
-            String node = identifier.substring("meta_".length());
-            return data.getMetaData(makeContexts(player)).getMeta().getOrDefault(node, "");
-        }
-
-        return null;
-    }
-
-    @Override
-    public String getIdentifier() {
-        return IDENTIFIER;
-    }
-
-    @Override
-    public String getPlugin() {
-        return PLUGIN_NAME;
-    }
-
-    @Override
-    public String getAuthor() {
-        return AUTHOR;
-    }
-
-    @Override
-    public String getVersion() {
-        return VERSION;
-    }
-
-    private static String formatBoolean(boolean b) {
-        return b ? PlaceholderAPIPlugin.booleanTrue() : PlaceholderAPIPlugin.booleanFalse();
-    }
-}

pom.xml

@@ -12,7 +12,6 @@
         <module>common</module>
         <module>bukkit</module>
         <module>bukkit-legacy</module>
-        <module>bukkit-placeholders</module>
         <module>bungee</module>
         <module>sponge</module>
     </modules>
@@ -105,10 +104,6 @@
             <id>bungeeperms-repo</id>
             <url>http://repo.wea-ondara.net/repository/public/</url>
         </repository>
-        <repository>
-            <id>placeholderapi-repo</id>
-            <url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
-        </repository>
         <repository>
             <id>lilypad-repo</id>
             <url>http://ci.lilypadmc.org/plugin/repository/everything</url>