feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Convert old blockchange logs

Browse Source
This commit is contained in:
Brokkonaut
2018-07-24 19:16:04 +02:00
parent d1d16a6246
commit 8f18af2252
5 changed files with 2507 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>de.diddiz</groupId> <groupId>de.diddiz</groupId>
<artifactId>logblock</artifactId> <artifactId>logblock</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>LogBlock</name> <name>LogBlock</name>
@ -133,7 +133,7 @@
<resources> <resources>
<resource> <resource>
<filtering>true</filtering> <filtering>true</filtering>
<directory>${project.basedir}/src/main/resources</directory> <directory>src/main/resources</directory>
</resource> </resource>
</resources> </resources>
<plugins> <plugins>

4
src/main/java/de/diddiz/LogBlock/CommandsHandler.java
View File

@ -674,7 +674,7 @@ public class CommandsHandler implements CommandExecutor {
if (stack != null) { if (stack != null) {
chestaccess = new ChestAccess(stack, rs.getBoolean("itemremove")); chestaccess = new ChestAccess(stack, rs.getBoolean("itemremove"));
} }
editor.queueEdit(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"), rs.getInt("replaced"), rs.getInt("replacedData"), rs.getInt("type"), rs.getByte("typeData"), rs.getString("signtext"), chestaccess); editor.queueEdit(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"), rs.getInt("replaced"), rs.getInt("replacedData"), rs.getInt("type"), rs.getInt("typeData"), rs.getString("signtext"), chestaccess);
} }
final int changes = editor.getSize(); final int changes = editor.getSize();
if (changes > 10000) { if (changes > 10000) {
@ -749,7 +749,7 @@ public class CommandsHandler implements CommandExecutor {
if (stack != null) { if (stack != null) {
chestaccess = new ChestAccess(stack, !rs.getBoolean("itemremove")); chestaccess = new ChestAccess(stack, !rs.getBoolean("itemremove"));
} }
editor.queueEdit(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"), rs.getInt("type"), rs.getInt("typeData"), rs.getInt("replaced"), rs.getByte("replacedData"), rs.getString("signtext"), chestaccess); editor.queueEdit(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"), rs.getInt("type"), rs.getInt("typeData"), rs.getInt("replaced"), rs.getInt("replacedData"), rs.getString("signtext"), chestaccess);
} }
final int changes = editor.getSize(); final int changes = editor.getSize();
if (!params.silent) { if (!params.silent) {

14
src/main/java/de/diddiz/LogBlock/LogBlock.java
View File

@ -14,6 +14,7 @@ import org.bukkit.permissions.Permission;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.sql.Connection; import java.sql.Connection;
@ -56,6 +57,7 @@ public class LogBlock extends JavaPlugin {
@Override @Override
public void onLoad() { public void onLoad() {
logblock = this; logblock = this;
consumer = new Consumer(this);
try { try {
updater = new Updater(this); updater = new Updater(this);
Config.load(this); Config.load(this);
@ -74,11 +76,12 @@ public class LogBlock extends JavaPlugin {
st.executeQuery("SET NAMES utf8mb4;"); st.executeQuery("SET NAMES utf8mb4;");
} }
conn.close(); conn.close();
updater.checkTables();
MaterialConverter.initializeMaterials(getConnection());
MaterialConverter.getOrAddMaterialId(Material.AIR.getKey()); // AIR must be the first entry
if (updater.update()) { if (updater.update()) {
load(this); load(this);
} }
updater.checkTables();
MaterialConverter.initializeMaterials(getConnection());
} catch (final NullPointerException ex) { } catch (final NullPointerException ex) {
getLogger().log(Level.SEVERE, "Error while loading: ", ex); getLogger().log(Level.SEVERE, "Error while loading: ", ex);
} catch (final Exception ex) { } catch (final Exception ex) {
@ -86,12 +89,10 @@ public class LogBlock extends JavaPlugin {
errorAtLoading = true; errorAtLoading = true;
return; return;
} }
consumer = new Consumer(this);
} }
@Override @Override
public void onEnable() { public void onEnable() {
MaterialConverter.getOrAddMaterialId(Material.AIR.getKey()); // AIR must be the first entry
BukkitUtils.isDoublePlant(Material.AIR); // Force static code to run BukkitUtils.isDoublePlant(Material.AIR); // Force static code to run
final PluginManager pm = getPluginManager(); final PluginManager pm = getPluginManager();
if (errorAtLoading) { if (errorAtLoading) {
@ -333,4 +334,9 @@ public class LogBlock extends JavaPlugin {
conn.close(); conn.close();
} }
} }
@Override
public File getFile() {
return super.getFile();
}
} }

136
src/main/java/de/diddiz/LogBlock/Updater.java
View File

@ -4,13 +4,18 @@ import de.diddiz.LogBlock.config.Config;
import de.diddiz.LogBlock.config.WorldConfig; import de.diddiz.LogBlock.config.WorldConfig;
import de.diddiz.util.UUIDFetcher; import de.diddiz.util.UUIDFetcher;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.block.data.BlockData;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader;
import java.sql.*; import java.sql.*;
import java.util.*; import java.util.*;
import java.util.jar.JarFile;
import java.util.logging.Level; import java.util.logging.Level;
import static de.diddiz.LogBlock.config.Config.getLoggedWorlds; import static de.diddiz.LogBlock.config.Config.getLoggedWorlds;
@ -405,6 +410,100 @@ class Updater {
} }
config.set("version", "1.12.0"); config.set("version", "1.12.0");
} }
if (configVersion.compareTo(new ComparableVersion("1.13.0")) < 0) {
getLogger().info("Updating tables to 1.13.0 ...");
try {
MaterialUpdater materialUpdater = null;
checkTables(); // we need to create the tables first
getLogger().info("Convertig BlockId to BlockData. This can take a while ...");
final Connection conn = logblock.getConnection();
conn.setAutoCommit(false);
final Statement st = conn.createStatement();
for (final WorldConfig wcfg : getLoggedWorlds()) {
boolean hadRow = true;
int rowsToConvert = 0;
int done = 0;
try {
ResultSet rs = st.executeQuery("SELECT count(*) as rowcount FROM `" + wcfg.table + "`");
if (rs.next()) {
rowsToConvert = rs.getInt(1);
getLogger().info("Converting " + rowsToConvert + " entries in " + wcfg.table);
}
} catch (SQLException e) {
getLogger().info("Could not convert " + wcfg.table + ": " + e.getMessage());
continue;
}
PreparedStatement deleteStatement = conn.prepareStatement("DELETE FROM `" + wcfg.table + "` WHERE id = ?");
PreparedStatement insertStatement = conn.prepareStatement("INSERT INTO `" + wcfg.table + "-blocks` (id, date, playerid, replaced, replacedData, type, typeData, x, y, z) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", Statement.RETURN_GENERATED_KEYS);
while (hadRow) {
hadRow = false;
ResultSet entries = st.executeQuery("SELECT id, date, playerid, replaced, type, data, x, y, z FROM `" + wcfg.table + "` ORDER BY id ASC LIMIT 10000");
while (entries.next()) {
hadRow = true;
int id = entries.getInt("id");
Timestamp date = entries.getTimestamp("date");
int playerid = entries.getInt("playerid");
int replaced = entries.getInt("replaced");
int type = entries.getInt("type");
int data = entries.getInt("data");
int x = entries.getInt("x");
int y = entries.getInt("y");
int z = entries.getInt("z");
if (data == 16) {
data = 0;
}
if (materialUpdater == null) {
materialUpdater = new MaterialUpdater(logblock);
}
try {
String replacedBlockData = materialUpdater.getBlockData(replaced, data).getAsString();
String setBlockData = materialUpdater.getBlockData(type, data).getAsString();
int newReplacedId = MaterialConverter.getOrAddMaterialId(replacedBlockData);
int newReplacedData = MaterialConverter.getOrAddBlockStateId(replacedBlockData);
int newSetId = MaterialConverter.getOrAddMaterialId(setBlockData);
int newSetData = MaterialConverter.getOrAddBlockStateId(setBlockData);
insertStatement.setInt(1, id);
insertStatement.setTimestamp(2, date);
insertStatement.setInt(3, playerid);
insertStatement.setInt(4, newReplacedId);
insertStatement.setInt(5, newReplacedData);
insertStatement.setInt(6, newSetId);
insertStatement.setInt(7, newSetData);
insertStatement.setInt(8, x);
insertStatement.setInt(9, y);
insertStatement.setInt(10, z);
insertStatement.addBatch();
} catch (Exception e) {
getLogger().info("Exception in entry " + id + " (" + replaced + ":" + data + "->" + type + ":" + data + "): " + e.getMessage());
}
deleteStatement.setInt(1, id);
deleteStatement.addBatch();
done++;
}
if (hadRow) {
insertStatement.executeBatch();
deleteStatement.executeBatch();
}
conn.commit();
logblock.getConsumer().run(); // force a consumer run
getLogger().info(done + "/" + rowsToConvert);
}
}
st.close();
conn.close();
} catch (final SQLException | IOException ex) {
Bukkit.getLogger().log(Level.SEVERE, "[Updater] Error: ", ex);
return false;
}
config.set("version", "1.13.0");
}
logblock.saveConfig(); logblock.saveConfig();
return true; return true;
@ -497,4 +596,41 @@ class Updater {
} }
} }
} }
public static class MaterialUpdater {
BlockData[][] blockDataMapping;
public MaterialUpdater(LogBlock plugin) throws IOException {
blockDataMapping = new BlockData[256][16];
JarFile file = new JarFile(plugin.getFile());
BufferedReader reader = new BufferedReader(new InputStreamReader(new BufferedInputStream(file.getInputStream(file.getJarEntry("blockdata.txt"))), "UTF-8"));
while (true) {
String line = reader.readLine();
if (line == null) {
break;
}
int splitter1 = line.indexOf(":");
int splitter2 = line.indexOf(",");
if (splitter1 >= 0 && splitter2 >= 0) {
int blockid = Integer.parseInt(line.substring(0, splitter1));
int blockdata = Integer.parseInt(line.substring(splitter1 + 1, splitter2));
BlockData newBlockData = Bukkit.createBlockData(line.substring(splitter2 + 1));
if (blockdata == 0) {
for (int i = 0; i < 16; i++) {
if (blockDataMapping[blockid][i] == null) {
blockDataMapping[blockid][i] = newBlockData;
}
}
} else {
blockDataMapping[blockid][blockdata] = newBlockData;
}
}
}
file.close();
}
public BlockData getBlockData(int id, int data) {
return id >= 0 && id < 256 && data >= 0 && data < 16 ? blockDataMapping[id][data] : null;
}
}
} }

2357
src/main/resources/blockdata.txt Normal file
View File

File diff suppressed because it is too large Load Diff