Merge branch 'v3.0' into v3.0
This commit is contained in:
mikeprimm
GitHub
commit
69e42c83db
19 changed files with 154 additions and 176 deletions
|
|
@ -16,7 +16,7 @@ import java.util.concurrent.CancellationException;
|
|||
import java.util.concurrent.ExecutionException;
|
||||
import java.util.concurrent.Future;
|
||||
|
||||
import org.bstats.Metrics;
|
||||
import org.bstats.bukkit.Metrics;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Chunk;
|
||||
|
|
@ -1194,7 +1194,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
|
|||
onblockfromto = core.isTrigger("blockfromto");
|
||||
onblockphysics = core.isTrigger("blockphysics");
|
||||
onpiston = core.isTrigger("pistonmoved");
|
||||
onblockfade = core.isTrigger("blockfaded");
|
||||
onblockredstone = core.isTrigger("blockredstone");
|
||||
|
||||
if(onplace) {
|
||||
|
|
@ -1585,35 +1584,31 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
|
|||
private void initMetrics() {
|
||||
metrics = new Metrics(this);
|
||||
|
||||
metrics.addCustomChart(new Metrics.MultiLineChart("features_used") {
|
||||
@Override
|
||||
public HashMap<String, Integer> getValues(HashMap<String, Integer> hashMap) {
|
||||
hashMap.put("internal_web_server", core.configuration.getBoolean("disable-webserver", false) ? 0 : 1);
|
||||
hashMap.put("login_security", core.configuration.getBoolean("login-enabled", false) ? 1 : 0);
|
||||
hashMap.put("player_info_protected", core.player_info_protected ? 1 : 0);
|
||||
for (String mod : modsused)
|
||||
hashMap.put(mod + "_blocks", 1);
|
||||
return hashMap;
|
||||
}
|
||||
});
|
||||
metrics.addCustomChart(new Metrics.MultiLineChart("features_used", () -> {
|
||||
Map<String, Integer> hashMap = new HashMap<>();
|
||||
hashMap.put("internal_web_server", core.configuration.getBoolean("disable-webserver", false) ? 0 : 1);
|
||||
hashMap.put("login_security", core.configuration.getBoolean("login-enabled", false) ? 1 : 0);
|
||||
hashMap.put("player_info_protected", core.player_info_protected ? 1 : 0);
|
||||
for (String mod : modsused)
|
||||
hashMap.put(mod + "_blocks", 1);
|
||||
return hashMap;
|
||||
}));
|
||||
|
||||
metrics.addCustomChart(new Metrics.MultiLineChart("map_data") {
|
||||
@Override
|
||||
public HashMap<String, Integer> getValues(HashMap<String, Integer> hashMap) {
|
||||
hashMap.put("worlds", core.mapManager != null ? core.mapManager.getWorlds().size() : 0);
|
||||
int maps = 0, hdmaps = 0;
|
||||
if (core.mapManager != null)
|
||||
for (DynmapWorld w : core.mapManager.getWorlds()) {
|
||||
for (MapType mt : w.maps)
|
||||
if (mt instanceof HDMap)
|
||||
++hdmaps;
|
||||
maps += w.maps.size();
|
||||
}
|
||||
hashMap.put("maps", maps);
|
||||
hashMap.put("hd_maps", hdmaps);
|
||||
return hashMap;
|
||||
}
|
||||
});
|
||||
metrics.addCustomChart(new Metrics.MultiLineChart("map_data", () -> {
|
||||
Map<String, Integer> hashMap = new HashMap<>();
|
||||
hashMap.put("worlds", core.mapManager != null ? core.mapManager.getWorlds().size() : 0);
|
||||
int maps = 0, hdmaps = 0;
|
||||
if (core.mapManager != null)
|
||||
for (DynmapWorld w : core.mapManager.getWorlds()) {
|
||||
for (MapType mt : w.maps)
|
||||
if (mt instanceof HDMap)
|
||||
++hdmaps;
|
||||
maps += w.maps.size();
|
||||
}
|
||||
hashMap.put("maps", maps);
|
||||
hashMap.put("hd_maps", hdmaps);
|
||||
return hashMap;
|
||||
}));
|
||||
}
|
||||
@Override
|
||||
public void processSignChange(int blkid, String world, int x, int y, int z,
|
||||
|
|
|
|||
|
|
@ -1,65 +1,65 @@
|
|||
package org.dynmap.bukkit;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.dynmap.Log;
|
||||
import org.dynmap.bukkit.helper.BukkitVersionHelper;
|
||||
import org.dynmap.bukkit.helper.BukkitVersionHelperCB;
|
||||
import org.dynmap.bukkit.helper.BukkitVersionHelperGlowstone;
|
||||
import org.dynmap.bukkit.helper.v113.BukkitVersionHelperSpigot113;
|
||||
import org.dynmap.bukkit.helper.v113_1.BukkitVersionHelperSpigot113_1;
|
||||
import org.dynmap.bukkit.helper.v113_2.BukkitVersionHelperSpigot113_2;
|
||||
import org.dynmap.bukkit.helper.v114.BukkitVersionHelperSpigot114;
|
||||
import org.dynmap.bukkit.helper.v114_1.BukkitVersionHelperSpigot114_1;
|
||||
import org.dynmap.bukkit.helper.v115.BukkitVersionHelperSpigot115;
|
||||
|
||||
public class Helper {
|
||||
|
||||
public static final BukkitVersionHelper getHelper() {
|
||||
if (BukkitVersionHelper.helper == null) {
|
||||
String v = Bukkit.getServer().getVersion();
|
||||
Log.info("version=" + v);
|
||||
if (v.contains("MCPC")) {
|
||||
Log.severe("*********************************************************************************");
|
||||
Log.severe("* MCPC-Plus is no longer supported via the Bukkit version of Dynmap. *");
|
||||
Log.severe("* Install the appropriate Forge version of Dynmap. *");
|
||||
Log.severe("* Add the DynmapCBBridge plugin to enable support for Dynmap-compatible plugins *");
|
||||
Log.severe("*********************************************************************************");
|
||||
}
|
||||
else if(v.contains("BukkitForge")) {
|
||||
Log.severe("*********************************************************************************");
|
||||
Log.severe("* BukkitForge is not supported via the Bukkit version of Dynmap. *");
|
||||
Log.severe("* Install the appropriate Forge version of Dynmap. *");
|
||||
Log.severe("* Add the DynmapCBBridge plugin to enable support for Dynmap-compatible plugins *");
|
||||
Log.severe("*********************************************************************************");
|
||||
}
|
||||
else if(Bukkit.getServer().getClass().getName().contains("GlowServer")) {
|
||||
Log.info("Loading Glowstone support");
|
||||
BukkitVersionHelper.helper = new BukkitVersionHelperGlowstone();
|
||||
}
|
||||
else if (v.contains("(MC: 1.15)")) {
|
||||
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot115();
|
||||
}
|
||||
else if (v.contains("(MC: 1.14.1)") || v.contains("(MC: 1.14.2)") ||
|
||||
v.contains("(MC: 1.14.3)") || v.contains("(MC: 1.14.4)")) {
|
||||
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot114_1();
|
||||
}
|
||||
else if (v.contains("(MC: 1.14)")) {
|
||||
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot114();
|
||||
}
|
||||
else if (v.contains("(MC: 1.13.2)")) {
|
||||
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot113_2();
|
||||
}
|
||||
else if (v.contains("(MC: 1.13.1)")) {
|
||||
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot113_1();
|
||||
}
|
||||
else if (v.contains("(MC: 1.13)")) {
|
||||
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot113();
|
||||
}
|
||||
else {
|
||||
BukkitVersionHelper.helper = new BukkitVersionHelperCB();
|
||||
}
|
||||
}
|
||||
return BukkitVersionHelper.helper;
|
||||
}
|
||||
|
||||
}
|
||||
package org.dynmap.bukkit;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.dynmap.Log;
|
||||
import org.dynmap.bukkit.helper.BukkitVersionHelper;
|
||||
import org.dynmap.bukkit.helper.BukkitVersionHelperCB;
|
||||
import org.dynmap.bukkit.helper.BukkitVersionHelperGlowstone;
|
||||
import org.dynmap.bukkit.helper.v113.BukkitVersionHelperSpigot113;
|
||||
import org.dynmap.bukkit.helper.v113_1.BukkitVersionHelperSpigot113_1;
|
||||
import org.dynmap.bukkit.helper.v113_2.BukkitVersionHelperSpigot113_2;
|
||||
import org.dynmap.bukkit.helper.v114.BukkitVersionHelperSpigot114;
|
||||
import org.dynmap.bukkit.helper.v114_1.BukkitVersionHelperSpigot114_1;
|
||||
import org.dynmap.bukkit.helper.v115.BukkitVersionHelperSpigot115;
|
||||
|
||||
public class Helper {
|
||||
|
||||
public static final BukkitVersionHelper getHelper() {
|
||||
if (BukkitVersionHelper.helper == null) {
|
||||
String v = Bukkit.getServer().getVersion();
|
||||
Log.info("version=" + v);
|
||||
if (v.contains("MCPC")) {
|
||||
Log.severe("*********************************************************************************");
|
||||
Log.severe("* MCPC-Plus is no longer supported via the Bukkit version of Dynmap. *");
|
||||
Log.severe("* Install the appropriate Forge version of Dynmap. *");
|
||||
Log.severe("* Add the DynmapCBBridge plugin to enable support for Dynmap-compatible plugins *");
|
||||
Log.severe("*********************************************************************************");
|
||||
}
|
||||
else if(v.contains("BukkitForge")) {
|
||||
Log.severe("*********************************************************************************");
|
||||
Log.severe("* BukkitForge is not supported via the Bukkit version of Dynmap. *");
|
||||
Log.severe("* Install the appropriate Forge version of Dynmap. *");
|
||||
Log.severe("* Add the DynmapCBBridge plugin to enable support for Dynmap-compatible plugins *");
|
||||
Log.severe("*********************************************************************************");
|
||||
}
|
||||
else if(Bukkit.getServer().getClass().getName().contains("GlowServer")) {
|
||||
Log.info("Loading Glowstone support");
|
||||
BukkitVersionHelper.helper = new BukkitVersionHelperGlowstone();
|
||||
}
|
||||
else if (v.contains("(MC: 1.15)")) {
|
||||
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot115();
|
||||
}
|
||||
else if (v.contains("(MC: 1.14.1)") || v.contains("(MC: 1.14.2)") ||
|
||||
v.contains("(MC: 1.14.3)") || v.contains("(MC: 1.14.4)")) {
|
||||
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot114_1();
|
||||
}
|
||||
else if (v.contains("(MC: 1.14)")) {
|
||||
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot114();
|
||||
}
|
||||
else if (v.contains("(MC: 1.13.2)")) {
|
||||
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot113_2();
|
||||
}
|
||||
else if (v.contains("(MC: 1.13.1)")) {
|
||||
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot113_1();
|
||||
}
|
||||
else if (v.contains("(MC: 1.13)")) {
|
||||
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot113();
|
||||
}
|
||||
else {
|
||||
BukkitVersionHelper.helper = new BukkitVersionHelperCB();
|
||||
}
|
||||
}
|
||||
return BukkitVersionHelper.helper;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,9 +6,12 @@ import java.util.UUID;
|
|||
import java.util.concurrent.ExecutionException;
|
||||
import java.util.concurrent.Future;
|
||||
|
||||
import me.lucko.luckperms.api.LuckPermsApi;
|
||||
import me.lucko.luckperms.api.User;
|
||||
import me.lucko.luckperms.api.caching.PermissionData;
|
||||
import net.luckperms.api.LuckPerms;
|
||||
import net.luckperms.api.model.user.User;
|
||||
import net.luckperms.api.model.user.UserManager;
|
||||
import net.luckperms.api.cacheddata.CachedPermissionData;
|
||||
import net.luckperms.api.cacheddata.CachedDataManager;
|
||||
import net.luckperms.api.query.QueryOptions;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.OfflinePlayer;
|
||||
|
|
@ -18,19 +21,19 @@ import org.dynmap.Log;
|
|||
|
||||
public class LuckPermsPermissions implements PermissionProvider {
|
||||
String name;
|
||||
LuckPermsApi luckPerms;
|
||||
LuckPerms luckPerms;
|
||||
|
||||
public static LuckPermsPermissions create(Server server, String name) {
|
||||
if (!server.getPluginManager().isPluginEnabled("LuckPerms"))
|
||||
return null;
|
||||
LuckPermsApi luckPerms = server.getServicesManager().load(LuckPermsApi.class);
|
||||
LuckPerms luckPerms = server.getServicesManager().load(LuckPerms.class);
|
||||
if (luckPerms == null)
|
||||
return null;
|
||||
Log.info("Using LuckPerms " + luckPerms.getPlatformInfo().getVersion() + " for access control");
|
||||
Log.info("Using LuckPerms " + luckPerms.getPluginMetadata().getVersion() + " for access control");
|
||||
return new LuckPermsPermissions(name, luckPerms);
|
||||
}
|
||||
|
||||
public LuckPermsPermissions(String name, LuckPermsApi luckPerms) {
|
||||
public LuckPermsPermissions(String name, LuckPerms luckPerms) {
|
||||
this.name = name;
|
||||
this.luckPerms = luckPerms;
|
||||
}
|
||||
|
|
@ -43,10 +46,10 @@ public class LuckPermsPermissions implements PermissionProvider {
|
|||
@Override
|
||||
public Set<String> hasOfflinePermissions(String player, Set<String> perms) {
|
||||
Set<String> result = new HashSet<>();
|
||||
PermissionData user = getUser(player);
|
||||
CachedPermissionData user = getUser(player);
|
||||
if (user != null) {
|
||||
for (String p : perms) {
|
||||
if (user.getPermissionValue(name + "." + p).asBoolean())
|
||||
if (user.checkPermission(name + "." + p).asBoolean())
|
||||
result.add(p);
|
||||
}
|
||||
}
|
||||
|
|
@ -55,34 +58,39 @@ public class LuckPermsPermissions implements PermissionProvider {
|
|||
|
||||
@Override
|
||||
public boolean hasOfflinePermission(String player, String perm) {
|
||||
PermissionData user = getUser(player);
|
||||
CachedPermissionData user = getUser(player);
|
||||
if (user == null)
|
||||
return false;
|
||||
return user.getPermissionValue(name + "." + perm).asBoolean();
|
||||
return user.checkPermission(name + "." + perm).asBoolean();
|
||||
}
|
||||
|
||||
private PermissionData getUser(String username) {
|
||||
private CachedPermissionData getUser(String username) {
|
||||
OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(username);
|
||||
UUID uuid;
|
||||
|
||||
if (offlinePlayer != null && offlinePlayer.getUniqueId() != null)
|
||||
uuid = offlinePlayer.getUniqueId();
|
||||
else
|
||||
uuid = joinFuture(luckPerms.getStorage().getUUID(username));
|
||||
uuid = joinFuture(luckPerms.getUserManager().lookupUniqueId(username));
|
||||
|
||||
if (uuid == null)
|
||||
return null;
|
||||
|
||||
User user = luckPerms.getUser(uuid);
|
||||
User user = luckPerms.getUserManager().getUser(uuid);
|
||||
if (user == null) {
|
||||
joinFuture(luckPerms.getStorage().loadUser(uuid));
|
||||
user = luckPerms.getUser(uuid);
|
||||
joinFuture(luckPerms.getUserManager().loadUser(uuid));
|
||||
user = luckPerms.getUserManager().getUser(uuid);
|
||||
}
|
||||
|
||||
if (user == null)
|
||||
return null;
|
||||
|
||||
return user.getCachedData().getPermissionData(luckPerms.getContextManager().getStaticContexts());
|
||||
CachedDataManager data = user.getCachedData();
|
||||
return luckPerms
|
||||
.getContextManager()
|
||||
.getQueryOptions(user)
|
||||
.map(queryOptions -> data.getPermissionData(queryOptions))
|
||||
.orElse(null);
|
||||
}
|
||||
|
||||
private static <T> T joinFuture(Future<T> future) {
|
||||
|
|
@ -92,4 +100,4 @@ public class LuckPermsPermissions implements PermissionProvider {
|
|||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue