Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-28 11:37:39 +01:00
Code Issues Projects Releases Wiki Activity

Fixed a few issues from the merge, added the mod directory to the zip

Browse Source 
backup.
This commit is contained in:
GJ 2012-05-05 13:51:54 -04:00
parent b529219a0e
commit 1b37ba8daa
9 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/commands/mc/McremoveCommand.java
View File

@ -17,11 +17,12 @@ import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;
public class McremoveCommand implements CommandExecutor { public class McremoveCommand implements CommandExecutor {
private final String location = mcMMO.p.usersFile; private final String location;
private final mcMMO plugin; private final mcMMO plugin;
public McremoveCommand (mcMMO plugin) { public McremoveCommand (mcMMO plugin) {
this.plugin = plugin; this.plugin = plugin;
this.location = plugin.usersFile;
} }
@Override @Override

2
src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
View File

@ -57,7 +57,7 @@ public class PlayerProfile {
HashMap<ToolType, Integer> toolATS = new HashMap<ToolType, Integer>(); HashMap<ToolType, Integer> toolATS = new HashMap<ToolType, Integer>();
private String playerName; private String playerName;
private String location = mcMMO.p.usersFile; private final String location = mcMMO.p.usersFile;
public PlayerProfile(String name, boolean addNew) { public PlayerProfile(String name, boolean addNew) {
hud = Config.getInstance().defaulthud; hud = Config.getInstance().defaulthud;

11
src/main/java/com/gmail/nossr50/mcMMO.java
View File

@ -6,7 +6,8 @@ import com.gmail.nossr50.commands.spout.*;
import com.gmail.nossr50.commands.mc.*; import com.gmail.nossr50.commands.mc.*;
import com.gmail.nossr50.commands.party.*; import com.gmail.nossr50.commands.party.*;
import com.gmail.nossr50.commands.general.*; import com.gmail.nossr50.commands.general.*;
import com.gmail.nossr50.config.*; import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.LoadTreasures;
import com.gmail.nossr50.config.mods.LoadCustomTools; import com.gmail.nossr50.config.mods.LoadCustomTools;
import com.gmail.nossr50.runnables.*; import com.gmail.nossr50.runnables.*;
import com.gmail.nossr50.util.Database; import com.gmail.nossr50.util.Database;
@ -50,7 +51,7 @@ public class mcMMO extends JavaPlugin {
public static mcMMO p; public static mcMMO p;
/* Jar Stuff */ /* Jar Stuff */
public static File mcmmo; public final File mcmmo = getFile();
//File Paths //File Paths
public final String mainDirectory = getDataFolder().getPath() + File.separator; public final String mainDirectory = getDataFolder().getPath() + File.separator;
@ -66,9 +67,6 @@ public class mcMMO extends JavaPlugin {
*/ */
public void onEnable() { public void onEnable() {
p = this; p = this;
mcmmo = getFile();
if (!configInstance.getUseMySQL()) {
configInstance.load(); configInstance.load();
LoadTreasures.getInstance().load(); LoadTreasures.getInstance().load();
@ -76,7 +74,8 @@ public class mcMMO extends JavaPlugin {
if (configInstance.getToolModsEnabled()) { if (configInstance.getToolModsEnabled()) {
LoadCustomTools.getInstance().load(); LoadCustomTools.getInstance().load();
} }
if (!configInstance.getUseMySQL()) {
Users.loadUsers(); Users.loadUsers();
} }

4
src/main/java/com/gmail/nossr50/party/Party.java
View File

@ -170,7 +170,7 @@ public class Party {
* @return the list of parties. * @return the list of parties.
*/ */
public ArrayList<String> getParties() { public ArrayList<String> getParties() {
String location = mcMMO.p.usersFile; String location = plugin.usersFile;
ArrayList<String> parties = new ArrayList<String>(); ArrayList<String> parties = new ArrayList<String>();
try { try {
@ -194,7 +194,7 @@ public class Party {
in.close(); in.close();
} }
catch (Exception e) { catch (Exception e) {
mcMMO.p.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString()); plugin.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
} }
return parties; return parties;
} }

2
src/main/java/com/gmail/nossr50/runnables/SQLConversionTask.java
View File

@ -17,7 +17,7 @@ public class SQLConversionTask implements Runnable {
@Override @Override
public void run() { public void run() {
String location = mcMMO.p.usersFile; String location = plugin.usersFile;
try { try {
FileReader file = new FileReader(location); FileReader file = new FileReader(location);

4
src/main/java/com/gmail/nossr50/spout/SpoutStuff.java
View File

@ -34,7 +34,7 @@ import com.gmail.nossr50.util.Users;
public class SpoutStuff { public class SpoutStuff {
private static mcMMO plugin = mcMMO.p; private static mcMMO plugin = mcMMO.p;
public final static String spoutDirectory = mcMMO.p.mainDirectory + "Resources" + File.separator; public final static String spoutDirectory = plugin.mainDirectory + "Resources" + File.separator;
public final static String hudDirectory = spoutDirectory + "HUD" + File.separator; public final static String hudDirectory = spoutDirectory + "HUD" + File.separator;
public final static String hudStandardDirectory = hudDirectory + "Standard" + File.separator; public final static String hudStandardDirectory = hudDirectory + "Standard" + File.separator;
public final static String hudRetroDirectory = hudDirectory + "Retro" + File.separator; public final static String hudRetroDirectory = hudDirectory + "Retro" + File.separator;
@ -59,7 +59,7 @@ public class SpoutStuff {
try { try {
File currentFile = new File(theFilePath + theFileName); File currentFile = new File(theFilePath + theFileName);
JarFile jar = new JarFile(mcMMO.mcmmo); JarFile jar = new JarFile(plugin.mcmmo);
JarEntry entry = jar.getJarEntry("resources/" + theFileName); JarEntry entry = jar.getJarEntry("resources/" + theFileName);
InputStream is = jar.getInputStream(entry); InputStream is = jar.getInputStream(entry);

4
src/main/java/com/gmail/nossr50/util/Leaderboard.java
View File

@ -14,9 +14,9 @@ import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.datatypes.Tree; import com.gmail.nossr50.datatypes.Tree;
public class Leaderboard { public class Leaderboard {
private static String leaderboardsDirectory = mcMMO.p.leaderboardDirectory;
private static String location = mcMMO.p.usersFile;
private static mcMMO plugin = mcMMO.p; private static mcMMO plugin = mcMMO.p;
private static String leaderboardsDirectory = plugin.leaderboardDirectory;
private static String location = plugin.usersFile;
/** /**
* Create the leaderboards. * Create the leaderboards.

13
src/main/java/com/gmail/nossr50/util/Users.java
View File

@ -12,16 +12,19 @@ import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.PlayerProfile;
public class Users { public class Users {
private final static mcMMO plugin = mcMMO.p;
public static HashMap<String, PlayerProfile> players = new HashMap<String, PlayerProfile>(); public static HashMap<String, PlayerProfile> players = new HashMap<String, PlayerProfile>();
/** /**
* Load users. * Load users.
*/ */
public static void loadUsers() { public static void loadUsers() {
new File(mcMMO.p.flatFileDirectory).mkdir();
new File(mcMMO.p.leaderboardDirectory).mkdir();
File theDir = new File(mcMMO.p.usersFile); new File(plugin.flatFileDirectory).mkdir();
new File(plugin.leaderboardDirectory).mkdir();
File theDir = new File(plugin.usersFile);
if (!theDir.exists()) { if (!theDir.exists()) {
try { try {
@ -101,7 +104,7 @@ public class Users {
* @return the player's profile * @return the player's profile
*/ */
public static PlayerProfile getProfileByName(String playerName) { public static PlayerProfile getProfileByName(String playerName) {
if (mcMMO.p.getServer().getOfflinePlayer(playerName).isOnline() || players.containsKey(playerName.toLowerCase())) { if (plugin.getServer().getOfflinePlayer(playerName).isOnline() || players.containsKey(playerName.toLowerCase())) {
if (players.containsKey(playerName.toLowerCase())) { if (players.containsKey(playerName.toLowerCase())) {
return players.get(playerName.toLowerCase()); return players.get(playerName.toLowerCase());
} }

16
src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java
View File

@ -16,14 +16,15 @@ import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.Config;
public class ZipLibrary { public class ZipLibrary {
private final static mcMMO plugin = mcMMO.p;
private static String BackupDirectory = mcMMO.p.mainDirectory + "backup"; private static String BackupDirectory = plugin.mainDirectory + "backup" + File.separator;
private static File BackupDir = new File(BackupDirectory); private static File BackupDir = new File(BackupDirectory);
private static File FlatFileDirectory = new File(mcMMO.p.flatFileDirectory); private static File FlatFileDirectory = new File(plugin.flatFileDirectory);
private static File UsersFile = new File(mcMMO.p.usersFile); private static File ModFileDirectory = new File(plugin.modDirectory);
private static File ConfigFile = new File(mcMMO.p.mainDirectory + "config.yml"); private static File UsersFile = new File(plugin.usersFile);
private static File TreasuresFile = new File(mcMMO.p.mainDirectory + "treasures.yml"); private static File ConfigFile = new File(plugin.mainDirectory + "config.yml");
private static File Leaderboards = new File(mcMMO.p.leaderboardDirectory); private static File TreasuresFile = new File(plugin.mainDirectory + "treasures.yml");
private static File Leaderboards = new File(plugin.leaderboardDirectory);
public static void mcMMObackup() throws IOException { public static void mcMMObackup() throws IOException {
if (Config.getInstance().getUseMySQL()) { if (Config.getInstance().getUseMySQL()) {
@ -47,6 +48,7 @@ public class ZipLibrary {
//Create the Source List, and add directories/etc to the file. //Create the Source List, and add directories/etc to the file.
List<File> sources = new ArrayList<File>(); List<File> sources = new ArrayList<File>();
sources.add(FlatFileDirectory); sources.add(FlatFileDirectory);
sources.add(ModFileDirectory);
sources.add(UsersFile); sources.add(UsersFile);
sources.add(ConfigFile); sources.add(ConfigFile);
sources.add(TreasuresFile); sources.add(TreasuresFile);