|
@@ -2,14 +2,15 @@ package de.Linus122.TelegramChat;
|
|
|
|
|
|
import java.io.File;
|
|
import java.io.File;
|
|
import java.io.FileInputStream;
|
|
import java.io.FileInputStream;
|
|
-import java.io.FileOutputStream;
|
|
|
|
|
|
+import java.io.FileReader;
|
|
|
|
+import java.io.FileWriter;
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
import java.io.ObjectInputStream;
|
|
import java.io.ObjectInputStream;
|
|
-import java.io.ObjectOutputStream;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Random;
|
|
import java.util.Random;
|
|
import java.util.UUID;
|
|
import java.util.UUID;
|
|
|
|
+import java.util.logging.Level;
|
|
|
|
|
|
import org.bukkit.Bukkit;
|
|
import org.bukkit.Bukkit;
|
|
import org.bukkit.OfflinePlayer;
|
|
import org.bukkit.OfflinePlayer;
|
|
@@ -25,8 +26,8 @@ import org.bukkit.plugin.java.JavaPlugin;
|
|
import com.google.gson.Gson;
|
|
import com.google.gson.Gson;
|
|
|
|
|
|
import de.Linus122.Metrics.Metrics;
|
|
import de.Linus122.Metrics.Metrics;
|
|
-import de.Linus122.TelegramComponents.ChatMessageToTelegram;
|
|
|
|
import de.Linus122.TelegramComponents.ChatMessageToMc;
|
|
import de.Linus122.TelegramComponents.ChatMessageToMc;
|
|
|
|
+import de.Linus122.TelegramComponents.ChatMessageToTelegram;
|
|
|
|
|
|
public class Main extends JavaPlugin implements Listener {
|
|
public class Main extends JavaPlugin implements Listener {
|
|
private static File datad = new File("plugins/TelegramChat/data.json");
|
|
private static File datad = new File("plugins/TelegramChat/data.json");
|
|
@@ -49,16 +50,32 @@ public class Main extends JavaPlugin implements Listener {
|
|
dir.mkdir();
|
|
dir.mkdir();
|
|
data = new Data();
|
|
data = new Data();
|
|
if (datad.exists()) {
|
|
if (datad.exists()) {
|
|
|
|
+ Gson gson = new Gson();
|
|
try {
|
|
try {
|
|
- FileInputStream fin = new FileInputStream(datad);
|
|
|
|
- ObjectInputStream ois = new ObjectInputStream(fin);
|
|
|
|
- Gson gson = new Gson();
|
|
|
|
- data = (Data) gson.fromJson((String) ois.readObject(), Data.class);
|
|
|
|
- ois.close();
|
|
|
|
- fin.close();
|
|
|
|
|
|
+ FileReader fileReader = new FileReader(datad);
|
|
|
|
+ StringBuilder sb = new StringBuilder();
|
|
|
|
+ int c;
|
|
|
|
+ while((c = fileReader.read()) !=-1) {
|
|
|
|
+ sb.append((char) c);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ data = (Data) gson.fromJson(sb.toString(), Data.class);
|
|
|
|
+
|
|
|
|
+ fileReader.close();
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
- // TODO Auto-generated catch block
|
|
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ // old method for loading the data.yml file
|
|
|
|
+ try {
|
|
|
|
+ FileInputStream fin = new FileInputStream(datad);
|
|
|
|
+ ObjectInputStream ois = new ObjectInputStream(fin);
|
|
|
|
+
|
|
|
|
+ data = (Data) gson.fromJson((String) ois.readObject(), Data.class);
|
|
|
|
+ ois.close();
|
|
|
|
+ fin.close();
|
|
|
|
+ } catch (Exception e2) {
|
|
|
|
+ e2.printStackTrace();
|
|
|
|
+ }
|
|
|
|
+ this.getLogger().log(Level.INFO, "Converted old data.yml");
|
|
|
|
+ save();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -89,12 +106,10 @@ public class Main extends JavaPlugin implements Listener {
|
|
Gson gson = new Gson();
|
|
Gson gson = new Gson();
|
|
|
|
|
|
try {
|
|
try {
|
|
- FileOutputStream fout = new FileOutputStream(datad);
|
|
|
|
- ObjectOutputStream oos = new ObjectOutputStream(fout);
|
|
|
|
-
|
|
|
|
- oos.writeObject(gson.toJson(data));
|
|
|
|
- fout.close();
|
|
|
|
- oos.close();
|
|
|
|
|
|
+ FileWriter fileWriter = new FileWriter(datad);
|
|
|
|
+ fileWriter.write(gson.toJson(data));
|
|
|
|
+
|
|
|
|
+ fileWriter.close();
|
|
} catch (IOException e) {
|
|
} catch (IOException e) {
|
|
// TODO Auto-generated catch block
|
|
// TODO Auto-generated catch block
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|