Skip to content

Commit 0c006a9

Browse files
hidden1ninhidden1nin
committed
Removed Plugin code, now can be used as a dependency so plugins can be stand-alone!
1 parent 44f3151 commit 0c006a9

13 files changed

Lines changed: 274 additions & 434 deletions

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ $RECYCLE.BIN/
9797

9898
target/
9999

100+
GetDataCommand
101+
102+
100103
pom.xml.tag
101104
pom.xml.releaseBackup
102105
pom.xml.versionsBackup

‎src/main/java/com/hiddentech/playerstorage/GetDataCommand.java‎

Lines changed: 0 additions & 119 deletions
This file was deleted.

‎src/main/java/com/hiddentech/playerstorage/LoginConfig.java‎

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,47 @@
11
package com.hiddentech.playerstorage;
22

3+
import org.bukkit.configuration.file.YamlConfiguration;
4+
5+
import java.io.File;
6+
import java.io.IOException;
7+
38
public class LoginConfig {
4-
private final PlayerStorage plugin;
9+
private final PlayerStorageAPI plugin;
510

6-
public LoginConfig(PlayerStorage plugin){
11+
public LoginConfig(PlayerStorageAPI plugin){
712
this.plugin = plugin;
813
setConfig();
914
}
1015

1116
private void setConfig() {
1217
//make directory
13-
if (!plugin.getDataFolder().exists()) {
14-
plugin.getDataFolder().mkdirs();
18+
19+
File file = new File(plugin.getPlugin().getDataFolder()+"/Database.yml");
20+
if(!file.exists()){
21+
try {
22+
file.createNewFile();
23+
} catch (IOException e) {
24+
e.printStackTrace();
25+
}
1526
}
27+
YamlConfiguration yml = YamlConfiguration.loadConfiguration(file);
1628
//add config for connection
17-
if(!plugin.getConfig().isSet("Redis_Connection")){
18-
plugin.getConfig().set("Redis_Connection", "change this!");
19-
//redis-14639.c266.us-east-1-3.ec2.cloud.redislabs.com:14639
20-
plugin.getConfig().set("Redis_Port", 12345);
21-
plugin.getConfig().set("Redis_Password", "and this too!");
22-
plugin.getConfig().set("Redis_Data_Expire_After", 86400);
23-
//rbZX3oKRmEroQ7XOWRtUb25cCMRtM2Fr
29+
if(!yml.isSet("Redis_Connection")){
30+
yml.set("Redis_Connection", "change this!");
31+
yml.set("Redis_Port", 12345);
32+
yml.set("Redis_Password", "and this too!");
33+
yml.set("Redis_Data_Expire_After", 86400);
34+
}
35+
if(!yml.isSet("Storage_Configuration")){
36+
yml.set("Storage_Configuration","both");
37+
yml.set("Mongo_DB_Name","PlayerStorageAPI");
38+
yml.set("Mongo_DB_ConnectionString","Change Me Too!");
2439
}
25-
if(!plugin.getConfig().isSet("Storage_Configuration")){
26-
plugin.getConfig().set("Storage_Configuration","both");
27-
plugin.getConfig().set("Mongo_DB_Name","PlayerStorageAPI");
28-
plugin.getConfig().set("Mongo_DB_ConnectionString","Change Me Too!");
40+
try {
41+
yml.options().copyDefaults(true);
42+
yml.save(file);
43+
} catch (IOException e) {
44+
e.printStackTrace();
2945
}
30-
plugin.saveConfig();
3146
}
3247
}

‎src/main/java/com/hiddentech/playerstorage/MongoPlayerData.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,22 @@
44
import com.mongodb.client.model.Filters;
55
import com.mongodb.client.model.ReplaceOptions;
66
import org.bson.Document;
7-
import org.bukkit.Bukkit;
87
import org.bukkit.scheduler.BukkitRunnable;
98

10-
import java.util.ArrayList;
11-
import java.util.Map;
129
import java.util.UUID;
1310

1411
public class MongoPlayerData extends Document {
1512

1613
private final Mongo mongo;
1714
private final String uuid;
1815
private final Document document = this;
19-
private final PlayerStorage plugin;
16+
private final PlayerStorageAPI plugin;
2017
private final PlayerData data;
2118

22-
public MongoPlayerData(UUID uuid, PlayerData data, Mongo mongo, PlayerStorage plugin) {
19+
public MongoPlayerData(UUID uuid, PlayerData data, Mongo mongo, PlayerStorageAPI plugin) {
2320
this(uuid.toString(),data,mongo,plugin);
2421
}
25-
public MongoPlayerData(String uuid,PlayerData data, Mongo mongo,PlayerStorage plugin) {
22+
public MongoPlayerData(String uuid,PlayerData data, Mongo mongo,PlayerStorageAPI plugin) {
2623
this.mongo = mongo;
2724
this.uuid = uuid;
2825
this.plugin = plugin;
@@ -44,6 +41,6 @@ public void run() {
4441
}
4542
mongo.getCollection().replaceOne(Filters.eq("uuid", uuid), document, new ReplaceOptions().upsert(true));
4643
}
47-
}.runTaskAsynchronously(plugin);
44+
}.runTaskAsynchronously(plugin.getPlugin());
4845
}
4946
}

‎src/main/java/com/hiddentech/playerstorage/PlayerRegistry.java‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
public class PlayerRegistry {
1818

19-
private final PlayerStorage plugin;
19+
private final PlayerStorageAPI plugin;
2020

2121
public HashMap<UUID, PlayerData> getPlayers() {
2222
return players;
@@ -45,7 +45,7 @@ public HashMap<String, String> getDefaultStrings() {
4545
private HashMap<String, Integer> defaultInts = new HashMap<>();
4646
private HashMap<String, String> defaultStrings = new HashMap<>();
4747

48-
public PlayerRegistry(PlayerStorage plugin) {
48+
public PlayerRegistry(PlayerStorageAPI plugin) {
4949
this.plugin = plugin;
5050
}
5151

@@ -70,17 +70,19 @@ public void run() {
7070
new BukkitRunnable() {
7171
@Override
7272
public void run() {
73-
plugin.getServer().getPluginManager().callEvent(new PlayerDataLoadEvent(plugin.getServer().getPlayer(uuid), data));
74-
}}.runTask(plugin);
73+
plugin.getPlugin().getServer().getPluginManager().callEvent(new PlayerDataLoadEvent(plugin.getPlugin().getServer().getPlayer(uuid), data));
74+
}
75+
}.runTask(plugin.getPlugin());
7576
players.put(uuid, data);
7677
savePlayer(uuid);
7778
} else {
78-
PlayerData data= new PlayerData(uuid);
79+
PlayerData data = new PlayerData(uuid);
7980
new BukkitRunnable() {
8081
@Override
8182
public void run() {
82-
plugin.getServer().getPluginManager().callEvent(new PlayerDataLoadEvent(plugin.getServer().getPlayer(uuid), data));
83-
}}.runTask(plugin);
83+
plugin.getPlugin().getServer().getPluginManager().callEvent(new PlayerDataLoadEvent(plugin.getPlugin().getServer().getPlayer(uuid), data));
84+
}
85+
}.runTask(plugin.getPlugin());
8486
players.put(uuid, data);
8587
}
8688
return;
@@ -111,8 +113,9 @@ public void run() {
111113
new BukkitRunnable() {
112114
@Override
113115
public void run() {
114-
plugin.getServer().getPluginManager().callEvent(new PlayerDataLoadEvent(plugin.getServer().getPlayer(uuid), data));
115-
}}.runTask(plugin);
116+
plugin.getPlugin().getServer().getPluginManager().callEvent(new PlayerDataLoadEvent(plugin.getPlugin().getServer().getPlayer(uuid), data));
117+
}
118+
}.runTask(plugin.getPlugin());
116119
players.put(uuid, data);
117120
return;
118121
}
@@ -124,21 +127,22 @@ public void run() {
124127
}
125128

126129
}
127-
}.runTaskAsynchronously(plugin);
130+
}.runTaskAsynchronously(plugin.getPlugin());
128131

