mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-03 06:04:43 +02:00
Compare commits
1 Commits
feature/co
...
fix-unload
| Author | SHA1 | Date | |
|---|---|---|---|
| 740da5bccc |
@ -89,8 +89,6 @@ tasks.named<ShadowJar>("shadowJar") {
|
||||
relocate("net.jcip", "com.plotsquared.core.annotations.jcip")
|
||||
relocate("edu.umd.cs.findbugs", "com.plotsquared.core.annotations.findbugs")
|
||||
relocate("com.intellectualsites.annotations", "com.plotsquared.core.annotations.informative")
|
||||
relocate("org.jdbi.v3", "com.plotsquared.core.jdbi")
|
||||
relocate("com.zaxxer.hikari", "com.plotsquared.core.hikari")
|
||||
|
||||
// Get rid of all the libs which are 100% unused.
|
||||
minimize()
|
||||
|
||||
@ -82,8 +82,6 @@ import com.plotsquared.core.inject.annotations.DefaultGenerator;
|
||||
import com.plotsquared.core.inject.annotations.ImpromptuPipeline;
|
||||
import com.plotsquared.core.inject.annotations.WorldConfig;
|
||||
import com.plotsquared.core.inject.annotations.WorldFile;
|
||||
import com.plotsquared.core.inject.modules.DatabaseModule;
|
||||
import com.plotsquared.core.inject.modules.JdbiModule;
|
||||
import com.plotsquared.core.inject.modules.PlotSquaredModule;
|
||||
import com.plotsquared.core.listener.PlotListener;
|
||||
import com.plotsquared.core.listener.WESubscriber;
|
||||
@ -142,7 +140,6 @@ import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||
import org.incendo.serverlib.ServerLib;
|
||||
|
||||
import javax.xml.crypto.Data;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.lang.reflect.Method;
|
||||
@ -295,9 +292,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
|
||||
new WorldManagerModule(),
|
||||
new PlotSquaredModule(),
|
||||
new BukkitModule(this),
|
||||
new BackupModule(),
|
||||
new JdbiModule(),
|
||||
new DatabaseModule()
|
||||
new BackupModule()
|
||||
);
|
||||
this.injector.injectMembers(this);
|
||||
|
||||
|
||||
@ -33,7 +33,6 @@ import org.bukkit.entity.Ageable;
|
||||
import org.bukkit.entity.ArmorStand;
|
||||
import org.bukkit.entity.Bat;
|
||||
import org.bukkit.entity.Boat;
|
||||
import org.bukkit.entity.Breedable;
|
||||
import org.bukkit.entity.ChestedHorse;
|
||||
import org.bukkit.entity.EnderDragon;
|
||||
import org.bukkit.entity.Entity;
|
||||
@ -166,7 +165,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
|
||||
//this.horse.style = horse.getStyle();
|
||||
//this.horse.color = horse.getColor();
|
||||
storeTameable(horse);
|
||||
storeBreedable(horse);
|
||||
storeAgeable(horse);
|
||||
storeLiving(horse);
|
||||
storeInventory(horse);
|
||||
return;
|
||||
@ -174,7 +173,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
|
||||
// END INVENTORY HOLDER //
|
||||
case "WOLF", "OCELOT" -> {
|
||||
storeTameable((Tameable) entity);
|
||||
storeBreedable((Breedable) entity);
|
||||
storeAgeable((Ageable) entity);
|
||||
storeLiving((LivingEntity) entity);
|
||||
return;
|
||||
}
|
||||
@ -188,18 +187,18 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
|
||||
this.dataByte = (byte) 0;
|
||||
}
|
||||
this.dataByte2 = sheep.getColor().getDyeData();
|
||||
storeBreedable(sheep);
|
||||
storeAgeable(sheep);
|
||||
storeLiving(sheep);
|
||||
return;
|
||||
}
|
||||
case "VILLAGER", "CHICKEN", "COW", "MUSHROOM_COW", "PIG", "TURTLE", "POLAR_BEAR" -> {
|
||||
storeBreedable((Breedable) entity);
|
||||
storeAgeable((Ageable) entity);
|
||||
storeLiving((LivingEntity) entity);
|
||||
return;
|
||||
}
|
||||
case "RABBIT" -> {
|
||||
this.dataByte = getOrdinal(Rabbit.Type.values(), ((Rabbit) entity).getRabbitType());
|
||||
storeBreedable((Breedable) entity);
|
||||
storeAgeable((Ageable) entity);
|
||||
storeLiving((LivingEntity) entity);
|
||||
return;
|
||||
}
|
||||
@ -383,11 +382,6 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated Use {@link #restoreBreedable(Breedable)} instead
|
||||
* @since 7.1.0
|
||||
*/
|
||||
@Deprecated(forRemoval = true, since = "7.1.0")
|
||||
private void restoreAgeable(Ageable entity) {
|
||||
if (!this.aged.adult) {
|
||||
entity.setBaby();
|
||||
@ -398,11 +392,6 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated Use {@link #storeBreedable(Breedable)} instead
|
||||
* @since 7.1.0
|
||||
*/
|
||||
@Deprecated(forRemoval = true, since = "7.1.0")
|
||||
public void storeAgeable(Ageable aged) {
|
||||
this.aged = new AgeableStats();
|
||||
this.aged.age = aged.getAge();
|
||||
@ -410,29 +399,6 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
|
||||
this.aged.adult = aged.isAdult();
|
||||
}
|
||||
|
||||
/**
|
||||
* @since 7.1.0
|
||||
*/
|
||||
private void restoreBreedable(Breedable entity) {
|
||||
if (!this.aged.adult) {
|
||||
entity.setBaby();
|
||||
}
|
||||
entity.setAgeLock(this.aged.locked);
|
||||
if (this.aged.age > 0) {
|
||||
entity.setAge(this.aged.age);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @since 7.1.0
|
||||
*/
|
||||
private void storeBreedable(Breedable breedable) {
|
||||
this.aged = new AgeableStats();
|
||||
this.aged.age = breedable.getAge();
|
||||
this.aged.locked = breedable.getAgeLock();
|
||||
this.aged.adult = breedable.isAdult();
|
||||
}
|
||||
|
||||
public void storeTameable(Tameable tamed) {
|
||||
this.tamed = new TameableStats();
|
||||
this.tamed.owner = tamed.getOwner();
|
||||
@ -536,7 +502,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
|
||||
//horse.setStyle(this.horse.style);
|
||||
//horse.setColor(this.horse.color);
|
||||
restoreTameable(horse);
|
||||
restoreBreedable(horse);
|
||||
restoreAgeable(horse);
|
||||
restoreLiving(horse);
|
||||
restoreInventory(horse);
|
||||
return entity;
|
||||
@ -544,7 +510,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
|
||||
// END INVENTORY HOLDER //
|
||||
case "WOLF", "OCELOT" -> {
|
||||
restoreTameable((Tameable) entity);
|
||||
restoreBreedable((Breedable) entity);
|
||||
restoreAgeable((Ageable) entity);
|
||||
restoreLiving((LivingEntity) entity);
|
||||
return entity;
|
||||
}
|
||||
@ -557,12 +523,12 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
|
||||
if (this.dataByte2 != 0) {
|
||||
sheep.setColor(DyeColor.getByDyeData(this.dataByte2));
|
||||
}
|
||||
restoreBreedable(sheep);
|
||||
restoreAgeable(sheep);
|
||||
restoreLiving(sheep);
|
||||
return sheep;
|
||||
}
|
||||
case "VILLAGER", "CHICKEN", "COW", "TURTLE", "POLAR_BEAR", "MUSHROOM_COW", "PIG" -> {
|
||||
restoreBreedable((Breedable) entity);
|
||||
restoreAgeable((Ageable) entity);
|
||||
restoreLiving((LivingEntity) entity);
|
||||
return entity;
|
||||
}
|
||||
@ -571,7 +537,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
|
||||
if (this.dataByte != 0) {
|
||||
((Rabbit) entity).setRabbitType(Rabbit.Type.values()[this.dataByte]);
|
||||
}
|
||||
restoreBreedable((Breedable) entity);
|
||||
restoreAgeable((Ageable) entity);
|
||||
restoreLiving((LivingEntity) entity);
|
||||
return entity;
|
||||
}
|
||||
|
||||
@ -33,7 +33,6 @@ import com.plotsquared.core.plot.PlotArea;
|
||||
import com.plotsquared.core.plot.flag.implementations.BlockBurnFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.BlockIgnitionFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.BreakFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.ConcreteHardenFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.CoralDryFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.CropGrowFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.DisablePhysicsFlag;
|
||||
@ -587,12 +586,6 @@ public class BlockEventListener implements Listener {
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
if (event.getNewState().getType().toString().endsWith("CONCRETE")) {
|
||||
if (!plot.getFlag(ConcreteHardenFlag.class)) {
|
||||
plot.debug("Concrete powder could not harden because concrete-harden = false");
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
|
||||
@ -37,11 +37,6 @@ dependencies {
|
||||
// Logging
|
||||
compileOnlyApi(libs.log4j)
|
||||
|
||||
// Database
|
||||
api(libs.hikaricp)
|
||||
api(libs.jdbiCore)
|
||||
api(libs.jdbiGuice)
|
||||
|
||||
// Other libraries
|
||||
api(libs.prtree)
|
||||
api(libs.aopalliance)
|
||||
@ -77,6 +72,7 @@ tasks {
|
||||
opt.links("https://jd.advntr.dev/text-minimessage/4.14.0/")
|
||||
opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
|
||||
opt.links("https://checkerframework.org/api/")
|
||||
opt.links("https://javadoc.io/doc/com.intellectualsites.informative-annotations/informative-annotations/latest/")
|
||||
opt.isLinkSource = true
|
||||
opt.bottom(File("$rootDir/javadocfooter.html").readText())
|
||||
opt.isUse = true
|
||||
|
||||
@ -18,7 +18,6 @@
|
||||
*/
|
||||
package com.plotsquared.core;
|
||||
|
||||
import com.google.inject.Key;
|
||||
import com.plotsquared.core.configuration.ConfigurationSection;
|
||||
import com.plotsquared.core.configuration.ConfigurationUtil;
|
||||
import com.plotsquared.core.configuration.MemorySection;
|
||||
@ -32,12 +31,14 @@ import com.plotsquared.core.configuration.caption.load.DefaultCaptionProvider;
|
||||
import com.plotsquared.core.configuration.file.YamlConfiguration;
|
||||
import com.plotsquared.core.configuration.serialization.ConfigurationSerialization;
|
||||
import com.plotsquared.core.database.DBFunc;
|
||||
import com.plotsquared.core.database.Database;
|
||||
import com.plotsquared.core.database.MySQL;
|
||||
import com.plotsquared.core.database.SQLManager;
|
||||
import com.plotsquared.core.database.SQLite;
|
||||
import com.plotsquared.core.generator.GeneratorWrapper;
|
||||
import com.plotsquared.core.generator.HybridPlotWorld;
|
||||
import com.plotsquared.core.generator.HybridUtils;
|
||||
import com.plotsquared.core.generator.IndependentPlotGenerator;
|
||||
import com.plotsquared.core.inject.annotations.PlotDatabase;
|
||||
import com.plotsquared.core.inject.factory.HybridPlotWorldFactory;
|
||||
import com.plotsquared.core.listener.PlotListener;
|
||||
import com.plotsquared.core.location.Location;
|
||||
@ -74,9 +75,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||
|
||||
import javax.sql.DataSource;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.Closeable;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileOutputStream;
|
||||
@ -1237,11 +1236,8 @@ public class PlotSquared {
|
||||
DBFunc.validatePlots(plots);
|
||||
|
||||
// Close the connection
|
||||
final DataSource dataSource = platform().injector().getInstance(Key.get(DataSource.class, PlotDatabase.class));
|
||||
if (dataSource instanceof Closeable closeable) {
|
||||
closeable.close();
|
||||
}
|
||||
} catch (IOException | NullPointerException throwable) {
|
||||
DBFunc.close();
|
||||
} catch (NullPointerException throwable) {
|
||||
LOGGER.error("Could not close database connection", throwable);
|
||||
throwable.printStackTrace();
|
||||
}
|
||||
@ -1293,7 +1289,26 @@ public class PlotSquared {
|
||||
if (DBFunc.dbManager != null) {
|
||||
DBFunc.dbManager.close();
|
||||
}
|
||||
DBFunc.dbManager = platform().injector().getInstance(SQLManager.class);
|
||||
Database database;
|
||||
if (Storage.MySQL.USE) {
|
||||
database = new MySQL(Storage.MySQL.HOST, Storage.MySQL.PORT, Storage.MySQL.DATABASE,
|
||||
Storage.MySQL.USER, Storage.MySQL.PASSWORD
|
||||
);
|
||||
} else if (Storage.SQLite.USE) {
|
||||
File file = FileUtils.getFile(platform.getDirectory(), Storage.SQLite.DB + ".db");
|
||||
database = new SQLite(file);
|
||||
} else {
|
||||
LOGGER.error("No storage type is set. Disabling PlotSquared");
|
||||
this.platform.shutdown(); //shutdown used instead of disable because no database is set
|
||||
return;
|
||||
}
|
||||
DBFunc.dbManager = new SQLManager(
|
||||
database,
|
||||
Storage.PREFIX,
|
||||
this.eventDispatcher,
|
||||
this.plotListener,
|
||||
this.worldConfiguration
|
||||
);
|
||||
this.plots_tmp = DBFunc.getPlots();
|
||||
if (getPlotAreaManager() instanceof SinglePlotAreaManager) {
|
||||
SinglePlotArea area = ((SinglePlotAreaManager) getPlotAreaManager()).getArea();
|
||||
@ -1307,13 +1322,13 @@ public class PlotSquared {
|
||||
}
|
||||
this.clustersTmp = DBFunc.getClusters();
|
||||
LOGGER.info("Connection to database established. Type: {}", Storage.MySQL.USE ? "MySQL" : "SQLite");
|
||||
} catch (Exception e) {
|
||||
} catch (ClassNotFoundException | SQLException e) {
|
||||
LOGGER.error(
|
||||
"Failed to open database connection ({}). Disabling PlotSquared",
|
||||
Storage.MySQL.USE ? "MySQL" : "SQLite"
|
||||
);
|
||||
LOGGER.error("==== Here is an ugly stacktrace, if you are interested in those things ===");
|
||||
LOGGER.error("", e);
|
||||
e.printStackTrace();
|
||||
LOGGER.error("==== End of stacktrace ====");
|
||||
LOGGER.error(
|
||||
"Please go to the {} 'storage.yml' and configure the database correctly",
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
package com.plotsquared.core.command;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.plotsquared.core.PlotSquared;
|
||||
import com.plotsquared.core.configuration.Settings;
|
||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||
import com.plotsquared.core.database.DBFunc;
|
||||
@ -102,13 +101,8 @@ public class Add extends Command {
|
||||
Permission.PERMISSION_ADMIN_COMMAND_TRUST))) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
PlotSquared
|
||||
.platform()
|
||||
.playerManager()
|
||||
.getUsernameCaption(uuid)
|
||||
.thenApply(caption -> TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(caption.toComponent(player))
|
||||
TagResolver.resolver("value", Tag.inserting(
|
||||
PlayerManager.resolveName(uuid).toComponent(player)
|
||||
))
|
||||
);
|
||||
iterator.remove();
|
||||
@ -117,10 +111,8 @@ public class Add extends Command {
|
||||
if (plot.isOwner(uuid)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("member.already_added"),
|
||||
PlotSquared.platform().playerManager().getUsernameCaption(uuid)
|
||||
.thenApply(caption -> TagResolver.resolver(
|
||||
"player",
|
||||
Tag.inserting(caption.toComponent(player))
|
||||
TagResolver.resolver("player", Tag.inserting(
|
||||
PlayerManager.resolveName(uuid).toComponent(player)
|
||||
))
|
||||
);
|
||||
iterator.remove();
|
||||
@ -129,10 +121,8 @@ public class Add extends Command {
|
||||
if (plot.getMembers().contains(uuid)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("member.already_added"),
|
||||
PlotSquared.platform().playerManager().getUsernameCaption(uuid)
|
||||
.thenApply(caption -> TagResolver.resolver(
|
||||
"player",
|
||||
Tag.inserting(caption.toComponent(player))
|
||||
TagResolver.resolver("player", Tag.inserting(
|
||||
PlayerManager.resolveName(uuid).toComponent(player)
|
||||
))
|
||||
);
|
||||
iterator.remove();
|
||||
|
||||
@ -25,7 +25,6 @@ import com.plotsquared.core.player.PlotPlayer;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
/**
|
||||
* CommandCategory.
|
||||
@ -83,7 +82,7 @@ public enum CommandCategory implements Caption {
|
||||
// TODO this method shouldn't be invoked
|
||||
@Deprecated
|
||||
@Override
|
||||
public @NotNull String toString() {
|
||||
public String toString() {
|
||||
return this.caption.getComponent(LocaleHolder.console());
|
||||
}
|
||||
|
||||
@ -109,5 +108,4 @@ public enum CommandCategory implements Caption {
|
||||
return !MainCommand.getInstance().getCommands(this, player).isEmpty();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -29,6 +29,7 @@ import com.plotsquared.core.util.WorldUtil;
|
||||
import com.plotsquared.core.util.entity.EntityCategories;
|
||||
import com.plotsquared.core.util.entity.EntityCategory;
|
||||
import com.plotsquared.core.util.query.PlotQuery;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import com.plotsquared.core.uuid.UUIDMapping;
|
||||
import com.sk89q.worldedit.world.entity.EntityType;
|
||||
import net.kyori.adventure.text.Component;
|
||||
@ -70,7 +71,7 @@ public class Debug extends SubCommand {
|
||||
TranslatableCaption.of("commandconfig.command_syntax"),
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(Component.text("/plot debug <player | debug-players | entitytypes | msg>"))
|
||||
Tag.inserting(Component.text("/plot debug <loadedchunks | player | debug-players | entitytypes | msg>"))
|
||||
)
|
||||
);
|
||||
}
|
||||
@ -84,6 +85,16 @@ public class Debug extends SubCommand {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
if (args.length > 0 && "loadedchunks".equalsIgnoreCase(args[0])) {
|
||||
final long start = System.currentTimeMillis();
|
||||
player.sendMessage(TranslatableCaption.of("debug.fetching_loaded_chunks"));
|
||||
TaskManager.runTaskAsync(() -> player.sendMessage(StaticCaption
|
||||
.of("Loaded chunks: " + this.worldUtil
|
||||
.getChunkChunks(player.getLocation().getWorldName())
|
||||
.size() + " (" + (System.currentTimeMillis()
|
||||
- start) + "ms) using thread: " + Thread.currentThread().getName())));
|
||||
return true;
|
||||
}
|
||||
if (args.length > 0 && "uuids".equalsIgnoreCase(args[0])) {
|
||||
final Collection<UUIDMapping> mappings = PlotSquared.get().getImpromptuUUIDPipeline().getAllImmediately();
|
||||
player.sendMessage(
|
||||
@ -185,7 +196,7 @@ public class Debug extends SubCommand {
|
||||
|
||||
@Override
|
||||
public Collection<Command> tab(final PlotPlayer<?> player, String[] args, boolean space) {
|
||||
return Stream.of("debug-players", "entitytypes")
|
||||
return Stream.of("loadedchunks", "debug-players", "entitytypes")
|
||||
.filter(value -> value.startsWith(args[0].toLowerCase(Locale.ENGLISH)))
|
||||
.map(value -> new Command(null, false, value, "plots.admin", RequiredType.NONE, null) {
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
@ -117,11 +117,10 @@ public class Deny extends SubCommand {
|
||||
} else if (plot.getDenied().contains(uuid)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("member.already_added"),
|
||||
PlotSquared.platform().playerManager().getUsernameCaption(uuid)
|
||||
.thenApply(caption -> TagResolver.resolver(
|
||||
TagResolver.resolver(
|
||||
"player",
|
||||
Tag.inserting(caption.toComponent(player))
|
||||
))
|
||||
Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
|
||||
)
|
||||
);
|
||||
return;
|
||||
} else {
|
||||
|
||||
@ -517,7 +517,6 @@ public class ListCmd extends SubCommand {
|
||||
}
|
||||
}
|
||||
finalResolver.tag("players", Tag.inserting(builder.asComponent()));
|
||||
finalResolver.tag("size", Tag.inserting(Component.text(plot.getConnectedPlots().size())));
|
||||
caption.set(TranslatableCaption.of("info.plot_list_item"));
|
||||
caption.setTagResolvers(finalResolver.build());
|
||||
}
|
||||
|
||||
@ -31,6 +31,7 @@ import com.plotsquared.core.player.PlayerMetaDataKeys;
|
||||
import com.plotsquared.core.player.PlotPlayer;
|
||||
import com.plotsquared.core.plot.Plot;
|
||||
import com.plotsquared.core.util.EventDispatcher;
|
||||
import com.plotsquared.core.util.PlayerManager;
|
||||
import com.plotsquared.core.util.TabCompletions;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import net.kyori.adventure.text.Component;
|
||||
@ -135,11 +136,10 @@ public class Owner extends SetCommand {
|
||||
if (plot.isOwner(uuid)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("member.already_owner"),
|
||||
PlotSquared.platform().playerManager().getUsernameCaption(uuid)
|
||||
.thenApply(caption -> TagResolver.resolver(
|
||||
TagResolver.resolver(
|
||||
"player",
|
||||
Tag.inserting(caption.toComponent(player))
|
||||
))
|
||||
Tag.inserting(PlayerManager.resolveName(uuid, false).toComponent(player))
|
||||
)
|
||||
);
|
||||
return;
|
||||
}
|
||||
@ -147,11 +147,10 @@ public class Owner extends SetCommand {
|
||||
if (other == null) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player_offline"),
|
||||
PlotSquared.platform().playerManager().getUsernameCaption(uuid)
|
||||
.thenApply(caption -> TagResolver.resolver(
|
||||
TagResolver.resolver(
|
||||
"player",
|
||||
Tag.inserting(caption.toComponent(player))
|
||||
))
|
||||
Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
|
||||
)
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
package com.plotsquared.core.command;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.plotsquared.core.PlotSquared;
|
||||
import com.plotsquared.core.configuration.Settings;
|
||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||
import com.plotsquared.core.database.DBFunc;
|
||||
@ -104,11 +103,10 @@ public class Trust extends Command {
|
||||
player.hasPermission(Permission.PERMISSION_TRUST_EVERYONE) || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_TRUST))) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("errors.invalid_player"),
|
||||
PlotSquared.platform().playerManager().getUsernameCaption(uuid)
|
||||
.thenApply(caption -> TagResolver.resolver(
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(caption.toComponent(player))
|
||||
))
|
||||
Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
|
||||
)
|
||||
);
|
||||
iterator.remove();
|
||||
continue;
|
||||
@ -116,11 +114,10 @@ public class Trust extends Command {
|
||||
if (currentPlot.isOwner(uuid)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("member.already_added"),
|
||||
PlotSquared.platform().playerManager().getUsernameCaption(uuid)
|
||||
.thenApply(caption -> TagResolver.resolver(
|
||||
"player",
|
||||
Tag.inserting(caption.toComponent(player))
|
||||
))
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
|
||||
)
|
||||
);
|
||||
iterator.remove();
|
||||
continue;
|
||||
@ -128,11 +125,10 @@ public class Trust extends Command {
|
||||
if (currentPlot.getTrusted().contains(uuid)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("member.already_added"),
|
||||
PlotSquared.platform().playerManager().getUsernameCaption(uuid)
|
||||
.thenApply(caption -> TagResolver.resolver(
|
||||
"player",
|
||||
Tag.inserting(caption.toComponent(player))
|
||||
))
|
||||
TagResolver.resolver(
|
||||
"value",
|
||||
Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
|
||||
)
|
||||
);
|
||||
iterator.remove();
|
||||
continue;
|
||||
|
||||
@ -44,6 +44,4 @@ public interface Caption {
|
||||
*/
|
||||
@NonNull Component toComponent(@NonNull LocaleHolder localeHolder);
|
||||
|
||||
@NonNull String toString();
|
||||
|
||||
}
|
||||
|
||||
@ -51,9 +51,4 @@ public final class StaticCaption implements Caption {
|
||||
return MiniMessage.miniMessage().deserialize(this.value);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull String toString() {
|
||||
return "StaticCaption(" + value + ")";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -25,7 +25,6 @@ import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.Locale;
|
||||
import java.util.regex.Pattern;
|
||||
@ -133,9 +132,4 @@ public final class TranslatableCaption implements NamespacedCaption {
|
||||
return Objects.hashCode(this.getNamespace(), this.getKey());
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull String toString() {
|
||||
return "TranslatableCaption(" + getNamespace() + ":" + getKey() + ")";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -29,7 +29,6 @@ import java.sql.Statement;
|
||||
* @author -_Husky_-
|
||||
* @author tips48
|
||||
*/
|
||||
@Deprecated(forRemoval = true)
|
||||
public abstract class Database {
|
||||
|
||||
public abstract Connection forceConnection() throws SQLException, ClassNotFoundException;
|
||||
|
||||
@ -33,7 +33,6 @@ import java.sql.Statement;
|
||||
* @author -_Husky_-
|
||||
* @author tips48
|
||||
*/
|
||||
@Deprecated(forRemoval = true)
|
||||
public class MySQL extends Database {
|
||||
|
||||
private final String user;
|
||||
|
||||
@ -25,7 +25,6 @@ import com.plotsquared.core.configuration.Settings;
|
||||
import com.plotsquared.core.configuration.Storage;
|
||||
import com.plotsquared.core.configuration.caption.CaptionUtility;
|
||||
import com.plotsquared.core.configuration.file.YamlConfiguration;
|
||||
import com.plotsquared.core.inject.annotations.PlotDatabase;
|
||||
import com.plotsquared.core.inject.annotations.WorldConfig;
|
||||
import com.plotsquared.core.listener.PlotListener;
|
||||
import com.plotsquared.core.location.BlockLoc;
|
||||
@ -45,14 +44,10 @@ import com.plotsquared.core.util.HashUtil;
|
||||
import com.plotsquared.core.util.StringMan;
|
||||
import com.plotsquared.core.util.task.RunnableVal;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import jakarta.inject.Inject;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||
|
||||
import javax.sql.DataSource;
|
||||
import java.io.Closeable;
|
||||
import java.sql.Connection;
|
||||
import java.sql.DatabaseMetaData;
|
||||
import java.sql.PreparedStatement;
|
||||
@ -97,12 +92,12 @@ public class SQLManager implements AbstractDB {
|
||||
|
||||
// Private Final
|
||||
private final String prefix;
|
||||
private final Database database;
|
||||
private final boolean mySQL;
|
||||
@SuppressWarnings({"unused", "FieldCanBeLocal"})
|
||||
private final EventDispatcher eventDispatcher;
|
||||
@SuppressWarnings({"unused", "FieldCanBeLocal"})
|
||||
private final PlotListener plotListener;
|
||||
private final DataSource dataSource;
|
||||
private final YamlConfiguration worldConfiguration;
|
||||
/**
|
||||
* important tasks
|
||||
@ -134,12 +129,20 @@ public class SQLManager implements AbstractDB {
|
||||
*/
|
||||
public volatile ConcurrentHashMap<PlotCluster, Queue<UniqueStatement>> clusterTasks;
|
||||
// Private
|
||||
private boolean supportsGetGeneratedKeys;
|
||||
private Connection connection;
|
||||
private boolean closed = false;
|
||||
|
||||
@Inject
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @param database
|
||||
* @param prefix prefix
|
||||
* @throws SQLException
|
||||
* @throws ClassNotFoundException
|
||||
*/
|
||||
public SQLManager(
|
||||
final @NonNull @PlotDatabase DataSource dataSource,
|
||||
final @NonNull Database database,
|
||||
final @NonNull String prefix,
|
||||
final @NonNull EventDispatcher eventDispatcher,
|
||||
final @NonNull PlotListener plotListener,
|
||||
@WorldConfig final @NonNull YamlConfiguration worldConfiguration
|
||||
@ -149,27 +152,15 @@ public class SQLManager implements AbstractDB {
|
||||
this.eventDispatcher = eventDispatcher;
|
||||
this.plotListener = plotListener;
|
||||
this.worldConfiguration = worldConfiguration;
|
||||
this.dataSource = dataSource;
|
||||
this.mySQL = Storage.MySQL.USE;
|
||||
this.database = database;
|
||||
this.connection = database.openConnection();
|
||||
this.mySQL = database instanceof MySQL;
|
||||
this.globalTasks = new ConcurrentLinkedQueue<>();
|
||||
this.notifyTasks = new ConcurrentLinkedQueue<>();
|
||||
this.plotTasks = new ConcurrentHashMap<>();
|
||||
this.playerTasks = new ConcurrentHashMap<>();
|
||||
this.clusterTasks = new ConcurrentHashMap<>();
|
||||
this.prefix = Storage.PREFIX;
|
||||
|
||||
try (final Connection connection = dataSource.getConnection()) {
|
||||
final DatabaseMetaData metaData = connection.getMetaData();
|
||||
this.supportsGetGeneratedKeys = metaData.supportsGetGeneratedKeys();
|
||||
|
||||
if (this.mySQL && !this.supportsGetGeneratedKeys) {
|
||||
final String driver = metaData.getDriverName();
|
||||
final String driverVersion = metaData.getDriverVersion();
|
||||
throw new SQLException("Database Driver for MySQL does not support Statement#getGeneratedKeys - which breaks " +
|
||||
"PlotSquared functionality (Using " + driver + ":" + driverVersion + ")");
|
||||
}
|
||||
}
|
||||
|
||||
this.prefix = prefix;
|
||||
this.SET_OWNER = "UPDATE `" + this.prefix
|
||||
+ "plot` SET `owner` = ? WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND `world` = ?";
|
||||
this.GET_ALL_PLOTS =
|
||||
@ -180,32 +171,20 @@ public class SQLManager implements AbstractDB {
|
||||
"INSERT INTO `" + this.prefix + "plot_settings` (`plot_plot_id`) values ";
|
||||
this.CREATE_TIERS =
|
||||
"INSERT INTO `" + this.prefix + "plot_%tier%` (`plot_plot_id`, `user_uuid`) values ";
|
||||
String tempCreatePlot = "INSERT INTO `" + this.prefix
|
||||
this.CREATE_PLOT = "INSERT INTO `" + this.prefix
|
||||
+ "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) VALUES(?, ?, ?, ?, ?)";
|
||||
if (!supportsGetGeneratedKeys) {
|
||||
tempCreatePlot += " RETURNING `id`";
|
||||
}
|
||||
this.CREATE_PLOT = tempCreatePlot;
|
||||
|
||||
if (mySQL) {
|
||||
this.CREATE_PLOT_SAFE = "INSERT IGNORE INTO `" + this.prefix
|
||||
+ "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) SELECT ?, ?, ?, ?, ? FROM DUAL WHERE NOT EXISTS (SELECT null FROM `"
|
||||
+ this.prefix + "plot` WHERE `world` = ? AND `plot_id_x` = ? AND `plot_id_z` = ?)";
|
||||
} else {
|
||||
String tempCreatePlotSafe = "INSERT INTO `" + this.prefix
|
||||
this.CREATE_PLOT_SAFE = "INSERT INTO `" + this.prefix
|
||||
+ "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) SELECT ?, ?, ?, ?, ? WHERE NOT EXISTS (SELECT null FROM `"
|
||||
+ this.prefix + "plot` WHERE `world` = ? AND `plot_id_x` = ? AND `plot_id_z` = ?)";
|
||||
if (!supportsGetGeneratedKeys) {
|
||||
tempCreatePlotSafe += " RETURNING `id`";
|
||||
}
|
||||
this.CREATE_PLOT_SAFE = tempCreatePlotSafe;
|
||||
}
|
||||
String tempCreateCluster = "INSERT INTO `" + this.prefix
|
||||
this.CREATE_CLUSTER = "INSERT INTO `" + this.prefix
|
||||
+ "cluster`(`pos1_x`, `pos1_z`, `pos2_x`, `pos2_z`, `owner`, `world`) VALUES(?, ?, ?, ?, ?, ?)";
|
||||
if (!supportsGetGeneratedKeys) {
|
||||
tempCreateCluster += " RETURNING `id`";
|
||||
}
|
||||
this.CREATE_CLUSTER = tempCreateCluster;
|
||||
|
||||
try {
|
||||
createTables();
|
||||
} catch (SQLException e) {
|
||||
@ -218,6 +197,11 @@ public class SQLManager implements AbstractDB {
|
||||
!globalTasks.isEmpty() || !playerTasks.isEmpty() || !plotTasks.isEmpty()
|
||||
|| !clusterTasks.isEmpty();
|
||||
if (hasTask) {
|
||||
if (SQLManager.this.mySQL && System.currentTimeMillis() - last > 550000
|
||||
|| !isValid()) {
|
||||
last = System.currentTimeMillis();
|
||||
reconnect();
|
||||
}
|
||||
if (!sendBatch()) {
|
||||
try {
|
||||
if (!getNotifyTasks().isEmpty()) {
|
||||
@ -242,6 +226,32 @@ public class SQLManager implements AbstractDB {
|
||||
});
|
||||
}
|
||||
|
||||
public boolean isValid() {
|
||||
try {
|
||||
if (connection.isClosed()) {
|
||||
return false;
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
return false;
|
||||
}
|
||||
try (PreparedStatement stmt = this.connection.prepareStatement("SELECT 1")) {
|
||||
stmt.execute();
|
||||
return true;
|
||||
} catch (Throwable e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public void reconnect() {
|
||||
try {
|
||||
close();
|
||||
SQLManager.this.closed = false;
|
||||
SQLManager.this.connection = database.forceConnection();
|
||||
} catch (SQLException | ClassNotFoundException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
public synchronized Queue<Runnable> getGlobalTasks() {
|
||||
return this.globalTasks;
|
||||
}
|
||||
@ -260,7 +270,7 @@ public class SQLManager implements AbstractDB {
|
||||
task = new UniqueStatement(String.valueOf(plot.hashCode())) {
|
||||
|
||||
@Override
|
||||
public @Nullable PreparedStatement get(final @NonNull Connection connection) {
|
||||
public PreparedStatement get() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@ -294,7 +304,7 @@ public class SQLManager implements AbstractDB {
|
||||
task = new UniqueStatement(String.valueOf(uuid.hashCode())) {
|
||||
|
||||
@Override
|
||||
public PreparedStatement get(final @NonNull Connection connection) {
|
||||
public PreparedStatement get() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@ -325,7 +335,7 @@ public class SQLManager implements AbstractDB {
|
||||
task = new UniqueStatement(String.valueOf(cluster.hashCode())) {
|
||||
|
||||
@Override
|
||||
public @Nullable PreparedStatement get(final @NonNull Connection connection) {
|
||||
public PreparedStatement get() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@ -357,10 +367,10 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
|
||||
public boolean sendBatch() {
|
||||
try (Connection connection = this.dataSource().getConnection()) {
|
||||
try {
|
||||
if (!getGlobalTasks().isEmpty()) {
|
||||
if (connection.getAutoCommit()) {
|
||||
connection.setAutoCommit(false);
|
||||
if (this.connection.getAutoCommit()) {
|
||||
this.connection.setAutoCommit(false);
|
||||
}
|
||||
Runnable task = getGlobalTasks().remove();
|
||||
if (task != null) {
|
||||
@ -371,19 +381,18 @@ public class SQLManager implements AbstractDB {
|
||||
LOGGER.error("============ DATABASE ERROR ============");
|
||||
LOGGER.error("There was an error updating the database.");
|
||||
LOGGER.error(" - It will be corrected on shutdown");
|
||||
LOGGER.error("", e);
|
||||
e.printStackTrace();
|
||||
LOGGER.error("========================================");
|
||||
}
|
||||
}
|
||||
commit(connection);
|
||||
commit();
|
||||
return true;
|
||||
}
|
||||
|
||||
int count = -1;
|
||||
if (!this.plotTasks.isEmpty()) {
|
||||
count = Math.max(count, 0);
|
||||
if (connection.getAutoCommit()) {
|
||||
connection.setAutoCommit(false);
|
||||
if (this.connection.getAutoCommit()) {
|
||||
this.connection.setAutoCommit(false);
|
||||
}
|
||||
String method = null;
|
||||
PreparedStatement statement = null;
|
||||
@ -437,8 +446,8 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
if (!this.playerTasks.isEmpty()) {
|
||||
count = Math.max(count, 0);
|
||||
if (connection.getAutoCommit()) {
|
||||
connection.setAutoCommit(false);
|
||||
if (this.connection.getAutoCommit()) {
|
||||
this.connection.setAutoCommit(false);
|
||||
}
|
||||
String method = null;
|
||||
PreparedStatement statement = null;
|
||||
@ -482,8 +491,8 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
if (!this.clusterTasks.isEmpty()) {
|
||||
count = Math.max(count, 0);
|
||||
if (connection.getAutoCommit()) {
|
||||
connection.setAutoCommit(false);
|
||||
if (this.connection.getAutoCommit()) {
|
||||
this.connection.setAutoCommit(false);
|
||||
}
|
||||
String method = null;
|
||||
PreparedStatement statement = null;
|
||||
@ -527,12 +536,12 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
}
|
||||
if (count > 0) {
|
||||
commit(connection);
|
||||
commit();
|
||||
return true;
|
||||
}
|
||||
if (count != -1) {
|
||||
if (!connection.getAutoCommit()) {
|
||||
connection.setAutoCommit(true);
|
||||
if (!this.connection.getAutoCommit()) {
|
||||
this.connection.setAutoCommit(true);
|
||||
}
|
||||
}
|
||||
if (!this.clusterTasks.isEmpty()) {
|
||||
@ -552,6 +561,10 @@ public class SQLManager implements AbstractDB {
|
||||
return false;
|
||||
}
|
||||
|
||||
public Connection getConnection() {
|
||||
return this.connection;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set Plot owner
|
||||
*
|
||||
@ -570,8 +583,8 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
|
||||
return connection.prepareStatement(SQLManager.this.SET_OWNER);
|
||||
public PreparedStatement get() throws SQLException {
|
||||
return SQLManager.this.connection.prepareStatement(SQLManager.this.SET_OWNER);
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -579,7 +592,7 @@ public class SQLManager implements AbstractDB {
|
||||
@Override
|
||||
public void createPlotsAndData(final List<Plot> myList, final Runnable whenDone) {
|
||||
addGlobalTask(() -> {
|
||||
try (Connection connection = this.dataSource().getConnection()) {
|
||||
try {
|
||||
// Create the plots
|
||||
createPlots(myList, () -> {
|
||||
final Map<PlotId, Integer> idMap = new HashMap<>();
|
||||
@ -596,7 +609,7 @@ public class SQLManager implements AbstractDB {
|
||||
final ArrayList<UUIDPair> denied = new ArrayList<>();
|
||||
|
||||
// Populating structures
|
||||
try (PreparedStatement stmt = connection
|
||||
try (PreparedStatement stmt = SQLManager.this.connection
|
||||
.prepareStatement(SQLManager.this.GET_ALL_PLOTS);
|
||||
ResultSet result = stmt.executeQuery()) {
|
||||
while (result.next()) {
|
||||
@ -621,14 +634,13 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
}
|
||||
|
||||
createFlags(connection, idMap, myList, () -> createSettings(
|
||||
connection,
|
||||
createFlags(idMap, myList, () -> createSettings(
|
||||
settings,
|
||||
() -> createTiers(helpers, "helpers",
|
||||
() -> createTiers(trusted, "trusted",
|
||||
() -> createTiers(denied, "denied", () -> {
|
||||
try {
|
||||
connection.commit();
|
||||
SQLManager.this.connection.commit();
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
@ -642,7 +654,7 @@ public class SQLManager implements AbstractDB {
|
||||
} catch (SQLException e) {
|
||||
LOGGER.warn("Failed to set all flags and member tiers for plots", e);
|
||||
try {
|
||||
connection.commit();
|
||||
SQLManager.this.connection.commit();
|
||||
} catch (SQLException e1) {
|
||||
e1.printStackTrace();
|
||||
}
|
||||
@ -650,6 +662,11 @@ public class SQLManager implements AbstractDB {
|
||||
});
|
||||
} catch (Exception e) {
|
||||
LOGGER.warn("Warning! Failed to set all helper for plots", e);
|
||||
try {
|
||||
SQLManager.this.connection.commit();
|
||||
} catch (SQLException e1) {
|
||||
e1.printStackTrace();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -706,13 +723,8 @@ public class SQLManager implements AbstractDB {
|
||||
setBulk(myList, mod, whenDone);
|
||||
}
|
||||
|
||||
private void createFlags(
|
||||
final @NonNull Connection connection,
|
||||
final @NonNull Map<@NonNull PlotId, @NonNull Integer> ids,
|
||||
final @NonNull List<@NonNull Plot> plots,
|
||||
final @NonNull Runnable whenDone
|
||||
) {
|
||||
try (final PreparedStatement preparedStatement = connection.prepareStatement(
|
||||
public void createFlags(Map<PlotId, Integer> ids, List<Plot> plots, Runnable whenDone) {
|
||||
try (final PreparedStatement preparedStatement = this.connection.prepareStatement(
|
||||
"INSERT INTO `" + SQLManager.this.prefix
|
||||
+ "plot_flags`(`plot_id`, `flag`, `value`) VALUES(?, ?, ?)")) {
|
||||
for (final Plot plot : plots) {
|
||||
@ -810,7 +822,6 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
|
||||
public <T> void setBulk(List<T> objList, StmtMod<T> mod, Runnable whenDone) {
|
||||
try (Connection connection = this.dataSource().getConnection()) {
|
||||
int size = objList.size();
|
||||
if (size == 0) {
|
||||
if (whenDone != null) {
|
||||
@ -838,13 +849,13 @@ public class SQLManager implements AbstractDB {
|
||||
if (last == -1) {
|
||||
last = subList.size();
|
||||
statement = mod.getCreateMySQL(subList.size());
|
||||
preparedStmt = connection.prepareStatement(statement);
|
||||
preparedStmt = this.connection.prepareStatement(statement);
|
||||
}
|
||||
if (subList.size() != last || count % 5000 == 0 && count > 0) {
|
||||
preparedStmt.executeBatch();
|
||||
preparedStmt.close();
|
||||
statement = mod.getCreateMySQL(subList.size());
|
||||
preparedStmt = connection.prepareStatement(statement);
|
||||
preparedStmt = this.connection.prepareStatement(statement);
|
||||
}
|
||||
for (int i = 0; i < subList.size(); i++) {
|
||||
count++;
|
||||
@ -880,13 +891,13 @@ public class SQLManager implements AbstractDB {
|
||||
if (last == -1) {
|
||||
last = subList.size();
|
||||
statement = mod.getCreateSQLite(subList.size());
|
||||
preparedStmt = connection.prepareStatement(statement);
|
||||
preparedStmt = this.connection.prepareStatement(statement);
|
||||
}
|
||||
if (subList.size() != last || count % 5000 == 0 && count > 0) {
|
||||
preparedStmt.executeBatch();
|
||||
preparedStmt.clearParameters();
|
||||
statement = mod.getCreateSQLite(subList.size());
|
||||
preparedStmt = connection.prepareStatement(statement);
|
||||
preparedStmt = this.connection.prepareStatement(statement);
|
||||
}
|
||||
for (int i = 0; i < subList.size(); i++) {
|
||||
count++;
|
||||
@ -903,7 +914,7 @@ public class SQLManager implements AbstractDB {
|
||||
e.printStackTrace();
|
||||
LOGGER.error("2: | {}", objList.get(0).getClass().getCanonicalName());
|
||||
LOGGER.error("Could not bulk save!");
|
||||
try (PreparedStatement preparedStmt = connection
|
||||
try (PreparedStatement preparedStmt = this.connection
|
||||
.prepareStatement(mod.getCreateSQL())) {
|
||||
for (T obj : objList) {
|
||||
mod.setSQL(preparedStmt, obj);
|
||||
@ -918,16 +929,10 @@ public class SQLManager implements AbstractDB {
|
||||
if (whenDone != null) {
|
||||
whenDone.run();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
LOGGER.error("Failed to create SQL connection", e);
|
||||
}
|
||||
}
|
||||
|
||||
private void createSettings(
|
||||
final @NonNull Connection connection,
|
||||
final @NonNull List<@NonNull LegacySettings> myList,
|
||||
final @NonNull Runnable whenDone) {
|
||||
try (PreparedStatement preparedStatement = connection.prepareStatement(
|
||||
public void createSettings(final ArrayList<LegacySettings> myList, final Runnable whenDone) {
|
||||
try (final PreparedStatement preparedStatement = this.connection.prepareStatement(
|
||||
"INSERT INTO `" + SQLManager.this.prefix + "plot_settings`"
|
||||
+ "(`plot_plot_id`,`biome`,`rain`,`custom_time`,`time`,`deny_entry`,`alias`,`merged`,`position`) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)")) {
|
||||
|
||||
@ -1054,8 +1059,8 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
|
||||
return connection.prepareStatement(
|
||||
public PreparedStatement get() throws SQLException {
|
||||
return SQLManager.this.connection.prepareStatement(
|
||||
SQLManager.this.CREATE_PLOT_SAFE,
|
||||
Statement.RETURN_GENERATED_KEYS
|
||||
);
|
||||
@ -1068,8 +1073,9 @@ public class SQLManager implements AbstractDB {
|
||||
|
||||
@Override
|
||||
public void addBatch(PreparedStatement statement) throws SQLException {
|
||||
if (statement.execute() || statement.getUpdateCount() > 0) {
|
||||
try (ResultSet keys = supportsGetGeneratedKeys ? statement.getGeneratedKeys() : statement.getResultSet()) {
|
||||
int inserted = statement.executeUpdate();
|
||||
if (inserted > 0) {
|
||||
try (ResultSet keys = statement.getGeneratedKeys()) {
|
||||
if (keys.next()) {
|
||||
plot.temp = keys.getInt(1);
|
||||
addPlotTask(plot, new UniqueStatement(
|
||||
@ -1081,8 +1087,8 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
|
||||
return connection.prepareStatement(
|
||||
public PreparedStatement get() throws SQLException {
|
||||
return SQLManager.this.connection.prepareStatement(
|
||||
"INSERT INTO `" + SQLManager.this.prefix
|
||||
+ "plot_settings`(`plot_plot_id`) VALUES(?)");
|
||||
}
|
||||
@ -1101,14 +1107,17 @@ public class SQLManager implements AbstractDB {
|
||||
});
|
||||
}
|
||||
|
||||
private void commit(final @NonNull Connection connection) {
|
||||
public void commit() {
|
||||
if (this.closed) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
if (!connection.getAutoCommit()) {
|
||||
connection.commit();
|
||||
connection.setAutoCommit(true);
|
||||
if (!this.connection.getAutoCommit()) {
|
||||
this.connection.commit();
|
||||
this.connection.setAutoCommit(true);
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
LOGGER.error("Failed to commit database transaction", e);
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
@ -1125,8 +1134,8 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
|
||||
return connection
|
||||
public PreparedStatement get() throws SQLException {
|
||||
return SQLManager.this.connection
|
||||
.prepareStatement(SQLManager.this.CREATE_PLOT, Statement.RETURN_GENERATED_KEYS);
|
||||
}
|
||||
|
||||
@ -1136,8 +1145,8 @@ public class SQLManager implements AbstractDB {
|
||||
|
||||
@Override
|
||||
public void addBatch(PreparedStatement statement) throws SQLException {
|
||||
statement.execute();
|
||||
try (ResultSet keys = supportsGetGeneratedKeys ? statement.getGeneratedKeys() : statement.getResultSet()) {
|
||||
statement.executeUpdate();
|
||||
try (ResultSet keys = statement.getGeneratedKeys()) {
|
||||
if (keys.next()) {
|
||||
plot.temp = keys.getInt(1);
|
||||
}
|
||||
@ -1151,8 +1160,8 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
|
||||
return connection.prepareStatement(
|
||||
public PreparedStatement get() throws SQLException {
|
||||
return SQLManager.this.connection.prepareStatement(
|
||||
"INSERT INTO `" + SQLManager.this.prefix
|
||||
+ "plot_settings`(`plot_plot_id`) VALUES(?)");
|
||||
}
|
||||
@ -1167,7 +1176,6 @@ public class SQLManager implements AbstractDB {
|
||||
*/
|
||||
@Override
|
||||
public void createTables() throws SQLException {
|
||||
try (Connection connection = this.dataSource().getConnection()) {
|
||||
String[] tables =
|
||||
new String[]{"plot", "plot_denied", "plot_helpers", "plot_comments", "plot_trusted",
|
||||
"plot_rating", "plot_settings", "cluster", "player_meta", "plot_flags"};
|
||||
@ -1185,7 +1193,7 @@ public class SQLManager implements AbstractDB {
|
||||
return;
|
||||
}
|
||||
boolean addConstraint = create == tables.length;
|
||||
try (Statement stmt = connection.createStatement()) {
|
||||
try (Statement stmt = this.connection.createStatement()) {
|
||||
if (this.mySQL) {
|
||||
stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot` ("
|
||||
+ "`id` INT(11) NOT NULL AUTO_INCREMENT," + "`plot_id_x` INT(11) NOT NULL,"
|
||||
@ -1320,7 +1328,6 @@ public class SQLManager implements AbstractDB {
|
||||
stmt.clearBatch();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteSettings(final Plot plot) {
|
||||
@ -1331,8 +1338,8 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
|
||||
return connection.prepareStatement(
|
||||
public PreparedStatement get() throws SQLException {
|
||||
return SQLManager.this.connection.prepareStatement(
|
||||
"DELETE FROM `" + SQLManager.this.prefix
|
||||
+ "plot_settings` WHERE `plot_plot_id` = ?");
|
||||
}
|
||||
@ -1351,8 +1358,8 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
|
||||
return connection.prepareStatement(
|
||||
public PreparedStatement get() throws SQLException {
|
||||
return SQLManager.this.connection.prepareStatement(
|
||||
"DELETE FROM `" + SQLManager.this.prefix
|
||||
+ "plot_helpers` WHERE `plot_plot_id` = ?");
|
||||
}
|
||||
@ -1371,8 +1378,8 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
|
||||
return connection.prepareStatement(
|
||||
public PreparedStatement get() throws SQLException {
|
||||
return SQLManager.this.connection.prepareStatement(
|
||||
"DELETE FROM `" + SQLManager.this.prefix
|
||||
+ "plot_trusted` WHERE `plot_plot_id` = ?");
|
||||
}
|
||||
@ -1391,8 +1398,8 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
|
||||
return connection.prepareStatement(
|
||||
public PreparedStatement get() throws SQLException {
|
||||
return SQLManager.this.connection.prepareStatement(
|
||||
"DELETE FROM `" + SQLManager.this.prefix
|
||||
+ "plot_denied` WHERE `plot_plot_id` = ?");
|
||||
}
|
||||
@ -1409,8 +1416,8 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
|
||||
return connection.prepareStatement(
|
||||
public PreparedStatement get() throws SQLException {
|
||||
return SQLManager.this.connection.prepareStatement(
|
||||
"DELETE FROM `" + SQLManager.this.prefix
|
||||
+ "plot_comments` WHERE `world` = ? AND `hashcode` = ?");
|
||||
}
|
||||
@ -1429,8 +1436,8 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
|
||||
return connection.prepareStatement(
|
||||
public PreparedStatement get() throws SQLException {
|
||||
return SQLManager.this.connection.prepareStatement(
|
||||
"DELETE FROM `" + SQLManager.this.prefix
|
||||
+ "plot_rating` WHERE `plot_plot_id` = ?");
|
||||
}
|
||||
@ -1457,8 +1464,8 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
|
||||
return connection.prepareStatement(
|
||||
public PreparedStatement get() throws SQLException {
|
||||
return SQLManager.this.connection.prepareStatement(
|
||||
"DELETE FROM `" + SQLManager.this.prefix + "plot` WHERE `id` = ?");
|
||||
}
|
||||
});
|
||||
@ -1479,8 +1486,8 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
|
||||
return connection.prepareStatement(
|
||||
public PreparedStatement get() throws SQLException {
|
||||
return SQLManager.this.connection.prepareStatement(
|
||||
"INSERT INTO `" + SQLManager.this.prefix
|
||||
+ "plot_settings`(`plot_plot_id`) VALUES(?)");
|
||||
}
|
||||
@ -1489,12 +1496,16 @@ public class SQLManager implements AbstractDB {
|
||||
|
||||
@Override
|
||||
public int getClusterId(PlotCluster cluster) {
|
||||
try (Connection connection = this.dataSource.getConnection()) {
|
||||
if (cluster.temp > 0) {
|
||||
return cluster.temp;
|
||||
}
|
||||
try {
|
||||
commit();
|
||||
if (cluster.temp > 0) {
|
||||
return cluster.temp;
|
||||
}
|
||||
int c_id;
|
||||
try (PreparedStatement stmt = connection.prepareStatement(
|
||||
try (PreparedStatement stmt = this.connection.prepareStatement(
|
||||
"SELECT `id` FROM `" + this.prefix
|
||||
+ "cluster` WHERE `pos1_x` = ? AND `pos1_z` = ? AND `pos2_x` = ? AND `pos2_z` = ? AND `world` = ? ORDER BY `timestamp` ASC")) {
|
||||
stmt.setInt(1, cluster.getP1().getX());
|
||||
@ -1528,12 +1539,13 @@ public class SQLManager implements AbstractDB {
|
||||
if (plot.temp > 0) {
|
||||
return plot.temp;
|
||||
}
|
||||
try (Connection connection = this.dataSource().getConnection()) {
|
||||
try {
|
||||
commit();
|
||||
if (plot.temp > 0) {
|
||||
return plot.temp;
|
||||
}
|
||||
int id;
|
||||
try (PreparedStatement statement = connection.prepareStatement(
|
||||
try (PreparedStatement statement = this.connection.prepareStatement(
|
||||
"SELECT `id` FROM `" + this.prefix
|
||||
+ "plot` WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND world = ? ORDER BY `timestamp` ASC")) {
|
||||
statement.setInt(1, plot.getId().getX());
|
||||
@ -1562,15 +1574,15 @@ public class SQLManager implements AbstractDB {
|
||||
|
||||
@Override
|
||||
public void updateTables(int[] oldVersion) {
|
||||
try (Connection connection = this.dataSource().getConnection()) {
|
||||
try {
|
||||
if (this.mySQL && !PlotSquared.get().checkVersion(oldVersion, 3, 3, 2)) {
|
||||
try (Statement stmt = connection.createStatement()) {
|
||||
try (Statement stmt = this.connection.createStatement()) {
|
||||
stmt.executeUpdate(
|
||||
"ALTER TABLE `" + this.prefix + "plots` DROP INDEX `unique_alias`");
|
||||
} catch (SQLException ignored) {
|
||||
}
|
||||
}
|
||||
DatabaseMetaData data = connection.getMetaData();
|
||||
DatabaseMetaData data = this.connection.getMetaData();
|
||||
ResultSet rs =
|
||||
data.getColumns(null, null, this.prefix + "plot_comments", "plot_plot_id");
|
||||
if (rs.next()) {
|
||||
@ -1578,7 +1590,7 @@ public class SQLManager implements AbstractDB {
|
||||
rs = data.getColumns(null, null, this.prefix + "plot_comments", "hashcode");
|
||||
if (!rs.next()) {
|
||||
rs.close();
|
||||
try (Statement statement = connection.createStatement()) {
|
||||
try (Statement statement = this.connection.createStatement()) {
|
||||
statement.addBatch("DROP TABLE `" + this.prefix + "plot_comments`");
|
||||
if (Storage.MySQL.USE) {
|
||||
statement.addBatch(
|
||||
@ -1613,7 +1625,7 @@ public class SQLManager implements AbstractDB {
|
||||
rs.close();
|
||||
rs = data.getColumns(null, null, this.prefix + "plot_denied", "plot_plot_id");
|
||||
if (rs.next()) {
|
||||
try (Statement statement = connection.createStatement()) {
|
||||
try (Statement statement = this.connection.createStatement()) {
|
||||
statement.executeUpdate("DELETE FROM `" + this.prefix
|
||||
+ "plot_denied` WHERE `plot_plot_id` NOT IN (SELECT `id` FROM `"
|
||||
+ this.prefix + "plot`)");
|
||||
@ -1622,7 +1634,7 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
|
||||
rs.close();
|
||||
try (Statement statement = connection.createStatement()) {
|
||||
try (Statement statement = this.connection.createStatement()) {
|
||||
for (String table : new String[]{"plot_denied", "plot_helpers",
|
||||
"plot_trusted"}) {
|
||||
ResultSet result = statement.executeQuery(
|
||||
@ -1694,12 +1706,9 @@ public class SQLManager implements AbstractDB {
|
||||
@Override
|
||||
public boolean convertFlags() {
|
||||
final Map<Integer, Map<String, String>> flagMap = new HashMap<>();
|
||||
try (
|
||||
Connection connection = this.dataSource().getConnection();
|
||||
Statement statement = connection.createStatement();
|
||||
ResultSet resultSet = statement
|
||||
.executeQuery("SELECT * FROM `" + this.prefix + "plot_settings`")
|
||||
) {
|
||||
try (Statement statement = this.connection.createStatement()) {
|
||||
try (ResultSet resultSet = statement
|
||||
.executeQuery("SELECT * FROM `" + this.prefix + "plot_settings`")) {
|
||||
while (resultSet.next()) {
|
||||
final int id = resultSet.getInt("plot_plot_id");
|
||||
final String plotFlags = resultSet.getString("flags");
|
||||
@ -1720,14 +1729,14 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (final Exception e) {
|
||||
LOGGER.error("Failed to load old flag values", e);
|
||||
return false;
|
||||
}
|
||||
LOGGER.info("Loaded {} plot flag collections...", flagMap.size());
|
||||
LOGGER.info("Attempting to store these flags in the new table...");
|
||||
try (Connection connection = this.dataSource().getConnection(); PreparedStatement preparedStatement =
|
||||
connection.prepareStatement(
|
||||
try (final PreparedStatement preparedStatement = this.connection.prepareStatement(
|
||||
"INSERT INTO `" + SQLManager.this.prefix
|
||||
+ "plot_flags`(`plot_id`, `flag`, `value`) VALUES(?, ?, ?)")) {
|
||||
|
||||
@ -1812,7 +1821,7 @@ public class SQLManager implements AbstractDB {
|
||||
/*
|
||||
* Getting plots
|
||||
*/
|
||||
try (Connection connection = this.dataSource().getConnection(); Statement statement = connection.createStatement()) {
|
||||
try (Statement statement = this.connection.createStatement()) {
|
||||
int id;
|
||||
String o;
|
||||
UUID user;
|
||||
@ -2145,8 +2154,8 @@ public class SQLManager implements AbstractDB {
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException {
|
||||
return connection.prepareStatement(
|
||||
public PreparedStatement get() throws SQLException {
|
||||
return SQLManager.this.connection.prepareStatement(
|
||||
"UPDATE `" + SQLManager.this.prefix
|
||||
+ "plot_settings` SET `merged` = ? WHERE `plot_plot_id` = ?");
|
||||
}
|
||||
@ -3049,8 +3058,8 @@ public class SQLManager implements AbstractDB {
|
||||
|
||||
@Override
|
||||
public void addBatch(PreparedStatement statement) throws SQLException {
|
||||
statement.execute();
|
||||
try (ResultSet keys = supportsGetGeneratedKeys ? statement.getGeneratedKeys() : statement.getResultSet()) {
|
||||
statement.executeUpdate();
|
||||
try (ResultSet keys = statement.getGeneratedKeys()) {
|
||||
if (keys.next()) {
|
||||
cluster.temp = keys.getInt(1);
|
||||
}
|
||||
@ -3131,8 +3140,6 @@ public class SQLManager implements AbstractDB {
|
||||
|
||||
@Override
|
||||
public PreparedStatement get() throws SQLException {
|
||||
try (final Connection connection = )
|
||||
|
||||
return SQLManager.this.connection.prepareStatement(
|
||||
"DELETE FROM `" + SQLManager.this.prefix
|
||||
+ "cluster_invited` WHERE `cluster_id` = ? AND `user_uuid` = ?");
|
||||
@ -3400,16 +3407,13 @@ public class SQLManager implements AbstractDB {
|
||||
@Override
|
||||
public void close() {
|
||||
try {
|
||||
((Closeable) this.dataSource()).close();
|
||||
} catch (Exception e) {
|
||||
LOGGER.error("Failed to close data source", e);
|
||||
this.closed = true;
|
||||
this.connection.close();
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
private @NonNull DataSource dataSource() {
|
||||
return this.dataSource;
|
||||
}
|
||||
|
||||
private record LegacySettings(
|
||||
int id,
|
||||
PlotSettings settings
|
||||
@ -3433,7 +3437,7 @@ public class SQLManager implements AbstractDB {
|
||||
statement.executeBatch();
|
||||
}
|
||||
|
||||
public abstract @Nullable PreparedStatement get(final @NonNull Connection connection) throws SQLException;
|
||||
public abstract PreparedStatement get() throws SQLException;
|
||||
|
||||
public abstract void set(PreparedStatement statement) throws SQLException;
|
||||
|
||||
|
||||
@ -33,7 +33,6 @@ import java.sql.Statement;
|
||||
/**
|
||||
* Connects to and uses a SQLite database.
|
||||
*/
|
||||
@Deprecated(forRemoval = true)
|
||||
public class SQLite extends Database {
|
||||
|
||||
private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + SQLite.class.getSimpleName());
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
package com.plotsquared.core.inject.annotations;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
@Target({ElementType.FIELD, ElementType.TYPE, ElementType.PARAMETER})
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface PlotDatabase {
|
||||
|
||||
}
|
||||
@ -1,72 +0,0 @@
|
||||
package com.plotsquared.core.inject.modules;
|
||||
|
||||
import com.google.inject.AbstractModule;
|
||||
import com.plotsquared.core.PlotSquared;
|
||||
import com.plotsquared.core.configuration.Storage;
|
||||
import com.plotsquared.core.inject.annotations.PlotDatabase;
|
||||
import com.plotsquared.core.util.FileUtils;
|
||||
import com.plotsquared.core.util.StringMan;
|
||||
import com.zaxxer.hikari.HikariConfig;
|
||||
import com.zaxxer.hikari.HikariDataSource;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import javax.sql.DataSource;
|
||||
import java.io.File;
|
||||
|
||||
public class DatabaseModule extends AbstractModule {
|
||||
|
||||
private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlotSquared.class.getSimpleName());
|
||||
|
||||
@Override
|
||||
protected void configure() {
|
||||
try {
|
||||
if (Storage.MySQL.USE) {
|
||||
this.configureMySQL();
|
||||
} else if (Storage.SQLite.USE) {
|
||||
this.configureSQLite();
|
||||
} else {
|
||||
LOGGER.error("No storage type is set. Disabling PlotSquared");
|
||||
PlotSquared.platform().shutdown();
|
||||
}
|
||||
} catch (final Exception e) {
|
||||
LOGGER.error("Unable to initialize database", e);
|
||||
PlotSquared.platform().shutdown();
|
||||
}
|
||||
}
|
||||
|
||||
private void configureSQLite() throws Exception {
|
||||
final File file = FileUtils.getFile(PlotSquared.platform().getDirectory(), Storage.SQLite.DB + ".db");
|
||||
if (!file.exists()) {
|
||||
file.createNewFile();
|
||||
}
|
||||
Class.forName("org.sqlite.JDBC");
|
||||
|
||||
final HikariConfig config = new HikariConfig();
|
||||
config.setJdbcUrl("jdbc:sqlite:" + file);
|
||||
config.setDriverClassName("org.sqlite.JDBC");
|
||||
final DataSource dataSource = new HikariDataSource();
|
||||
|
||||
binder().bind(DataSource.class).annotatedWith(PlotDatabase.class).toInstance(dataSource);
|
||||
}
|
||||
|
||||
private void configureMySQL() {
|
||||
final HikariConfig hikariConfig = new HikariConfig();
|
||||
hikariConfig.setJdbcUrl(
|
||||
String.format(
|
||||
"jdbc:mysql://%s:%s/%s?%s",
|
||||
Storage.MySQL.HOST,
|
||||
Storage.MySQL.PORT,
|
||||
Storage.MySQL.DATABASE,
|
||||
StringMan.join(Storage.MySQL.PROPERTIES, "&")
|
||||
));
|
||||
hikariConfig.setUsername(Storage.MySQL.USER);
|
||||
hikariConfig.setPassword(Storage.MySQL.PASSWORD);
|
||||
hikariConfig.addDataSourceProperty("cachePrepStmts", "true");
|
||||
hikariConfig.addDataSourceProperty("prepStmtCacheSize", "512");
|
||||
hikariConfig.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
|
||||
final DataSource dataSource = new HikariDataSource(hikariConfig);
|
||||
|
||||
binder().bind(DataSource.class).annotatedWith(PlotDatabase.class).toInstance(dataSource);
|
||||
}
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
package com.plotsquared.core.inject.modules;
|
||||
|
||||
import com.plotsquared.core.inject.annotations.PlotDatabase;
|
||||
import org.jdbi.v3.guice.AbstractJdbiDefinitionModule;
|
||||
|
||||
public class JdbiModule extends AbstractJdbiDefinitionModule {
|
||||
|
||||
public JdbiModule() {
|
||||
super(PlotDatabase.class);
|
||||
}
|
||||
@Override
|
||||
public void configureJdbi() {
|
||||
|
||||
}
|
||||
}
|
||||
@ -55,6 +55,7 @@ import com.plotsquared.core.plot.flag.implementations.TitlesFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.WeatherFlag;
|
||||
import com.plotsquared.core.plot.flag.types.TimedFlag;
|
||||
import com.plotsquared.core.util.EventDispatcher;
|
||||
import com.plotsquared.core.util.PlayerManager;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import com.plotsquared.core.util.task.TaskTime;
|
||||
import com.sk89q.worldedit.world.gamemode.GameMode;
|
||||
@ -62,6 +63,7 @@ import com.sk89q.worldedit.world.gamemode.GameModes;
|
||||
import com.sk89q.worldedit.world.item.ItemType;
|
||||
import com.sk89q.worldedit.world.item.ItemTypes;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.ComponentLike;
|
||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||
import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
@ -75,7 +77,6 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
public class PlotListener {
|
||||
|
||||
@ -320,27 +321,22 @@ public class PlotListener {
|
||||
}
|
||||
if ((lastPlot != null) && plot.getId().equals(lastPlot.getId()) && plot.hasOwner()) {
|
||||
final UUID plotOwner = plot.getOwnerAbs();
|
||||
ComponentLike owner = PlayerManager.resolveName(plotOwner, true).toComponent(player);
|
||||
Caption header = fromFlag ? StaticCaption.of(title) : TranslatableCaption.of("titles" +
|
||||
".title_entered_plot");
|
||||
Caption subHeader = fromFlag ? StaticCaption.of(subtitle) : TranslatableCaption.of("titles" +
|
||||
".title_entered_plot_sub");
|
||||
|
||||
CompletableFuture<TagResolver> future = PlotSquared.platform().playerManager()
|
||||
.getUsernameCaption(plotOwner).thenApply(caption -> TagResolver.builder()
|
||||
.tag("owner", Tag.inserting(caption.toComponent(player)))
|
||||
TagResolver resolver = TagResolver.builder()
|
||||
.tag("plot", Tag.inserting(Component.text(lastPlot.getId().toString())))
|
||||
.tag("world", Tag.inserting(Component.text(player.getLocation().getWorldName())))
|
||||
.tag("owner", Tag.inserting(owner))
|
||||
.tag("alias", Tag.inserting(Component.text(plot.getAlias())))
|
||||
.build()
|
||||
);
|
||||
|
||||
future.whenComplete((tagResolver, throwable) -> {
|
||||
.build();
|
||||
if (Settings.Titles.TITLES_AS_ACTIONBAR) {
|
||||
player.sendActionBar(header, tagResolver);
|
||||
player.sendActionBar(header, resolver);
|
||||
} else {
|
||||
player.sendTitle(header, subHeader, tagResolver);
|
||||
player.sendTitle(header, subHeader, resolver);
|
||||
}
|
||||
});
|
||||
}
|
||||
}, TaskTime.seconds(1L));
|
||||
}
|
||||
|
||||
@ -80,7 +80,6 @@ import java.util.Map;
|
||||
import java.util.Queue;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
@ -882,7 +881,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
|
||||
final Component titleComponent = MiniMessage.miniMessage().deserialize(title.getComponent(this), replacements);
|
||||
final Component subtitleComponent =
|
||||
MiniMessage.miniMessage().deserialize(subtitle.getComponent(this), replacements);
|
||||
final Title.Times times = Title.Times.times(
|
||||
final Title.Times times = Title.Times.of(
|
||||
Duration.of(Settings.Titles.TITLES_FADE_IN * 50L, ChronoUnit.MILLIS),
|
||||
Duration.of(Settings.Titles.TITLES_STAY * 50L, ChronoUnit.MILLIS),
|
||||
Duration.of(Settings.Titles.TITLES_FADE_OUT * 50L, ChronoUnit.MILLIS)
|
||||
@ -954,54 +953,6 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sends a message to the command caller, when the future is resolved
|
||||
*
|
||||
* @param caption Caption to send
|
||||
* @param asyncReplacement Async variable replacement
|
||||
* @return A Future to be resolved, after the message was sent
|
||||
* @since 7.1.0
|
||||
*/
|
||||
public final CompletableFuture<Void> sendMessage(
|
||||
@NonNull Caption caption,
|
||||
CompletableFuture<@NonNull TagResolver> asyncReplacement
|
||||
) {
|
||||
return sendMessage(caption, new CompletableFuture[]{asyncReplacement});
|
||||
}
|
||||
|
||||
/**
|
||||
* Sends a message to the command caller, when all futures are resolved
|
||||
*
|
||||
* @param caption Caption to send
|
||||
* @param asyncReplacements Async variable replacements
|
||||
* @param replacements Sync variable replacements
|
||||
* @return A Future to be resolved, after the message was sent
|
||||
* @since 7.1.0
|
||||
*/
|
||||
public final CompletableFuture<Void> sendMessage(
|
||||
@NonNull Caption caption,
|
||||
CompletableFuture<@NonNull TagResolver>[] asyncReplacements,
|
||||
@NonNull TagResolver... replacements
|
||||
) {
|
||||
return CompletableFuture.allOf(asyncReplacements).whenComplete((unused, throwable) -> {
|
||||
Set<TagResolver> resolvers = new HashSet<>(Arrays.asList(replacements));
|
||||
if (throwable != null) {
|
||||
sendMessage(
|
||||
TranslatableCaption.of("errors.error"),
|
||||
TagResolver.resolver("value", Tag.inserting(
|
||||
Component.text("Failed to resolve asynchronous caption replacements")
|
||||
))
|
||||
);
|
||||
LOGGER.error("Failed to resolve asynchronous tagresolver(s) for " + caption, throwable);
|
||||
} else {
|
||||
for (final CompletableFuture<TagResolver> asyncReplacement : asyncReplacements) {
|
||||
resolvers.add(asyncReplacement.join());
|
||||
}
|
||||
}
|
||||
sendMessage(caption, resolvers.toArray(TagResolver[]::new));
|
||||
});
|
||||
}
|
||||
|
||||
// Redefine from PermissionHolder as it's required from CommandCaller
|
||||
@Override
|
||||
public boolean hasPermission(@NonNull String permission) {
|
||||
|
||||
@ -51,8 +51,6 @@ import com.plotsquared.core.util.MathMan;
|
||||
import com.plotsquared.core.util.PlotExpression;
|
||||
import com.plotsquared.core.util.RegionUtil;
|
||||
import com.plotsquared.core.util.StringMan;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import com.plotsquared.core.util.task.TaskTime;
|
||||
import com.sk89q.worldedit.math.BlockVector2;
|
||||
import com.sk89q.worldedit.math.BlockVector3;
|
||||
import com.sk89q.worldedit.regions.CuboidRegion;
|
||||
@ -393,28 +391,6 @@ public abstract class PlotArea implements ComponentLike {
|
||||
}
|
||||
}
|
||||
|
||||
this.spawnEggs = config.getBoolean("event.spawn.egg");
|
||||
this.spawnCustom = config.getBoolean("event.spawn.custom");
|
||||
this.spawnBreeding = config.getBoolean("event.spawn.breeding");
|
||||
|
||||
if (PlotSquared.get().isWeInitialised()) {
|
||||
loadFlags(config);
|
||||
} else {
|
||||
ConsolePlayer.getConsole().sendMessage(
|
||||
TranslatableCaption.of("flags.delaying_loading_area_flags"),
|
||||
TagResolver.resolver("area", Tag.inserting(Component.text(this.id == null ? this.worldName : this.id)))
|
||||
);
|
||||
TaskManager.runTaskLater(() -> loadFlags(config), TaskTime.ticks(1));
|
||||
}
|
||||
|
||||
loadConfiguration(config);
|
||||
}
|
||||
|
||||
private void loadFlags(ConfigurationSection config) {
|
||||
ConsolePlayer.getConsole().sendMessage(
|
||||
TranslatableCaption.of("flags.loading_area_flags"),
|
||||
TagResolver.resolver("area", Tag.inserting(Component.text(this.id == null ? this.worldName : this.id)))
|
||||
);
|
||||
List<String> flags = config.getStringList("flags.default");
|
||||
if (flags.isEmpty()) {
|
||||
flags = config.getStringList("flags");
|
||||
@ -435,6 +411,10 @@ public abstract class PlotArea implements ComponentLike {
|
||||
TagResolver.resolver("flags", Tag.inserting(Component.text(flags.toString())))
|
||||
);
|
||||
|
||||
this.spawnEggs = config.getBoolean("event.spawn.egg");
|
||||
this.spawnCustom = config.getBoolean("event.spawn.custom");
|
||||
this.spawnBreeding = config.getBoolean("event.spawn.breeding");
|
||||
|
||||
List<String> roadflags = config.getStringList("road.flags");
|
||||
if (roadflags.isEmpty()) {
|
||||
roadflags = new ArrayList<>();
|
||||
@ -446,12 +426,14 @@ public abstract class PlotArea implements ComponentLike {
|
||||
}
|
||||
}
|
||||
}
|
||||
this.roadFlags = !roadflags.isEmpty();
|
||||
this.roadFlags = roadflags.size() > 0;
|
||||
parseFlags(this.getRoadFlagContainer(), roadflags);
|
||||
ConsolePlayer.getConsole().sendMessage(
|
||||
TranslatableCaption.of("flags.road_flags"),
|
||||
TagResolver.resolver("flags", Tag.inserting(Component.text(roadflags.toString())))
|
||||
);
|
||||
|
||||
loadConfiguration(config);
|
||||
}
|
||||
|
||||
public abstract void loadConfiguration(ConfigurationSection config);
|
||||
|
||||
@ -38,6 +38,7 @@ import com.plotsquared.core.location.Location;
|
||||
import com.plotsquared.core.player.PlotPlayer;
|
||||
import com.plotsquared.core.plot.flag.PlotFlag;
|
||||
import com.plotsquared.core.queue.QueueCoordinator;
|
||||
import com.plotsquared.core.util.PlayerManager;
|
||||
import com.plotsquared.core.util.task.TaskManager;
|
||||
import com.plotsquared.core.util.task.TaskTime;
|
||||
import com.sk89q.worldedit.function.pattern.Pattern;
|
||||
@ -58,7 +59,6 @@ import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
@ -383,17 +383,13 @@ public final class PlotModificationManager {
|
||||
}
|
||||
if (createSign) {
|
||||
queue.setCompleteTask(() -> TaskManager.runTaskAsync(() -> {
|
||||
List<CompletableFuture<Void>> tasks = plots.stream().map(current -> PlotSquared.platform().playerManager()
|
||||
.getUsernameCaption(current.getOwnerAbs())
|
||||
.thenAccept(caption -> current
|
||||
.getPlotModificationManager()
|
||||
.setSign(caption.getComponent(LocaleHolder.console()))))
|
||||
.toList();
|
||||
CompletableFuture.allOf(tasks.toArray(CompletableFuture[]::new)).whenComplete((unused, throwable) -> {
|
||||
for (Plot current : plots) {
|
||||
current.getPlotModificationManager().setSign(PlayerManager.resolveName(current.getOwnerAbs()).getComponent(
|
||||
LocaleHolder.console()));
|
||||
}
|
||||
if (whenDone != null) {
|
||||
TaskManager.runTask(whenDone);
|
||||
}
|
||||
});
|
||||
}));
|
||||
} else if (whenDone != null) {
|
||||
queue.setCompleteTask(whenDone);
|
||||
|
||||
@ -29,7 +29,6 @@ import com.plotsquared.core.plot.flag.implementations.BlockIgnitionFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.BlockedCmdsFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.BreakFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.ChatFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.ConcreteHardenFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.CopperOxideFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.CoralDryFlag;
|
||||
import com.plotsquared.core.plot.flag.implementations.CropGrowFlag;
|
||||
@ -143,7 +142,6 @@ public final class GlobalFlagContainer extends FlagContainer {
|
||||
this.addFlag(BeaconEffectsFlag.BEACON_EFFECT_TRUE);
|
||||
this.addFlag(BlockIgnitionFlag.BLOCK_IGNITION_TRUE);
|
||||
this.addFlag(ChatFlag.CHAT_FLAG_TRUE);
|
||||
this.addFlag(ConcreteHardenFlag.CONCRETE_HARDEN_TRUE);
|
||||
this.addFlag(CopperOxideFlag.COPPER_OXIDE_FALSE);
|
||||
this.addFlag(CoralDryFlag.CORAL_DRY_FALSE);
|
||||
this.addFlag(CropGrowFlag.CROP_GROW_TRUE);
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
/*
|
||||
* PlotSquared, a land and world management plugin for Minecraft.
|
||||
* Copyright (C) IntellectualSites <https://intellectualsites.com>
|
||||
* Copyright (C) IntellectualSites team and contributors
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package com.plotsquared.core.plot.flag.implementations;
|
||||
|
||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
|
||||
import com.plotsquared.core.plot.flag.types.BooleanFlag;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
|
||||
public class ConcreteHardenFlag extends BooleanFlag<ConcreteHardenFlag> {
|
||||
|
||||
public static final ConcreteHardenFlag CONCRETE_HARDEN_TRUE = new ConcreteHardenFlag(true);
|
||||
public static final ConcreteHardenFlag CONCRETE_HARDEN_FALSE = new ConcreteHardenFlag(false);
|
||||
|
||||
private ConcreteHardenFlag(boolean value) {
|
||||
super(value, TranslatableCaption.of("flags.flag_description_concrete_harden"));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ConcreteHardenFlag flagOf(@NonNull Boolean value) {
|
||||
return value ? CONCRETE_HARDEN_TRUE : CONCRETE_HARDEN_FALSE;
|
||||
}
|
||||
|
||||
}
|
||||
@ -42,14 +42,28 @@ public class EntityUtil {
|
||||
}
|
||||
|
||||
private static int capNumeral(final @NonNull String flagName) {
|
||||
return switch (flagName) {
|
||||
case "mob-cap" -> CAP_MOB;
|
||||
case "hostile-cap" -> CAP_MONSTER;
|
||||
case "animal-cap" -> CAP_ANIMAL;
|
||||
case "vehicle-cap" -> CAP_VEHICLE;
|
||||
case "misc-cap" -> CAP_MISC;
|
||||
default -> CAP_ENTITY;
|
||||
};
|
||||
int i;
|
||||
switch (flagName) {
|
||||
case "mob-cap":
|
||||
i = CAP_MOB;
|
||||
break;
|
||||
case "hostile-cap":
|
||||
i = CAP_MONSTER;
|
||||
break;
|
||||
case "animal-cap":
|
||||
i = CAP_ANIMAL;
|
||||
break;
|
||||
case "vehicle-cap":
|
||||
i = CAP_VEHICLE;
|
||||
break;
|
||||
case "misc-cap":
|
||||
i = CAP_MISC;
|
||||
break;
|
||||
case "entity-cap":
|
||||
default:
|
||||
i = CAP_ENTITY;
|
||||
}
|
||||
return i;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
|
||||
@ -28,7 +28,6 @@ import com.plotsquared.core.database.DBFunc;
|
||||
import com.plotsquared.core.player.ConsolePlayer;
|
||||
import com.plotsquared.core.player.OfflinePlotPlayer;
|
||||
import com.plotsquared.core.player.PlotPlayer;
|
||||
import com.plotsquared.core.plot.Plot;
|
||||
import com.plotsquared.core.uuid.UUIDMapping;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.kyori.adventure.text.ComponentLike;
|
||||
@ -38,7 +37,6 @@ import net.kyori.adventure.text.minimessage.tag.Tag;
|
||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||
import org.jetbrains.annotations.Contract;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
@ -50,7 +48,6 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.function.BiConsumer;
|
||||
|
||||
@ -172,9 +169,7 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
|
||||
* @return A caption containing either the name, {@code None}, {@code Everyone} or {@code Unknown}
|
||||
* @see #resolveName(UUID, boolean)
|
||||
* @since 6.4.0
|
||||
* @deprecated Don't unnecessarily block threads and utilize playerMap - see {@link #getUsernameCaption(UUID)}
|
||||
*/
|
||||
@Deprecated(since = "7.1.0")
|
||||
public static @NonNull Caption resolveName(final @Nullable UUID owner) {
|
||||
return resolveName(owner, true);
|
||||
}
|
||||
@ -186,9 +181,7 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
|
||||
* @param blocking If the operation should block the current thread for {@link Settings.UUID#BLOCKING_TIMEOUT} milliseconds
|
||||
* @return A caption containing either the name, {@code None}, {@code Everyone} or {@code Unknown}
|
||||
* @since 6.4.0
|
||||
* @deprecated Don't unnecessarily block threads and utilize playerMap - see {@link #getUsernameCaption(UUID)}
|
||||
*/
|
||||
@Deprecated(since = "7.1.0")
|
||||
public static @NonNull Caption resolveName(final @Nullable UUID owner, final boolean blocking) {
|
||||
if (owner == null) {
|
||||
return TranslatableCaption.of("info.none");
|
||||
@ -218,50 +211,6 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
|
||||
return StaticCaption.of(name);
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolves a UUID to a formatted {@link Caption} representing the player behind the UUID.
|
||||
* Returns a {@link CompletableFuture} instead of a plain {@link UUID} as this method may query the
|
||||
* {@link com.plotsquared.core.uuid.UUIDPipeline ImpromptuUUIDPipeline}.
|
||||
* <br>
|
||||
* Special Cases:
|
||||
* <ul>
|
||||
* <li>{@code null}: Resolves to a {@link TranslatableCaption} with the key {@code info.none}</li>
|
||||
* <li>{@link DBFunc#EVERYONE}: Resolves to a {@link TranslatableCaption} with the key {@code info.everyone}</li>
|
||||
* <li>{@link DBFunc#SERVER}: Resolves to a {@link TranslatableCaption} with the key {@code info.server}</li>
|
||||
* </ul>
|
||||
* <br>
|
||||
* Otherwise, if the UUID is a valid UUID and not reserved by PlotSquared itself, this method first attempts to query the
|
||||
* online players ({@link #getPlayerIfExists(UUID)}) for the specific UUID.
|
||||
* If no online player was found for that UUID, the {@link com.plotsquared.core.uuid.UUIDPipeline ImpromptuUUIDPipeline} is
|
||||
* queried to retrieve the known username
|
||||
*
|
||||
* @param uuid The UUID of the player (for example provided by {@link Plot#getOwner()}
|
||||
* @return A CompletableFuture resolving to a Caption representing the players name of the uuid
|
||||
* @since 7.1.0
|
||||
*/
|
||||
@Contract("_->!null")
|
||||
public @NonNull CompletableFuture<Caption> getUsernameCaption(@Nullable UUID uuid) {
|
||||
if (uuid == null) {
|
||||
return CompletableFuture.completedFuture(TranslatableCaption.of("info.none"));
|
||||
}
|
||||
if (uuid.equals(DBFunc.EVERYONE)) {
|
||||
return CompletableFuture.completedFuture(TranslatableCaption.of("info.everyone"));
|
||||
}
|
||||
if (uuid.equals(DBFunc.SERVER)) {
|
||||
return CompletableFuture.completedFuture(TranslatableCaption.of("info.server"));
|
||||
}
|
||||
P player = getPlayerIfExists(uuid);
|
||||
if (player != null) {
|
||||
return CompletableFuture.completedFuture(StaticCaption.of(player.getName()));
|
||||
}
|
||||
return PlotSquared.get().getImpromptuUUIDPipeline().getNames(Collections.singleton(uuid)).thenApply(mapping -> {
|
||||
if (mapping.isEmpty()) {
|
||||
return TranslatableCaption.of("info.unknown");
|
||||
}
|
||||
return StaticCaption.of(mapping.get(0).username());
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove a player from the player map
|
||||
*
|
||||
|
||||
@ -47,7 +47,6 @@ import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.TimeZone;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.function.BiFunction;
|
||||
|
||||
/**
|
||||
@ -110,9 +109,9 @@ public final class PlaceholderRegistry {
|
||||
if (plotOwner == null) {
|
||||
return legacyComponent(TranslatableCaption.of("generic.generic_unowned"), player);
|
||||
}
|
||||
|
||||
try {
|
||||
return PlotSquared.platform().playerManager().getUsernameCaption(plotOwner)
|
||||
.get(Settings.UUID.BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS).getComponent(player);
|
||||
return PlayerManager.resolveName(plotOwner, false).getComponent(player);
|
||||
} catch (final Exception ignored) {
|
||||
}
|
||||
return legacyComponent(TranslatableCaption.of("info.unknown"), player);
|
||||
@ -188,7 +187,6 @@ public final class PlaceholderRegistry {
|
||||
}
|
||||
});
|
||||
this.createPlaceholder("currentplot_biome", (player, plot) -> plot.getBiomeSynchronous().toString());
|
||||
this.createPlaceholder("currentplot_size", (player, plot) -> String.valueOf(plot.getConnectedPlots().size()));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -551,7 +551,6 @@
|
||||
"flags.flag_description_block_burn": "<gray>Set to `true` to allow blocks to burn within the plot.</gray>",
|
||||
"flags.flag_description_block_ignition": "<gray>Set to `false` to prevent blocks from igniting within the plot.</gray>",
|
||||
"flags.flag_description_break": "<gray>Define a list of materials players should be able to break even when they aren't added to the plot.</gray>",
|
||||
"flags.flag_description_concrete_harden": "<gray>Set to `false` to disable concrete powder forming to concrete with water.</gray>",
|
||||
"flags.flag_description_device_interact": "<gray>Set to `true` to allow devices to be interacted with in the plot.</gray>",
|
||||
"flags.flag_description_disable_physics": "<gray>Set to `true` to disable block physics in the plot.</gray>",
|
||||
"flags.flag_description_drop_protection": "<gray>Set to `true` to prevent dropped items from being picked up by non-members of the plot.</gray>",
|
||||
@ -632,8 +631,6 @@
|
||||
"flags.flag_error_double": "Flag value must be a decimal number.",
|
||||
"flags.flag_error_music": "Flag value must be a valid music disc ID.",
|
||||
"flags.flag_error_title": "Flag value must be in the format </red><grey>\"A title\" \"The subtitle\"</grey><red>.",
|
||||
"flags.delaying_loading_area_flags": "<prefix><gray>Delaying loading flags for area `</gray><dark_aqua><area></dark_aqua><gray>` as WorldEdit is not initialised yet.</gray>",
|
||||
"flags.loading_area_flags": "<prefix><gray>Loading flags for area: </gray><dark_aqua><area></dark_aqua>",
|
||||
"flags.area_flags": "<prefix><gray>Area flags: </gray><dark_aqua><flags></dark_aqua>",
|
||||
"flags.road_flags": "<prefix><gray>Road flags: </gray><dark_aqua><flags></dark_aqua>",
|
||||
"commands.description.add": "<gray>Allow a user to build in a plot while the plot owner is online.</gray>",
|
||||
|
||||
@ -22,7 +22,7 @@ plugins {
|
||||
}
|
||||
|
||||
group = "com.intellectualsites.plotsquared"
|
||||
version = "7.1.1-SNAPSHOT"
|
||||
version = "7.0.1-SNAPSHOT"
|
||||
|
||||
if (!File("$rootDir/.git").exists()) {
|
||||
logger.lifecycle("""
|
||||
@ -150,26 +150,22 @@ subprojects {
|
||||
id.set("Sauilitired")
|
||||
name.set("Alexander Söderberg")
|
||||
organization.set("IntellectualSites")
|
||||
organizationUrl.set("https://github.com/IntellectualSites")
|
||||
}
|
||||
developer {
|
||||
id.set("NotMyFault")
|
||||
name.set("Alexander Brandes")
|
||||
organization.set("IntellectualSites")
|
||||
organizationUrl.set("https://github.com/IntellectualSites")
|
||||
email.set("contact(at)notmyfault.dev")
|
||||
}
|
||||
developer {
|
||||
id.set("SirYwell")
|
||||
name.set("Hannes Greule")
|
||||
organization.set("IntellectualSites")
|
||||
organizationUrl.set("https://github.com/IntellectualSites")
|
||||
}
|
||||
developer {
|
||||
id.set("dordsor21")
|
||||
name.set("dordsor21")
|
||||
organization.set("IntellectualSites")
|
||||
organizationUrl.set("https://github.com/IntellectualSites")
|
||||
}
|
||||
}
|
||||
|
||||
@ -226,25 +222,20 @@ tasks.getByName<Jar>("jar") {
|
||||
|
||||
val supportedVersions = listOf("1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20.1", "1.20.2")
|
||||
tasks {
|
||||
register("cacheLatestFaweArtifact") {
|
||||
val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()
|
||||
val artifact = ((JsonSlurper().parse(lastSuccessfulBuildUrl) as Map<*, *>)["artifacts"] as List<*>)
|
||||
.map { it as Map<*, *> }
|
||||
.map { it["fileName"] as String }
|
||||
.first { it -> it.contains("Bukkit") }
|
||||
project.ext["faweArtifact"] = artifact
|
||||
}
|
||||
.first { it.contains("Bukkit") }
|
||||
|
||||
supportedVersions.forEach {
|
||||
register<RunServer>("runServer-$it") {
|
||||
dependsOn(getByName("cacheLatestFaweArtifact"))
|
||||
minecraftVersion(it)
|
||||
pluginJars(*project(":plotsquared-bukkit").getTasksByName("shadowJar", false)
|
||||
.map { task -> (task as Jar).archiveFile }
|
||||
pluginJars(*project(":plotsquared-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
|
||||
.toTypedArray())
|
||||
jvmArgs("-DPaper.IgnoreJavaVersion=true", "-Dcom.mojang.eula.agree=true")
|
||||
downloadPlugins {
|
||||
url("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/artifact/artifacts/${project.ext["faweArtifact"]}")
|
||||
url("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/artifact/artifacts/$artifact")
|
||||
}
|
||||
group = "run paper"
|
||||
runDirectory.set(file("run-$it"))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
paper = "1.20.2-R0.1-SNAPSHOT"
|
||||
guice = "7.0.0"
|
||||
spotbugs = "4.7.3"
|
||||
checkerqual = "3.39.0"
|
||||
checkerqual = "3.38.0"
|
||||
gson = "2.10"
|
||||
guava = "31.1-jre"
|
||||
snakeyaml = "2.0"
|
||||
@ -19,10 +19,6 @@ luckperms = "5.4"
|
||||
essentialsx = "2.20.1"
|
||||
mvdwapi = "3.1.1"
|
||||
|
||||
# Datebase
|
||||
hikaricp = "5.0.1"
|
||||
jdbi = "3.41.3"
|
||||
|
||||
# Third party
|
||||
prtree = "2.0.1"
|
||||
aopalliance = "1.0"
|
||||
@ -32,7 +28,7 @@ squirrelid = "0.3.2"
|
||||
paster = "1.1.5"
|
||||
bstats = "3.0.2"
|
||||
paperlib = "1.0.8"
|
||||
informative-annotations = "1.4"
|
||||
informative-annotations = "1.3"
|
||||
vault = "1.7.1"
|
||||
serverlib = "2.3.4"
|
||||
|
||||
@ -67,11 +63,6 @@ essentialsx = { group = "net.essentialsx", name = "EssentialsX", version.ref = "
|
||||
faweCore = { group = "com.fastasyncworldedit", name = "FastAsyncWorldEdit-Core", version.ref = "fawe" }
|
||||
faweBukkit = { group = "com.fastasyncworldedit", name = "FastAsyncWorldEdit-Bukkit", version.ref = "fawe" }
|
||||
|
||||
# Database
|
||||
hikaricp = { group = "com.zaxxer", name = "HikariCP", version.ref = "hikaricp" }
|
||||
jdbiCore = { group = "org.jdbi", name = "jdbi3-core", version.ref = "jdbi" }
|
||||
jdbiGuice = { group = "org.jdbi", name = "jdbi3-guice", version.ref = "jdbi" }
|
||||
|
||||
# Third party
|
||||
prtree = { group = "com.intellectualsites.prtree", name = "PRTree", version.ref = "prtree" }
|
||||
aopalliance = { group = "aopalliance", name = "aopalliance", version.ref = "aopalliance" }
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
14
gradlew
vendored
14
gradlew
vendored
@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
# shellcheck disable=SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
# shellcheck disable=SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
@ -202,11 +202,11 @@ fi
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
# Collect all arguments for the java command;
|
||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||
# shell script including quotes and variable substitutions, so put them in
|
||||
# double quotes to make sure that they get re-expanded; and
|
||||
# * put everything else in single quotes, so that it's not re-expanded.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
|
||||
Reference in New Issue
Block a user