Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions src/main/java/com/drtshock/playervaults/Metrics.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,12 @@
import org.bukkit.plugin.ServicePriority;

import javax.net.ssl.HttpsURLConnection;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.*;
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;
Expand Down
51 changes: 23 additions & 28 deletions src/main/java/com/drtshock/playervaults/PlayerVaults.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,7 @@

package com.drtshock.playervaults;

import com.drtshock.playervaults.commands.ConsoleCommand;
import com.drtshock.playervaults.commands.ConvertCommand;
import com.drtshock.playervaults.commands.DeleteCommand;
import com.drtshock.playervaults.commands.HelpMeCommand;
import com.drtshock.playervaults.commands.SignCommand;
import com.drtshock.playervaults.commands.SignSetInfo;
import com.drtshock.playervaults.commands.VaultCommand;
import com.drtshock.playervaults.commands.*;
import com.drtshock.playervaults.config.Loader;
import com.drtshock.playervaults.config.file.Config;
import com.drtshock.playervaults.config.file.Translation;
Expand All @@ -39,15 +33,11 @@
import com.drtshock.playervaults.vaultmanagement.VaultManager;
import com.drtshock.playervaults.vaultmanagement.VaultViewInfo;
import com.google.gson.Gson;
import net.kyori.adventure.audience.Audience;
import dev.kitteh.cardboardbox.CardboardBox;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.minimessage.MiniMessage;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.OfflinePlayer;
import org.bukkit.Registry;
import org.bukkit.*;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.InvalidConfigurationException;
Expand All @@ -60,16 +50,9 @@
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.scheduler.BukkitRunnable;
import dev.kitteh.cardboardbox.CardboardBox;
import sun.misc.Unsafe;

import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.*;
import java.lang.reflect.Field;
import java.net.HttpURLConnection;
import java.net.URL;
Expand All @@ -79,13 +62,7 @@
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.function.Supplier;
Expand Down Expand Up @@ -198,6 +175,24 @@ public void run() {
}
}.runTaskTimer(this, 20, 20);

// Force save after an amount of time
new BukkitRunnable() {
@Override
public void run() {
long now = System.currentTimeMillis();
inVault.forEach((uuid, info) -> {
Player p = Bukkit.getPlayer(UUID.fromString(uuid));
if (p != null && p.isOnline()) {
Inventory inv = p.getOpenInventory().getTopInventory();
if (inv != null && inv.getViewers().size() >= 1) {
// Player is still in the vault, force save after a timeout
VaultManager.getInstance().saveVault(inv, p.getUniqueId().toString(), info.getNumber());
}
}
});
}
}.runTaskTimer(this, 6000, 6000);

this.metrics = new Metrics(this, 6905);
Plugin vault = getServer().getPluginManager().getPlugin("Vault");
this.metricsDrillPie("vault", () -> this.metricsPluginInfo(vault));
Expand Down
16 changes: 2 additions & 14 deletions src/main/java/com/drtshock/playervaults/config/Loader.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,7 @@
import com.drtshock.playervaults.config.annotation.ConfigName;
import com.drtshock.playervaults.config.annotation.WipeOnReload;
import com.drtshock.playervaults.config.file.Translation;
import com.drtshock.playervaults.lib.com.typesafe.config.Config;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigFactory;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigRenderOptions;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigValue;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigValueFactory;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigValueType;
import com.drtshock.playervaults.lib.com.typesafe.config.*;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;

Expand All @@ -38,14 +33,7 @@
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;

