Upstream/WorldSystem
1
0
Fork 0
mirror of https://github.com/trainerlord/WorldSystem.git synced 2024-09-27 04:13:17 +02:00
Code Issues Projects Releases Wiki Activity

Removed unnecessary imports

Browse Source
This commit is contained in:
Daniel 2019-05-04 09:23:09 +02:00
parent d7bc9975e2
commit 0d5364a041
47 changed files with 357 additions and 424 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/de/butzlabben/inventory/DependListener.java
View File

@ -1,10 +1,9 @@
package de.butzlabben.inventory;
import de.butzlabben.world.wrapper.WorldPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import de.butzlabben.world.wrapper.WorldPlayer;
public interface DependListener {
ItemStack getItemStack(Player p, WorldPlayer wp);

8
src/main/java/de/butzlabben/inventory/OrcInventory.java
View File

@ -1,14 +1,14 @@
package de.butzlabben.inventory;
import java.util.HashMap;
import java.util.Map.Entry;
import java.util.Objects;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import java.util.HashMap;
import java.util.Map.Entry;
import java.util.Objects;
public abstract class OrcInventory {
protected String title;

11
src/main/java/de/butzlabben/inventory/OrcItem.java
View File

@ -1,17 +1,16 @@
package de.butzlabben.inventory;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import de.butzlabben.world.wrapper.WorldPlayer;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemFlag;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import de.butzlabben.world.wrapper.WorldPlayer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
public class OrcItem {

7
src/main/java/de/butzlabben/inventory/OrcListener.java
View File

@ -1,8 +1,6 @@
package de.butzlabben.inventory;
import java.util.HashMap;
import java.util.UUID;
import de.butzlabben.world.WorldSystem;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -10,7 +8,8 @@ import org.bukkit.event.Listener;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryCloseEvent;
import de.butzlabben.world.WorldSystem;
import java.util.HashMap;
import java.util.UUID;
/**
* @author Butzlabben

7
src/main/java/de/butzlabben/inventory/pages/InventoryPage.java
View File

@ -1,12 +1,11 @@
package de.butzlabben.inventory.pages;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import de.butzlabben.inventory.OrcInventory;
import de.butzlabben.inventory.OrcItem;
import de.butzlabben.world.config.GuiConfig;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
/**
* @author Butzlabben

7
src/main/java/de/butzlabben/inventory/pages/PageGUICreator.java
View File

@ -1,14 +1,13 @@
package de.butzlabben.inventory.pages;
import de.butzlabben.inventory.OrcItem;
import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
import org.bukkit.entity.Player;
import de.butzlabben.inventory.OrcItem;
/**
* @author Butzlabben
* @since 21.05.2018

29
src/main/java/de/butzlabben/world/GameProfileBuilder.java
View File

@ -1,32 +1,19 @@
package de.butzlabben.world;
import com.google.gson.*;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
import com.mojang.authlib.properties.PropertyMap;
import com.mojang.util.UUIDTypeAdapter;
import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.lang.reflect.Type;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
import com.mojang.authlib.properties.PropertyMap;
import com.mojang.util.UUIDTypeAdapter;
import java.util.*;
/**
* @author Butzlabben

7
src/main/java/de/butzlabben/world/WorldCheckerRunnable.java
View File

@ -1,15 +1,14 @@
package de.butzlabben.world;
import de.butzlabben.world.config.MessageConfig;
import de.butzlabben.world.config.PluginConfig;
import de.butzlabben.world.wrapper.SystemWorld;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import de.butzlabben.world.config.MessageConfig;
import de.butzlabben.world.config.PluginConfig;
import de.butzlabben.world.wrapper.SystemWorld;
public class WorldCheckerRunnable implements Runnable {
@Override

4
src/main/java/de/butzlabben/world/WorldSystem.java
View File

@ -1,7 +1,9 @@
package de.butzlabben.world;
import de.butzlabben.world.autoupdater.AutoUpdater;
import de.butzlabben.world.command.*;
import de.butzlabben.world.command.WSCommand;
import de.butzlabben.world.command.WorldAdministrateCommand;
import de.butzlabben.world.command.WorldSettingsCommands;
import de.butzlabben.world.config.*;
import de.butzlabben.world.listener.*;
import de.butzlabben.world.util.PapiExtension;

9
src/main/java/de/butzlabben/world/autoupdater/AutoUpdater.java
View File

@ -1,9 +1,6 @@
package de.butzlabben.world.autoupdater;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import de.butzlabben.world.config.PluginConfig;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -13,7 +10,9 @@ import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;
import de.butzlabben.world.config.PluginConfig;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
/**
* @author Butzlabben

2
src/main/java/de/butzlabben/world/command/WSCommand.java
View File

@ -1,7 +1,7 @@
package de.butzlabben.world.command;
import de.butzlabben.world.autoupdater.AutoUpdater;
import de.butzlabben.world.WorldSystem;
import de.butzlabben.world.autoupdater.AutoUpdater;
import de.butzlabben.world.config.DependenceConfig;
import de.butzlabben.world.config.MessageConfig;
import de.butzlabben.world.config.PluginConfig;

2
src/main/java/de/butzlabben/world/command/WorldSettingsCommands.java
View File

@ -18,9 +18,7 @@ import net.myplayplanet.commandframework.CommandArgs;
import net.myplayplanet.commandframework.api.Command;
import org.apache.commons.io.FileUtils;
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.WorldCreator;
import org.bukkit.WorldType;
import org.bukkit.entity.Player;
import java.io.File;

8
src/main/java/de/butzlabben/world/config/DependenceConfig.java
View File

@ -1,14 +1,14 @@
package de.butzlabben.world.config;
import java.io.File;
import java.io.IOException;
import java.util.UUID;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import java.io.File;
import java.io.IOException;
import java.util.UUID;
public class DependenceConfig {
private OfflinePlayer op;

4
src/main/java/de/butzlabben/world/config/Entry.java
View File

@ -1,11 +1,11 @@
package de.butzlabben.world.config;
import java.io.File;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.configuration.file.YamlConfiguration;
import java.io.File;
public class Entry {
private final OfflinePlayer op;

20
src/main/java/de/butzlabben/world/config/GuiConfig.java
View File

@ -1,16 +1,7 @@
package de.butzlabben.world.config;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.List;
import de.butzlabben.inventory.OrcItem;
import de.butzlabben.world.WorldSystem;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
@ -18,8 +9,11 @@ import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.java.JavaPlugin;
import de.butzlabben.inventory.OrcItem;
import de.butzlabben.world.WorldSystem;
import java.io.*;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.List;
public class GuiConfig {

451
src/main/java/de/butzlabben/world/config/PluginConfig.java
View File

@ -1,252 +1,243 @@
package de.butzlabben.world.config;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import de.butzlabben.world.WorldSystem;
import de.butzlabben.world.util.PlayerPositions;
import net.md_5.bungee.api.ChatColor;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin;
import java.io.*;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.text.SimpleDateFormat;
import java.util.Date;
import de.butzlabben.world.util.PlayerPositions;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.WorldCreator;
import org.bukkit.World.Environment;
import org.bukkit.WorldType;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin;
import de.butzlabben.world.WorldSystem;
import net.md_5.bungee.api.ChatColor;
public class PluginConfig {
private PluginConfig() {
}
private static File file;
public static void checkConfig(File f) {
file = f;
if (file.exists()) {
YamlConfiguration cfg = getConfig();
if (!(cfg.isString("worldfolder") && cfg.isInt("unloadingtime")
&& cfg.isBoolean("survival") && cfg.isString("language") && cfg.isString("prefix")
&& cfg.isInt("request_expires") && cfg.isBoolean("need_confirm")
&& cfg.isBoolean("contact_authserver") && cfg.isBoolean("spawn_teleportation")
&& cfg.isInt("delete_after") && cfg.isBoolean("worldtemplates.multi_choose")
&& cfg.isString("worldtemplates.default") &&
// Database stuff
cfg.isString("database.type") && cfg.isString("database.worlds_table_name") && cfg.isString("database.players_table_name")
&& cfg.isString("database.mysql_settings.host") && cfg.isInt("database.mysql_settings.port")
&& cfg.isString("database.mysql_settings.username") && cfg.isString("database.mysql_settings.password")
&& cfg.isString("database.mysql_settings.database") && cfg.isString("database.sqlite_settings.file") &&
cfg.isInt("lagsystem.period_in_seconds") && cfg.isInt("lagsystem.entities_per_world")
&& cfg.isBoolean("lagsystem.garbagecollector.use")
&& cfg.isInt("lagsystem.garbagecollector.period_in_minutes") &&
cfg.isString("worldgeneration.type") && cfg.isString("worldgeneration.environment")
&& cfg.isString("worldgeneration.generator")
&& (cfg.isLong("worldgeneration.seed") || cfg.isInt("worldgeneration.seed")) &&
cfg.isString("spawn.spawnpoint.world") && cfg.isInt("spawn.gamemode")
&& cfg.isBoolean("spawn.spawnpoint.use_last_location")
&& (cfg.isDouble("spawn.spawnpoint.x") || cfg.isInt("spawn.spawnpoint.x"))
&& (cfg.isDouble("spawn.spawnpoint.y") || cfg.isInt("spawn.spawnpoint.y"))
&& (cfg.isDouble("spawn.spawnpoint.z") || cfg.isInt("spawn.spawnpoint.z"))
&& (cfg.isDouble("spawn.spawnpoint.yaw") || cfg.isInt("spawn.spawnpoint.yaw"))
&& (cfg.isDouble("spawn.spawnpoint.pitch") || cfg.isInt("spawn.spawnpoint.pitch")) &&
cfg.isBoolean("worldspawn.use") && cfg.isBoolean("worldspawn.use_last_location")
&& (cfg.isDouble("worldspawn.spawnpoint.x") || cfg.isInt("worldspawn.spawnpoint.x"))
&& (cfg.isDouble("worldspawn.spawnpoint.y") || cfg.isInt("worldspawn.spawnpoint.y"))
&& (cfg.isDouble("worldspawn.spawnpoint.z") || cfg.isInt("worldspawn.spawnpoint.z"))
&& (cfg.isDouble("worldspawn.spawnpoint.yaw") || cfg.isInt("worldspawn.spawnpoint.yaw"))
&& (cfg.isDouble("worldspawn.spawnpoint.pitch") || cfg.isInt("worldspawn.spawnpoint.pitch")))) {
try {
Files.copy(file.toPath(),
new File(file.getParentFile(), "config-broken-"
+ new SimpleDateFormat("dd-MM-yyyy-HH-mm-ss").format(new Date()) + ".yml").toPath(),
StandardCopyOption.REPLACE_EXISTING);
Files.delete(file.toPath());
System.err.println("[WorldSystem] Config is broken, creating a new one!");
checkConfig(f);
} catch (IOException e) {
e.printStackTrace();
}
}
} else {
try {
InputStream in = JavaPlugin.getPlugin(WorldSystem.class).getResource("config.yml");
Files.copy(in, file.toPath());
} catch (IOException e) {
System.err.println("Wasn't able to create Config");
e.printStackTrace();
}
}
// Should fix #2
if (getSpawn(null).getWorld() == null) {
Bukkit.getConsoleSender().sendMessage(getPrefix() + "§cWorld is null in spawn.world!");
}
}
public static YamlConfiguration getConfig() {
try {
return YamlConfiguration
.loadConfiguration(new InputStreamReader(new FileInputStream(file), Charset.forName("UTF-8")));
} catch (FileNotFoundException e) {
e.printStackTrace();
}
throw new IllegalStateException("Cannot access config file");
}
public static int getGCPeriod() {
return getConfig().getInt("lagsystem.garbagecollector.period_in_minutes", 5);
}
public static boolean useGC() {
return getConfig().getBoolean("lagsystem.garbagecollector.use", false);
}
public static int getEntitysPerWorld() {
return getConfig().getInt("lagsystem.entities_per_world", 350);
}
public static int getLagCheckPeriod() {
return getConfig().getInt("lagsystem.period_in_seconds", 10);
}
public static boolean useWorldSpawn() {
return getConfig().getBoolean("worldspawn.use", true);
}
public static boolean isSurvival() {
return getConfig().getBoolean("survival", false);
}
public static int getUnloadingTime() {
return getConfig().getInt("unloadingtime", 20);
}
private final static GameMode[] gameModes = new GameMode[] { GameMode.SURVIVAL, GameMode.CREATIVE,
GameMode.ADVENTURE, GameMode.SPECTATOR };
public static GameMode getSpawnGamemode() {
return gameModes[getConfig().getInt("spawn.gamemode", 2)];
}
public static String getWorlddir() {
return getConfig().getString("worldfolder", "plugins/WorldSystem/Worlds") + "/";
}
public static boolean isMultiChoose() {
return getConfig().getBoolean("worldtemplates.multi_choose", false);
}
public static String getDefaultWorldTemplate() {
return getConfig().getString("worldtemplates.default", "");
}
public static String getLanguage() {
return getConfig().getString("language", "en");
}
public static String getPrefix() {
return ChatColor.translateAlternateColorCodes('&', getConfig().getString("prefix", "§8[§3WorldSystem§8] §6"));
}
public static Location getWorldSpawn(World w) {
return getLocation(getConfig(), "worldspawn.spawnpoint", w);
}
public static Location getSpawn(Player player) {
YamlConfiguration cfg = getConfig();
Location location = getLocation(cfg, "spawn.spawnpoint", Bukkit.getWorld(cfg.getString("spawn.spawnpoint.world", "world")));
return PlayerPositions.getInstance().injectPlayersLocation(player, location);
}
public static int getRequestExpire() {
return getConfig().getInt("request_expires", 20);
}
private static Location getLocation(YamlConfiguration cfg, String path, World world) {
return new Location(world, cfg.getDouble(path + ".x", 0), cfg.getDouble(path + ".y", 20),
cfg.getDouble(path + ".z", 0), (float) cfg.getDouble(path + ".yaw", 0),
(float) cfg.getDouble(path + ".pitch", 0));
}
public static boolean confirmNeed() {
return getConfig().getBoolean("need_confirm", true);
}
public static boolean contactAuth() {
return getConfig().getBoolean("contact_authserver", true);
}
public static boolean spawnTeleportation() {
return getConfig().getBoolean("spawn_teleportation", true);
}
public static boolean shouldDelete() {
return getConfig().getInt("delete_after") != -1;
}
public static long deleteAfter() {
return getConfig().getLong("delete_after");
}
public static boolean useWorldSpawnLastLocation() {
return getConfig().getBoolean("worldspawn.use_last_location");
private PluginConfig() {
}
public static boolean useSpawnLastLocation() {
return getConfig().getBoolean("spawn.spawnpoint.use_last_location");
}
private static File file;
public static String getWorldsTableName() {
return getConfig().getString("database.worlds_table_name");
}
private final static GameMode[] gameModes = new GameMode[]{GameMode.SURVIVAL, GameMode.CREATIVE,
GameMode.ADVENTURE, GameMode.SPECTATOR};
public static String getPlayersTableName() {
return getConfig().getString("database.players_table_name");
}
public static void checkConfig(File f) {
file = f;
if (file.exists()) {
YamlConfiguration cfg = getConfig();
if (!(cfg.isString("worldfolder") && cfg.isInt("unloadingtime")
&& cfg.isBoolean("survival") && cfg.isString("language") && cfg.isString("prefix")
&& cfg.isInt("request_expires") && cfg.isBoolean("need_confirm")
&& cfg.isBoolean("contact_authserver") && cfg.isBoolean("spawn_teleportation")
&& cfg.isInt("delete_after") && cfg.isBoolean("worldtemplates.multi_choose")
&& cfg.isString("worldtemplates.default") &&
public static String getDatabaseType() {
return getConfig().getString("database.type");
}
// Database stuff
cfg.isString("database.type") && cfg.isString("database.worlds_table_name") && cfg.isString("database.players_table_name")
&& cfg.isString("database.mysql_settings.host") && cfg.isInt("database.mysql_settings.port")
&& cfg.isString("database.mysql_settings.username") && cfg.isString("database.mysql_settings.password")
&& cfg.isString("database.mysql_settings.database") && cfg.isString("database.sqlite_settings.file") &&
public static String getSqliteFile() {
return getConfig().getString("database.sqlite_settings.file");
}
cfg.isInt("lagsystem.period_in_seconds") && cfg.isInt("lagsystem.entities_per_world")
&& cfg.isBoolean("lagsystem.garbagecollector.use")
&& cfg.isInt("lagsystem.garbagecollector.period_in_minutes") &&
public static String getMysqlHost() {
return getConfig().getString("database.mysql_settings.host");
}
cfg.isString("worldgeneration.type") && cfg.isString("worldgeneration.environment")
&& cfg.isString("worldgeneration.generator")
&& (cfg.isLong("worldgeneration.seed") || cfg.isInt("worldgeneration.seed")) &&
public static int getMysqlPort() {
return getConfig().getInt("database.mysql_settings.port");
}
cfg.isString("spawn.spawnpoint.world") && cfg.isInt("spawn.gamemode")
&& cfg.isBoolean("spawn.spawnpoint.use_last_location")
&& (cfg.isDouble("spawn.spawnpoint.x") || cfg.isInt("spawn.spawnpoint.x"))
&& (cfg.isDouble("spawn.spawnpoint.y") || cfg.isInt("spawn.spawnpoint.y"))
&& (cfg.isDouble("spawn.spawnpoint.z") || cfg.isInt("spawn.spawnpoint.z"))
&& (cfg.isDouble("spawn.spawnpoint.yaw") || cfg.isInt("spawn.spawnpoint.yaw"))
&& (cfg.isDouble("spawn.spawnpoint.pitch") || cfg.isInt("spawn.spawnpoint.pitch")) &&
public static String getMysqlUser() {
return getConfig().getString("database.mysql_settings.user");
}
cfg.isBoolean("worldspawn.use") && cfg.isBoolean("worldspawn.use_last_location")
&& (cfg.isDouble("worldspawn.spawnpoint.x") || cfg.isInt("worldspawn.spawnpoint.x"))
&& (cfg.isDouble("worldspawn.spawnpoint.y") || cfg.isInt("worldspawn.spawnpoint.y"))
&& (cfg.isDouble("worldspawn.spawnpoint.z") || cfg.isInt("worldspawn.spawnpoint.z"))
&& (cfg.isDouble("worldspawn.spawnpoint.yaw") || cfg.isInt("worldspawn.spawnpoint.yaw"))
&& (cfg.isDouble("worldspawn.spawnpoint.pitch") || cfg.isInt("worldspawn.spawnpoint.pitch")))) {
try {
Files.copy(file.toPath(),
new File(file.getParentFile(), "config-broken-"
+ new SimpleDateFormat("dd-MM-yyyy-HH-mm-ss").format(new Date()) + ".yml").toPath(),
StandardCopyOption.REPLACE_EXISTING);
Files.delete(file.toPath());
System.err.println("[WorldSystem] Config is broken, creating a new one!");
checkConfig(f);
} catch (IOException e) {
e.printStackTrace();
}
}
} else {
try {
InputStream in = JavaPlugin.getPlugin(WorldSystem.class).getResource("config.yml");
Files.copy(in, file.toPath());
} catch (IOException e) {
System.err.println("Wasn't able to create Config");
e.printStackTrace();
}
}
public static String getMysqlPassword() {
return getConfig().getString("database.mysql_settings.password");
}
// Should fix #2
if (getSpawn(null).getWorld() == null) {
Bukkit.getConsoleSender().sendMessage(getPrefix() + "§cWorld is null in spawn.world!");
}
}
public static String getMysqlDatabaseName() {
return getConfig().getString("database.mysql_settings.host");
}
public static YamlConfiguration getConfig() {
try {
return YamlConfiguration
.loadConfiguration(new InputStreamReader(new FileInputStream(file), Charset.forName("UTF-8")));
} catch (FileNotFoundException e) {
e.printStackTrace();
}
throw new IllegalStateException("Cannot access config file");
}
public static int getGCPeriod() {
return getConfig().getInt("lagsystem.garbagecollector.period_in_minutes", 5);
}
public static boolean useGC() {
return getConfig().getBoolean("lagsystem.garbagecollector.use", false);
}
public static int getEntitysPerWorld() {
return getConfig().getInt("lagsystem.entities_per_world", 350);
}
public static int getLagCheckPeriod() {
return getConfig().getInt("lagsystem.period_in_seconds", 10);
}
public static boolean useWorldSpawn() {
return getConfig().getBoolean("worldspawn.use", true);
}
public static boolean isSurvival() {
return getConfig().getBoolean("survival", false);
}
public static int getUnloadingTime() {
return getConfig().getInt("unloadingtime", 20);
}
public static GameMode getSpawnGamemode() {
return gameModes[getConfig().getInt("spawn.gamemode", 2)];
}
public static String getWorlddir() {
return getConfig().getString("worldfolder", "plugins/WorldSystem/Worlds") + "/";
}
public static boolean isMultiChoose() {
return getConfig().getBoolean("worldtemplates.multi_choose", false);
}
public static String getDefaultWorldTemplate() {
return getConfig().getString("worldtemplates.default", "");
}
public static String getLanguage() {
return getConfig().getString("language", "en");
}
public static String getPrefix() {
return ChatColor.translateAlternateColorCodes('&', getConfig().getString("prefix", "§8[§3WorldSystem§8] §6"));
}
public static Location getWorldSpawn(World w) {
return getLocation(getConfig(), "worldspawn.spawnpoint", w);
}
public static Location getSpawn(Player player) {
YamlConfiguration cfg = getConfig();
Location location = getLocation(cfg, "spawn.spawnpoint", Bukkit.getWorld(cfg.getString("spawn.spawnpoint.world", "world")));
return PlayerPositions.getInstance().injectPlayersLocation(player, location);
}
public static int getRequestExpire() {
return getConfig().getInt("request_expires", 20);
}
private static Location getLocation(YamlConfiguration cfg, String path, World world) {
return new Location(world, cfg.getDouble(path + ".x", 0), cfg.getDouble(path + ".y", 20),
cfg.getDouble(path + ".z", 0), (float) cfg.getDouble(path + ".yaw", 0),
(float) cfg.getDouble(path + ".pitch", 0));
}
public static boolean confirmNeed() {
return getConfig().getBoolean("need_confirm", true);
}
public static boolean contactAuth() {
return getConfig().getBoolean("contact_authserver", true);
}
public static boolean spawnTeleportation() {
return getConfig().getBoolean("spawn_teleportation", true);
}
public static boolean shouldDelete() {
return getConfig().getInt("delete_after") != -1;
}
public static long deleteAfter() {
return getConfig().getLong("delete_after");
}
public static boolean useWorldSpawnLastLocation() {
return getConfig().getBoolean("worldspawn.use_last_location");
}
public static boolean useSpawnLastLocation() {
return getConfig().getBoolean("spawn.spawnpoint.use_last_location");
}
public static String getWorldsTableName() {
return getConfig().getString("database.worlds_table_name");
}
public static String getPlayersTableName() {
return getConfig().getString("database.players_table_name");
}
public static String getDatabaseType() {
return getConfig().getString("database.type");
}
public static String getSqliteFile() {
return getConfig().getString("database.sqlite_settings.file");
}
public static String getMysqlHost() {
return getConfig().getString("database.mysql_settings.host");
}
public static int getMysqlPort() {
return getConfig().getInt("database.mysql_settings.port");
}
public static String getMysqlUser() {
return getConfig().getString("database.mysql_settings.user");
}
public static String getMysqlPassword() {
return getConfig().getString("database.mysql_settings.password");
}
public static String getMysqlDatabaseName() {
return getConfig().getString("database.mysql_settings.host");
}
}

22
src/main/java/de/butzlabben/world/config/SettingsConfig.java
View File

@ -1,17 +1,7 @@
package de.butzlabben.world.config;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.util.HashMap;
import java.util.List;
import java.util.UUID;
import de.butzlabben.world.WorldSystem;
import de.butzlabben.world.wrapper.SystemWorld;
import org.bukkit.Bukkit;
import org.bukkit.Difficulty;
import org.bukkit.Location;
@ -20,8 +10,12 @@ import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin;
import de.butzlabben.world.WorldSystem;
import de.butzlabben.world.wrapper.SystemWorld;
import java.io.*;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.util.HashMap;
import java.util.List;
import java.util.UUID;
public class SettingsConfig {

4
src/main/java/de/butzlabben/world/event/WorldAddmemberEvent.java
View File

@ -1,10 +1,10 @@
package de.butzlabben.world.event;
import java.util.UUID;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import java.util.UUID;
/**
* Event for adding somebody to a world
*

3
src/main/java/de/butzlabben/world/event/WorldDeleteEvent.java
View File

@ -1,10 +1,9 @@
package de.butzlabben.world.event;
import de.butzlabben.world.wrapper.SystemWorld;
import org.bukkit.command.CommandSender;
import org.bukkit.event.HandlerList;
import de.butzlabben.world.wrapper.SystemWorld;
/**
* Event if a systemworld gets deleted
*

3
src/main/java/de/butzlabben/world/event/WorldLoadEvent.java
View File

@ -1,10 +1,9 @@
package de.butzlabben.world.event;
import de.butzlabben.world.wrapper.SystemWorld;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import de.butzlabben.world.wrapper.SystemWorld;
/**
* Event for loading a world
*

4
src/main/java/de/butzlabben/world/event/WorldRemovememberEvent.java
View File

@ -1,10 +1,10 @@
package de.butzlabben.world.event;
import java.util.UUID;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import java.util.UUID;
/**
* @author Butzlabben
* @since 09.05.2018

3
src/main/java/de/butzlabben/world/event/WorldResetEvent.java
View File

@ -1,10 +1,9 @@
package de.butzlabben.world.event;
import de.butzlabben.world.wrapper.SystemWorld;
import org.bukkit.command.CommandSender;
import org.bukkit.event.HandlerList;
import de.butzlabben.world.wrapper.SystemWorld;
/**
* Event when a world gets reset
*

3
src/main/java/de/butzlabben/world/event/WorldToggleFireEvent.java
View File

@ -1,10 +1,9 @@
package de.butzlabben.world.event;
import de.butzlabben.world.wrapper.SystemWorld;
import org.bukkit.command.CommandSender;
import org.bukkit.event.HandlerList;
import de.butzlabben.world.wrapper.SystemWorld;
/**
* @author Butzlabben
* @since 09.05.2018

3
src/main/java/de/butzlabben/world/event/WorldToggleTntEvent.java
View File

@ -1,10 +1,9 @@
package de.butzlabben.world.event;
import de.butzlabben.world.wrapper.SystemWorld;
import org.bukkit.command.CommandSender;
import org.bukkit.event.HandlerList;
import de.butzlabben.world.wrapper.SystemWorld;
/**
* @author Butzlabben
* @since 09.05.2018

3
src/main/java/de/butzlabben/world/event/WorldUnloadEvent.java
View File

@ -1,8 +1,7 @@
package de.butzlabben.world.event;
import org.bukkit.event.HandlerList;
import de.butzlabben.world.wrapper.SystemWorld;
import org.bukkit.event.HandlerList;
/**
* @author Butzlabben

5
src/main/java/de/butzlabben/world/gui/GuiCommand.java
View File

@ -1,13 +1,12 @@
package de.butzlabben.world.gui;
import de.butzlabben.world.config.MessageConfig;
import de.butzlabben.world.wrapper.WorldPlayer;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import de.butzlabben.world.config.MessageConfig;
import de.butzlabben.world.wrapper.WorldPlayer;
public class GuiCommand implements CommandExecutor {
@Override

11
src/main/java/de/butzlabben/world/gui/PlayerOptionsGUI.java
View File

@ -1,11 +1,5 @@
package de.butzlabben.world.gui;
import java.util.UUID;
import de.butzlabben.world.gui.playeroption.WorldEditStatus;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import de.butzlabben.inventory.DependListener;
import de.butzlabben.inventory.OrcInventory;
import de.butzlabben.inventory.OrcItem;
@ -15,7 +9,12 @@ import de.butzlabben.world.gui.clicklistener.CommandExecutorClickListener;
import de.butzlabben.world.gui.playeroption.BuildStatus;
import de.butzlabben.world.gui.playeroption.GamemodeStatus;
import de.butzlabben.world.gui.playeroption.TeleportStatus;
import de.butzlabben.world.gui.playeroption.WorldEditStatus;
import de.butzlabben.world.wrapper.WorldPlayer;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import java.util.UUID;
public class PlayerOptionsGUI extends OrcInventory {

20
src/main/java/de/butzlabben/world/gui/PlayersPageGUI.java
View File

@ -1,20 +1,20 @@
package de.butzlabben.world.gui;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map.Entry;
import java.util.UUID;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.SkullMeta;
import de.butzlabben.inventory.OrcItem;
import de.butzlabben.inventory.pages.PageGUICreator;
import de.butzlabben.world.config.GuiConfig;
import de.butzlabben.world.config.MessageConfig;
import de.butzlabben.world.config.WorldConfig;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.SkullMeta;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map.Entry;
import java.util.UUID;
/**
* @author Butzlabben

11
src/main/java/de/butzlabben/world/gui/WorldOptionsGUI.java
View File

@ -1,11 +1,5 @@
package de.butzlabben.world.gui;
import java.util.HashMap;
import java.util.UUID;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import de.butzlabben.inventory.DependListener;
import de.butzlabben.inventory.OrcInventory;
import de.butzlabben.inventory.OrcItem;
@ -15,6 +9,11 @@ import de.butzlabben.world.gui.clicklistener.CommandExecutorClickListener;
import de.butzlabben.world.gui.worldoption.FireStatus;
import de.butzlabben.world.gui.worldoption.TntStatus;
import de.butzlabben.world.wrapper.WorldPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import java.util.HashMap;
import java.util.UUID;
public class WorldOptionsGUI extends OrcInventory {

5
src/main/java/de/butzlabben/world/gui/WorldSystemGUI.java
View File

@ -1,14 +1,13 @@
package de.butzlabben.world.gui;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import de.butzlabben.inventory.OrcClickListener;
import de.butzlabben.inventory.OrcInventory;
import de.butzlabben.inventory.OrcItem;
import de.butzlabben.world.config.GuiConfig;
import de.butzlabben.world.config.WorldConfig;
import de.butzlabben.world.gui.clicklistener.InventoryOpenClickListener;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
public class WorldSystemGUI extends OrcInventory {

3
src/main/java/de/butzlabben/world/gui/clicklistener/ComingSoonClickListener.java
View File

@ -1,10 +1,9 @@
package de.butzlabben.world.gui.clicklistener;
import org.bukkit.entity.Player;
import de.butzlabben.inventory.OrcClickListener;
import de.butzlabben.inventory.OrcInventory;
import de.butzlabben.inventory.OrcItem;
import org.bukkit.entity.Player;
public class ComingSoonClickListener implements OrcClickListener {

3
src/main/java/de/butzlabben/world/gui/clicklistener/CommandExecutorClickListener.java
View File

@ -1,10 +1,9 @@
package de.butzlabben.world.gui.clicklistener;
import org.bukkit.entity.Player;
import de.butzlabben.inventory.OrcClickListener;
import de.butzlabben.inventory.OrcInventory;
import de.butzlabben.inventory.OrcItem;
import org.bukkit.entity.Player;
public class CommandExecutorClickListener implements OrcClickListener {

5
src/main/java/de/butzlabben/world/gui/clicklistener/InventoryOpenClickListener.java
View File

@ -1,12 +1,11 @@
package de.butzlabben.world.gui.clicklistener;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import de.butzlabben.inventory.OrcClickListener;
import de.butzlabben.inventory.OrcInventory;
import de.butzlabben.inventory.OrcItem;
import de.butzlabben.world.config.MessageConfig;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
public class InventoryOpenClickListener implements OrcClickListener {

5
src/main/java/de/butzlabben/world/gui/playeroption/BuildStatus.java
View File

@ -1,11 +1,10 @@
package de.butzlabben.world.gui.playeroption;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import de.butzlabben.inventory.DependListener;
import de.butzlabben.inventory.OrcItem;
import de.butzlabben.world.wrapper.WorldPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
public class BuildStatus implements DependListener {

5
src/main/java/de/butzlabben/world/gui/playeroption/GamemodeStatus.java
View File

@ -1,11 +1,10 @@
package de.butzlabben.world.gui.playeroption;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import de.butzlabben.inventory.DependListener;
import de.butzlabben.inventory.OrcItem;
import de.butzlabben.world.wrapper.WorldPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
public class GamemodeStatus implements DependListener {

5
src/main/java/de/butzlabben/world/gui/playeroption/TeleportStatus.java
View File

@ -1,11 +1,10 @@
package de.butzlabben.world.gui.playeroption;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import de.butzlabben.inventory.DependListener;
import de.butzlabben.inventory.OrcItem;
import de.butzlabben.world.wrapper.WorldPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
public class TeleportStatus implements DependListener {

11
src/main/java/de/butzlabben/world/gui/worldoption/FireStatus.java
View File

@ -1,16 +1,15 @@
package de.butzlabben.world.gui.worldoption;
import java.io.File;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import de.butzlabben.inventory.DependListener;
import de.butzlabben.inventory.OrcItem;
import de.butzlabben.world.config.DependenceConfig;
import de.butzlabben.world.config.PluginConfig;
import de.butzlabben.world.wrapper.WorldPlayer;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import java.io.File;
public class FireStatus implements DependListener {

11
src/main/java/de/butzlabben/world/gui/worldoption/TntStatus.java
View File

@ -1,16 +1,15 @@
package de.butzlabben.world.gui.worldoption;
import java.io.File;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import de.butzlabben.inventory.DependListener;
import de.butzlabben.inventory.OrcItem;
import de.butzlabben.world.config.DependenceConfig;
import de.butzlabben.world.config.PluginConfig;
import de.butzlabben.world.wrapper.WorldPlayer;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import java.io.File;
public class TntStatus implements DependListener {

9
src/main/java/de/butzlabben/world/listener/BlockListener.java
View File

@ -1,8 +1,7 @@
package de.butzlabben.world.listener;
import java.io.File;
import java.util.Objects;
import de.butzlabben.world.config.WorldConfig;
import de.butzlabben.world.wrapper.WorldPlayer;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
@ -12,8 +11,8 @@ import org.bukkit.event.block.BlockIgniteEvent;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.entity.EntityExplodeEvent;
import de.butzlabben.world.config.WorldConfig;
import de.butzlabben.world.wrapper.WorldPlayer;
import java.io.File;
import java.util.Objects;
public class BlockListener implements Listener {

11
src/main/java/de/butzlabben/world/listener/PlayerDeathListener.java
View File

@ -1,8 +1,8 @@
package de.butzlabben.world.listener;
import java.util.HashMap;
import java.util.UUID;
import de.butzlabben.world.config.PluginConfig;
import de.butzlabben.world.config.WorldConfig;
import de.butzlabben.world.wrapper.WorldPlayer;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -10,9 +10,8 @@ import org.bukkit.event.Listener;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.player.PlayerRespawnEvent;
import de.butzlabben.world.config.PluginConfig;
import de.butzlabben.world.config.WorldConfig;
import de.butzlabben.world.wrapper.WorldPlayer;
import java.util.HashMap;
import java.util.UUID;
public class PlayerDeathListener implements Listener {

7
src/main/java/de/butzlabben/world/listener/PlayerListener.java
View File

@ -1,7 +1,10 @@
package de.butzlabben.world.listener;
import de.butzlabben.world.config.DependenceConfig;
import de.butzlabben.world.config.PluginConfig;
import de.butzlabben.world.config.WorldConfig;
import de.butzlabben.world.util.PlayerPositions;
import de.butzlabben.world.wrapper.SystemWorld;
import de.butzlabben.world.wrapper.WorldPlayer;
import org.bukkit.World;
import org.bukkit.entity.Player;
@ -11,10 +14,6 @@ import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import de.butzlabben.world.config.DependenceConfig;
import de.butzlabben.world.config.PluginConfig;
import de.butzlabben.world.wrapper.SystemWorld;
public class PlayerListener implements Listener {
//#17

6
src/main/java/de/butzlabben/world/util/TeleportUtil.java
View File

@ -1,11 +1,11 @@
package de.butzlabben.world.util;
import java.util.HashMap;
import java.util.UUID;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import java.util.HashMap;
import java.util.UUID;
/**
* @author Butzlabben
* @since 13.09.2018

2
src/main/java/de/butzlabben/world/util/database/DatabaseRepository.java
View File

@ -3,11 +3,11 @@ package de.butzlabben.world.util.database;
import de.butzlabben.world.config.PluginConfig;
import lombok.Getter;
@Getter
public class DatabaseRepository {
@Getter
private static DatabaseRepository instance = new DatabaseRepository();
@Getter
private final DatabaseUtil util;
private DatabaseRepository() {

3
src/main/java/de/butzlabben/world/util/database/MysqlConnection.java
View File

@ -2,7 +2,8 @@ package de.butzlabben.world.util.database;
import de.butzlabben.world.config.PluginConfig;
import java.sql.*;
import java.sql.DriverManager;
import java.sql.SQLException;
public class MysqlConnection extends DatabaseConnection {

3
src/main/java/de/butzlabben/world/util/database/SqliteConnection.java
View File

@ -2,7 +2,8 @@ package de.butzlabben.world.util.database;
import de.butzlabben.world.config.PluginConfig;
import java.sql.*;
import java.sql.DriverManager;
import java.sql.SQLException;
public class SqliteConnection extends DatabaseConnection {

5
src/main/java/de/butzlabben/world/wrapper/AsyncCreatorAdapter.java
View File

@ -1,13 +1,12 @@
package de.butzlabben.world.wrapper;
import com.boydti.fawe.bukkit.wrapper.AsyncWorld;
import com.boydti.fawe.util.TaskManager;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.WorldCreator;
import org.bukkit.block.Block;
import com.boydti.fawe.bukkit.wrapper.AsyncWorld;
import com.boydti.fawe.util.TaskManager;
import java.util.Objects;
/**

8
src/main/java/org/bstats/bukkit/Metrics.java
View File

@ -18,13 +18,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Timer;
import java.util.TimerTask;
import java.util.UUID;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.logging.Level;
import java.util.zip.GZIPOutputStream;