129132
}
130133

131134
private void JedisLoad(Jedis jedis, UUID uuid) {
132135
Map<String, String> stored = jedis.hgetAll(uuid.toString());
133-
Map<String, String> storedStrings = (Map<String, String>) DataType.STRING.deSerialize(stored);
134-
Map<String, Boolean> storedBooleans = (Map<String, Boolean>) DataType.BOOLEAN.deSerialize(stored);
135-
Map<String, Integer> storedInts = (Map<String, Integer>) DataType.INTEGER.deSerialize(stored);
136+
Map<String, String> storedStrings = (Map<String, String>) DataType.STRING.deSerialize(stored, plugin);
137+
Map<String, Boolean> storedBooleans = (Map<String, Boolean>) DataType.BOOLEAN.deSerialize(stored, plugin);
138+
Map<String, Integer> storedInts = (Map<String, Integer>) DataType.INTEGER.deSerialize(stored, plugin);
136139
PlayerData data = new PlayerData(uuid, storedStrings, storedBooleans, storedInts);
137140
new BukkitRunnable() {
138141
@Override
139142
public void run() {
140-
plugin.getServer().getPluginManager().callEvent(new PlayerDataLoadEvent(plugin.getServer().getPlayer(uuid), data));
141-
}}.runTask(plugin);
143+
plugin.getPlugin().getServer().getPluginManager().callEvent(new PlayerDataLoadEvent(plugin.getPlugin().getServer().getPlayer(uuid), data));
144+
}
145+
}.runTask(plugin.getPlugin());
142146
players.put(uuid, data);
143147

144148
jedis.close();
@@ -154,8 +158,9 @@ private PlayerData loadPlayerFromMongo(UUID uuid) {
154158
new BukkitRunnable() {
155159
@Override
156160
public void run() {
157-
plugin.getServer().getPluginManager().callEvent(new PlayerDataLoadEvent(plugin.getServer().getPlayer(uuid), data));
158-
}}.runTask(plugin);
161+
plugin.getPlugin().getServer().getPluginManager().callEvent(new PlayerDataLoadEvent(plugin.getPlugin().getServer().getPlayer(uuid), data));
162+
}
163+
}.runTask(plugin.getPlugin());
159164
return data;
160165
}
161166

@@ -196,7 +201,7 @@ public void run() {
196201
e.printStackTrace();
197202
}
198203
}
199-
}.runTaskAsynchronously(plugin);
204+
}.runTaskAsynchronously(plugin.getPlugin());
200205
}
201206

202207

0 commit comments

Comments
 (0)