Netherite-Public/ZNPCsPlus
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

move legacy data before downloading libraries

Browse source
This commit is contained in:
D3v1s0m 2023-12-27 20:08:35 +05:30
parent 5501e3a500
commit 2686cd4bb6
No known key found for this signature in database
GPG key ID: FA1F770C7B1D40C1
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlus.java
View file

@ -99,16 +99,6 @@ public class ZNpcsPlus {
PluginManager pluginManager = Bukkit.getPluginManager(); PluginManager pluginManager = Bukkit.getPluginManager();
long before = System.currentTimeMillis(); long before = System.currentTimeMillis();
boolean legacy = new File(getDataFolder(), "data.json").isFile() && !new File(getDataFolder(), "data").isDirectory();
if (legacy) try {
Files.move(getDataFolder().toPath(), new File(getDataFolder().getParentFile(), "ZNPCsPlusLegacy").toPath());
} catch (IOException e) {
log(ChatColor.RED + " * Moving legacy files to subfolder failed, plugin will shut down.");
e.printStackTrace();
pluginManager.disablePlugin(bootstrap);
return;
}
log(ChatColor.WHITE + " * Initializing libraries..."); log(ChatColor.WHITE + " * Initializing libraries...");
packetEvents.init(); packetEvents.init();
@ -172,7 +162,7 @@ public class ZNpcsPlus {
npcRegistry.reload(); npcRegistry.reload();
if (configManager.getConfig().autoSaveEnabled()) shutdownTasks.add(npcRegistry::save); if (configManager.getConfig().autoSaveEnabled()) shutdownTasks.add(npcRegistry::save);
if (legacy) { if (bootstrap.movedLegacy()) {
log(ChatColor.WHITE + " * Converting legacy data..."); log(ChatColor.WHITE + " * Converting legacy data...");
try { try {
Collection<NpcEntryImpl> entries = importerRegistry.getImporter("znpcsplus_legacy").importData(); Collection<NpcEntryImpl> entries = importerRegistry.getImporter("znpcsplus_legacy").importData();

18
plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlusBootstrap.java
View file

@ -6,18 +6,32 @@ import lol.pyr.znpcsplus.libraries.LibraryLoader;
import lol.pyr.znpcsplus.util.FileUtil; import lol.pyr.znpcsplus.util.FileUtil;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.io.Reader; import java.io.Reader;
import java.nio.file.Files;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
public class ZNpcsPlusBootstrap extends JavaPlugin { public class ZNpcsPlusBootstrap extends JavaPlugin {
private ZNpcsPlus zNpcsPlus; private ZNpcsPlus zNpcsPlus;
private boolean legacy;
@Override @Override
public void onLoad() { public void onLoad() {
legacy = new File(getDataFolder(), "data.json").isFile() && !new File(getDataFolder(), "data").isDirectory();
if (legacy) try {
Files.move(getDataFolder().toPath(), new File(getDataFolder().getParentFile(), "ZNPCsPlusLegacy").toPath());
} catch (IOException e) {
getLogger().severe(ChatColor.RED + "Failed to move legacy data folder! Plugin will disable.");
e.printStackTrace();
Bukkit.getPluginManager().disablePlugin(this);
return;
}
getLogger().info("Downloading and loading libraries, this might take a while if this is the first time you're launching the plugin"); getLogger().info("Downloading and loading libraries, this might take a while if this is the first time you're launching the plugin");
LibraryLoader loader = new LibraryLoader(this, new File(getDataFolder(), "libraries")); LibraryLoader loader = new LibraryLoader(this, new File(getDataFolder(), "libraries"));
@ -103,6 +117,10 @@ public class ZNpcsPlusBootstrap extends JavaPlugin {
return context -> context.send(component); return context -> context.send(component);
} }
public boolean movedLegacy() {
return legacy;
}
// Ugly hack because of https://github.com/johnrengelman/shadow/issues/232 // Ugly hack because of https://github.com/johnrengelman/shadow/issues/232
private static String decrypt(String packageName) { private static String decrypt(String packageName) {
return packageName.replace("..", "."); return packageName.replace("..", ".");