mirror of
https://github.com/SimplexDevelopment/FreedomNetworkSuite.git
synced 2024-11-13 04:33:33 +00:00
Merge branch 'Displayable-GUI-API' into videos-stupid-contributions
This commit is contained in:
commit
6edf320bf7
@ -34,7 +34,7 @@ import org.bukkit.plugin.java.JavaPlugin;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
@Info(name = "cage", description = "Cage a player.",
|
||||
usage = "/cage <player> <on|off> [material]")
|
||||
usage = "/cage <player> <on|off> [material]")
|
||||
@Permissive(perm = "datura.cage")
|
||||
public class CageCommand extends Commander
|
||||
{
|
||||
@ -52,12 +52,14 @@ public class CageCommand extends Commander
|
||||
{
|
||||
case "on" ->
|
||||
{
|
||||
((Datura) getPlugin()).getCager().cagePlayer(player.getUniqueId());
|
||||
((Datura) getPlugin()).getCager()
|
||||
.cagePlayer(player.getUniqueId());
|
||||
sender.sendPlainMessage("Caged " + player.getName() + ".");
|
||||
}
|
||||
case "off" ->
|
||||
{
|
||||
((Datura) getPlugin()).getCager().uncagePlayer(player.getUniqueId());
|
||||
((Datura) getPlugin()).getCager()
|
||||
.uncagePlayer(player.getUniqueId());
|
||||
sender.sendPlainMessage("Liberated " + player.getName() + ".");
|
||||
}
|
||||
}
|
||||
@ -65,18 +67,21 @@ public class CageCommand extends Commander
|
||||
|
||||
@Completion(args = {"[material]"}, index = 2)
|
||||
@Subcommand(permission = "datura.cage.custom", args = {Player.class, String.class, Material.class})
|
||||
public void cagePlayer(final CommandSender sender, final Player player, final String string, final Material material)
|
||||
public void cagePlayer(final CommandSender sender, final Player player, final String string,
|
||||
final Material material)
|
||||
{
|
||||
switch (string.toLowerCase())
|
||||
{
|
||||
case "on" ->
|
||||
{
|
||||
((Datura) getPlugin()).getCager().cagePlayer(player.getUniqueId(), material);
|
||||
((Datura) getPlugin()).getCager()
|
||||
.cagePlayer(player.getUniqueId(), material);
|
||||
sender.sendPlainMessage("Caged " + player.getName() + ".");
|
||||
}
|
||||
case "off" ->
|
||||
{
|
||||
((Datura) getPlugin()).getCager().uncagePlayer(player.getUniqueId());
|
||||
((Datura) getPlugin()).getCager()
|
||||
.uncagePlayer(player.getUniqueId());
|
||||
sender.sendPlainMessage("Liberated " + player.getName() + ".");
|
||||
}
|
||||
}
|
||||
|
@ -31,8 +31,7 @@ public final class LockerCommand extends Commander
|
||||
.lock(player);
|
||||
|
||||
sender.sendPlainMessage("Locked " + player.getName() + ".");
|
||||
}
|
||||
else if (string.equalsIgnoreCase("off"))
|
||||
} else if (string.equalsIgnoreCase("off"))
|
||||
{
|
||||
((Datura) getPlugin()).getLocker()
|
||||
.unlock(player);
|
||||
|
@ -16,9 +16,9 @@ record PermissionNode(String key,
|
||||
public Permission bukkit()
|
||||
{
|
||||
return new Permission(key(),
|
||||
value()
|
||||
? PermissionDefault.TRUE
|
||||
: PermissionDefault.FALSE);
|
||||
value()
|
||||
? PermissionDefault.TRUE
|
||||
: PermissionDefault.FALSE);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -62,42 +62,42 @@ public class MySQL implements SQL
|
||||
{
|
||||
return getConnection()
|
||||
.thenApplyAsync(connection ->
|
||||
{
|
||||
try
|
||||
{
|
||||
final PreparedStatement statement = connection.prepareStatement(query);
|
||||
for (int i = 0; i < args.length; i++)
|
||||
{
|
||||
statement.setObject(i + 1, args[i]);
|
||||
}
|
||||
return statement;
|
||||
}
|
||||
catch (SQLException ex)
|
||||
{
|
||||
throw new CompletionException("Failed to prepare statement: "
|
||||
+ query + "\n", ex);
|
||||
}
|
||||
}, CommonsBase.getInstance()
|
||||
.getExecutor()
|
||||
.getAsync());
|
||||
{
|
||||
try
|
||||
{
|
||||
final PreparedStatement statement = connection.prepareStatement(query);
|
||||
for (int i = 0; i < args.length; i++)
|
||||
{
|
||||
statement.setObject(i + 1, args[i]);
|
||||
}
|
||||
return statement;
|
||||
}
|
||||
catch (SQLException ex)
|
||||
{
|
||||
throw new CompletionException("Failed to prepare statement: "
|
||||
+ query + "\n", ex);
|
||||
}
|
||||
}, CommonsBase.getInstance()
|
||||
.getExecutor()
|
||||
.getAsync());
|
||||
}
|
||||
|
||||
private CompletableFuture<Connection> getConnection()
|
||||
{
|
||||
return CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
try
|
||||
{
|
||||
return DriverManager.getConnection(url.toString());
|
||||
}
|
||||
catch (SQLException ex)
|
||||
{
|
||||
throw new CompletionException("Failed to connect to the database: "
|
||||
+ url.toString() + "\n", ex);
|
||||
}
|
||||
}, CommonsBase.getInstance()
|
||||
.getExecutor()
|
||||
.getAsync());
|
||||
{
|
||||
try
|
||||
{
|
||||
return DriverManager.getConnection(url.toString());
|
||||
}
|
||||
catch (SQLException ex)
|
||||
{
|
||||
throw new CompletionException("Failed to connect to the database: "
|
||||
+ url.toString() + "\n", ex);
|
||||
}
|
||||
}, CommonsBase.getInstance()
|
||||
.getExecutor()
|
||||
.getAsync());
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -105,20 +105,20 @@ public class MySQL implements SQL
|
||||
{
|
||||
return prepareStatement(query, args)
|
||||
.thenApplyAsync(statement ->
|
||||
{
|
||||
try
|
||||
{
|
||||
return statement.executeQuery();
|
||||
}
|
||||
catch (SQLException ex)
|
||||
{
|
||||
throw new CompletionException(
|
||||
"Failed to retrieve a result set from query: "
|
||||
+ query + "\n", ex);
|
||||
}
|
||||
}, CommonsBase.getInstance()
|
||||
.getExecutor()
|
||||
.getAsync());
|
||||
{
|
||||
try
|
||||
{
|
||||
return statement.executeQuery();
|
||||
}
|
||||
catch (SQLException ex)
|
||||
{
|
||||
throw new CompletionException(
|
||||
"Failed to retrieve a result set from query: "
|
||||
+ query + "\n", ex);
|
||||
}
|
||||
}, CommonsBase.getInstance()
|
||||
.getExecutor()
|
||||
.getAsync());
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -126,19 +126,19 @@ public class MySQL implements SQL
|
||||
{
|
||||
return prepareStatement(query, args)
|
||||
.thenApplyAsync(statement ->
|
||||
{
|
||||
try
|
||||
{
|
||||
return statement.executeUpdate();
|
||||
}
|
||||
catch (SQLException ex)
|
||||
{
|
||||
throw new CompletionException("Failed to execute update: "
|
||||
+ query + "\n", ex);
|
||||
}
|
||||
}, CommonsBase.getInstance()
|
||||
.getExecutor()
|
||||
.getAsync());
|
||||
{
|
||||
try
|
||||
{
|
||||
return statement.executeUpdate();
|
||||
}
|
||||
catch (SQLException ex)
|
||||
{
|
||||
throw new CompletionException("Failed to execute update: "
|
||||
+ query + "\n", ex);
|
||||
}
|
||||
}, CommonsBase.getInstance()
|
||||
.getExecutor()
|
||||
.getAsync());
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -146,19 +146,19 @@ public class MySQL implements SQL
|
||||
{
|
||||
return prepareStatement(query, args)
|
||||
.thenApplyAsync(statement ->
|
||||
{
|
||||
try
|
||||
{
|
||||
return statement.execute();
|
||||
}
|
||||
catch (SQLException ex)
|
||||
{
|
||||
throw new CompletionException("Failed to execute statement: "
|
||||
+ query + "\n", ex);
|
||||
}
|
||||
}, CommonsBase.getInstance()
|
||||
.getExecutor()
|
||||
.getAsync());
|
||||
{
|
||||
try
|
||||
{
|
||||
return statement.execute();
|
||||
}
|
||||
catch (SQLException ex)
|
||||
{
|
||||
throw new CompletionException("Failed to execute statement: "
|
||||
+ query + "\n", ex);
|
||||
}
|
||||
}, CommonsBase.getInstance()
|
||||
.getExecutor()
|
||||
.getAsync());
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -185,25 +185,25 @@ public class MySQL implements SQL
|
||||
{
|
||||
return executeQuery("SELECT ? FROM ? WHERE ? = ?", column, table, key, identity.getId())
|
||||
.thenApplyAsync(resultSet ->
|
||||
{
|
||||
try
|
||||
{
|
||||
if (resultSet.next())
|
||||
{
|
||||
return resultSet.getObject(column, type);
|
||||
}
|
||||
}
|
||||
catch (SQLException ex)
|
||||
{
|
||||
throw new CompletionException(
|
||||
"Failed to retrieve column: " + column + " from table: " + table + " " +
|
||||
"where primary key: " + key + " is equal to: " + identity.getId() + "\n",
|
||||
ex);
|
||||
}
|
||||
return null;
|
||||
}, CommonsBase.getInstance()
|
||||
.getExecutor()
|
||||
.getAsync());
|
||||
{
|
||||
try
|
||||
{
|
||||
if (resultSet.next())
|
||||
{
|
||||
return resultSet.getObject(column, type);
|
||||
}
|
||||
}
|
||||
catch (SQLException ex)
|
||||
{
|
||||
throw new CompletionException(
|
||||
"Failed to retrieve column: " + column + " from table: " + table + " " +
|
||||
"where primary key: " + key + " is equal to: " + identity.getId() + "\n",
|
||||
ex);
|
||||
}
|
||||
return null;
|
||||
}, CommonsBase.getInstance()
|
||||
.getExecutor()
|
||||
.getAsync());
|
||||
}
|
||||
|
||||
public CompletableFuture<Boolean> updateColumn(final String table, final String column, final Object value,
|
||||
|
@ -26,9 +26,7 @@ public class SimpleUserData implements UserData
|
||||
private final UserDataUpdateEvent event = new UserDataUpdateEvent(this);
|
||||
private Group group;
|
||||
private long playtime;
|
||||
private boolean frozen;
|
||||
private boolean canInteract;
|
||||
private boolean caged;
|
||||
private AtomicLong balance;
|
||||
private boolean transactionsFrozen;
|
||||
|
||||
@ -49,7 +47,6 @@ public class SimpleUserData implements UserData
|
||||
final User user,
|
||||
final Group group,
|
||||
final long playtime,
|
||||
final boolean frozen,
|
||||
final boolean canInteract,
|
||||
final long balance,
|
||||
final boolean transactionsFrozen)
|
||||
@ -59,7 +56,6 @@ public class SimpleUserData implements UserData
|
||||
this.user = user;
|
||||
this.group = group;
|
||||
this.playtime = playtime;
|
||||
this.frozen = frozen;
|
||||
this.canInteract = canInteract;
|
||||
this.balance = new AtomicLong(balance);
|
||||
this.transactionsFrozen = transactionsFrozen;
|
||||
@ -69,61 +65,58 @@ public class SimpleUserData implements UserData
|
||||
{
|
||||
return sql.executeQuery("SELECT * FROM users WHERE UUID = ?", uuid)
|
||||
.thenApplyAsync(result ->
|
||||
{
|
||||
try
|
||||
{
|
||||
if (result.next())
|
||||
{
|
||||
final String g = result.getString("group");
|
||||
{
|
||||
try
|
||||
{
|
||||
if (result.next())
|
||||
{
|
||||
final String g = result.getString("group");
|
||||
|
||||
final UUID u = UUID.fromString(uuid);
|
||||
final String username = result.getString("username");
|
||||
final UUID u = UUID.fromString(uuid);
|
||||
final String username = result.getString("username");
|
||||
|
||||
final Player player = Bukkit.getPlayer(u);
|
||||
final Player player = Bukkit.getPlayer(u);
|
||||
|
||||
if (player == null)
|
||||
throw new IllegalStateException(
|
||||
"Player should be online but they are not!");
|
||||
if (player == null)
|
||||
throw new IllegalStateException("Player should be online but they are not!");
|
||||
|
||||
final User user = new FreedomUser(player);
|
||||
final Group group = CommonsBase.getInstance()
|
||||
.getRegistrations()
|
||||
.getGroupRegistry()
|
||||
.getGroup(g);
|
||||
final User user = new FreedomUser(player);
|
||||
final Group group = CommonsBase.getInstance()
|
||||
.getRegistrations()
|
||||
.getGroupRegistry()
|
||||
.getGroup(g);
|
||||
|
||||
final long playtime = result.getLong("playtime");
|
||||
final boolean frozen = result.getBoolean("frozen");
|
||||
final boolean canInteract = result.getBoolean("canInteract");
|
||||
final boolean caged = result.getBoolean("caged");
|
||||
final long balance = result.getLong("balance");
|
||||
final boolean transactionsFrozen = result.getBoolean(
|
||||
"transactionsFrozen");
|
||||
return new SimpleUserData(u, username, user, group, playtime, frozen,
|
||||
canInteract, balance, transactionsFrozen);
|
||||
}
|
||||
}
|
||||
catch (SQLException ex)
|
||||
{
|
||||
final String sb = "An error occurred while trying to retrieve user data for" +
|
||||
" UUID " +
|
||||
uuid +
|
||||
" from the database." +
|
||||
"\nCaused by: " +
|
||||
ExceptionUtils.getRootCauseMessage(ex) +
|
||||
"\nStack trace: " +
|
||||
ExceptionUtils.getStackTrace(ex);
|
||||
final long playtime = result.getLong("playtime");
|
||||
final boolean canInteract = result.getBoolean("canInteract");
|
||||
final long balance = result.getLong("balance");
|
||||
final boolean transactionsFrozen = result.getBoolean("transactionsFrozen");
|
||||
|
||||
return new SimpleUserData(u, username, user, group, playtime,
|
||||
canInteract, balance, transactionsFrozen);
|
||||
}
|
||||
}
|
||||
catch (SQLException ex)
|
||||
{
|
||||
final String sb = "An error occurred while trying to retrieve user data for" +
|
||||
" UUID " +
|
||||
uuid +
|
||||
" from the database." +
|
||||
"\nCaused by: " +
|
||||
ExceptionUtils.getRootCauseMessage(ex) +
|
||||
"\nStack trace: " +
|
||||
ExceptionUtils.getStackTrace(ex);
|
||||
|
||||
FreedomLogger.getLogger("Datura")
|
||||
.error(sb);
|
||||
}
|
||||
FreedomLogger.getLogger("Datura")
|
||||
.error(sb);
|
||||
}
|
||||
|
||||
final Player player = Bukkit.getPlayer(UUID.fromString(uuid));
|
||||
if (player == null) throw new IllegalStateException(
|
||||
"Player should be online but they are not!");
|
||||
return new SimpleUserData(player);
|
||||
}, CommonsBase.getInstance()
|
||||
.getExecutor()
|
||||
.getAsync())
|
||||
final Player player = Bukkit.getPlayer(UUID.fromString(uuid));
|
||||
if (player == null) throw new IllegalStateException("Player should be online but they are not!");
|
||||
|
||||
return new SimpleUserData(player);
|
||||
}, CommonsBase.getInstance()
|
||||
.getExecutor()
|
||||
.getAsync())
|
||||
.join();
|
||||
}
|
||||
|
||||
@ -185,19 +178,6 @@ public class SimpleUserData implements UserData
|
||||
this.playtime = 0L;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isFrozen()
|
||||
{
|
||||
return frozen;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setFrozen(final boolean frozen)
|
||||
{
|
||||
event.ping();
|
||||
this.frozen = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canInteract()
|
||||
{
|
||||
|
@ -46,13 +46,17 @@ public class CakeCommand extends Commander
|
||||
@Base
|
||||
public void broadcastCake(final CommandSender sender)
|
||||
{
|
||||
Bukkit.broadcast(FreedomMiniMessage.deserialize(true, "<rainbow>But there's no sense crying over every mistake. You just keep on trying till you run out of cake.</rainbow>"));
|
||||
Bukkit.broadcast(FreedomMiniMessage.deserialize(true,
|
||||
"<rainbow>But there's no sense crying over every mistake. You just keep on trying till you run out of " +
|
||||
"cake.</rainbow>"));
|
||||
|
||||
final ItemStack stack = new ItemStack(Material.CAKE, 1);
|
||||
final ItemMeta meta = stack.getItemMeta();
|
||||
meta.displayName(FreedomMiniMessage.deserialize(true, "<dark_gray>The <white>Lie"));
|
||||
stack.setItemMeta(meta);
|
||||
|
||||
Bukkit.getOnlinePlayers().forEach(player -> player.getInventory().addItem(stack));
|
||||
Bukkit.getOnlinePlayers()
|
||||
.forEach(player -> player.getInventory()
|
||||
.addItem(stack));
|
||||
}
|
||||
}
|
||||
|
@ -8,7 +8,7 @@ public class SimpleTransactionResult implements TransactionResult
|
||||
{
|
||||
public static final TransactionResult SUCCESSFUL = new SimpleTransactionResult("Successful transaction.", true);
|
||||
public static final TransactionResult UNAUTHORIZED = new SimpleTransactionResult("Unauthorized transaction.",
|
||||
false);
|
||||
false);
|
||||
public static final TransactionResult AMOUNT_TOO_SMALL = new SimpleTransactionResult(
|
||||
"Transaction balance too small.", false);
|
||||
public static final TransactionResult INSUFFICIENT_FUNDS = new SimpleTransactionResult(
|
||||
|
@ -20,8 +20,10 @@ public final class ClownfishItem extends ShopItem
|
||||
{
|
||||
if (target == null) return;
|
||||
|
||||
final Location location = user.getEyeLocation().clone();
|
||||
final Vector vector = location.getDirection().multiply(2);
|
||||
final Location location = user.getEyeLocation()
|
||||
.clone();
|
||||
final Vector vector = location.getDirection()
|
||||
.multiply(2);
|
||||
|
||||
target.setVelocity(vector);
|
||||
}
|
||||
|
@ -27,6 +27,7 @@ public final class BasicTrail extends SimpleTrail
|
||||
final Location location = player.getLocation()
|
||||
.clone()
|
||||
.subtract(0, 1, 0);
|
||||
location.getWorld().spawnParticle(particle, location, 1, 0.0, 0.5, 0.0, options);
|
||||
location.getWorld()
|
||||
.spawnParticle(particle, location, 1, 0.0, 0.5, 0.0, options);
|
||||
}
|
||||
}
|
||||
|
@ -24,6 +24,6 @@ public final class FlameTrail extends SimpleTrail
|
||||
final Vector direction = location.getDirection();
|
||||
location.getWorld()
|
||||
.spawnParticle(getTrailType().getType(), location, 0, direction.getX(), direction.getY(),
|
||||
direction.getZ(), 0.1);
|
||||
direction.getZ(), 0.1);
|
||||
}
|
||||
}
|
||||
|
@ -20,6 +20,7 @@ public final class HeartTrail extends SimpleTrail
|
||||
final Location location = player.getLocation()
|
||||
.clone()
|
||||
.subtract(0, 1, 0);
|
||||
location.getWorld().spawnParticle(getTrailType().getType(), location, 1, 0.0, 0.5, 0.0);
|
||||
location.getWorld()
|
||||
.spawnParticle(getTrailType().getType(), location, 1, 0.0, 0.5, 0.0);
|
||||
}
|
||||
}
|
||||
|
@ -21,7 +21,8 @@ public abstract class SimpleTrail implements Trail
|
||||
private Set<Color> gradientColor = null;
|
||||
private boolean active = false;
|
||||
|
||||
protected SimpleTrail(final Player player, final TrailType trailType) {
|
||||
protected SimpleTrail(final Player player, final TrailType trailType)
|
||||
{
|
||||
this.associatedPlayerUUID = player.getUniqueId();
|
||||
this.trailType = trailType;
|
||||
}
|
||||
|
@ -25,6 +25,7 @@ public final class StrobeTrail extends SimpleTrail
|
||||
final Location location = player.getLocation()
|
||||
.clone()
|
||||
.subtract(0, 1, 0);
|
||||
location.getWorld().spawnParticle(getTrailType().getType(), location, 1, 0.0, 0.5, 0.0, dustTransition);
|
||||
location.getWorld()
|
||||
.spawnParticle(getTrailType().getType(), location, 1, 0.0, 0.5, 0.0, dustTransition);
|
||||
}
|
||||
}
|
||||
|
@ -4,7 +4,8 @@ import org.bukkit.entity.Player;
|
||||
|
||||
public final class TrailProvider
|
||||
{
|
||||
public BasicTrail basicTrail(final Player player) {
|
||||
public BasicTrail basicTrail(final Player player)
|
||||
{
|
||||
return new BasicTrail(player);
|
||||
}
|
||||
|
||||
|
@ -20,9 +20,10 @@ public class CommonsBase extends JavaPlugin
|
||||
@Override
|
||||
public void onDisable()
|
||||
{
|
||||
Bukkit.getScheduler().runTaskLater(this, () -> getRegistrations()
|
||||
.getServiceRegistry()
|
||||
.stopAllServices(), 1L);
|
||||
Bukkit.getScheduler()
|
||||
.runTaskLater(this, () -> getRegistrations()
|
||||
.getServiceRegistry()
|
||||
.stopAllServices(), 1L);
|
||||
|
||||
getRegistrations().getServiceRegistry()
|
||||
.unregisterService(EventBus.class);
|
||||
|
@ -1,15 +1,11 @@
|
||||
package me.totalfreedom.config;
|
||||
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
|
||||
public interface Configuration
|
||||
{
|
||||
YamlConfiguration asYaml();
|
||||
|
||||
void save() throws IOException;
|
||||
|
||||
void load() throws IOException;
|
||||
|
@ -0,0 +1,6 @@
|
||||
package me.totalfreedom.config;
|
||||
|
||||
public final class YamlWrapper
|
||||
{
|
||||
|
||||
}
|
@ -76,13 +76,13 @@ public abstract class AbstractMenu
|
||||
{
|
||||
Bukkit.getOnlinePlayers()
|
||||
.forEach(player ->
|
||||
{
|
||||
if (openInvs.get(player.getUniqueId())
|
||||
.equals(getDisplayableUUID()))
|
||||
{
|
||||
close(player);
|
||||
}
|
||||
});
|
||||
{
|
||||
if (openInvs.get(player.getUniqueId())
|
||||
.equals(getDisplayableUUID()))
|
||||
{
|
||||
close(player);
|
||||
}
|
||||
});
|
||||
|
||||
invByUUID.remove(getDisplayableUUID());
|
||||
}
|
||||
|
@ -30,7 +30,9 @@ public final class Displayable implements Inventory, InventoryHolder
|
||||
|
||||
// If the size is not a multiple of nine, find the difference to the next highest multiple of 9 and make up
|
||||
// the difference.
|
||||
this.size = (size % 9 == 0) ? size : size + (9 - size % 9);
|
||||
this.size = (size % 9 == 0)
|
||||
? size
|
||||
: size + (9 - size % 9);
|
||||
|
||||
this.contents = new ItemStack[size];
|
||||
}
|
||||
@ -152,7 +154,7 @@ public final class Displayable implements Inventory, InventoryHolder
|
||||
if (remainingAmount < item.getAmount())
|
||||
{
|
||||
removedItems.put(removedItems.size(),
|
||||
new ItemStack(item.getType(), item.getAmount() - remainingAmount));
|
||||
new ItemStack(item.getType(), item.getAmount() - remainingAmount));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -25,14 +25,14 @@ class SubscriptionBox<T extends FEvent>
|
||||
public void tick()
|
||||
{
|
||||
subscriptions.forEach(s ->
|
||||
{
|
||||
if (!s.event()
|
||||
.shouldCall()) return;
|
||||
{
|
||||
if (!s.event()
|
||||
.shouldCall()) return;
|
||||
|
||||
s.callback()
|
||||
.call(s.event());
|
||||
s.event()
|
||||
.reset();
|
||||
});
|
||||
s.callback()
|
||||
.call(s.event());
|
||||
s.event()
|
||||
.reset();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -3,10 +3,8 @@ package me.totalfreedom.particle;
|
||||
import me.totalfreedom.api.Interpolator;
|
||||
import me.totalfreedom.utils.InterpolationUtils;
|
||||
import org.bukkit.Color;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.OfflinePlayer;
|
||||
import org.bukkit.Particle;
|
||||
import org.bukkit.World;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
|
@ -3,6 +3,7 @@ package me.totalfreedom.provider;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
@ -21,6 +22,7 @@ public class ContextProvider
|
||||
toInt(string),
|
||||
toLong(string),
|
||||
toFloat(string),
|
||||
toMaterial(string),
|
||||
toPlayer(string),
|
||||
toWorld(string),
|
||||
toLocation(string),
|
||||
@ -92,6 +94,11 @@ public class ContextProvider
|
||||
}
|
||||
}
|
||||
|
||||
private @Nullable Material toMaterial(final String string)
|
||||
{
|
||||
return Material.matchMaterial(string);
|
||||
}
|
||||
|
||||
private @Nullable Player toPlayer(final String string)
|
||||
{
|
||||
return Bukkit.getPlayer(string);
|
||||
|
@ -3,6 +3,7 @@ package me.totalfreedom.service;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.concurrent.Executor;
|
||||
|
||||
@ -15,7 +16,7 @@ public final class ServiceSubscription<T extends Service>
|
||||
|
||||
private boolean isActive = false;
|
||||
|
||||
ServiceSubscription(final JavaPlugin plugin, final T service, final boolean async)
|
||||
ServiceSubscription(@NotNull final JavaPlugin plugin, @NotNull final T service, final boolean async)
|
||||
{
|
||||
this.service = service;
|
||||
this.async = async;
|
||||
@ -52,12 +53,8 @@ public final class ServiceSubscription<T extends Service>
|
||||
public void stop()
|
||||
{
|
||||
this.isActive = false;
|
||||
Bukkit.getScheduler().cancelTask(this.getServiceId());
|
||||
}
|
||||
|
||||
public T getService()
|
||||
{
|
||||
return service;
|
||||
Bukkit.getScheduler()
|
||||
.cancelTask(this.getServiceId());
|
||||
}
|
||||
|
||||
public int getServiceId()
|
||||
@ -65,6 +62,12 @@ public final class ServiceSubscription<T extends Service>
|
||||
return serviceId;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public T getService()
|
||||
{
|
||||
return service;
|
||||
}
|
||||
|
||||
public boolean isAsync()
|
||||
{
|
||||
return async;
|
||||
|
@ -22,10 +22,10 @@ public interface SQLProperties
|
||||
default String toURLPlain()
|
||||
{
|
||||
return String.format("jdbc:%s://%s:%s/%s",
|
||||
this.getDriver(),
|
||||
this.getHost(),
|
||||
this.getPort(),
|
||||
this.getDatabase());
|
||||
this.getDriver(),
|
||||
this.getHost(),
|
||||
this.getPort(),
|
||||
this.getDatabase());
|
||||
}
|
||||
|
||||
String getDriver();
|
||||
@ -39,12 +39,12 @@ public interface SQLProperties
|
||||
default String toURLWithLogin()
|
||||
{
|
||||
return String.format("jdbc:%s://%s:%s/%s?user=%s&password=%s",
|
||||
this.getDriver(),
|
||||
this.getHost(),
|
||||
this.getPort(),
|
||||
this.getDatabase(),
|
||||
this.getUsername(),
|
||||
this.getPassword());
|
||||
this.getDriver(),
|
||||
this.getHost(),
|
||||
this.getPort(),
|
||||
this.getDatabase(),
|
||||
this.getUsername(),
|
||||
this.getPassword());
|
||||
}
|
||||
|
||||
String getUsername();
|
||||
|
@ -56,14 +56,6 @@ public class FreedomLogger implements Audience
|
||||
public String infoComponent(final Supplier<Component> component)
|
||||
{
|
||||
return this.infoComponent(component.get());
|
||||
} /**
|
||||
* This method allows you to log a message to the console.
|
||||
*
|
||||
* @param message The message to send.
|
||||
*/
|
||||
public void info(final String message)
|
||||
{
|
||||
logger.info(message);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -78,6 +70,14 @@ public class FreedomLogger implements Audience
|
||||
|
||||
logger.info(plainText);
|
||||
return plainText;
|
||||
} /**
|
||||
* This method allows you to log a message to the console.
|
||||
*
|
||||
* @param message The message to send.
|
||||
*/
|
||||
public void info(final String message)
|
||||
{
|
||||
logger.info(message);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -32,46 +32,54 @@ import net.kyori.adventure.text.minimessage.tag.standard.StandardTags;
|
||||
*/
|
||||
public class FreedomMiniMessage
|
||||
{
|
||||
private static final MiniMessage unsafe = MiniMessage.miniMessage();
|
||||
private static final MiniMessage safe = MiniMessage.builder()
|
||||
.tags(TagResolver.resolver(
|
||||
StandardTags.color(),
|
||||
StandardTags.rainbow(),
|
||||
StandardTags.gradient(),
|
||||
StandardTags.newline(),
|
||||
StandardTags.decorations(TextDecoration.ITALIC),
|
||||
StandardTags.decorations(TextDecoration.BOLD),
|
||||
StandardTags.decorations(TextDecoration.STRIKETHROUGH),
|
||||
StandardTags.decorations(TextDecoration.UNDERLINED)
|
||||
))
|
||||
.build();
|
||||
|
||||
private FreedomMiniMessage()
|
||||
{
|
||||
throw new UnsupportedOperationException("Instantiation of a static utility class is not supported.");
|
||||
}
|
||||
|
||||
private static final MiniMessage unsafe = MiniMessage.miniMessage();
|
||||
|
||||
private static final MiniMessage safe = MiniMessage.builder().tags(TagResolver.resolver(
|
||||
StandardTags.color(),
|
||||
StandardTags.rainbow(),
|
||||
StandardTags.gradient(),
|
||||
StandardTags.newline(),
|
||||
StandardTags.decorations(TextDecoration.ITALIC),
|
||||
StandardTags.decorations(TextDecoration.BOLD),
|
||||
StandardTags.decorations(TextDecoration.STRIKETHROUGH),
|
||||
StandardTags.decorations(TextDecoration.UNDERLINED)
|
||||
)).build();
|
||||
|
||||
/**
|
||||
* Deserializes an input string using an instance of MiniMessage that is either safe (resolves only a specific set of tags)
|
||||
* or unsafe (resolves all tags).
|
||||
* @param safe Whether to use a safe instance of MiniMessage
|
||||
* @param input An input string formatted with MiniMessage's input
|
||||
* @param placeholders Custom placeholders to use when processing the input
|
||||
* @return A processed Component
|
||||
* Deserializes an input string using an instance of MiniMessage that is either safe (resolves only a specific
|
||||
* set of tags)
|
||||
* or unsafe (resolves all tags).
|
||||
*
|
||||
* @param safe Whether to use a safe instance of MiniMessage
|
||||
* @param input An input string formatted with MiniMessage's input
|
||||
* @param placeholders Custom placeholders to use when processing the input
|
||||
* @return A processed Component
|
||||
*/
|
||||
public static Component deserialize(boolean safe, String input, TagResolver... placeholders)
|
||||
{
|
||||
return (safe ? FreedomMiniMessage.safe : unsafe).deserialize(input, placeholders);
|
||||
return (safe
|
||||
? FreedomMiniMessage.safe
|
||||
: unsafe).deserialize(input, placeholders);
|
||||
}
|
||||
|
||||
/**
|
||||
* Serializes an input component using an instance of MiniMessage that is either safe (resolves only a specific set
|
||||
* of tags) or unsafe (resolves all tags).
|
||||
* @param safe Whether to use a safe instance of MiniMessage
|
||||
* @param input An already processed component
|
||||
* @return A processed Component
|
||||
* of tags) or unsafe (resolves all tags).
|
||||
*
|
||||
* @param safe Whether to use a safe instance of MiniMessage
|
||||
* @param input An already processed component
|
||||
* @return A processed Component
|
||||
*/
|
||||
public static String serialize(boolean safe, Component input)
|
||||
{
|
||||
return (safe ? FreedomMiniMessage.safe : unsafe).serialize(input);
|
||||
return (safe
|
||||
? FreedomMiniMessage.safe
|
||||
: unsafe).serialize(input);
|
||||
}
|
||||
}
|
||||
|
@ -69,18 +69,18 @@ public final class InterpolationUtils
|
||||
{
|
||||
final LinkedHashSet<TextColor> base = new LinkedHashSet<>();
|
||||
final Set<TextColor> redToOrange = componentRGBGradient(length, NamedTextColor.RED,
|
||||
NamedTextColor.GOLD, InterpolationUtils::linear);
|
||||
NamedTextColor.GOLD, InterpolationUtils::linear);
|
||||
final Set<TextColor> orangeToYellow = componentRGBGradient(length, NamedTextColor.GOLD,
|
||||
NamedTextColor.YELLOW, InterpolationUtils::linear);
|
||||
NamedTextColor.YELLOW, InterpolationUtils::linear);
|
||||
final Set<TextColor> yellowToGreen = componentRGBGradient(length, NamedTextColor.YELLOW,
|
||||
NamedTextColor.GREEN, InterpolationUtils::linear);
|
||||
NamedTextColor.GREEN, InterpolationUtils::linear);
|
||||
final Set<TextColor> greenToBlue = componentRGBGradient(length, NamedTextColor.GREEN,
|
||||
NamedTextColor.BLUE, InterpolationUtils::linear);
|
||||
NamedTextColor.BLUE, InterpolationUtils::linear);
|
||||
final Set<TextColor> blueToPurple = componentRGBGradient(length, NamedTextColor.BLUE,
|
||||
NamedTextColor.LIGHT_PURPLE,
|
||||
InterpolationUtils::linear);
|
||||
NamedTextColor.LIGHT_PURPLE,
|
||||
InterpolationUtils::linear);
|
||||
final Set<TextColor> purpleToRed = componentRGBGradient(length, TextColor.color(75, 0, 130),
|
||||
TextColor.color(255, 0, 0), InterpolationUtils::linear);
|
||||
TextColor.color(255, 0, 0), InterpolationUtils::linear);
|
||||
base.addAll(redToOrange);
|
||||
base.addAll(orangeToYellow);
|
||||
base.addAll(yellowToGreen);
|
||||
|
Loading…
Reference in New Issue
Block a user