diff --git a/pom.xml b/pom.xml
index c83a19f..c2f6ae0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,10 +36,6 @@
sk89q-repo
http://maven.sk89q.com/repo/
-
- Residence
- http://ci.drtshock.net/plugin/repository/everything/
-
methuselah-repo
@@ -96,7 +92,7 @@
2.2.2
compile
-
+
net.milkbowl.vault
@@ -116,12 +112,6 @@
6.1
provided
-
- net.t00thpick1
- Residence
- 3.0-SNAPSHOT
- provided
-
diff --git a/src/main/java/ru/simsonic/rscPermissions/API/Settings.java b/src/main/java/ru/simsonic/rscPermissions/API/Settings.java
index a07fd4c..e46a5d9 100644
--- a/src/main/java/ru/simsonic/rscPermissions/API/Settings.java
+++ b/src/main/java/ru/simsonic/rscPermissions/API/Settings.java
@@ -50,7 +50,6 @@ public interface Settings
public String getMaintenancePingMsg();
public String getMaintenanceKickMsg();
public String getMaintenanceJoinMsg();
- public boolean isUseResidence();
public boolean isUseWorldGuard();
public long getRegionFinderGranularity();
public int getAutoReloadDelayTicks();
diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPluginConfiguration.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPluginConfiguration.java
index e4f4faf..52b0aa1 100644
--- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPluginConfiguration.java
+++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPluginConfiguration.java
@@ -14,7 +14,7 @@ import ru.simsonic.rscPermissions.BukkitPluginMain;
public class BukkitPluginConfiguration implements Settings
{
- private final static int CURRENT_CONFIG_VERSION = 4;
+ private final static int CURRENT_CONFIG_VERSION = 5;
private final BukkitPluginMain plugin;
private String strDefaultGroup = "Default";
private String strMaintenanceMode = "";
@@ -27,7 +27,6 @@ public class BukkitPluginConfiguration implements Settings
private boolean bUsingAncestorPrefixes = true;
private boolean bUseMetrics = true;
private boolean bUseWorldGuard = true;
- private boolean bUseResidence = true;
private int nAutoReloadDelayTicks = 20 * 900;
private int nRegionFinderGranularity = 1000;
public BukkitPluginConfiguration(final BukkitPluginMain plugin)
@@ -50,7 +49,11 @@ public class BukkitPluginConfiguration implements Settings
case 3:
update_v3_to_v4(config);
BukkitPluginMain.consoleLog.info(Settings.CHAT_PREFIX + "Configuration updated from v3 to v4.");
+ case 4:
+ update_v4_to_v5(config);
+ BukkitPluginMain.consoleLog.info(Settings.CHAT_PREFIX + "Configuration updated from v3 to v4.");
case CURRENT_CONFIG_VERSION: // Current version
+ config.set("internal.version", CURRENT_CONFIG_VERSION);
plugin.saveConfig();
break;
}
@@ -60,14 +63,12 @@ public class BukkitPluginConfiguration implements Settings
config.set("settings.enable-bans", null);
config.set("settings.integration.worldguard", true);
config.set("settings.integration.residence", true);
- config.set("internal.version", 2);
}
private void update_v2_to_v3(FileConfiguration config)
{
config.set("settings.enable-rewards", null);
config.set("settings.auto-update", null);
config.set("settings.language", "english");
- config.set("internal.version", 3);
}
private void update_v3_to_v4(FileConfiguration config)
{
@@ -80,7 +81,10 @@ public class BukkitPluginConfiguration implements Settings
config.set("settings.maintenances.default.ping-motd", DEFAULT_MMODE_MSG_PING);
config.set("settings.maintenances.default.kick-online", DEFAULT_MMODE_MSG_KICK);
config.set("settings.maintenances.default.block-join", DEFAULT_MMODE_MSG_JOIN);
- config.set("internal.version", 4);
+ }
+ private void update_v4_to_v5(FileConfiguration config)
+ {
+ config.set("settings.integration.residence", null);
}
@Override
public void onEnable()
@@ -94,7 +98,6 @@ public class BukkitPluginConfiguration implements Settings
bTreatAsteriskAsOP = config.getBoolean("settings.treat-asterisk-as-op", true);
bUsingAncestorPrefixes = config.getBoolean("settings.groups-inherit-parent-prefixes", true);
bUseWorldGuard = config.getBoolean("settings.integration.worldguard", true);
- bUseResidence = config.getBoolean("settings.integration.residence", true);
bUseMetrics = config.getBoolean("settings.use-metrics", true);
nAutoReloadDelayTicks = config.getInt("settings.auto-reload-delay-sec", 900) * 20;
nRegionFinderGranularity = config.getInt("settings.region-finder-thread-granularity-msec", 1000);
@@ -182,11 +185,6 @@ public class BukkitPluginConfiguration implements Settings
return bUseWorldGuard;
}
@Override
- public boolean isUseResidence()
- {
- return bUseResidence;
- }
- @Override
public int getAutoReloadDelayTicks()
{
return nAutoReloadDelayTicks;
diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java
index f04b841..4272e52 100644
--- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java
+++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java
@@ -9,10 +9,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import net.t00thpick1.residence.Residence;
-import net.t00thpick1.residence.api.ResidenceAPI;
-import net.t00thpick1.residence.api.ResidenceManager;
-import net.t00thpick1.residence.api.areas.ResidenceArea;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.ConsoleCommandSender;
@@ -40,10 +36,10 @@ public final class BukkitRegionProviders
// WorldGuard
if(rscp.settings.isUseWorldGuard())
{
- final Plugin pluginWG = rscp.getServer().getPluginManager().getPlugin("WorldGuard");
- if(pluginWG != null && pluginWG instanceof WorldGuardPlugin)
+ final Plugin plugin = rscp.getServer().getPluginManager().getPlugin("WorldGuard");
+ if(plugin != null && plugin instanceof WorldGuardPlugin)
{
- this.worldguard = pluginWG;
+ this.worldguard = plugin;
console.sendMessage(Phrases.INTEGRATION_WG_Y.toPlayer());
} else {
this.worldguard = null;
@@ -51,20 +47,6 @@ public final class BukkitRegionProviders
}
} else
this.worldguard = null;
- // Residence
- if(rscp.settings.isUseResidence())
- {
- final Plugin pluginR = rscp.getServer().getPluginManager().getPlugin("Residence");
- if(pluginR != null && pluginR instanceof Residence)
- {
- this.residence = pluginR;
- console.sendMessage(Phrases.INTEGRATION_R_Y.toPlayer());
- } else {
- this.residence = null;
- console.sendMessage(Phrases.INTEGRATION_R_N.toPlayer());
- }
- } else
- this.residence = null;
}
public synchronized void deintegrate()
{
@@ -83,8 +65,8 @@ public final class BukkitRegionProviders
if(worldguard != null && worldguard.isEnabled())
try
{
- final WorldGuardPlugin pluginWG = (WorldGuardPlugin)worldguard;
- final RegionManager rman = pluginWG.getRegionManager(world);
+ final WorldGuardPlugin plugin = (WorldGuardPlugin)worldguard;
+ final RegionManager rman = plugin.getRegionManager(world);
if(rman == null)
return false;
// Get list
@@ -95,20 +77,6 @@ public final class BukkitRegionProviders
worldguard = null;
rscp.getServer().getConsoleSender().sendMessage(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_WG_OLD.toString()));
}
- // Residence
- if(residence != null && residence.isEnabled())
- try
- {
- // Get list
- final ResidenceManager residenceManager = ResidenceAPI.getResidenceManager();
- if(residenceManager != null)
- {
- final ResidenceArea residenceArea = residenceManager.getByLocation(location);
- if(residenceArea != null)
- playerRegions.add(residenceArea.getFullName());
- }
- } catch(RuntimeException ex) {
- }
// Is it changed?
int hashcode = playerRegions.hashCode();
if(playerLastWorld.containsKey(player))
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 2d81f54..de8acad 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -24,8 +24,6 @@ settings:
integration:
# Use WorldGuard (v6+) as region provider?
worldguard: true
- # Use Residence (v3+) as region provider?
- residence: true
# Send statistics to mcstats.org?
use-metrics: true
# Named limits for entering server when there few slots are free.
@@ -45,4 +43,4 @@ settings:
# Please don't tough it
internal:
- version: 4
+ version: 5