mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

Fixes #1009

Browse Source
This commit is contained in:
TheBusyBiscuit 2019-08-19 09:17:40 +02:00
parent c672dd9afb
commit 480ee72e08
3 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -4,4 +4,5 @@
/.settings/
*.iml
/target
/.idea/
/.idea/
dependency-reduced-pom.xml

49
src/me/mrCookieSlime/Slimefun/api/BlockStorage.java
View File

@ -19,9 +19,11 @@ import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.HumanEntity;
import org.bukkit.inventory.ItemStack;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.JsonPrimitive;
import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
import me.mrCookieSlime.CSCoreLibPlugin.general.Math.DoubleHandler;
@ -316,20 +318,13 @@ public class BlockStorage {
}
private static Map<String, String> parseJSON(String json) {
Map<String, String> map = new HashMap<String, String>();
Map<String, String> map = new HashMap<>();
if (json != null && json.length() > 2) {
try {
JSONParser parser = new JSONParser();
JSONObject obj = (JSONObject) parser.parse(json);
for (Object entry: obj.keySet()) {
String key = entry.toString();
String value = obj.get(entry).toString();
map.put(key, value);
}
} catch (ParseException e) {
e.printStackTrace();
JsonParser parser = new JsonParser();
JsonObject obj = (JsonObject) parser.parse(json);
for (Map.Entry<String, JsonElement> entry: obj.entrySet()) {
map.put(entry.getKey(), entry.getValue().getAsString());
}
}
return map;
@ -350,13 +345,12 @@ public class BlockStorage {
}
}
@SuppressWarnings("unchecked")
private static String serializeBlockInfo(Config cfg) {
JSONObject json = new JSONObject();
JsonObject json = new JsonObject();
for (String key : cfg.getKeys()) {
json.put(key, cfg.getString(key));
json.add(key, new JsonPrimitive(cfg.getString(key)));
}
return json.toJSONString();
return json.toString();
}
private static String getJSONData(Chunk chunk) {
return map_chunks.get(serializeChunk(chunk));
@ -572,7 +566,7 @@ public class BlockStorage {
}
public static Set<String> getTickingChunks() {
return new HashSet<String>(loaded_tickers);
return new HashSet<>(loaded_tickers);
}
@Deprecated
@ -586,7 +580,7 @@ public class BlockStorage {
@Deprecated
public static Set<Block> getTickingBlocks(String chunk) {
Set<Block> ret = new HashSet<Block>();
Set<Block> ret = new HashSet<>();
for (Location l: getTickingLocations(chunk)) {
ret.add(l.getBlock());
}
@ -594,7 +588,7 @@ public class BlockStorage {
}
public static Set<Location> getTickingLocations(String chunk) {
return new HashSet<Location>(ticking_chunks.get(chunk));
return new HashSet<>(ticking_chunks.get(chunk));
}
public BlockMenu loadInventory(Location l, BlockMenuPreset preset) {
@ -652,10 +646,6 @@ public class BlockStorage {
if (!storage.hasInventory(l)) return storage.loadInventory(l, BlockMenuPreset.getPreset(checkID(l)));
else return storage.inventories.get(l);
}
public static JSONParser getParser() {
return new JSONParser();
}
public static Config getChunkInfo(Chunk chunk) {
try {
@ -684,18 +674,17 @@ public class BlockStorage {
return map_chunks.containsKey(serializeChunk(chunk));
}
@SuppressWarnings("unchecked")
public static void setChunkInfo(Chunk chunk, String key, String value) {
Config cfg = new Config("data-storage/Slimefun/temp.yml");
if (hasChunkInfo(chunk)) cfg = getChunkInfo(chunk);
cfg.setValue(key, value);
JSONObject json = new JSONObject();
JsonObject json = new JsonObject();
for (String path: cfg.getKeys()) {
json.put(path, cfg.getString(path));
json.add(path, new JsonPrimitive(cfg.getString(path)));
}
map_chunks.put(serializeChunk(chunk), json.toJSONString());
map_chunks.put(serializeChunk(chunk), json.toString());
chunk_changes++;
}

2
src/plugin.yml
View File

@ -7,7 +7,7 @@ website: http://TheBusyBiscuit.github.io/
main: me.mrCookieSlime.Slimefun.SlimefunStartup
softdepend: [CS-CoreLib, ClearLag, WorldEdit]
api-version: 1.13
api-version: 1.14
commands:
slimefun: