Upstream
/
Minepacks
mirror of https://github.com/GeorgH93/Minepacks.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup backpack callback code

This commit is contained in:
GeorgH93 2023-12-14 14:12:08 +01:00
parent 222e122eda
commit b238a17467
No known key found for this signature in database
GPG Key ID: D1630D37F9E4B3C8
6 changed files with 20 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/Callback.java
View File

@ -21,5 +21,5 @@ public interface Callback<T>
{
void onResult(T done);
void onFail();
default void onFail() { /* In most cases this can be ignored since it will not happen with most db queries used */ }
}

15
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/RestoreCommand.java
View File

@ -114,17 +114,10 @@ public class RestoreCommand extends MinepacksCommand
messageNoUserFound.send(sender);
return;
}
getMinepacksPlugin().getBackpack(target, new Callback<Backpack>() {
@Override
public void onResult(Backpack backpack)
{
backpack.getInventory().setContents(items);
backpack.setChanged();
messageRestored.send(sender);
}
@Override
public void onFail() {}
getMinepacksPlugin().getBackpack(target, backpack -> {
backpack.getInventory().setContents(items);
backpack.setChanged();
messageRestored.send(sender);
});
}
else

24
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/SortCommand.java
View File

@ -44,24 +44,16 @@ public class SortCommand extends MinepacksCommand
public void execute(final @NotNull CommandSender commandSender, @NotNull String mainCommandAlias, @NotNull String alias, @NotNull String[] args)
{
final Player player = (Player) commandSender;
getMinepacksPlugin().getBackpack(player, new Callback<Backpack>()
{
@Override
public void onResult(Backpack backpack)
getMinepacksPlugin().getBackpack(player, backpack -> {
InventoryCompressor compressor = new InventoryCompressor(backpack.getInventory().getContents());
if(!compressor.sort().isEmpty())
{
InventoryCompressor compressor = new InventoryCompressor(backpack.getInventory().getContents());
if(!compressor.sort().isEmpty())
{
plugin.getLogger().warning("Failed to sort backpack!"); //this should not happen
return;
}
backpack.getInventory().setContents(compressor.getTargetStacks());
backpack.setChanged();
messageSorted.send(player);
plugin.getLogger().warning("Failed to sort backpack!"); //this should not happen
return;
}
@Override
public void onFail() {} // This should not happen
backpack.getInventory().setContents(compressor.getTargetStacks());
backpack.setChanged();
messageSorted.send(player);
});
}

11
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/CooldownManager.java
View File

@ -91,16 +91,7 @@ public class CooldownManager extends BukkitRunnable implements Listener
{
final UUID uuid = event.getPlayer().getUniqueId();
cooldowns.put(uuid, System.currentTimeMillis() + cooldown); // Temporary cooldown till the data is loaded from the database
plugin.getDatabase().getCooldown(event.getPlayer(), new Callback<Long>() {
@Override
public void onResult(Long dbCooldownTime)
{
cooldowns.put(uuid, dbCooldownTime);
}
@Override
public void onFail() {}
});
plugin.getDatabase().getCooldown(event.getPlayer(), dbCooldownTime -> cooldowns.put(uuid, dbCooldownTime));
}
else if(addOnJoin)
{

18
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/DropOnDeath.java
View File

@ -48,21 +48,13 @@ public class DropOnDeath extends MinepacksListener
if (!player.hasPermission(Permissions.KEEP_ON_DEATH))
{
final Location location = player.getLocation();
plugin.getBackpack(player, new Callback<Backpack>()
{
@Override
public void onResult(Backpack backpack)
plugin.getBackpack(player, backpack -> {
BackpackDropOnDeathEvent event1 = new BackpackDropOnDeathEvent(player, backpack);
plugin.getServer().getPluginManager().callEvent(event1);
if(!event1.isCancelled())
{
BackpackDropOnDeathEvent event = new BackpackDropOnDeathEvent(player, backpack);
plugin.getServer().getPluginManager().callEvent(event);
if(!event.isCancelled())
{
backpack.drop(location);
}
backpack.drop(location);
}
@Override
public void onFail() {}
});
}
}

12
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java
View File

@ -306,17 +306,7 @@ public class Minepacks extends JavaPlugin implements MinepacksPlugin, IPlugin
@Override
public void openBackpack(@NotNull Player opener, @NotNull OfflinePlayer owner, boolean editable, @Nullable String title)
{
database.getBackpack(owner, new Callback<Backpack>()
{
@Override
public void onResult(Backpack backpack)
{
openBackpack(opener, backpack, editable, title);
}
@Override
public void onFail() {}
});
database.getBackpack(owner, backpack -> openBackpack(opener, backpack, editable, title));
}
@Override