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

Make structureutil compatible with older versions

Browse Source
This commit is contained in:
Denyk 2020-03-22 20:31:49 +01:00 committed by Brianna
parent 0513ce9ac2
commit d1d0a3dc24
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/songoda/skyblock/command/commands/admin/StructureCommand.java
View File

@ -185,6 +185,7 @@ public class StructureCommand extends SubCommand {
"Command.Island.Admin.Structure.Save.Saved.Successful.Message") "Command.Island.Admin.Structure.Save.Saved.Successful.Message")
.replace("%name", args[1])); .replace("%name", args[1]));
soundManager.playSound(player, Sounds.VILLAGER_YES.bukkitSound(), 1.0F, 1.0F); soundManager.playSound(player, Sounds.VILLAGER_YES.bukkitSound(), 1.0F, 1.0F);
return;
} catch (Exception e) { } catch (Exception e) {
messageManager.sendMessage(player, configLoad messageManager.sendMessage(player, configLoad
.getString("Command.Island.Admin.Structure.Save.Saved.Failed.Message")); .getString("Command.Island.Admin.Structure.Save.Saved.Failed.Message"));
@ -198,6 +199,7 @@ public class StructureCommand extends SubCommand {
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F); soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
} }
} else if (args[0].equalsIgnoreCase("convert")) { } else if (args[0].equalsIgnoreCase("convert")) {
if (args.length == 2) { if (args.length == 2) {
File structureFile = new File(new File(skyblock.getDataFolder().toString() + "/structures"), args[1]); File structureFile = new File(new File(skyblock.getDataFolder().toString() + "/structures"), args[1]);

1
src/main/java/com/songoda/skyblock/island/IslandManager.java
View File

@ -155,7 +155,6 @@ public class IslandManager {
FileConfiguration configLoad_world = config_world.getFileConfiguration(); FileConfiguration configLoad_world = config_world.getFileConfiguration();
FileConfiguration configLoad_config = config_config.getFileConfiguration(); FileConfiguration configLoad_config = config_config.getFileConfiguration();
int x = (int) configLoad_world.get("World." + world.name() + ".nextAvailableLocation.island_number"); int x = (int) configLoad_world.get("World." + world.name() + ".nextAvailableLocation.island_number");
System.out.println("Ile n°" + x);
double r = Math.floor((Math.sqrt(x + 1) - 1) / 2) + 1; double r = Math.floor((Math.sqrt(x + 1) - 1) / 2) + 1;
double p = (8 * r * (r -1)) / 2; double p = (8 * r * (r -1)) / 2;
double en = r * 2; double en = r * 2;

5
src/main/java/com/songoda/skyblock/utils/structure/StructureUtil.java
View File

@ -35,6 +35,7 @@ import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.regex.Pattern;
public final class StructureUtil { public final class StructureUtil {
@ -112,7 +113,9 @@ public final class StructureUtil {
fileInputStream.close(); fileInputStream.close();
Storage storage; Storage storage;
if (!org.bukkit.craftbukkit.libs.org.apache.commons.codec.binary.Base64.isBase64(content)) { Pattern pattern = Pattern.compile("^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)?$");
if (!pattern.matcher(new String(content)).find()) {
try { try {
storage = new Gson().fromJson(Compression.decompress(content), Storage.class); storage = new Gson().fromJson(Compression.decompress(content), Storage.class);
} catch (JsonSyntaxException e) { } catch (JsonSyntaxException e) {