Misterzym
/
rscPermissions-plugin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Completely remove Residence support. WorldGuard now is the only RegionListProvider.

master
SimSonic 9 years ago
parent
836cb76dff
commit
e20d253ed8
5 changed files with 16 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      pom.xml
  2. 1
      src/main/java/ru/simsonic/rscPermissions/API/Settings.java
  3. 20
      src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPluginConfiguration.java
  4. 42
      src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java
  5. 4
      src/main/resources/config.yml

12
pom.xml
Unescape View File

@ -36,10 +36,6 @@
<id>sk89q-repo</id> <id>sk89q-repo</id>
<url>http://maven.sk89q.com/repo/</url> <url>http://maven.sk89q.com/repo/</url>
</repository> </repository>
<repository>
<id>Residence</id>
<url>http://ci.drtshock.net/plugin/repository/everything/</url>
</repository>
<!-- Reality_SC's repo with own libraries --> <!-- Reality_SC's repo with own libraries -->
<repository> <repository>
<id>methuselah-repo</id> <id>methuselah-repo</id>
@ -96,7 +92,7 @@
<version>2.2.2</version> <version>2.2.2</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- VaultAPI, WorldGaurg, Residence, etc. --> <!-- VaultAPI, WorldGaurg, etc. -->
<dependency> <dependency>
<!--groupId>net.milkbowl.vault</groupId--> <!--groupId>net.milkbowl.vault</groupId-->
<groupId>net.milkbowl.vault</groupId> <groupId>net.milkbowl.vault</groupId>
@ -116,12 +112,6 @@
<version>6.1</version> <version>6.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>net.t00thpick1</groupId>
<artifactId>Residence</artifactId>
<version>3.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
<properties> <properties>

1
src/main/java/ru/simsonic/rscPermissions/API/Settings.java
Unescape View File

@ -50,7 +50,6 @@ public interface Settings
public String getMaintenancePingMsg(); public String getMaintenancePingMsg();
public String getMaintenanceKickMsg(); public String getMaintenanceKickMsg();
public String getMaintenanceJoinMsg(); public String getMaintenanceJoinMsg();
public boolean isUseResidence();
public boolean isUseWorldGuard(); public boolean isUseWorldGuard();
public long getRegionFinderGranularity(); public long getRegionFinderGranularity();
public int getAutoReloadDelayTicks(); public int getAutoReloadDelayTicks();

20
src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitPluginConfiguration.java
Unescape View File