public class Loader {
public static void loadAndSave(@NonNull String fileName, @NonNull Object config) throws IOException, IllegalAccessException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,7 @@
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;

@SuppressWarnings("FieldMayBeFinal")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin;
import org.bukkit.util.io.BukkitObjectInputStream;

import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
import java.lang.reflect.Field;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.*;
import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;

public class AxVaultsConverter implements Converter {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin;

import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.sql.Connection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,14 @@
import org.bukkit.command.CommandSender;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin;
import org.bukkit.util.io.BukkitObjectInputStream;

import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Arrays;
import java.util.Base64;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Level;
import java.util.regex.Matcher;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,13 @@
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin;

import java.io.File;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
import java.lang.reflect.Field;
import java.nio.file.Files;
import java.nio.file.Path;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.logging.Level;

public class XVaultsConverter implements Converter {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
*/
package com.drtshock.playervaults.lib.com.typesafe.config;

import com.drtshock.playervaults.lib.com.typesafe.config.impl.ConfigImplUtil;

import java.io.IOException;
import java.io.Serializable;
import java.lang.reflect.Field;

import com.drtshock.playervaults.lib.com.typesafe.config.impl.ConfigImplUtil;

/**
* All exceptions thrown by the library are subclasses of
* <code>ConfigException</code>.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.drtshock.playervaults.lib.com.typesafe.config;

import java.net.URL;

import com.drtshock.playervaults.lib.com.typesafe.config.impl.ConfigImpl;

import java.net.URL;

/**
* This class contains some static factory methods for building a {@link
* ConfigOrigin}. {@code ConfigOrigin}s are automatically created when you
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.drtshock.playervaults.lib.com.typesafe.config;

import java.util.List;

import com.drtshock.playervaults.lib.com.typesafe.config.impl.ConfigImplUtil;

import java.util.List;

/**
* Contains static utility methods.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
*/
package com.drtshock.playervaults.lib.com.typesafe.config;

import java.util.Map;

import com.drtshock.playervaults.lib.com.typesafe.config.impl.ConfigImpl;

import java.util.Map;

/**
* This class holds some static factory methods for building {@link ConfigValue}
* instances. See also {@link ConfigFactory} which has methods for parsing files
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package com.drtshock.playervaults.lib.com.typesafe.config.impl;

import com.drtshock.playervaults.lib.com.typesafe.config.parser.ConfigNode;

import java.util.Collection;

abstract class AbstractConfigNode implements ConfigNode {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,9 @@
*/
package com.drtshock.playervaults.lib.com.typesafe.config.impl;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;

import com.drtshock.playervaults.lib.com.typesafe.config.ConfigException;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigMergeable;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigObject;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigOrigin;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigRenderOptions;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigValue;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigValueType;
import com.drtshock.playervaults.lib.com.typesafe.config.*;

import java.util.*;

abstract class AbstractConfigObject extends AbstractConfigValue implements ConfigObject, Container {
final private SimpleConfig config;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,9 @@
*/
package com.drtshock.playervaults.lib.com.typesafe.config.impl;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;

import com.drtshock.playervaults.lib.com.typesafe.config.ConfigException;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigMergeable;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigObject;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigOrigin;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigRenderOptions;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigValue;
import com.drtshock.playervaults.lib.com.typesafe.config.*;

import java.util.*;

/**
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,15 @@
package com.drtshock.playervaults.lib.com.typesafe.config.impl;

import com.drtshock.playervaults.lib.com.typesafe.config.*;
import com.drtshock.playervaults.lib.com.typesafe.config.Optional;

import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.lang.reflect.*;
import java.time.Duration;
import java.util.Set;

import com.drtshock.playervaults.lib.com.typesafe.config.Config;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigObject;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigList;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigException;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigMemorySize;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigValue;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigValueType;
import com.drtshock.playervaults.lib.com.typesafe.config.Optional;
import java.util.*;

/**
* Internal implementation detail, not ABI stable, do not touch.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
*/
package com.drtshock.playervaults.lib.com.typesafe.config.impl;

import java.io.ObjectStreamException;
import java.io.Serializable;

import com.drtshock.playervaults.lib.com.typesafe.config.ConfigOrigin;
import com.drtshock.playervaults.lib.com.typesafe.config.ConfigValueType;

import java.io.ObjectStreamException;
import java.io.Serializable;

final class ConfigBoolean extends AbstractConfigValue implements Serializable {

private static final long serialVersionUID = 2L;
Expand Down
Loading