Skip to content

Commit

Permalink
Change package names
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianbinder authored Oct 12, 2017
1 parent 6587b37 commit da70059
Show file tree
Hide file tree
Showing 109 changed files with 477 additions and 451 deletions.
4 changes: 2 additions & 2 deletions PowerfulPerms/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>PowerfulPerms-Parent</artifactId>
<groupId>com.github.cheesesoftware</groupId>
<groupId>com.github.gustav9797</groupId>
<version>4.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -13,7 +13,7 @@

<dependencies>
<dependency>
<groupId>com.github.cheesesoftware</groupId>
<groupId>com.github.gustav9797</groupId>
<artifactId>PowerfulPermsAPI</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package com.github.cheesesoftware.PowerfulPerms;
package com.github.gustav9797.PowerfulPerms;

import com.github.gustav9797.PowerfulPerms.common.SchedulerBase;
import java.util.Date;
import java.util.concurrent.TimeUnit;

import org.bukkit.Bukkit;
import org.bukkit.scheduler.BukkitTask;

import com.github.cheesesoftware.PowerfulPerms.common.SchedulerBase;

public class BukkitScheduler extends SchedulerBase {

private PowerfulPerms plugin;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package com.github.cheesesoftware.PowerfulPerms.Bungee;
package com.github.gustav9797.PowerfulPerms.Bungee;

import com.github.gustav9797.PowerfulPerms.common.SchedulerBase;
import java.util.Date;
import java.util.concurrent.TimeUnit;

import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.scheduler.ScheduledTask;

import com.github.cheesesoftware.PowerfulPerms.common.SchedulerBase;

public class BungeeScheduler extends SchedulerBase {

private PowerfulPerms plugin;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.github.cheesesoftware.PowerfulPerms.Bungee;
package com.github.gustav9797.PowerfulPerms.Bungee;

import com.github.gustav9797.PowerfulPerms.command.BaseCommand;
import java.util.List;

import com.github.cheesesoftware.PowerfulPerms.command.BaseCommand;
import com.github.cheesesoftware.PowerfulPerms.common.ICommand;
import com.github.cheesesoftware.PowerfulPermsAPI.PermissionManager;
import com.github.gustav9797.PowerfulPerms.common.ICommand;
import com.github.gustav9797.PowerfulPermsAPI.PermissionManager;

import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ProxyServer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package com.github.cheesesoftware.PowerfulPerms.Bungee;
package com.github.gustav9797.PowerfulPerms.Bungee;

import java.util.LinkedHashMap;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;

import com.github.cheesesoftware.PowerfulPerms.common.PermissionContainer;
import com.github.cheesesoftware.PowerfulPerms.common.PermissionManagerMiddle;
import com.github.cheesesoftware.PowerfulPerms.common.PermissionPlayerBase;
import com.github.cheesesoftware.PowerfulPerms.database.Database;
import com.github.cheesesoftware.PowerfulPermsAPI.CachedGroup;
import com.github.cheesesoftware.PowerfulPermsAPI.Group;
import com.github.cheesesoftware.PowerfulPermsAPI.PermissionPlayer;
import com.github.cheesesoftware.PowerfulPermsAPI.PlayerLoadedEvent;
import com.github.gustav9797.PowerfulPerms.common.PermissionContainer;
import com.github.gustav9797.PowerfulPerms.common.PermissionManagerMiddle;
import com.github.gustav9797.PowerfulPerms.common.PermissionPlayerBase;
import com.github.gustav9797.PowerfulPerms.database.Database;
import com.github.gustav9797.PowerfulPermsAPI.CachedGroup;
import com.github.gustav9797.PowerfulPermsAPI.Group;
import com.github.gustav9797.PowerfulPermsAPI.PermissionPlayer;
import com.github.gustav9797.PowerfulPermsAPI.PlayerLoadedEvent;
import com.google.common.util.concurrent.ListenableFuture;

import net.md_5.bungee.api.connection.ProxiedPlayer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.github.cheesesoftware.PowerfulPerms.Bungee;
package com.github.gustav9797.PowerfulPerms.Bungee;

import java.util.LinkedHashMap;
import java.util.List;

import com.github.cheesesoftware.PowerfulPerms.common.PermissionPlayerBase;
import com.github.cheesesoftware.PowerfulPermsAPI.CachedGroup;
import com.github.cheesesoftware.PowerfulPermsAPI.Permission;
import com.github.cheesesoftware.PowerfulPermsAPI.PowerfulPermsPlugin;
import com.github.gustav9797.PowerfulPerms.common.PermissionPlayerBase;
import com.github.gustav9797.PowerfulPermsAPI.CachedGroup;
import com.github.gustav9797.PowerfulPermsAPI.Permission;
import com.github.gustav9797.PowerfulPermsAPI.PowerfulPermsPlugin;

import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package com.github.cheesesoftware.PowerfulPerms.Bungee;
package com.github.gustav9797.PowerfulPerms.Bungee;

import com.github.gustav9797.PowerfulPerms.common.ChatColor;
import com.github.gustav9797.PowerfulPerms.database.Database;
import com.github.gustav9797.PowerfulPerms.database.DatabaseCredentials;
import com.github.gustav9797.PowerfulPerms.database.MySQLDatabase;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
Expand All @@ -12,16 +16,12 @@
import java.util.UUID;
import java.util.concurrent.TimeUnit;

import com.github.cheesesoftware.PowerfulPerms.common.ChatColor;
import com.github.cheesesoftware.PowerfulPerms.common.PermissionManagerBase;
import com.github.cheesesoftware.PowerfulPerms.common.Versioner;
import com.github.cheesesoftware.PowerfulPerms.database.Database;
import com.github.cheesesoftware.PowerfulPerms.database.DatabaseCredentials;
import com.github.cheesesoftware.PowerfulPerms.database.MySQLDatabase;
import com.github.cheesesoftware.PowerfulPermsAPI.PermissionManager;
import com.github.cheesesoftware.PowerfulPermsAPI.PermissionPlayer;
import com.github.cheesesoftware.PowerfulPermsAPI.PowerfulPermsPlugin;
import com.github.cheesesoftware.PowerfulPermsAPI.ServerMode;
import com.github.gustav9797.PowerfulPerms.common.PermissionManagerBase;
import com.github.gustav9797.PowerfulPerms.common.Versioner;
import com.github.gustav9797.PowerfulPermsAPI.PermissionManager;
import com.github.gustav9797.PowerfulPermsAPI.PermissionPlayer;
import com.github.gustav9797.PowerfulPermsAPI.PowerfulPermsPlugin;
import com.github.gustav9797.PowerfulPermsAPI.ServerMode;
import com.google.common.io.ByteStreams;

import net.md_5.bungee.api.CommandSender;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.cheesesoftware.PowerfulPerms;
package com.github.gustav9797.PowerfulPerms;

import java.util.ArrayList;
import java.util.HashSet;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.cheesesoftware.PowerfulPerms;
package com.github.gustav9797.PowerfulPerms;

import java.lang.reflect.Field;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.github.cheesesoftware.PowerfulPerms;
package com.github.gustav9797.PowerfulPerms;

import com.github.gustav9797.PowerfulPerms.command.BaseCommand;
import java.util.List;

import org.bukkit.Bukkit;
Expand All @@ -9,9 +10,8 @@
import org.bukkit.command.TabCompleter;
import org.bukkit.entity.Player;

import com.github.cheesesoftware.PowerfulPerms.command.BaseCommand;
import com.github.cheesesoftware.PowerfulPerms.common.ICommand;
import com.github.cheesesoftware.PowerfulPermsAPI.PermissionManager;
import com.github.gustav9797.PowerfulPerms.common.ICommand;
import com.github.gustav9797.PowerfulPermsAPI.PermissionManager;

public class PermissionCommandExecutor implements ICommand, CommandExecutor, TabCompleter {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.github.cheesesoftware.PowerfulPerms;
package com.github.gustav9797.PowerfulPerms;

import com.github.gustav9797.PowerfulPerms.common.ChatColor;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.UUID;
Expand All @@ -18,17 +19,14 @@
import org.bukkit.event.player.PlayerLoginEvent;
import org.bukkit.event.player.PlayerQuitEvent;

import com.github.cheesesoftware.PowerfulPerms.PowerfulPerms;
import com.github.cheesesoftware.PowerfulPerms.PowerfulPermissionPlayer;
import com.github.cheesesoftware.PowerfulPerms.common.ChatColor;
import com.github.cheesesoftware.PowerfulPerms.common.PermissionContainer;
import com.github.cheesesoftware.PowerfulPerms.common.PermissionManagerMiddle;
import com.github.cheesesoftware.PowerfulPerms.common.PermissionPlayerBase;
import com.github.cheesesoftware.PowerfulPerms.database.Database;
import com.github.cheesesoftware.PowerfulPermsAPI.CachedGroup;
import com.github.cheesesoftware.PowerfulPermsAPI.Group;
import com.github.cheesesoftware.PowerfulPermsAPI.PermissionPlayer;
import com.github.cheesesoftware.PowerfulPermsAPI.PlayerLoadedEvent;
import com.github.gustav9797.PowerfulPerms.common.PermissionContainer;
import com.github.gustav9797.PowerfulPerms.common.PermissionManagerMiddle;
import com.github.gustav9797.PowerfulPerms.common.PermissionPlayerBase;
import com.github.gustav9797.PowerfulPerms.database.Database;
import com.github.gustav9797.PowerfulPermsAPI.CachedGroup;
import com.github.gustav9797.PowerfulPermsAPI.Group;
import com.github.gustav9797.PowerfulPermsAPI.PermissionPlayer;
import com.github.gustav9797.PowerfulPermsAPI.PlayerLoadedEvent;
import com.google.common.util.concurrent.ListenableFuture;

public class PowerfulPermissionManager extends PermissionManagerMiddle implements Listener {
Expand Down Expand Up @@ -110,7 +108,8 @@ public void onPlayerChat(AsyncPlayerChatEvent e) {
PermissionPlayer gp = this.getPermissionPlayer(e.getPlayer().getUniqueId());
if (PowerfulPerms.useChatFormat && PowerfulPerms.placeholderAPIEnabled) {
String output = me.clip.placeholderapi.PlaceholderAPI.setBracketPlaceholders(e.getPlayer(), PowerfulPerms.chatFormat);
e.setFormat(ChatColor.translateAlternateColorCodes('&', output.replace("{message}", "%2$s")));
e.setFormat(
ChatColor.translateAlternateColorCodes('&', output.replace("{message}", "%2$s")));
} else
e.setFormat(ChatColor.translateAlternateColorCodes('&', gp.getPrefix() + "%1$s" + gp.getSuffix() + "%2$s"));
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.github.cheesesoftware.PowerfulPerms;
package com.github.gustav9797.PowerfulPerms;

import com.github.gustav9797.PowerfulPerms.common.PermissionManagerBase;
import com.github.gustav9797.PowerfulPerms.common.PermissionPlayerBase;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
Expand All @@ -9,11 +11,9 @@
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;

import com.github.cheesesoftware.PowerfulPerms.common.PermissionManagerBase;
import com.github.cheesesoftware.PowerfulPerms.common.PermissionPlayerBase;
import com.github.cheesesoftware.PowerfulPermsAPI.CachedGroup;
import com.github.cheesesoftware.PowerfulPermsAPI.Permission;
import com.github.cheesesoftware.PowerfulPermsAPI.PowerfulPermsPlugin;
import com.github.gustav9797.PowerfulPermsAPI.CachedGroup;
import com.github.gustav9797.PowerfulPermsAPI.Permission;
import com.github.gustav9797.PowerfulPermsAPI.PowerfulPermsPlugin;

public class PowerfulPermissionPlayer extends PermissionPlayerBase {
private Player player;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.cheesesoftware.PowerfulPerms;
package com.github.gustav9797.PowerfulPerms;

import java.io.File;
import java.io.IOException;
Expand All @@ -18,17 +18,17 @@
import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.plugin.java.JavaPlugin;

import com.github.cheesesoftware.PowerfulPerms.Vault.ImporterHook;
import com.github.cheesesoftware.PowerfulPerms.Vault.VaultHook;
import com.github.cheesesoftware.PowerfulPerms.common.PermissionManagerBase;
import com.github.cheesesoftware.PowerfulPerms.common.Versioner;
import com.github.cheesesoftware.PowerfulPerms.database.Database;
import com.github.cheesesoftware.PowerfulPerms.database.DatabaseCredentials;
import com.github.cheesesoftware.PowerfulPerms.database.MySQLDatabase;
import com.github.cheesesoftware.PowerfulPermsAPI.IScheduler;
import com.github.cheesesoftware.PowerfulPermsAPI.PermissionManager;
import com.github.cheesesoftware.PowerfulPermsAPI.PowerfulPermsPlugin;
import com.github.cheesesoftware.PowerfulPermsAPI.ServerMode;
import com.github.gustav9797.PowerfulPerms.Vault.ImporterHook;
import com.github.gustav9797.PowerfulPerms.Vault.VaultHook;
import com.github.gustav9797.PowerfulPerms.common.PermissionManagerBase;
import com.github.gustav9797.PowerfulPerms.common.Versioner;
import com.github.gustav9797.PowerfulPerms.database.Database;
import com.github.gustav9797.PowerfulPerms.database.DatabaseCredentials;
import com.github.gustav9797.PowerfulPerms.database.MySQLDatabase;
import com.github.gustav9797.PowerfulPermsAPI.IScheduler;
import com.github.gustav9797.PowerfulPermsAPI.PermissionManager;
import com.github.gustav9797.PowerfulPermsAPI.PowerfulPermsPlugin;
import com.github.gustav9797.PowerfulPermsAPI.ServerMode;

public class PowerfulPerms extends JavaPlugin implements Listener, PowerfulPermsPlugin {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.github.cheesesoftware.PowerfulPerms.Redis;
package com.github.gustav9797.PowerfulPerms.Redis;

import java.util.UUID;

import org.apache.commons.pool2.impl.GenericObjectPoolConfig;

import com.github.cheesesoftware.PowerfulPerms.common.PermissionManagerBase;
import com.github.cheesesoftware.PowerfulPermsAPI.PowerfulPermsPlugin;
import com.github.gustav9797.PowerfulPerms.common.PermissionManagerBase;
import com.github.gustav9797.PowerfulPermsAPI.PowerfulPermsPlugin;

import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.cheesesoftware.PowerfulPerms.Vault;
package com.github.gustav9797.PowerfulPerms.Vault;

import java.util.ArrayList;
import java.util.LinkedHashMap;
Expand All @@ -7,12 +7,12 @@

import org.bukkit.OfflinePlayer;

import com.github.cheesesoftware.PowerfulPerms.common.PermissionManagerBase;
import com.github.cheesesoftware.PowerfulPerms.common.PermissionPlayerBase;
import com.github.cheesesoftware.PowerfulPermsAPI.CachedGroup;
import com.github.cheesesoftware.PowerfulPermsAPI.Group;
import com.github.cheesesoftware.PowerfulPermsAPI.PermissionManager;
import com.github.cheesesoftware.PowerfulPermsAPI.PowerfulPermsPlugin;
import com.github.gustav9797.PowerfulPerms.common.PermissionManagerBase;
import com.github.gustav9797.PowerfulPerms.common.PermissionPlayerBase;
import com.github.gustav9797.PowerfulPermsAPI.CachedGroup;
import com.github.gustav9797.PowerfulPermsAPI.Group;
import com.github.gustav9797.PowerfulPermsAPI.PermissionManager;
import com.github.gustav9797.PowerfulPermsAPI.PowerfulPermsPlugin;
import com.google.common.util.concurrent.ListenableFuture;

import eu.taigacraft.importer.permissions.PermissionsImporter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package com.github.cheesesoftware.PowerfulPerms.Vault;
package com.github.gustav9797.PowerfulPerms.Vault;

import com.github.gustav9797.PowerfulPerms.PowerfulPerms;
import java.util.Iterator;
import java.util.List;
import java.util.UUID;
import org.bukkit.Bukkit;

import com.github.cheesesoftware.PowerfulPerms.PowerfulPerms;
import com.github.cheesesoftware.PowerfulPerms.common.PermissionContainer;
import com.github.cheesesoftware.PowerfulPerms.common.PermissionManagerBase;
import com.github.cheesesoftware.PowerfulPermsAPI.Group;
import com.github.cheesesoftware.PowerfulPermsAPI.PermissionPlayer;
import com.github.cheesesoftware.PowerfulPermsAPI.Response;
import com.github.gustav9797.PowerfulPerms.common.PermissionContainer;
import com.github.gustav9797.PowerfulPerms.common.PermissionManagerBase;
import com.github.gustav9797.PowerfulPermsAPI.Group;
import com.github.gustav9797.PowerfulPermsAPI.PermissionPlayer;
import com.github.gustav9797.PowerfulPermsAPI.Response;
import net.milkbowl.vault.chat.Chat;
import net.milkbowl.vault.permission.Permission;

Expand Down Expand Up @@ -127,15 +127,15 @@ public String getPlayerVaultVariable(String playerName, String node, String worl
if (uuid == null)
return null;
try {
List<com.github.cheesesoftware.PowerfulPermsAPI.Permission> permissions = permissionManager.getPlayerOwnPermissionsBase(uuid);
List<com.github.gustav9797.PowerfulPermsAPI.Permission> permissions = permissionManager.getPlayerOwnPermissionsBase(uuid);
return getVaultVariable(permissions, node, world);
} catch (Exception e) {
e.printStackTrace();
}
} else {
PermissionPlayer p = permissionManager.getPermissionPlayer(playerName);
if (p != null) {
List<com.github.cheesesoftware.PowerfulPermsAPI.Permission> permissions = p.getPermissions();
List<com.github.gustav9797.PowerfulPermsAPI.Permission> permissions = p.getPermissions();
return getVaultVariable(permissions, node, world);
}
}
Expand Down Expand Up @@ -176,8 +176,8 @@ public void setGroupVaultVariable(String groupName, String node, String value, S
}
}

public String getVaultVariable(List<com.github.cheesesoftware.PowerfulPermsAPI.Permission> permissions, String node, String world) {
for (com.github.cheesesoftware.PowerfulPermsAPI.Permission p : permissions) {
public String getVaultVariable(List<com.github.gustav9797.PowerfulPermsAPI.Permission> permissions, String node, String world) {
for (com.github.gustav9797.PowerfulPermsAPI.Permission p : permissions) {
if (PermissionContainer.permissionApplies(p, PermissionManagerBase.serverName, world)) {
String perm = p.getPermissionString();
String begin = "vault.variables." + node + ".";
Expand Down
Loading

0 comments on commit da70059

Please sign in to comment.