mirror of
https://github.com/essentials/Essentials.git
synced 2025-08-14 02:24:16 +02:00
Switch to the new I18n class and format cleanup of all classes
This commit is contained in:
@@ -28,6 +28,7 @@ auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blank
|
||||
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2
|
||||
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
|
||||
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false
|
||||
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.importGroupsOrder=*
|
||||
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
|
||||
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false
|
||||
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
|
||||
@@ -36,6 +37,7 @@ auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.place
|
||||
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
|
||||
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
|
||||
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
|
||||
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.separateImportGroups=false
|
||||
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false
|
||||
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
|
||||
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
|
||||
|
@@ -1,9 +1,9 @@
|
||||
package com.earth2me.essentials.protect;
|
||||
|
||||
import static com.earth2me.essentials.I18n._;
|
||||
import com.earth2me.essentials.IConf;
|
||||
import com.earth2me.essentials.IEssentials;
|
||||
import com.earth2me.essentials.User;
|
||||
import com.earth2me.essentials.Util;
|
||||
import com.earth2me.essentials.protect.data.IProtectedBlock;
|
||||
import com.earth2me.essentials.protect.data.ProtectedBlockMemory;
|
||||
import com.earth2me.essentials.protect.data.ProtectedBlockMySQL;
|
||||
@@ -81,9 +81,9 @@ public class EssentialsProtect extends JavaPlugin implements IConf, IProtect
|
||||
ess.addReloadListener(this);
|
||||
if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion()))
|
||||
{
|
||||
LOGGER.log(Level.WARNING, Util.i18n("versionMismatchAll"));
|
||||
LOGGER.log(Level.WARNING, _("versionMismatchAll"));
|
||||
}
|
||||
LOGGER.info(Util.format("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), "essentials team"));
|
||||
LOGGER.info(_("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), "essentials team"));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -97,9 +97,9 @@ public class EssentialsProtect extends JavaPlugin implements IConf, IProtect
|
||||
public void alert(final User user, final String item, final String type)
|
||||
{
|
||||
final Location loc = user.getLocation();
|
||||
final String warnMessage = Util.format("alertFormat", user.getName(), type, item,
|
||||
loc.getWorld().getName() + "," + loc.getBlockX() + ","
|
||||
+ loc.getBlockY() + "," + loc.getBlockZ());
|
||||
final String warnMessage = _("alertFormat", user.getName(), type, item,
|
||||
loc.getWorld().getName() + "," + loc.getBlockX() + ","
|
||||
+ loc.getBlockY() + "," + loc.getBlockZ());
|
||||
LOGGER.log(Level.WARNING, warnMessage);
|
||||
for (Player p : this.getServer().getOnlinePlayers())
|
||||
{
|
||||
|
@@ -1,22 +1,15 @@
|
||||
package com.earth2me.essentials.protect;
|
||||
|
||||
import static com.earth2me.essentials.I18n._;
|
||||
import com.earth2me.essentials.IEssentials;
|
||||
import com.earth2me.essentials.User;
|
||||
import com.earth2me.essentials.Util;
|
||||
import com.earth2me.essentials.protect.data.IProtectedBlock;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.block.BlockFace;
|
||||
import org.bukkit.event.block.BlockBreakEvent;
|
||||
import org.bukkit.event.block.BlockBurnEvent;
|
||||
import org.bukkit.event.block.BlockFromToEvent;
|
||||
import org.bukkit.event.block.BlockIgniteEvent;
|
||||
import org.bukkit.event.block.BlockListener;
|
||||
import org.bukkit.event.block.BlockPistonExtendEvent;
|
||||
import org.bukkit.event.block.BlockPistonRetractEvent;
|
||||
import org.bukkit.event.block.BlockPlaceEvent;
|
||||
import org.bukkit.event.block.*;
|
||||
|
||||
|
||||
public class EssentialsProtectBlockListener extends BlockListener
|
||||
@@ -57,7 +50,7 @@ public class EssentialsProtectBlockListener extends BlockListener
|
||||
|
||||
if (prot.checkProtectionItems(ProtectConfig.alert_on_placement, id))
|
||||
{
|
||||
prot.alert(user, blockPlaced.getType().toString(), Util.i18n("alertPlaced"));
|
||||
prot.alert(user, blockPlaced.getType().toString(), _("alertPlaced"));
|
||||
}
|
||||
|
||||
final Block below = blockPlaced.getRelative(BlockFace.DOWN);
|
||||
@@ -255,7 +248,7 @@ public class EssentialsProtectBlockListener extends BlockListener
|
||||
|
||||
if (prot.checkProtectionItems(ProtectConfig.alert_on_break, typeId))
|
||||
{
|
||||
prot.alert(user, type.toString(), Util.i18n("alertBroke"));
|
||||
prot.alert(user, type.toString(), _("alertBroke"));
|
||||
}
|
||||
final IProtectedBlock storage = prot.getStorage();
|
||||
|
||||
|
@@ -3,6 +3,7 @@ package com.earth2me.essentials.protect;
|
||||
import com.earth2me.essentials.IEssentials;
|
||||
import com.earth2me.essentials.User;
|
||||
import java.util.HashSet;
|
||||
import java.util.Locale;
|
||||
import java.util.Set;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
@@ -14,26 +15,10 @@ import org.bukkit.block.Block;
|
||||
import org.bukkit.block.BlockFace;
|
||||
import org.bukkit.craftbukkit.CraftServer;
|
||||
import org.bukkit.craftbukkit.CraftWorld;
|
||||
import org.bukkit.entity.CreatureType;
|
||||
import org.bukkit.entity.Creeper;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Fireball;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.entity.Projectile;
|
||||
import org.bukkit.entity.SmallFireball;
|
||||
import org.bukkit.entity.TNTPrimed;
|
||||
import org.bukkit.event.entity.CreatureSpawnEvent;
|
||||
import org.bukkit.event.entity.EndermanPickupEvent;
|
||||
import org.bukkit.event.entity.EntityDamageByBlockEvent;
|
||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||
import org.bukkit.event.entity.EntityDamageEvent;
|
||||
import org.bukkit.entity.*;
|
||||
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
|
||||
import org.bukkit.event.entity.EntityExplodeEvent;
|
||||
import org.bukkit.event.entity.EntityListener;
|
||||
import org.bukkit.event.entity.EntityTargetEvent;
|
||||
import org.bukkit.event.entity.EntityTargetEvent.TargetReason;
|
||||
import org.bukkit.event.entity.ExplosionPrimeEvent;
|
||||
import org.bukkit.event.entity.*;
|
||||
|
||||
|
||||
public class EssentialsProtectEntityListener extends EntityListener
|
||||
@@ -315,7 +300,7 @@ public class EssentialsProtectEntityListener extends EntityListener
|
||||
{
|
||||
return;
|
||||
}
|
||||
final String creatureName = creature.toString().toLowerCase();
|
||||
final String creatureName = creature.toString().toLowerCase(Locale.ENGLISH);
|
||||
if (creatureName == null || creatureName.isEmpty())
|
||||
{
|
||||
return;
|
||||
|
@@ -1,14 +1,14 @@
|
||||
package com.earth2me.essentials.protect;
|
||||
|
||||
import static com.earth2me.essentials.I18n._;
|
||||
import com.earth2me.essentials.IEssentials;
|
||||
import com.earth2me.essentials.User;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.event.block.Action;
|
||||
import org.bukkit.event.player.PlayerInteractEvent;
|
||||
import org.bukkit.event.player.PlayerListener;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import com.earth2me.essentials.User;
|
||||
import com.earth2me.essentials.Util;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.event.block.Action;
|
||||
|
||||
|
||||
public class EssentialsProtectPlayerListener extends PlayerListener
|
||||
@@ -26,10 +26,6 @@ public class EssentialsProtectPlayerListener extends PlayerListener
|
||||
public void onPlayerInteract(final PlayerInteractEvent event)
|
||||
{
|
||||
// Do not return if cancelled, because the interact event has 2 cancelled states.
|
||||
/*if (event.isCancelled())
|
||||
{
|
||||
return;
|
||||
}*/
|
||||
final User user = ess.getUser(event.getPlayer());
|
||||
|
||||
if (event.hasItem()
|
||||
@@ -39,7 +35,7 @@ public class EssentialsProtectPlayerListener extends PlayerListener
|
||||
{
|
||||
if (ess.getSettings().warnOnBuildDisallow())
|
||||
{
|
||||
user.sendMessage(Util.i18n("buildAlert"));
|
||||
user.sendMessage(_("buildAlert"));
|
||||
}
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
@@ -49,7 +45,7 @@ public class EssentialsProtectPlayerListener extends PlayerListener
|
||||
{
|
||||
if (ess.getSettings().warnOnBuildDisallow())
|
||||
{
|
||||
user.sendMessage(Util.i18n("buildAlert"));
|
||||
user.sendMessage(_("buildAlert"));
|
||||
}
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
@@ -81,13 +77,13 @@ public class EssentialsProtectPlayerListener extends PlayerListener
|
||||
final String ownerNames = stringBuilder.toString();
|
||||
if (ownerNames != null && !ownerNames.isEmpty())
|
||||
{
|
||||
user.sendMessage(Util.format("protectionOwner", ownerNames));
|
||||
user.sendMessage(_("protectionOwner", ownerNames));
|
||||
}
|
||||
}
|
||||
if (item != null
|
||||
&& prot.checkProtectionItems(ProtectConfig.alert_on_use, item.getTypeId()))
|
||||
{
|
||||
prot.alert(user, item.getType().toString(), Util.i18n("alertUsed"));
|
||||
prot.alert(user, item.getType().toString(), _("alertUsed"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -62,7 +62,7 @@ public enum ProtectConfig
|
||||
{
|
||||
this(configName, null, false, true, false);
|
||||
}
|
||||
|
||||
|
||||
private ProtectConfig(final String configName, final String defValueString)
|
||||
{
|
||||
this(configName, defValueString, false, false, true);
|
||||
@@ -110,7 +110,7 @@ public enum ProtectConfig
|
||||
{
|
||||
return isString;
|
||||
}
|
||||
|
||||
|
||||
public boolean isList()
|
||||
{
|
||||
return isList;
|
||||
|
@@ -3,13 +3,22 @@ package com.earth2me.essentials.protect.data;
|
||||
import java.util.List;
|
||||
import org.bukkit.block.Block;
|
||||
|
||||
public interface IProtectedBlock {
|
||||
|
||||
public interface IProtectedBlock
|
||||
{
|
||||
public void clearProtections();
|
||||
|
||||
public void importProtections(List<OwnedBlock> blocks);
|
||||
|
||||
public List<OwnedBlock> exportProtections();
|
||||
|
||||
public void protectBlock(Block block, String playerName);
|
||||
|
||||
public boolean isProtected(Block block, String playerName);
|
||||
|
||||
public List<String> getOwners(Block block);
|
||||
|
||||
public int unprotectBlock(Block block);
|
||||
|
||||
public void onPluginDeactivation();
|
||||
}
|
||||
|
@@ -1,6 +1,8 @@
|
||||
package com.earth2me.essentials.protect.data;
|
||||
|
||||
public class OwnedBlock {
|
||||
|
||||
public class OwnedBlock
|
||||
{
|
||||
final int x;
|
||||
final int y;
|
||||
final int z;
|
||||
|
@@ -1,12 +1,7 @@
|
||||
package com.earth2me.essentials.protect.data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
import java.util.*;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
@@ -249,5 +244,5 @@ public class ProtectedBlockMemory implements IProtectedBlock
|
||||
public void onPluginDeactivation()
|
||||
{
|
||||
storage.onPluginDeactivation();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -8,50 +8,59 @@ import java.sql.SQLException;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
public class ProtectedBlockMySQL extends ProtectedBlockJDBC {
|
||||
|
||||
public ProtectedBlockMySQL(String url, String username, String password) throws PropertyVetoException {
|
||||
public class ProtectedBlockMySQL extends ProtectedBlockJDBC
|
||||
{
|
||||
public ProtectedBlockMySQL(String url, String username, String password) throws PropertyVetoException
|
||||
{
|
||||
super("com.mysql.jdbc.Driver", url, username, password);
|
||||
}
|
||||
|
||||
private static final String QueryCreateTable =
|
||||
"CREATE TABLE IF NOT EXISTS `EssentialsProtect` ("
|
||||
+ "`worldName` varchar(60) NOT NULL,"
|
||||
+ "`x` int(11) NOT NULL, `y` int(11) NOT NULL, `z` int(11) NOT NULL,"
|
||||
+ "`playerName` varchar(150) DEFAULT NULL,"
|
||||
+ "KEY `pos` (`worldName`,`x`,`z`,`y`)"
|
||||
+ ") ENGINE=MyISAM DEFAULT CHARSET=utf8";
|
||||
"CREATE TABLE IF NOT EXISTS `EssentialsProtect` ("
|
||||
+ "`worldName` varchar(60) NOT NULL,"
|
||||
+ "`x` int(11) NOT NULL, `y` int(11) NOT NULL, `z` int(11) NOT NULL,"
|
||||
+ "`playerName` varchar(150) DEFAULT NULL,"
|
||||
+ "KEY `pos` (`worldName`,`x`,`z`,`y`)"
|
||||
+ ") ENGINE=MyISAM DEFAULT CHARSET=utf8";
|
||||
|
||||
@Override
|
||||
protected PreparedStatement getStatementCreateTable(Connection conn) throws SQLException {
|
||||
protected PreparedStatement getStatementCreateTable(Connection conn) throws SQLException
|
||||
{
|
||||
return conn.prepareStatement(QueryCreateTable);
|
||||
}
|
||||
|
||||
private static final String QueryUpdateFrom2_0TableCheck =
|
||||
"SHOW COLUMNS FROM `EssentialsProtect` LIKE 'id';";
|
||||
"SHOW COLUMNS FROM `EssentialsProtect` LIKE 'id';";
|
||||
private static final String QueryUpdateFrom2_0Table =
|
||||
"ALTER TABLE `EssentialsProtect` "
|
||||
+ "CHARACTER SET = utf8, ENGINE = MyISAM,"
|
||||
+ "DROP COLUMN `id`,"
|
||||
+ "CHANGE COLUMN `playerName` `playerName` VARCHAR(150) NULL AFTER `z`,"
|
||||
+ "CHANGE COLUMN `worldName` `worldName` VARCHAR(60) NOT NULL,"
|
||||
+ "ADD INDEX `position` (`worldName` ASC, `x` ASC, `z` ASC, `y` ASC),"
|
||||
+ "DROP PRIMARY KEY ;";
|
||||
"ALTER TABLE `EssentialsProtect` "
|
||||
+ "CHARACTER SET = utf8, ENGINE = MyISAM,"
|
||||
+ "DROP COLUMN `id`,"
|
||||
+ "CHANGE COLUMN `playerName` `playerName` VARCHAR(150) NULL AFTER `z`,"
|
||||
+ "CHANGE COLUMN `worldName` `worldName` VARCHAR(60) NOT NULL,"
|
||||
+ "ADD INDEX `position` (`worldName` ASC, `x` ASC, `z` ASC, `y` ASC),"
|
||||
+ "DROP PRIMARY KEY ;";
|
||||
|
||||
@Override
|
||||
protected PreparedStatement getStatementUpdateFrom2_0Table(Connection conn) throws SQLException {
|
||||
protected PreparedStatement getStatementUpdateFrom2_0Table(Connection conn) throws SQLException
|
||||
{
|
||||
PreparedStatement testPS = null;
|
||||
ResultSet testRS = null;
|
||||
try {
|
||||
try
|
||||
{
|
||||
testPS = conn.prepareStatement(QueryUpdateFrom2_0TableCheck);
|
||||
testRS = testPS.executeQuery();
|
||||
if (testRS.first()) {
|
||||
if (testRS.first())
|
||||
{
|
||||
return conn.prepareStatement(QueryUpdateFrom2_0Table);
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
return conn.prepareStatement("SELECT 1;");
|
||||
}
|
||||
} finally {
|
||||
if (testRS != null) {
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (testRS != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
testRS.close();
|
||||
@@ -61,7 +70,8 @@ public class ProtectedBlockMySQL extends ProtectedBlockJDBC {
|
||||
Logger.getLogger(ProtectedBlockMySQL.class.getName()).log(Level.SEVERE, null, ex);
|
||||
}
|
||||
}
|
||||
if (testPS != null) {
|
||||
if (testPS != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
testPS.close();
|
||||
@@ -74,16 +84,18 @@ public class ProtectedBlockMySQL extends ProtectedBlockJDBC {
|
||||
}
|
||||
}
|
||||
private static final String QueryDeleteAll = "DELETE FROM EssentialsProtect;";
|
||||
|
||||
|
||||
@Override
|
||||
protected PreparedStatement getStatementDeleteAll(Connection conn) throws SQLException {
|
||||
protected PreparedStatement getStatementDeleteAll(Connection conn) throws SQLException
|
||||
{
|
||||
return conn.prepareStatement(QueryDeleteAll);
|
||||
}
|
||||
private static final String QueryInsert =
|
||||
"INSERT INTO EssentialsProtect (worldName, x, y, z, playerName) VALUES (?, ?, ?, ?, ?);";
|
||||
"INSERT INTO EssentialsProtect (worldName, x, y, z, playerName) VALUES (?, ?, ?, ?, ?);";
|
||||
|
||||
@Override
|
||||
protected PreparedStatement getStatementInsert(Connection conn, String world, int x, int y, int z, String playerName) throws SQLException {
|
||||
protected PreparedStatement getStatementInsert(Connection conn, String world, int x, int y, int z, String playerName) throws SQLException
|
||||
{
|
||||
PreparedStatement ps = conn.prepareStatement(QueryInsert);
|
||||
ps.setString(1, world);
|
||||
ps.setInt(2, x);
|
||||
@@ -93,11 +105,12 @@ public class ProtectedBlockMySQL extends ProtectedBlockJDBC {
|
||||
return ps;
|
||||
}
|
||||
private static final String QueryCountByPlayer =
|
||||
"SELECT COUNT(playerName), SUM(playerName = ?) FROM EssentialsProtect "
|
||||
+ "WHERE worldName = ? AND x = ? AND y = ? AND z = ? GROUP BY x;";
|
||||
"SELECT COUNT(playerName), SUM(playerName = ?) FROM EssentialsProtect "
|
||||
+ "WHERE worldName = ? AND x = ? AND y = ? AND z = ? GROUP BY x;";
|
||||
|
||||
@Override
|
||||
protected PreparedStatement getStatementPlayerCountByLocation(Connection conn, String world, int x, int y, int z, String playerName) throws SQLException {
|
||||
protected PreparedStatement getStatementPlayerCountByLocation(Connection conn, String world, int x, int y, int z, String playerName) throws SQLException
|
||||
{
|
||||
PreparedStatement ps = conn.prepareStatement(QueryCountByPlayer);
|
||||
ps.setString(1, playerName);
|
||||
ps.setString(2, world);
|
||||
@@ -107,10 +120,11 @@ public class ProtectedBlockMySQL extends ProtectedBlockJDBC {
|
||||
return ps;
|
||||
}
|
||||
private static final String QueryPlayersByLocation =
|
||||
"SELECT playerName FROM EssentialsProtect WHERE worldname = ? AND x = ? AND y = ? AND z = ?;";
|
||||
"SELECT playerName FROM EssentialsProtect WHERE worldname = ? AND x = ? AND y = ? AND z = ?;";
|
||||
|
||||
@Override
|
||||
protected PreparedStatement getStatementPlayersByLocation(Connection conn, String world, int x, int y, int z) throws SQLException {
|
||||
protected PreparedStatement getStatementPlayersByLocation(Connection conn, String world, int x, int y, int z) throws SQLException
|
||||
{
|
||||
PreparedStatement ps = conn.prepareStatement(QueryPlayersByLocation);
|
||||
ps.setString(1, world);
|
||||
ps.setInt(2, x);
|
||||
@@ -119,10 +133,11 @@ public class ProtectedBlockMySQL extends ProtectedBlockJDBC {
|
||||
return ps;
|
||||
}
|
||||
private static final String QueryDeleteByLocation =
|
||||
"DELETE FROM EssentialsProtect WHERE worldName = ? AND x = ? AND y = ? AND z = ?;";
|
||||
"DELETE FROM EssentialsProtect WHERE worldName = ? AND x = ? AND y = ? AND z = ?;";
|
||||
|
||||
@Override
|
||||
protected PreparedStatement getStatementDeleteByLocation(Connection conn, String world, int x, int y, int z) throws SQLException {
|
||||
protected PreparedStatement getStatementDeleteByLocation(Connection conn, String world, int x, int y, int z) throws SQLException
|
||||
{
|
||||
PreparedStatement ps = conn.prepareStatement(QueryDeleteByLocation);
|
||||
ps.setString(1, world);
|
||||
ps.setInt(2, x);
|
||||
@@ -131,10 +146,11 @@ public class ProtectedBlockMySQL extends ProtectedBlockJDBC {
|
||||
return ps;
|
||||
}
|
||||
private static final String QueryAllBlocks =
|
||||
"SELECT worldName, x, y, z, playerName FROM EssentialsProtect;";
|
||||
"SELECT worldName, x, y, z, playerName FROM EssentialsProtect;";
|
||||
|
||||
@Override
|
||||
protected PreparedStatement getStatementAllBlocks(Connection conn) throws SQLException {
|
||||
protected PreparedStatement getStatementAllBlocks(Connection conn) throws SQLException
|
||||
{
|
||||
return conn.prepareStatement(QueryAllBlocks);
|
||||
}
|
||||
}
|
||||
|
@@ -5,41 +5,45 @@ import java.sql.Connection;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.SQLException;
|
||||
|
||||
public class ProtectedBlockSQLite extends ProtectedBlockJDBC {
|
||||
|
||||
public ProtectedBlockSQLite(String url) throws PropertyVetoException {
|
||||
public class ProtectedBlockSQLite extends ProtectedBlockJDBC
|
||||
{
|
||||
public ProtectedBlockSQLite(String url) throws PropertyVetoException
|
||||
{
|
||||
super("org.sqlite.JDBC", url);
|
||||
}
|
||||
|
||||
private static final String QueryCreateTable =
|
||||
"CREATE TABLE IF NOT EXISTS EssentialsProtect ("
|
||||
+ "worldName TEXT ,playerName TEXT, "
|
||||
+ "x NUMERIC, y NUMERIC, z NUMERIC)";
|
||||
"CREATE TABLE IF NOT EXISTS EssentialsProtect ("
|
||||
+ "worldName TEXT ,playerName TEXT, "
|
||||
+ "x NUMERIC, y NUMERIC, z NUMERIC)";
|
||||
|
||||
@Override
|
||||
protected PreparedStatement getStatementCreateTable(Connection conn) throws SQLException {
|
||||
protected PreparedStatement getStatementCreateTable(Connection conn) throws SQLException
|
||||
{
|
||||
return conn.prepareStatement(QueryCreateTable);
|
||||
}
|
||||
|
||||
private static final String QueryUpdateFrom2_0Table =
|
||||
"CREATE INDEX IF NOT EXISTS position ON EssentialsProtect ("
|
||||
+ "worldName, x, z, y)";
|
||||
"CREATE INDEX IF NOT EXISTS position ON EssentialsProtect ("
|
||||
+ "worldName, x, z, y)";
|
||||
|
||||
@Override
|
||||
protected PreparedStatement getStatementUpdateFrom2_0Table(Connection conn) throws SQLException {
|
||||
protected PreparedStatement getStatementUpdateFrom2_0Table(Connection conn) throws SQLException
|
||||
{
|
||||
return conn.prepareStatement(QueryUpdateFrom2_0Table);
|
||||
}
|
||||
private static final String QueryDeleteAll = "DELETE FROM EssentialsProtect;";
|
||||
|
||||
@Override
|
||||
protected PreparedStatement getStatementDeleteAll(Connection conn) throws SQLException {
|
||||
protected PreparedStatement getStatementDeleteAll(Connection conn) throws SQLException
|
||||
{
|
||||
return conn.prepareStatement(QueryDeleteAll);
|
||||
}
|
||||
private static final String QueryInsert =
|
||||
"INSERT INTO EssentialsProtect (worldName, x, y, z, playerName) VALUES (?, ?, ?, ?, ?);";
|
||||
"INSERT INTO EssentialsProtect (worldName, x, y, z, playerName) VALUES (?, ?, ?, ?, ?);";
|
||||
|
||||
@Override
|
||||
protected PreparedStatement getStatementInsert(Connection conn, String world, int x, int y, int z, String playerName) throws SQLException {
|
||||
protected PreparedStatement getStatementInsert(Connection conn, String world, int x, int y, int z, String playerName) throws SQLException
|
||||
{
|
||||
PreparedStatement ps = conn.prepareStatement(QueryInsert);
|
||||
ps.setString(1, world);
|
||||
ps.setInt(2, x);
|
||||
@@ -49,11 +53,12 @@ public class ProtectedBlockSQLite extends ProtectedBlockJDBC {
|
||||
return ps;
|
||||
}
|
||||
private static final String QueryPlayerCountByLocation =
|
||||
"SELECT COUNT(playerName), SUM(playerName = ?) FROM EssentialsProtect "
|
||||
+ "WHERE worldName = ? AND x = ? AND y = ? AND z = ? GROUP BY x;";
|
||||
"SELECT COUNT(playerName), SUM(playerName = ?) FROM EssentialsProtect "
|
||||
+ "WHERE worldName = ? AND x = ? AND y = ? AND z = ? GROUP BY x;";
|
||||
|
||||
@Override
|
||||
protected PreparedStatement getStatementPlayerCountByLocation(Connection conn, String world, int x, int y, int z, String playerName) throws SQLException {
|
||||
protected PreparedStatement getStatementPlayerCountByLocation(Connection conn, String world, int x, int y, int z, String playerName) throws SQLException
|
||||
{
|
||||
PreparedStatement ps = conn.prepareStatement(QueryPlayerCountByLocation);
|
||||
ps.setString(1, playerName);
|
||||
ps.setString(2, world);
|
||||
@@ -63,10 +68,11 @@ public class ProtectedBlockSQLite extends ProtectedBlockJDBC {
|
||||
return ps;
|
||||
}
|
||||
private static final String QueryPlayersByLocation =
|
||||
"SELECT playerName FROM EssentialsProtect WHERE worldname = ? AND x = ? AND y = ? AND z = ?;";
|
||||
"SELECT playerName FROM EssentialsProtect WHERE worldname = ? AND x = ? AND y = ? AND z = ?;";
|
||||
|
||||
@Override
|
||||
protected PreparedStatement getStatementPlayersByLocation(Connection conn, String world, int x, int y, int z) throws SQLException {
|
||||
protected PreparedStatement getStatementPlayersByLocation(Connection conn, String world, int x, int y, int z) throws SQLException
|
||||
{
|
||||
PreparedStatement ps = conn.prepareStatement(QueryPlayersByLocation);
|
||||
ps.setString(1, world);
|
||||
ps.setInt(2, x);
|
||||
@@ -75,10 +81,11 @@ public class ProtectedBlockSQLite extends ProtectedBlockJDBC {
|
||||
return ps;
|
||||
}
|
||||
private static final String QueryDeleteByLocation =
|
||||
"DELETE FROM EssentialsProtect WHERE worldName = ? AND x = ? AND y = ? AND z = ?;";
|
||||
"DELETE FROM EssentialsProtect WHERE worldName = ? AND x = ? AND y = ? AND z = ?;";
|
||||
|
||||
@Override
|
||||
protected PreparedStatement getStatementDeleteByLocation(Connection conn, String world, int x, int y, int z) throws SQLException {
|
||||
protected PreparedStatement getStatementDeleteByLocation(Connection conn, String world, int x, int y, int z) throws SQLException
|
||||
{
|
||||
PreparedStatement ps = conn.prepareStatement(QueryDeleteByLocation);
|
||||
ps.setString(1, world);
|
||||
ps.setInt(2, x);
|
||||
@@ -87,10 +94,11 @@ public class ProtectedBlockSQLite extends ProtectedBlockJDBC {
|
||||
return ps;
|
||||
}
|
||||
private static final String QueryAllBlocks =
|
||||
"SELECT worldName, x, y, z, playerName FROM EssentialsProtect;";
|
||||
"SELECT worldName, x, y, z, playerName FROM EssentialsProtect;";
|
||||
|
||||
@Override
|
||||
protected PreparedStatement getStatementAllBlocks(Connection conn) throws SQLException {
|
||||
protected PreparedStatement getStatementAllBlocks(Connection conn) throws SQLException
|
||||
{
|
||||
return conn.prepareStatement(QueryAllBlocks);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user