@ -14,7 +14,7 @@ import ru.simsonic.rscPermissions.BukkitPluginMain;
public class BukkitPluginConfiguration implements Settings 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 final BukkitPluginMain plugin;
private String strDefaultGroup = "Default"; private String strDefaultGroup = "Default";
private String strMaintenanceMode = ""; private String strMaintenanceMode = "";
@ -27,7 +27,6 @@ public class BukkitPluginConfiguration implements Settings
private boolean bUsingAncestorPrefixes = true; private boolean bUsingAncestorPrefixes = true;
private boolean bUseMetrics = true; private boolean bUseMetrics = true;
private boolean bUseWorldGuard = true; private boolean bUseWorldGuard = true;
private boolean bUseResidence = true;
private int nAutoReloadDelayTicks = 20 * 900; private int nAutoReloadDelayTicks = 20 * 900;
private int nRegionFinderGranularity = 1000; private int nRegionFinderGranularity = 1000;
public BukkitPluginConfiguration(final BukkitPluginMain plugin) public BukkitPluginConfiguration(final BukkitPluginMain plugin)
@ -50,7 +49,11 @@ public class BukkitPluginConfiguration implements Settings
case 3: case 3:
update_v3_to_v4(config); update_v3_to_v4(config);
BukkitPluginMain.consoleLog.info(Settings.CHAT_PREFIX + "Configuration updated from v3 to v4."); 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 case CURRENT_CONFIG_VERSION: // Current version
config.set("internal.version", CURRENT_CONFIG_VERSION);
plugin.saveConfig(); plugin.saveConfig();
break; break;
} }
@ -60,14 +63,12 @@ public class BukkitPluginConfiguration implements Settings
config.set("settings.enable-bans", null); config.set("settings.enable-bans", null);
config.set("settings.integration.worldguard", true); config.set("settings.integration.worldguard", true);
config.set("settings.integration.residence", true); config.set("settings.integration.residence", true);
config.set("internal.version", 2);
} }
private void update_v2_to_v3(FileConfiguration config) private void update_v2_to_v3(FileConfiguration config)
{ {
config.set("settings.enable-rewards", null); config.set("settings.enable-rewards", null);
config.set("settings.auto-update", null); config.set("settings.auto-update", null);
config.set("settings.language", "english"); config.set("settings.language", "english");
config.set("internal.version", 3);
} }
private void update_v3_to_v4(FileConfiguration config) 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.ping-motd", DEFAULT_MMODE_MSG_PING);
config.set("settings.maintenances.default.kick-online", DEFAULT_MMODE_MSG_KICK); config.set("settings.maintenances.default.kick-online", DEFAULT_MMODE_MSG_KICK);
config.set("settings.maintenances.default.block-join", DEFAULT_MMODE_MSG_JOIN); 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 @Override
public void onEnable() public void onEnable()
@ -94,7 +98,6 @@ public class BukkitPluginConfiguration implements Settings
bTreatAsteriskAsOP = config.getBoolean("settings.treat-asterisk-as-op", true); bTreatAsteriskAsOP = config.getBoolean("settings.treat-asterisk-as-op", true);
bUsingAncestorPrefixes = config.getBoolean("settings.groups-inherit-parent-prefixes", true); bUsingAncestorPrefixes = config.getBoolean("settings.groups-inherit-parent-prefixes", true);
bUseWorldGuard = config.getBoolean("settings.integration.worldguard", true); bUseWorldGuard = config.getBoolean("settings.integration.worldguard", true);
bUseResidence = config.getBoolean("settings.integration.residence", true);
bUseMetrics = config.getBoolean("settings.use-metrics", true); bUseMetrics = config.getBoolean("settings.use-metrics", true);
nAutoReloadDelayTicks = config.getInt("settings.auto-reload-delay-sec", 900) * 20; nAutoReloadDelayTicks = config.getInt("settings.auto-reload-delay-sec", 900) * 20;
nRegionFinderGranularity = config.getInt("settings.region-finder-thread-granularity-msec", 1000); nRegionFinderGranularity = config.getInt("settings.region-finder-thread-granularity-msec", 1000);
@ -182,11 +185,6 @@ public class BukkitPluginConfiguration implements Settings
return bUseWorldGuard; return bUseWorldGuard;
} }
@Override @Override
public boolean isUseResidence()
{
return bUseResidence;
}
@Override
public int getAutoReloadDelayTicks() public int getAutoReloadDelayTicks()
{ {
return nAutoReloadDelayTicks; return nAutoReloadDelayTicks;

42
src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java
Unescape View File

@ -9,10 +9,6 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; 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.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
@ -40,10 +36,10 @@ public final class BukkitRegionProviders
// WorldGuard // WorldGuard
if(rscp.settings.isUseWorldGuard()) if(rscp.settings.isUseWorldGuard())
{ {
final Plugin pluginWG = rscp.getServer().getPluginManager().getPlugin("WorldGuard"); final Plugin plugin = rscp.getServer().getPluginManager().getPlugin("WorldGuard");
if(pluginWG != null && pluginWG instanceof WorldGuardPlugin) if(plugin != null && plugin instanceof WorldGuardPlugin)
{ {
this.worldguard = pluginWG; this.worldguard = plugin;
console.sendMessage(Phrases.INTEGRATION_WG_Y.toPlayer()); console.sendMessage(Phrases.INTEGRATION_WG_Y.toPlayer());
} else { } else {
this.worldguard = null; this.worldguard = null;
@ -51,20 +47,6 @@ public final class BukkitRegionProviders
} }
} else } else
this.worldguard = null; 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() public synchronized void deintegrate()
{ {
@ -83,8 +65,8 @@ public final class BukkitRegionProviders
if(worldguard != null && worldguard.isEnabled()) if(worldguard != null && worldguard.isEnabled())
try try
{ {
final WorldGuardPlugin pluginWG = (WorldGuardPlugin)worldguard; final WorldGuardPlugin plugin = (WorldGuardPlugin)worldguard;
final RegionManager rman = pluginWG.getRegionManager(world); final RegionManager rman = plugin.getRegionManager(world);
if(rman == null) if(rman == null)
return false; return false;
// Get list // Get list
@ -95,20 +77,6 @@ public final class BukkitRegionProviders
worldguard = null; worldguard = null;
rscp.getServer().getConsoleSender().sendMessage(GenericChatCodes.processStringStatic("[rscp] " + Phrases.INTEGRATION_WG_OLD.toString())); 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? // Is it changed?
int hashcode = playerRegions.hashCode(); int hashcode = playerRegions.hashCode();
if(playerLastWorld.containsKey(player)) if(playerLastWorld.containsKey(player))

4
src/main/resources/config.yml
Unescape View File

@ -24,8 +24,6 @@ settings:
integration: integration:
# Use WorldGuard (v6+) as region provider? # Use WorldGuard (v6+) as region provider?
worldguard: true worldguard: true
# Use Residence (v3+) as region provider?
residence: true
# Send statistics to mcstats.org? # Send statistics to mcstats.org?
use-metrics: true use-metrics: true
# Named limits for entering server when there few slots are free. # Named limits for entering server when there few slots are free.
@ -45,4 +43,4 @@ settings:
# Please don't tough it # Please don't tough it
internal: internal:
version: 4 version: 5

Write Preview
Loading…
Cancel
Save