From 3dfefcb77650fcae5a5375bb6d8fc4147c018414 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Sat, 26 Nov 2016 16:21:41 +0100 Subject: [PATCH] Fixes - saveDefaultConfig() - There's no default config in the plugin - The config process didn't put the world name in the config when saving - No plugin.yml - The Main class was created in each class it got referenced (Main plugin=new Main()), Bukkit doesn't allow that - TaskManager.configProcess was never set Still not much for an untested version. --- .gitignore | 32 +++--- .project | 46 ++++---- .settings/org.eclipse.jdt.core.prefs | 24 ++-- pom.xml | 108 +++++++++--------- src/iieLoadSaveEntireWorld/ConfigProcess.java | 29 +++-- src/iieLoadSaveEntireWorld/Main.java | 8 +- src/iieLoadSaveEntireWorld/TaskManager.java | 8 +- src/iieLoadSaveEntireWorld/WorldObject.java | 14 +-- target/config.yml | 0 target/plugin.yml | 6 - 10 files changed, 140 insertions(+), 135 deletions(-) delete mode 100644 target/config.yml delete mode 100644 target/plugin.yml diff --git a/.gitignore b/.gitignore index ca3076c..26688cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,17 @@ -*.class - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.ear - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -/bin/ -.classpath -*.classpath +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +/bin/ +.classpath +*.classpath /target/ diff --git a/.project b/.project index f40b925..0a7c09c 100644 --- a/.project +++ b/.project @@ -1,23 +1,23 @@ - - - iieLoadSaveEntireWorld - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - - + + + iieLoadSaveEntireWorld + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index df46a9a..672496e 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,12 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/pom.xml b/pom.xml index 546afa4..a279024 100644 --- a/pom.xml +++ b/pom.xml @@ -1,55 +1,55 @@ - - 4.0.0 - com.github.TBMCPlugins - Entire-World-Loader - master-SNAPSHOT - - src - - - src - - **/*.java - - - - . - - *.properties - *.yml - *.csv - *.txt - - true - - - - - maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - jitpack.io - https://jitpack.io/ - - - - - org.spigotmc - spigot-api - 1.11-R0.1-SNAPSHOT - - + + 4.0.0 + com.github.TBMCPlugins + Entire-World-Loader + master-SNAPSHOT + + src + + + src + + **/*.java + + + + . + + *.properties + *.yml + *.csv + *.txt + + true + + + + + maven-compiler-plugin + 3.5.1 + + 1.8 + 1.8 + + + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + jitpack.io + https://jitpack.io/ + + + + + org.spigotmc + spigot-api + 1.11-R0.1-SNAPSHOT + + \ No newline at end of file diff --git a/src/iieLoadSaveEntireWorld/ConfigProcess.java b/src/iieLoadSaveEntireWorld/ConfigProcess.java index 104c2f1..3a46e86 100644 --- a/src/iieLoadSaveEntireWorld/ConfigProcess.java +++ b/src/iieLoadSaveEntireWorld/ConfigProcess.java @@ -5,15 +5,18 @@ import org.bukkit.configuration.file.FileConfiguration; public class ConfigProcess implements Runnable { //STATIC - private static final Main plugin = new Main(); - private static final FileConfiguration config = plugin.getConfig(); + private static FileConfiguration config; static final boolean isNew(String name) { + if(config == null) + config = Main.getPlugin().getConfig(); return !config.contains(name); } static final WorldObject getUnfinished(String name) { + if(config == null) + config = Main.getPlugin().getConfig(); return new WorldObject ( config.getInt(name + ".width"), @@ -40,19 +43,23 @@ public class ConfigProcess implements Runnable { private final String name = TaskManager.loadProcess.worldname; public final void run() { - config.set(".currentRegion.x", TaskManager.loadProcess.currentRegion[0]); - config.set(".currentRegion.z", TaskManager.loadProcess.currentRegion[1]); - config.set(".n", TaskManager.loadProcess.n); - config.set(".c", TaskManager.loadProcess.c); - config.set(".D", TaskManager.loadProcess.D); - config.set(".d", TaskManager.loadProcess.d); - config.set(".B", TaskManager.loadProcess.B ? 1 : 0); - plugin.saveConfig(); + if(config == null) + config = Main.getPlugin().getConfig(); + config.set(name + ".currentRegion.x", TaskManager.loadProcess.currentRegion[0]); + config.set(name + ".currentRegion.z", TaskManager.loadProcess.currentRegion[1]); + config.set(name + ".n", TaskManager.loadProcess.n); + config.set(name + ".c", TaskManager.loadProcess.c); + config.set(name + ".D", TaskManager.loadProcess.D); + config.set(name + ".d", TaskManager.loadProcess.d); + config.set(name + ".B", TaskManager.loadProcess.B ? 1 : 0); + Main.getPlugin().saveConfig(); } final void finish() { + if(config == null) + config = Main.getPlugin().getConfig(); config.set("finished", name); config.set(name, null); - plugin.saveConfig(); + Main.getPlugin().saveConfig(); } } diff --git a/src/iieLoadSaveEntireWorld/Main.java b/src/iieLoadSaveEntireWorld/Main.java index fdcc8d7..1b2d32a 100644 --- a/src/iieLoadSaveEntireWorld/Main.java +++ b/src/iieLoadSaveEntireWorld/Main.java @@ -3,10 +3,16 @@ package iieLoadSaveEntireWorld; import org.bukkit.plugin.java.JavaPlugin; public class Main extends JavaPlugin { + private static Main plugin; + public static Main getPlugin() + { + return plugin; + } public void onEnable() { - saveDefaultConfig(); + //saveDefaultConfig(); + plugin = this; getCommand("beginfullmapload").setExecutor(new TaskManager.StartCommand()); getCommand("stopfullmapload").setExecutor(new TaskManager.StopCommand()); } diff --git a/src/iieLoadSaveEntireWorld/TaskManager.java b/src/iieLoadSaveEntireWorld/TaskManager.java index 88bb32f..ced7cdf 100644 --- a/src/iieLoadSaveEntireWorld/TaskManager.java +++ b/src/iieLoadSaveEntireWorld/TaskManager.java @@ -8,9 +8,6 @@ import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitTask; public class TaskManager { - - private static final Main plugin = new Main(); - static boolean inProgress = false; static LoadProcess loadProcess; static ConfigProcess configProcess; @@ -22,8 +19,9 @@ public class TaskManager { { inProgress = true; TaskManager.loadProcess = loadProcess; - TaskManager.loadTask = Bukkit.getScheduler().runTaskTimer( plugin, loadProcess, 0, 10 ); - TaskManager.configTask = Bukkit.getScheduler().runTaskTimer( plugin, new ConfigProcess(), 0, 200 ); + TaskManager.configProcess = new ConfigProcess(); + TaskManager.loadTask = Bukkit.getScheduler().runTaskTimer( Main.getPlugin(), loadProcess, 0, 10 ); + TaskManager.configTask = Bukkit.getScheduler().runTaskTimer( Main.getPlugin(), configProcess, 0, 200 ); } static final void finish() { diff --git a/src/iieLoadSaveEntireWorld/WorldObject.java b/src/iieLoadSaveEntireWorld/WorldObject.java index 9380c0c..01465f5 100644 --- a/src/iieLoadSaveEntireWorld/WorldObject.java +++ b/src/iieLoadSaveEntireWorld/WorldObject.java @@ -116,7 +116,7 @@ public class WorldObject { //add margins------------ final int[] edges = new int[4]; - final int[] radii = new int[4]; + final int[] radii = new int[4]; final boolean[] margin = new boolean[4]; //get block edge farthest from center @@ -144,15 +144,15 @@ public class WorldObject { if (!margin[3])//-----------0000 return bounds; else//----------------------0001 - if (radii[0] < radii[1]) + if (radii[0] < radii[1]) bounds[0]++; else bounds[1]++; else if (!margin[3])//-----------0010 - if (radii[0] < radii[1]) + if (radii[0] < radii[1]) bounds[0]++; - else + else bounds[1]++; else//----------------------0011 { @@ -162,7 +162,7 @@ public class WorldObject { else if (!margin[2]) if (!margin[3])//-----------0100 - if (radii[2] < radii[3]) + if (radii[2] < radii[3]) bounds[2]++; else bounds[3]++; @@ -198,9 +198,9 @@ public class WorldObject { if (margin[3])//------------1001 return bounds; else//----------------------1000 - if (radii[2] == radii[3]) + if (radii[2] == radii[3]) bounds[0]++; - else + else bounds[1]++; return bounds; diff --git a/target/config.yml b/target/config.yml deleted file mode 100644 index e69de29..0000000 diff --git a/target/plugin.yml b/target/plugin.yml deleted file mode 100644 index 4d5b3c3..0000000 --- a/target/plugin.yml +++ /dev/null @@ -1,6 +0,0 @@ - main: iieLoadSaveEntireWorld.Main - version: 1.0.0 - name: LoadSaveEntireWorld - commands: - loadsaveentireworld: - description: loads and saves the entire map, in 32x32 chunk sections \ No newline at end of file