diff --git a/Essentials/build.gradle.kts b/Essentials/build.gradle.kts index 04d68f760..858f3a561 100644 --- a/Essentials/build.gradle.kts +++ b/Essentials/build.gradle.kts @@ -6,10 +6,7 @@ plugins { } dependencies { - compileOnly("com.github.milkbowl:VaultAPI:1.7") { - exclude(group = "org.bukkit", module = "bukkit") - } - compileOnly("net.luckperms:api:5.0") + compileOnly("net.luckperms:api:5.5") api("io.papermc:paperlib:1.0.6") implementation("org.spongepowered:configurate-yaml:4.1.2") implementation("org.checkerframework:checker-qual:3.14.0") diff --git a/Essentials/src/main/java/com/earth2me/essentials/AsyncTeleport.java b/Essentials/src/main/java/com/earth2me/essentials/AsyncTeleport.java index 19ab45818..a69d814f0 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/AsyncTeleport.java +++ b/Essentials/src/main/java/com/earth2me/essentials/AsyncTeleport.java @@ -17,7 +17,6 @@ import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; -import java.math.BigDecimal; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.concurrent.CompletableFuture; @@ -52,20 +51,15 @@ public class AsyncTeleport implements IAsyncTeleport { public boolean cooldown(final boolean check, final CompletableFuture future) { final Calendar time = new GregorianCalendar(); if (teleportOwner.getLastTeleportTimestamp() > 0) { - // Take the current time, and remove the delay from it. final double cooldown = ess.getSettings().getTeleportCooldown(); final Calendar earliestTime = new GregorianCalendar(); earliestTime.add(Calendar.SECOND, -(int) cooldown); earliestTime.add(Calendar.MILLISECOND, -(int) ((cooldown * 1000.0) % 1000.0)); - // This value contains the most recent time a teleportPlayer could have been used that would allow another use. final long earliestLong = earliestTime.getTimeInMillis(); - // When was the last teleportPlayer used? final long lastTime = teleportOwner.getLastTeleportTimestamp(); if (lastTime > time.getTimeInMillis()) { - // This is to make sure time didn't get messed up on last teleportPlayer use. - // If this happens, let's give the user the benifit of the doubt. teleportOwner.setLastTeleportTimestamp(time.getTimeInMillis()); return false; } else if (lastTime > earliestLong @@ -77,7 +71,6 @@ public class AsyncTeleport implements IAsyncTeleport { return true; } } - // if justCheck is set, don't update lastTeleport; we're just checking if (!check) { teleportOwner.setLastTeleportTimestamp(time.getTimeInMillis()); } @@ -171,7 +164,7 @@ public class AsyncTeleport implements IAsyncTeleport { } try { - runOnMain(() -> teleportee.getBase().eject()); //EntityDismountEvent requires a sync context. + runOnMain(() -> teleportee.getBase().eject()); } catch (final ExecutionException | InterruptedException e) { future.completeExceptionally(e); return; @@ -192,11 +185,9 @@ public class AsyncTeleport implements IAsyncTeleport { if (LocationUtil.isBlockUnsafeForUser(ess, teleportee, chunk.getWorld(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())) { if (ess.getSettings().isTeleportSafetyEnabled()) { if (ess.getSettings().isForceDisableTeleportSafety()) { - //The chunk we're teleporting to is 100% going to be loaded here, no need to teleport async. teleportee.getBase().teleport(loc, cause); } else { try { - //There's a chance the safer location is outside the loaded chunk so still teleport async here. PaperLib.teleportAsync(teleportee.getBase(), LocationUtil.getSafeDestination(ess, teleportee, loc), cause); } catch (final Exception e) { future.completeExceptionally(e); @@ -209,13 +200,11 @@ public class AsyncTeleport implements IAsyncTeleport { } } else { if (ess.getSettings().isForceDisableTeleportSafety()) { - //The chunk we're teleporting to is 100% going to be loaded here, no need to teleport async. teleportee.getBase().teleport(loc, cause); } else { if (ess.getSettings().isTeleportToCenterLocation()) { loc = LocationUtil.getRoundedDestination(loc); } - //There's a *small* chance the rounded destination produces a location outside the loaded chunk so still teleport async here. PaperLib.teleportAsync(teleportee.getBase(), loc, cause); } } @@ -227,25 +216,25 @@ public class AsyncTeleport implements IAsyncTeleport { } @Override - public void teleport(final Location loc, final Trade chargeFor, final TeleportCause cause, final CompletableFuture future) { - teleport(teleportOwner, new LocationTarget(loc), chargeFor, cause, future); + public void teleport(final Location loc, final TeleportCause cause, final CompletableFuture future) { + teleport(teleportOwner, new LocationTarget(loc), cause, future); } @Override - public void teleport(final Player entity, final Trade chargeFor, final TeleportCause cause, final CompletableFuture future) { + public void teleport(final Player entity, final TeleportCause cause, final CompletableFuture future) { teleportOwner.sendMessage(tl("teleportToPlayer", entity.getDisplayName())); - teleport(teleportOwner, new PlayerTarget(entity), chargeFor, cause, future); + teleport(teleportOwner, new PlayerTarget(entity), cause, future); } @Override - public void teleportPlayer(final IUser otherUser, final Location loc, final Trade chargeFor, final TeleportCause cause, final CompletableFuture future) { - teleport(otherUser, new LocationTarget(loc), chargeFor, cause, future); + public void teleportPlayer(final IUser otherUser, final Location loc, final TeleportCause cause, final CompletableFuture future) { + teleport(otherUser, new LocationTarget(loc), cause, future); } @Override - public void teleportPlayer(final IUser otherUser, final Player entity, final Trade chargeFor, final TeleportCause cause, final CompletableFuture future) { + public void teleportPlayer(final IUser otherUser, final Player entity, final TeleportCause cause, final CompletableFuture future) { final ITarget target = new PlayerTarget(entity); - teleport(otherUser, target, chargeFor, cause, future); + teleport(otherUser, target, cause, future); future.thenAccept(success -> { if (success) { otherUser.sendMessage(tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ())); @@ -254,7 +243,7 @@ public class AsyncTeleport implements IAsyncTeleport { }); } - private void teleport(final IUser teleportee, final ITarget target, final Trade chargeFor, final TeleportCause cause, final CompletableFuture future) { + private void teleport(final IUser teleportee, final ITarget target, final TeleportCause cause, final CompletableFuture future) { double delay = ess.getSettings().getTeleportDelay(); final TeleportWarmupEvent event = new TeleportWarmupEvent(teleportee, cause, target, delay); @@ -265,21 +254,6 @@ public class AsyncTeleport implements IAsyncTeleport { } delay = event.getDelay(); - Trade cashCharge = chargeFor; - - if (chargeFor != null) { - chargeFor.isAffordableFor(teleportOwner, future); - if (future.isCompletedExceptionally()) { - return; - } - - //This code is to make sure that commandcosts are checked in the initial world, and not in the resulting world. - if (!chargeFor.getCommandCost(teleportOwner).equals(BigDecimal.ZERO)) { - //By converting a command cost to a regular cost, the command cost permission isn't checked when executing the charge after teleport. - cashCharge = new Trade(chargeFor.getCommandCost(teleportOwner), ess); - } - } - if (cooldown(true, future)) { future.complete(false); return; @@ -290,22 +264,16 @@ public class AsyncTeleport implements IAsyncTeleport { return; } nowAsync(teleportee, target, cause, future); - if (cashCharge != null) { - cashCharge.charge(teleportOwner, future); - if (future.isCompletedExceptionally()) { - return; - } - } future.complete(true); return; } cancel(false); warnUser(teleportee, delay); - initTimer((long) (delay * 1000.0), teleportee, target, cashCharge, cause, false, future); + initTimer((long) (delay * 1000.0), teleportee, target, cause, false, future); } - private void teleportOther(final IUser teleporter, final IUser teleportee, final ITarget target, final Trade chargeFor, final TeleportCause cause, final CompletableFuture future) { + private void teleportOther(final IUser teleporter, final IUser teleportee, final ITarget target, final TeleportCause cause, final CompletableFuture future) { double delay = ess.getSettings().getTeleportDelay(); final TeleportWarmupEvent event = new TeleportWarmupEvent(teleporter, teleportee, cause, target, delay); @@ -315,21 +283,6 @@ public class AsyncTeleport implements IAsyncTeleport { } delay = event.getDelay(); - Trade cashCharge = chargeFor; - - if (teleporter != null && chargeFor != null) { - chargeFor.isAffordableFor(teleporter, future); - if (future.isCompletedExceptionally()) { - return; - } - - //This code is to make sure that commandcosts are checked in the initial world, and not in the resulting world. - if (!chargeFor.getCommandCost(teleporter).equals(BigDecimal.ZERO)) { - //By converting a command cost to a regular cost, the command cost permission isn't checked when executing the charge after teleport. - cashCharge = new Trade(chargeFor.getCommandCost(teleporter), ess); - } - } - if (cooldown(true, future)) { return; } @@ -342,23 +295,17 @@ public class AsyncTeleport implements IAsyncTeleport { } nowAsync(teleportee, target, cause, future); - if (teleporter != null && cashCharge != null) { - cashCharge.charge(teleporter, future); - if (future.isCompletedExceptionally()) { - return; - } - } future.complete(true); return; } cancel(false); warnUser(teleportee, delay); - initTimer((long) (delay * 1000.0), teleportee, target, cashCharge, cause, false, future); + initTimer((long) (delay * 1000.0), teleportee, target, cause, false, future); } @Override - public void respawn(final Trade chargeFor, final TeleportCause cause, final CompletableFuture future) { + public void respawn(final TeleportCause cause, final CompletableFuture future) { double delay = ess.getSettings().getTeleportDelay(); final TeleportWarmupEvent event = new TeleportWarmupEvent(teleportOwner, cause, null, delay); @@ -368,12 +315,6 @@ public class AsyncTeleport implements IAsyncTeleport { } delay = event.getDelay(); - if (chargeFor != null) { - chargeFor.isAffordableFor(teleportOwner, future); - if (future.isCompletedExceptionally()) { - return; - } - } if (cooldown(true, future)) { return; } @@ -382,16 +323,13 @@ public class AsyncTeleport implements IAsyncTeleport { return; } respawnNow(teleportOwner, cause, future); - if (chargeFor != null) { - chargeFor.charge(teleportOwner, future); - } future.complete(true); return; } cancel(false); warnUser(teleportOwner, delay); - initTimer((long) (delay * 1000.0), teleportOwner, null, chargeFor, cause, true, future); + initTimer((long) (delay * 1000.0), teleportOwner, null, cause, true, future); } void respawnNow(final IUser teleportee, final TeleportCause cause, final CompletableFuture future) { @@ -414,8 +352,8 @@ public class AsyncTeleport implements IAsyncTeleport { } @Override - public void warp(final IUser otherUser, String warp, final Trade chargeFor, final TeleportCause cause, final CompletableFuture future) { - final UserWarpEvent event = new UserWarpEvent(otherUser, warp, chargeFor); + public void warp(final IUser otherUser, String warp, final TeleportCause cause, final CompletableFuture future) { + final UserWarpEvent event = new UserWarpEvent(otherUser, warp); Bukkit.getServer().getPluginManager().callEvent(event); if (event.isCancelled()) { return; @@ -438,20 +376,7 @@ public class AsyncTeleport implements IAsyncTeleport { } } }); - teleport(otherUser, new LocationTarget(loc), chargeFor, cause, future); - } - - @Override - public void back(final Trade chargeFor, final CompletableFuture future) { - back(teleportOwner, chargeFor, future); - } - - @Override - public void back(final IUser teleporter, final Trade chargeFor, final CompletableFuture future) { - tpType = TeleportType.BACK; - final Location loc = teleportOwner.getLastLocation(); - teleportOwner.sendMessage(tl("backUsageMsg", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); - teleportOther(teleporter, teleportOwner, new LocationTarget(loc), chargeFor, TeleportCause.COMMAND, future); + teleport(otherUser, new LocationTarget(loc), cause, future); } @Override @@ -459,11 +384,18 @@ public class AsyncTeleport implements IAsyncTeleport { nowAsync(teleportOwner, new LocationTarget(teleportOwner.getLastLocation()), TeleportCause.COMMAND, future); } + @Override + public void back(final IUser teleporter, final CompletableFuture future) { + tpType = TeleportType.BACK; + final Location loc = teleportOwner.getLastLocation(); + teleportOwner.sendMessage(tl("backUsageMsg", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + teleportOther(teleporter, teleportOwner, new LocationTarget(loc), TeleportCause.COMMAND, future); + } + public void setTpType(final TeleportType tpType) { this.tpType = tpType; } - //If we need to cancelTimer a pending teleportPlayer call this method private void cancel(final boolean notifyUser) { if (timedTeleport != null) { timedTeleport.cancelTimer(notifyUser); @@ -471,8 +403,8 @@ public class AsyncTeleport implements IAsyncTeleport { } } - private void initTimer(final long delay, final IUser teleportUser, final ITarget target, final Trade chargeFor, final TeleportCause cause, final boolean respawn, CompletableFuture future) { - timedTeleport = new AsyncTimedTeleport(teleportOwner, ess, this, delay, future, teleportUser, target, chargeFor, cause, respawn); + private void initTimer(final long delay, final IUser teleportUser, final ITarget target, final TeleportCause cause, final boolean respawn, CompletableFuture future) { + timedTeleport = new AsyncTimedTeleport(teleportOwner, ess, this, delay, future, teleportUser, target, cause, respawn); } public enum TeleportType { diff --git a/Essentials/src/main/java/com/earth2me/essentials/AsyncTimedTeleport.java b/Essentials/src/main/java/com/earth2me/essentials/AsyncTimedTeleport.java index a209915ed..e8b74b3c6 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/AsyncTimedTeleport.java +++ b/Essentials/src/main/java/com/earth2me/essentials/AsyncTimedTeleport.java @@ -16,28 +16,24 @@ public class AsyncTimedTeleport implements Runnable { private final IEssentials ess; private final AsyncTeleport teleport; private final UUID timer_teleportee; - private final long timer_started; // time this task was initiated - private final long timer_delay; // how long to delay the teleportPlayer + private final long timer_started; + private final long timer_delay; private final CompletableFuture parentFuture; - // note that I initially stored a clone of the location for reference, but... - // when comparing locations, I got incorrect mismatches (rounding errors, looked like) - // so, the X/Y/Z values are stored instead and rounded off private final long timer_initX; private final long timer_initY; private final long timer_initZ; private final ITarget timer_teleportTarget; private final boolean timer_respawn; private final boolean timer_canMove; - private final Trade timer_chargeFor; private final TeleportCause timer_cause; private int timer_task; private double timer_health; - AsyncTimedTeleport(final IUser user, final IEssentials ess, final AsyncTeleport teleport, final long delay, final IUser teleportUser, final ITarget target, final Trade chargeFor, final TeleportCause cause, final boolean respawn) { - this(user, ess, teleport, delay, null, teleportUser, target, chargeFor, cause, respawn); + AsyncTimedTeleport(final IUser user, final IEssentials ess, final AsyncTeleport teleport, final long delay, final IUser teleportUser, final ITarget target, final TeleportCause cause, final boolean respawn) { + this(user, ess, teleport, delay, null, teleportUser, target, cause, respawn); } - AsyncTimedTeleport(final IUser user, final IEssentials ess, final AsyncTeleport teleport, final long delay, final CompletableFuture future, final IUser teleportUser, final ITarget target, final Trade chargeFor, final TeleportCause cause, final boolean respawn) { + AsyncTimedTeleport(final IUser user, final IEssentials ess, final AsyncTeleport teleport, final long delay, final CompletableFuture future, final IUser teleportUser, final ITarget target, final TeleportCause cause, final boolean respawn) { this.teleportOwner = user; this.ess = ess; this.teleport = teleport; @@ -49,7 +45,6 @@ public class AsyncTimedTeleport implements Runnable { this.timer_initZ = Math.round(teleportUser.getBase().getLocation().getZ() * MOVE_CONSTANT); this.timer_teleportee = teleportUser.getBase().getUniqueId(); this.timer_teleportTarget = target; - this.timer_chargeFor = chargeFor; this.timer_cause = cause; this.timer_respawn = respawn; this.timer_canMove = user.isAuthorized("essentials.teleport.timer.move"); @@ -89,9 +84,8 @@ public class AsyncTimedTeleport implements Runnable { cancelTimer(false); return; } - + if (!timer_canMove && (Math.round(currLocation.getX() * MOVE_CONSTANT) != timer_initX || Math.round(currLocation.getY() * MOVE_CONSTANT) != timer_initY || Math.round(currLocation.getZ() * MOVE_CONSTANT) != timer_initZ || (ess.getConfig().getBoolean("teleport-cancel-on-damage") && teleportUser.getBase().getHealth() < timer_health))) { - // user moved, cancelTimer teleportPlayer cancelTimer(true); return; } @@ -100,7 +94,7 @@ public class AsyncTimedTeleport implements Runnable { @Override public void run() { - timer_health = teleportUser.getBase().getHealth(); // in case user healed, then later gets injured + timer_health = teleportUser.getBase().getHealth(); final long now = System.currentTimeMillis(); if (now > timer_started + timer_delay) { try { @@ -115,25 +109,11 @@ public class AsyncTimedTeleport implements Runnable { cancelTimer(false); teleportUser.sendMessage(tl("teleportationCommencing")); - if (timer_chargeFor != null) { - timer_chargeFor.isAffordableFor(teleportOwner); - } - if (timer_respawn) { teleport.respawnNow(teleportUser, timer_cause, parentFuture); } else { teleport.nowAsync(teleportUser, timer_teleportTarget, timer_cause, parentFuture); } - parentFuture.thenAccept(success -> { - if (timer_chargeFor != null) { - try { - timer_chargeFor.charge(teleportOwner); - } catch (final ChargeException ex) { - ess.showError(teleportOwner.getSource(), ex, "\\ teleport"); - } - } - }); - } catch (final Exception ex) { ess.showError(teleportOwner.getSource(), ex, "\\ teleport"); } @@ -144,7 +124,6 @@ public class AsyncTimedTeleport implements Runnable { ess.scheduleSyncDelayedTask(new DelayedTeleportTask()); } - //If we need to cancelTimer a pending teleportPlayer call this method void cancelTimer(final boolean notifyUser) { if (timer_task == -1) { return; diff --git a/Essentials/src/main/java/com/earth2me/essentials/BalanceTopImpl.java b/Essentials/src/main/java/com/earth2me/essentials/BalanceTopImpl.java deleted file mode 100644 index 4008b3fe5..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/BalanceTopImpl.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.earth2me.essentials; - -import net.ess3.api.IEssentials; -import net.essentialsx.api.v2.services.BalanceTop; -import org.bukkit.plugin.ServicePriority; - -import java.math.BigDecimal; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.CompletableFuture; - -public class BalanceTopImpl implements BalanceTop { - private final IEssentials ess; - private LinkedHashMap topCache = new LinkedHashMap<>(); - private BigDecimal balanceTopTotal = BigDecimal.ZERO; - private long cacheAge = 0; - private CompletableFuture cacheLock; - - public BalanceTopImpl(IEssentials ess) { - this.ess = ess; - ess.getServer().getServicesManager().register(BalanceTop.class, this, ess, ServicePriority.Normal); - } - - private void calculateBalanceTopMap() { - final List entries = new LinkedList<>(); - BigDecimal newTotal = BigDecimal.ZERO; - for (UUID u : ess.getUsers().getAllUserUUIDs()) { - final User user = ess.getUsers().loadUncachedUser(u); - if (user != null) { - if (!ess.getSettings().isNpcsInBalanceRanking() && user.isNPC()) { - // Don't list NPCs in output - continue; - } - if (!user.isBaltopExempt()) { - final BigDecimal userMoney = user.getMoney(); - user.updateMoneyCache(userMoney); - newTotal = newTotal.add(userMoney); - final String name; - if (user.getBase() instanceof OfflinePlayerStub) { - name = user.getLastAccountName(); - } else if (user.isHidden()) { - name = user.getName(); - } else { - name = user.getDisplayName(); - } - entries.add(new BalanceTop.Entry(user.getUUID(), name, userMoney)); - } - } - } - final LinkedHashMap sortedMap = new LinkedHashMap<>(); - entries.sort((entry1, entry2) -> entry2.getBalance().compareTo(entry1.getBalance())); - for (Entry entry : entries) { - sortedMap.put(entry.getUuid(), entry); - } - topCache = sortedMap; - balanceTopTotal = newTotal; - cacheAge = System.currentTimeMillis(); - cacheLock.complete(null); - cacheLock = null; - } - - @Override - public CompletableFuture calculateBalanceTopMapAsync() { - if (cacheLock != null) { - return cacheLock; - } - cacheLock = new CompletableFuture<>(); - ess.runTaskAsynchronously(this::calculateBalanceTopMap); - return cacheLock; - } - - @Override - public Map getBalanceTopCache() { - return Collections.unmodifiableMap(topCache); - } - - @Override - public long getCacheAge() { - return cacheAge; - } - - @Override - public BigDecimal getBalanceTopTotal() { - return balanceTopTotal; - } - - public boolean isCacheLocked() { - return cacheLock != null; - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/Essentials.java b/Essentials/src/main/java/com/earth2me/essentials/Essentials.java index 855ab1510..213bb55b8 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/main/java/com/earth2me/essentials/Essentials.java @@ -23,8 +23,6 @@ import com.earth2me.essentials.commands.NoChargeException; import com.earth2me.essentials.commands.NotEnoughArgumentsException; import com.earth2me.essentials.commands.PlayerNotFoundException; import com.earth2me.essentials.commands.QuietAbortException; -import com.earth2me.essentials.economy.EconomyLayers; -import com.earth2me.essentials.economy.vault.VaultEconomyProvider; import com.earth2me.essentials.items.AbstractItemDb; import com.earth2me.essentials.items.CustomItemResolver; import com.earth2me.essentials.items.FlatItemDb; @@ -42,7 +40,6 @@ import com.earth2me.essentials.userstorage.ModernUserMap; import com.earth2me.essentials.utils.FormatUtil; import com.earth2me.essentials.utils.VersionUtil; import io.papermc.lib.PaperLib; -import net.ess3.api.Economy; import net.ess3.api.IEssentials; import net.ess3.api.IItemDb; import net.ess3.api.IJails; @@ -92,7 +89,6 @@ import net.ess3.provider.providers.PaperMaterialTagProvider; import net.ess3.provider.providers.PaperRecipeBookListener; import net.ess3.provider.providers.PaperSerializationProvider; import net.ess3.provider.providers.PaperServerStateProvider; -import net.essentialsx.api.v2.services.BalanceTop; import net.essentialsx.api.v2.services.mail.MailService; import org.bukkit.Server; import org.bukkit.World; @@ -146,7 +142,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials { private transient ISettings settings; private transient Jails jails; private transient Warps warps; - private transient Worth worth; private transient List confList; private transient Backup backup; private transient AbstractItemDb itemDb; @@ -156,7 +151,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials { @Deprecated private transient UserMap legacyUserMap; private transient ModernUserMap userMap; - private transient BalanceTopImpl balanceTop; private transient ExecuteTimer execTimer; private transient MailService mail; private transient I18n i18n; @@ -183,10 +177,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials { private transient UpdateChecker updateChecker; private transient Map commandMap = new HashMap<>(); - static { - EconomyLayers.init(); - } - public Essentials() { } @@ -222,9 +212,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials { settings = new Settings(this); mail = new MailServiceImpl(this); userMap = new ModernUserMap(this); - balanceTop = new BalanceTopImpl(this); permissionsHandler = new PermissionsHandler(this, false); - Economy.setEss(this); confList = new ArrayList<>(); jails = new Jails(this); registerListeners(server.getPluginManager()); @@ -233,13 +221,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials { @Override public void onLoad() { - try { - // Vault registers their Essentials provider at low priority, so we have to use normal priority here - Class.forName("net.milkbowl.vault.economy.Economy"); - getServer().getServicesManager().register(net.milkbowl.vault.economy.Economy.class, new VaultEconomyProvider(this), this, ServicePriority.Normal); - } catch (final ClassNotFoundException ignored) { - // Probably safer than fetching for the plugin as bukkit may not have marked it as enabled at this point in time - } } @Override @@ -310,9 +291,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials { legacyUserMap = new UserMap(userMap); execTimer.mark("Init(Usermap)"); - balanceTop = new BalanceTopImpl(this); - execTimer.mark("Init(BalanceTop)"); - kits = new Kits(this); confList.add(kits); upgrade.convertKits(); @@ -325,10 +303,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials { confList.add(warps); execTimer.mark("Init(Warp)"); - worth = new Worth(this.getDataFolder()); - confList.add(worth); - execTimer.mark("Init(Worth)"); - itemDb = getItemDbFromConfig(); confList.add(itemDb); execTimer.mark("Init(ItemDB)"); @@ -354,8 +328,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials { confList.add(jails); execTimer.mark("Init(Jails)"); - EconomyLayers.onEnable(this); - //Spawner item provider only uses one but it's here for legacy... spawnerItemProvider = new BlockMetaSpawnerItemProvider(); @@ -462,7 +434,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials { timer = new EssentialsTimer(this); scheduleSyncRepeatingTask(timer, 1000, 50); - Economy.setEss(this); execTimer.mark("RegHandler"); // Register /hat and /back default permissions @@ -579,8 +550,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials { this.getPermissionsHandler().unregisterContexts(); - Economy.setEss(null); - Trade.closeLog(); getUsers().shutdown(); HandlerList.unregisterAll(this); @@ -588,7 +557,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials { @Override public void reload() { - Trade.closeLog(); for (final IConf iConf : confList) { iConf.reloadConfig(); @@ -882,11 +850,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials { return warps; } - @Override - public Worth getWorth() { - return worth; - } - @Override public Backup getBackup() { return backup; @@ -1185,11 +1148,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials { return userMap; } - @Override - public BalanceTop getBalanceTop() { - return balanceTop; - } - @Override public I18n getI18n() { return i18n; diff --git a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java index 8af16b8d4..963a461df 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java @@ -441,7 +441,6 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor { } user.setConfirmingClearCommand(null); - user.getConfirmingPayments().clear(); user.stopTransaction(); } diff --git a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPluginListener.java b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPluginListener.java index 38e1f9a1e..eb4fd85f1 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPluginListener.java +++ b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPluginListener.java @@ -1,7 +1,5 @@ package com.earth2me.essentials; -import com.earth2me.essentials.economy.EconomyLayer; -import com.earth2me.essentials.economy.EconomyLayers; import net.ess3.api.IEssentials; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -9,8 +7,6 @@ import org.bukkit.event.Listener; import org.bukkit.event.server.PluginDisableEvent; import org.bukkit.event.server.PluginEnableEvent; -import java.util.logging.Level; - public class EssentialsPluginListener implements Listener, IConf { private final transient IEssentials ess; @@ -26,12 +22,6 @@ public class EssentialsPluginListener implements Listener, IConf { ess.getPermissionsHandler().setUseSuperperms(ess.getSettings().useBukkitPermissions()); ess.getPermissionsHandler().checkPermissions(); ess.getAlternativeCommandsHandler().addPlugin(event.getPlugin()); - if (EconomyLayers.isServerStarted()) { - final EconomyLayer layer = EconomyLayers.onPluginEnable(event.getPlugin()); - if (layer != null) { - ess.getLogger().log(Level.INFO, "Essentials found a compatible payment resolution method: " + layer.getName() + " (v" + layer.getPluginVersion() + ")!"); - } - } } @EventHandler(priority = EventPriority.MONITOR) @@ -41,14 +31,6 @@ public class EssentialsPluginListener implements Listener, IConf { } ess.getPermissionsHandler().checkPermissions(); ess.getAlternativeCommandsHandler().removePlugin(event.getPlugin()); - if (EconomyLayers.onPluginDisable(event.getPlugin())) { - final EconomyLayer layer = EconomyLayers.getSelectedLayer(); - if (layer != null) { - ess.getLogger().log(Level.INFO, "Essentials found a new compatible payment resolution method: " + layer.getName() + " (v" + layer.getPluginVersion() + ")!"); - } else { - ess.getLogger().log(Level.INFO, "Active payment resolution method has been disabled! Falling back to Essentials' default payment resolution system!"); - } - } } @Override diff --git a/Essentials/src/main/java/com/earth2me/essentials/EssentialsUpgrade.java b/Essentials/src/main/java/com/earth2me/essentials/EssentialsUpgrade.java index 33fc06fb4..0b65cdce5 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/EssentialsUpgrade.java +++ b/Essentials/src/main/java/com/earth2me/essentials/EssentialsUpgrade.java @@ -249,142 +249,6 @@ public class EssentialsUpgrade { ess.getLogger().info("Done converting legacy userdata keys to Configurate."); } - /** - * This migration cleans up unused files left behind by the chaos resulting from Vault's questionable economy - * integration, and upstream Essentials' rushed and untested 1.7.10 UUID support. - * Both of these have been fixed in EssentialsX as of 2.18.x and 2.19.x respectively, but the leftover userdata - * files can reach into the tens of thousands and can cause excessive memory and storage usage, so this migration - * relocates these files to a backup folder to be removed by the server owner at a later date. - *

- * To quote JRoy, who suffered immensely while trying to debug and fix various related issues: - *

- * "Essentials decided when adding its initial support for UUIDs, it wanted an implementation which would cause - * eternal pain and suffering for any person who dared touch any of the code in the future. This code that was made - * was so bad, it managed to somehow not maintain any actual UUID support for any external integrations/plugins. - * Up until 2.19.0 and 2.18.0 respectively, our Vault integration and entire Economy system was entirely based off - * username strings, and thanks to Vault being a flawed standard, for some reason exposes account create to third - * party plugins rather than letting the implementation handle it. That doesn't seem like a huge problem at the - * surface, but there was one small problem: whoever made the Vault integration for Essentials suffered a stroke in - * the process of creating it. The implementation for the createAccount method, regardless of whether it was an - * actual player or an NPC account (which the Vault spec NEVER accounted for but plugins just have to guess when - * to support them), it would always create an NPC account. This caused any plugin integrating with Vault, creating - * NPC accounts for pretty much every single player on the server. It still, to this day, amazes me how nobody saw - * this code and didn't die without rewriting it; Or how everybody simply didn't stop using this plugin because how - * awful that godforsaken code was. Anyways, this upgrade does its best to delete NPC accounts created by the - * horrible economy code, as any operation which loads all user data into memory will load all these NPC accounts - * and spam the console with warnings." - */ - public void purgeBrokenNpcAccounts() { - if (doneFile.getBoolean("updatePurgeBrokenNpcAccounts", false)) { - return; - } - - final File userdataFolder = new File(ess.getDataFolder(), "userdata"); - if (!userdataFolder.exists() || !userdataFolder.isDirectory()) { - return; - } - final File[] userFiles = userdataFolder.listFiles(); - if (userFiles.length == 0) { - return; - } - final File backupFolder = new File(ess.getDataFolder(), "userdata-npc-backup"); - if (backupFolder.exists()) { - ess.getLogger().info("NPC backup folder already exists; skipping NPC purge."); - ess.getLogger().info("To finish purging broken NPC accounts, rename the \"plugins/Essentials/userdata-npc-backup\" folder and restart your server."); - return; - } else if (!backupFolder.mkdir()) { - ess.getLogger().info("Skipping NPC purge due to error creating backup folder."); - return; - } - - ess.getLogger().info("#===========================================================================#"); - ess.getLogger().info(" EssentialsX will now purge any NPC accounts which were incorrectly created."); - ess.getLogger().info(" Only NPC accounts with the default starting balance will be deleted. If"); - ess.getLogger().info(" they turn out to be valid NPC accounts, they will be re-created as needed."); - ess.getLogger().info(" Any files deleted here will be backed up to the "); - ess.getLogger().info(" \"plugins/Essentials/userdata-npc-backup\" folder. If you notice any files"); - ess.getLogger().info(" have been purged incorrectly, you should restore it from the backup and"); - ess.getLogger().info(" report it to us on GitHub:"); - ess.getLogger().info(" https://github.com/EssentialsX/Essentials/issues/new/choose"); - ess.getLogger().info(""); - ess.getLogger().info(" NOTE: This is a one-time process and will take several minutes if you have"); - ess.getLogger().info(" a lot of userdata files! If you interrupt this process, EssentialsX will"); - ess.getLogger().info(" skip the process until you rename or remove the backup folder."); - ess.getLogger().info("#===========================================================================#"); - - final int totalUserFiles = userFiles.length; - ess.getLogger().info("Found ~" + totalUserFiles + " files under \"plugins/Essentials/userdata\"..."); - - final AtomicInteger movedAccounts = new AtomicInteger(0); - final AtomicInteger totalAccounts = new AtomicInteger(0); - - // Less spammy feedback for greater userdata counts, eg 100 files -> 5 seconds, 1k -> 7s, 10k -> 9s, 100k -> 11s, 1m -> 14s - final long feedbackInterval = Math.min(15, 1 + Math.round(2.1 * Math.log10(userFiles.length))); - - final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(); - final ScheduledFuture feedbackTask = executor.scheduleWithFixedDelay( - () -> ess.getLogger().info("Scanned " + totalAccounts.get() + "/" + totalUserFiles + " accounts; moved " + movedAccounts.get() + " accounts"), - 5, feedbackInterval, TimeUnit.SECONDS); - - for (final File file : userFiles) { - if (!file.isFile() || !file.getName().endsWith(".yml")) { - continue; - } - final EssentialsConfiguration config = new EssentialsConfiguration(file); - try { - totalAccounts.incrementAndGet(); - config.load(); - - if (config.getKeys().size() > 4) { - continue; - } - - if (!config.getBoolean("npc", false)) { - continue; - } - - final BigDecimal money = config.getBigDecimal("money", null); - if (money == null || money.compareTo(ess.getSettings().getStartingBalance()) != 0) { - continue; - } - - if (config.getKeys().size() == 4 && !config.hasProperty("last-account-name") && config.hasProperty("mail")) { - continue; - } - - try { - //noinspection UnstableApiUsage - Files.move(file, new File(backupFolder, file.getName())); - movedAccounts.incrementAndGet(); - } catch (IOException e) { - ess.getLogger().log(Level.SEVERE, "Error while moving NPC file", e); - } - } catch (final RuntimeException ex) { - ess.getLogger().log(Level.INFO, "File: " + file); - feedbackTask.cancel(false); - executor.shutdown(); - throw ex; - } - } - feedbackTask.cancel(false); - executor.shutdown(); - doneFile.setProperty("updatePurgeBrokenNpcAccounts", true); - doneFile.save(); - - ess.getLogger().info("#===========================================================================#"); - ess.getLogger().info(" EssentialsX has finished purging NPC accounts."); - ess.getLogger().info(""); - ess.getLogger().info(" Deleted accounts: " + movedAccounts); - ess.getLogger().info(" Total accounts processed: " + totalAccounts); - ess.getLogger().info(""); - ess.getLogger().info(" Purged accounts have been backed up to"); - ess.getLogger().info(" \"plugins/Essentials/userdata-npc-backup\", and can be restored from there"); - ess.getLogger().info(" if needed. Please report any files which have been incorrectly deleted"); - ess.getLogger().info(" to us on GitHub:"); - ess.getLogger().info(" https://github.com/EssentialsX/Essentials/issues/new/choose"); - ess.getLogger().info("#===========================================================================#"); - } - public void convertIgnoreList() { final Pattern pattern = Pattern.compile("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"); if (doneFile.getBoolean("updateUsersIgnoreListUUID", false)) { @@ -1011,6 +875,5 @@ public class EssentialsUpgrade { convertIgnoreList(); convertStupidCamelCaseUserdataKeys(); convertMailList(); - purgeBrokenNpcAccounts(); } } diff --git a/Essentials/src/main/java/com/earth2me/essentials/IEssentials.java b/Essentials/src/main/java/com/earth2me/essentials/IEssentials.java index 0fea0d2e3..ea9e32174 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/IEssentials.java +++ b/Essentials/src/main/java/com/earth2me/essentials/IEssentials.java @@ -22,7 +22,6 @@ import net.ess3.provider.SpawnerBlockProvider; import net.ess3.provider.SpawnerItemProvider; import net.ess3.provider.SyncCommandsProvider; import net.ess3.provider.WorldInfoProvider; -import net.essentialsx.api.v2.services.BalanceTop; import net.essentialsx.api.v2.services.mail.MailService; import org.bukkit.Server; import org.bukkit.World; @@ -88,8 +87,6 @@ public interface IEssentials extends Plugin { IWarps getWarps(); - Worth getWorth(); - Backup getBackup(); Kits getKits(); @@ -123,8 +120,6 @@ public interface IEssentials extends Plugin { @Deprecated UserMap getUserMap(); - BalanceTop getBalanceTop(); - EssentialsTimer getTimer(); MailService getMail(); diff --git a/Essentials/src/main/java/com/earth2me/essentials/ISettings.java b/Essentials/src/main/java/com/earth2me/essentials/ISettings.java index a666f5173..33d44f969 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/ISettings.java +++ b/Essentials/src/main/java/com/earth2me/essentials/ISettings.java @@ -8,8 +8,6 @@ import org.bukkit.event.EventPriority; import org.spongepowered.configurate.CommentedConfigurationNode; import java.io.File; -import java.math.BigDecimal; -import java.text.NumberFormat; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -52,14 +50,6 @@ public interface ISettings extends IConf { boolean isChatQuestionEnabled(); - BigDecimal getCommandCost(IEssentialsCommand cmd); - - BigDecimal getCommandCost(String label); - - String getCurrencySymbol(); - - boolean isCurrencySymbolSuffixed(); - int getOversizedStackSize(); int getDefaultStackSize(); @@ -111,8 +101,6 @@ public interface ISettings extends IConf { int getSpawnMobLimit(); - BigDecimal getStartingBalance(); - boolean isTeleportSafetyEnabled(); boolean isForceDisableTeleportSafety(); @@ -143,8 +131,6 @@ public interface ISettings extends IConf { void setDebug(boolean debug); - boolean isEcoDisabled(); - @Deprecated boolean isTradeInStacks(int id); @@ -162,14 +148,6 @@ public interface ISettings extends IConf { boolean warnOnSmite(); - BigDecimal getMaxMoney(); - - BigDecimal getMinMoney(); - - boolean isEcoLogEnabled(); - - boolean isEcoLogUpdateEnabled(); - boolean realNamesOnList(); boolean removeGodOnDisconnect(); @@ -260,8 +238,6 @@ public interface ISettings extends IConf { int getMailsPerMinute(); - long getEconomyLagWarning(); - long getPermissionsLagWarning(); void setEssentialsChatActive(boolean b); @@ -302,10 +278,6 @@ public interface ISettings extends IConf { boolean isLastMessageReplyRecipient(); - BigDecimal getMinimumPayAmount(); - - boolean isPayExcludesIgnoreList(); - long getLastMessageReplyRecipientTimeout(); boolean isMilkBucketEasterEggEnabled(); @@ -334,10 +306,6 @@ public interface ISettings extends IConf { boolean isCommandCooldownPersistent(String label); - boolean isNpcsInBalanceRanking(); - - NumberFormat getCurrencyFormat(); - List getUnprotectedSignNames(); boolean isKitAutoEquip(); @@ -398,8 +366,6 @@ public interface ISettings extends IConf { boolean isUpdateCheckEnabled(); - boolean showZeroBaltop(); - int getMaxItemLore(); enum KeepInvPolicy { diff --git a/Essentials/src/main/java/com/earth2me/essentials/IUser.java b/Essentials/src/main/java/com/earth2me/essentials/IUser.java index 2e0b1f86c..3896a2df1 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/IUser.java +++ b/Essentials/src/main/java/com/earth2me/essentials/IUser.java @@ -4,7 +4,6 @@ import com.earth2me.essentials.api.IAsyncTeleport; import com.earth2me.essentials.commands.IEssentialsCommand; import com.earth2me.essentials.config.entities.CommandCooldown; import net.ess3.api.ITeleport; -import net.ess3.api.MaxMoneyException; import net.ess3.api.events.AfkStatusChangeEvent; import net.essentialsx.api.v2.services.mail.MailMessage; import net.essentialsx.api.v2.services.mail.MailSender; @@ -14,8 +13,6 @@ import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.Nullable; -import java.math.BigDecimal; - import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -41,18 +38,6 @@ public interface IUser { void healCooldown() throws Exception; - void giveMoney(BigDecimal value) throws MaxMoneyException; - - void giveMoney(final BigDecimal value, final CommandSource initiator) throws MaxMoneyException; - - void payUser(final User reciever, final BigDecimal value) throws Exception; - - void takeMoney(BigDecimal value); - - void takeMoney(final BigDecimal value, final CommandSource initiator); - - boolean canAfford(BigDecimal value); - Boolean canSpawnItem(final Material material); void setLastLocation(); @@ -79,10 +64,6 @@ public interface IUser { IAsyncTeleport getAsyncTeleport(); - BigDecimal getMoney(); - - void setMoney(final BigDecimal value) throws MaxMoneyException; - void setAfk(final boolean set, final AfkStatusChangeEvent.Cause cause); /** @@ -216,14 +197,6 @@ public interface IUser { long getAfkSince(); - boolean isAcceptingPay(); - - void setAcceptingPay(boolean acceptingPay); - - boolean isPromptingPayConfirm(); - - void setPromptingPayConfirm(boolean prompt); - boolean isPromptingClearConfirm(); void setPromptingClearConfirm(boolean prompt); @@ -232,8 +205,6 @@ public interface IUser { void setLastMessageReplyRecipient(boolean enabled); - Map getConfirmingPayments(); - Block getTargetBlock(int maxDistance); void setToggleShout(boolean toggleShout); diff --git a/Essentials/src/main/java/com/earth2me/essentials/Kit.java b/Essentials/src/main/java/com/earth2me/essentials/Kit.java index a4b0e4a43..d466ec65d 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/Kit.java +++ b/Essentials/src/main/java/com/earth2me/essentials/Kit.java @@ -1,13 +1,11 @@ package com.earth2me.essentials; -import com.earth2me.essentials.Trade.OverflowType; import com.earth2me.essentials.commands.NoChargeException; import com.earth2me.essentials.craftbukkit.Inventories; import com.earth2me.essentials.textreader.IText; import com.earth2me.essentials.textreader.KeywordReplacer; import com.earth2me.essentials.textreader.SimpleTextInput; import com.earth2me.essentials.utils.DateUtil; -import com.earth2me.essentials.utils.NumberUtil; import net.ess3.api.IEssentials; import net.ess3.api.events.KitClaimEvent; import net.essentialsx.api.v2.events.KitPreExpandItemsEvent; @@ -16,7 +14,6 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -31,13 +28,11 @@ public class Kit { final IEssentials ess; final String kitName; final Map kit; - final Trade charge; public Kit(final String kitName, final IEssentials ess) throws Exception { this.kitName = kitName; this.ess = ess; this.kit = ess.getKits().getKit(kitName); - this.charge = new Trade("kit-" + kitName, new Trade("kit-kit", ess), ess); if (kit == null) { throw new Exception(tl("kitNotFound")); @@ -67,10 +62,6 @@ public class Kit { } } - public void checkAffordable(final User user) throws Exception { - charge.isAffordableFor(user); - } - public void setTime(final User user) throws Exception { final Calendar time = new GregorianCalendar(); user.setKitTimestamp(kitName, time.getTimeInMillis()); @@ -80,10 +71,6 @@ public class Kit { user.setKitTimestamp(kitName, 0); } - public void chargeUser(final User user) throws Exception { - charge.charge(user); - } - public long getNextUse(final User user) throws Exception { if (user.isAuthorized("essentials.kit.exemptdelay")) { return 0L; @@ -172,14 +159,7 @@ public class Kit { final boolean autoEquip = ess.getSettings().isKitAutoEquip(); final List itemList = new ArrayList<>(); final List commandQueue = new ArrayList<>(); - final List moneyQueue = new ArrayList<>(); - final String currencySymbol = ess.getSettings().getCurrencySymbol().isEmpty() ? "$" : ess.getSettings().getCurrencySymbol(); for (final String kitItem : output.getLines()) { - if (kitItem.startsWith("$") || kitItem.startsWith(currencySymbol)) { - moneyQueue.add(NumberUtil.sanitizeCurrencyString(kitItem, ess)); - continue; - } - if (kitItem.startsWith("/")) { String command = kitItem.substring(1); final String name = user.getName(); @@ -249,15 +229,6 @@ public class Kit { } user.getBase().updateInventory(); - // Process money & command queues - // Done after all items have been processed so commands are not run and money is not given if - // an error occurs during the item giving process - for (final String valueString : moneyQueue) { - final BigDecimal value = new BigDecimal(valueString.trim()); - final Trade t = new Trade(value, ess); - t.pay(user, OverflowType.DROP); - } - for (final String cmd : commandQueue) { Bukkit.dispatchCommand(Bukkit.getConsoleSender(), cmd); } diff --git a/Essentials/src/main/java/com/earth2me/essentials/Kits.java b/Essentials/src/main/java/com/earth2me/essentials/Kits.java index 40f40843d..5ad1b4537 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/Kits.java +++ b/Essentials/src/main/java/com/earth2me/essentials/Kits.java @@ -2,11 +2,9 @@ package com.earth2me.essentials; import com.earth2me.essentials.config.ConfigurateUtil; import com.earth2me.essentials.config.EssentialsConfiguration; -import com.earth2me.essentials.utils.NumberUtil; import org.spongepowered.configurate.CommentedConfigurationNode; import java.io.File; -import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -143,10 +141,6 @@ public class Kits implements IConf { } else if (user.isAuthorized("essentials.kits." + kitItem.toLowerCase(Locale.ENGLISH))) { String cost = ""; String name = capitalCase(kitItem); - final BigDecimal costPrice = new Trade("kit-" + kitItem.toLowerCase(Locale.ENGLISH), ess).getCommandCost(user); - if (costPrice.signum() > 0) { - cost = tl("kitCost", NumberUtil.displayCurrency(costPrice, ess)); - } final Kit kit = new Kit(kitItem, ess); final double nextUse = kit.getNextUse(user); diff --git a/Essentials/src/main/java/com/earth2me/essentials/Settings.java b/Essentials/src/main/java/com/earth2me/essentials/Settings.java index 207962060..2332d22c3 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/Settings.java +++ b/Essentials/src/main/java/com/earth2me/essentials/Settings.java @@ -46,8 +46,6 @@ import java.util.regex.PatternSyntaxException; import static com.earth2me.essentials.I18n.tl; public class Settings implements net.ess3.api.ISettings { - private static final BigDecimal DEFAULT_MAX_MONEY = new BigDecimal("10000000000000"); - private static final BigDecimal DEFAULT_MIN_MONEY = new BigDecimal("-10000000000000"); private final transient EssentialsConfiguration config; private final transient IEssentials ess; private final transient AtomicInteger reloadCount = new AtomicInteger(0); @@ -63,7 +61,6 @@ public class Settings implements net.ess3.api.ISettings { private List overriddenCommands = Collections.emptyList(); private List playerCommands = Collections.emptyList(); private final transient Map disabledBukkitCommands = new HashMap<>(); - private Map commandCosts; private Set socialSpyCommands = new HashSet<>(); private Set muteCommands = new HashSet<>(); private String nicknamePrefix = "~"; @@ -74,13 +71,6 @@ public class Settings implements net.ess3.api.ISettings { private boolean warnOnBuildDisallow; private boolean debug = false; private boolean configDebug = false; - // #easteregg - private boolean economyDisabled = false; - private BigDecimal maxMoney = DEFAULT_MAX_MONEY; - private BigDecimal minMoney = DEFAULT_MIN_MONEY; - private boolean economyLog = false; - // #easteregg - private boolean economyLogUpdate = false; private boolean changeDisplayName = true; private boolean changePlayerListName = false; private boolean prefixsuffixconfigured = false; @@ -108,8 +98,6 @@ public class Settings implements net.ess3.api.ISettings { private int signUsePerSecond; private int mailsPerMinute; // #easteregg - private long economyLagWarning; - // #easteregg private long permissionsLagWarning; private boolean allowSilentJoin; private String customJoinMessage; @@ -120,8 +108,6 @@ public class Settings implements net.ess3.api.ISettings { private boolean isCustomNewUsernameMessage; private List spawnOnJoinGroups; private Map commandCooldowns; - private boolean npcsInBalanceRanking = false; - private NumberFormat currencyFormat; private List unprotectedSigns = Collections.emptyList(); private List defaultEnabledConfirmCommands; private TeleportWhenFreePolicy teleportWhenFreePolicy; @@ -287,11 +273,6 @@ public class Settings implements net.ess3.api.ISettings { return config.getInt("default-stack-size", -1); } - @Override - public BigDecimal getStartingBalance() { - return config.getBigDecimal("starting-balance", BigDecimal.ZERO); - } - @Override public boolean isCommandDisabled(final IEssentialsCommand cmd) { return isCommandDisabled(cmd.getName()); @@ -372,52 +353,6 @@ public class Settings implements net.ess3.api.ISettings { return config.getBoolean("override-" + name.toLowerCase(Locale.ENGLISH), false); } - @Override - public BigDecimal getCommandCost(final IEssentialsCommand cmd) { - return getCommandCost(cmd.getName()); - } - - private Map _getCommandCosts() { - final Map section = ConfigurateUtil.getMap(config.getSection("command-costs")); - if (!section.isEmpty()) { - final Map newMap = new HashMap<>(); - for (Map.Entry entry : section.entrySet()) { - final String command = entry.getKey(); - final CommentedConfigurationNode node = entry.getValue(); - if (command.charAt(0) == '/') { - ess.getLogger().warning("Invalid command cost. '" + command + "' should not start with '/'."); - } - try { - if (ConfigurateUtil.isDouble(node)) { - newMap.put(command.toLowerCase(Locale.ENGLISH), BigDecimal.valueOf(node.getDouble())); - } else if (ConfigurateUtil.isInt(node)) { - newMap.put(command.toLowerCase(Locale.ENGLISH), BigDecimal.valueOf(node.getInt())); - } else if (ConfigurateUtil.isString(node)) { - final String costString = node.getString(); - //noinspection ConstantConditions - final double cost = Double.parseDouble(costString.trim().replace("$", "").replace(getCurrencySymbol(), "").replaceAll("\\W", "")); - newMap.put(command.toLowerCase(Locale.ENGLISH), BigDecimal.valueOf(cost)); - } else { - ess.getLogger().warning("Invalid command cost for: " + command); - } - } catch (final Exception ex) { - ess.getLogger().warning("Invalid command cost for: " + command); - } - } - return newMap; - } - return null; - } - - @Override - public BigDecimal getCommandCost(String name) { - name = name.replace('.', '_').replace('/', '_'); - if (commandCosts != null && commandCosts.containsKey(name)) { - return commandCosts.get(name); - } - return BigDecimal.ZERO; - } - private Set _getSocialSpyCommands() { final Set socialspyCommands = new HashSet<>(); @@ -739,17 +674,10 @@ public class Settings implements net.ess3.api.ISettings { chatRadius = _getChatRadius(); chatShout = _getChatShout(); chatQuestion = _getChatQuestion(); - commandCosts = _getCommandCosts(); socialSpyCommands = _getSocialSpyCommands(); warnOnBuildDisallow = _warnOnBuildDisallow(); mailsPerMinute = _getMailsPerMinute(); - maxMoney = _getMaxMoney(); - minMoney = _getMinMoney(); permissionsLagWarning = _getPermissionsLagWarning(); - economyLagWarning = _getEconomyLagWarning(); - economyLog = _isEcoLogEnabled(); - economyLogUpdate = _isEcoLogUpdateEnabled(); - economyDisabled = _isEcoDisabled(); allowSilentJoin = _allowSilentJoinQuit(); customJoinMessage = _getCustomJoinMessage(); isCustomJoinMessage = !customJoinMessage.equals("none"); @@ -760,8 +688,6 @@ public class Settings implements net.ess3.api.ISettings { muteCommands = _getMuteCommands(); spawnOnJoinGroups = _getSpawnOnJoinGroups(); commandCooldowns = _getCommandCooldowns(); - npcsInBalanceRanking = _isNpcsInBalanceRanking(); - currencyFormat = _getCurrencyFormat(); unprotectedSigns = _getUnprotectedSign(); defaultEnabledConfirmCommands = _getDefaultEnabledConfirmCommands(); teleportWhenFreePolicy = _getTeleportWhenFreePolicy(); @@ -777,7 +703,6 @@ public class Settings implements net.ess3.api.ISettings { removeEffectsOnHeal = _isRemovingEffectsOnHeal(); vanishingItemPolicy = _getVanishingItemsPolicy(); bindingItemPolicy = _getBindingItemsPolicy(); - currencySymbol = _getCurrencySymbol(); worldAliases = _getWorldAliases(); reloadCount.incrementAndGet(); @@ -883,27 +808,6 @@ public class Settings implements net.ess3.api.ISettings { return config.getString("locale", ""); } - private String currencySymbol = "$"; - - // A valid currency symbol value must be one non-integer character. - private String _getCurrencySymbol() { - String value = config.getString("currency-symbol", "$").trim(); - if (value.length() > 1 || value.matches("\\d")) { - value = "$"; - } - return value; - } - - @Override - public String getCurrencySymbol() { - return currencySymbol; - } - - @Override - public boolean isCurrencySymbolSuffixed() { - return config.getBoolean("currency-symbol-suffix", false); - } - // #easteregg @Override @Deprecated @@ -917,15 +821,6 @@ public class Settings implements net.ess3.api.ISettings { return config.getBoolean("trade-in-stacks." + type.toString().toLowerCase().replace("_", ""), false); } - public boolean _isEcoDisabled() { - return config.getBoolean("disable-eco", false); - } - - @Override - public boolean isEcoDisabled() { - return economyDisabled; - } - @Override public boolean getProtectPreventSpawn(final String creatureName) { return config.getBoolean("protect.prevent.spawn." + creatureName, false); @@ -969,51 +864,11 @@ public class Settings implements net.ess3.api.ISettings { return config.getBoolean(configName, def); } - private BigDecimal _getMaxMoney() { - return config.getBigDecimal("max-money", DEFAULT_MAX_MONEY); - } - - @Override - public BigDecimal getMaxMoney() { - return maxMoney; - } - - private BigDecimal _getMinMoney() { - BigDecimal min = config.getBigDecimal("min-money", DEFAULT_MIN_MONEY); - if (min.signum() > 0) { - min = min.negate(); - } - return min; - } - - @Override - public BigDecimal getMinMoney() { - return minMoney; - } - - @Override - public boolean isEcoLogEnabled() { - return economyLog; - } - - public boolean _isEcoLogEnabled() { - return config.getBoolean("economy-log-enabled", false); - } - - @Override - public boolean isEcoLogUpdateEnabled() { - return economyLogUpdate; - } - @Override public boolean realNamesOnList() { return config.getBoolean("real-names-on-list", false); } - public boolean _isEcoLogUpdateEnabled() { - return config.getBoolean("economy-log-update-enabled", false); - } - @Override public boolean removeGodOnDisconnect() { return config.getBoolean("remove-god-on-disconnect", false); @@ -1340,16 +1195,6 @@ public class Settings implements net.ess3.api.ISettings { return mailsPerMinute; } - private long _getEconomyLagWarning() { - // Default to 25ms - return (long) (config.getDouble("economy-lag-warning", 25.0) * 1000000); - } - - @Override - public long getEconomyLagWarning() { - return economyLagWarning; - } - private long _getPermissionsLagWarning() { // Default to 25ms return (long) (config.getDouble("permissions-lag-warning", 25.0) * 1000000); @@ -1474,16 +1319,6 @@ public class Settings implements net.ess3.api.ISettings { return config.getBoolean("last-message-reply-recipient", false); } - @Override - public BigDecimal getMinimumPayAmount() { - return new BigDecimal(config.getString("minimum-pay-amount", "0.001")); - } - - @Override - public boolean isPayExcludesIgnoreList() { - return config.getBoolean("pay-excludes-ignore-list", false); - } - @Override public long getLastMessageReplyRecipientTimeout() { return config.getLong("last-message-reply-recipient-timeout", 180); @@ -1634,40 +1469,6 @@ public class Settings implements net.ess3.api.ISettings { return config.getBoolean("command-cooldown-persistence", true); } - private boolean _isNpcsInBalanceRanking() { - return config.getBoolean("npcs-in-balance-ranking", false); - } - - @Override - public boolean isNpcsInBalanceRanking() { - return npcsInBalanceRanking; - } - - private NumberFormat _getCurrencyFormat() { - final String currencyFormatString = config.getString("currency-format", "#,##0.00"); - - final String symbolLocaleString = config.getString("currency-symbol-format-locale", null); - final DecimalFormatSymbols decimalFormatSymbols; - if (symbolLocaleString != null) { - decimalFormatSymbols = DecimalFormatSymbols.getInstance(Locale.forLanguageTag(symbolLocaleString)); - } else { - // Fallback to the JVM's default locale - decimalFormatSymbols = DecimalFormatSymbols.getInstance(Locale.US); - } - - final DecimalFormat currencyFormat = new DecimalFormat(currencyFormatString, decimalFormatSymbols); - currencyFormat.setRoundingMode(RoundingMode.FLOOR); - - // Updates NumberUtil#PRETTY_FORMAT field so that all of Essentials can follow a single format. - NumberUtil.internalSetPrettyFormat(currencyFormat); - return currencyFormat; - } - - @Override - public NumberFormat getCurrencyFormat() { - return this.currencyFormat; - } - @Override public List getUnprotectedSignNames() { return this.unprotectedSigns; @@ -1924,11 +1725,6 @@ public class Settings implements net.ess3.api.ISettings { return config.getBoolean("update-check", true); } - @Override - public boolean showZeroBaltop() { - return config.getBoolean("show-zero-baltop", true); - } - @Override public int getMaxItemLore() { return config.getInt("max-itemlore-lines", 10); diff --git a/Essentials/src/main/java/com/earth2me/essentials/Teleport.java b/Essentials/src/main/java/com/earth2me/essentials/Teleport.java index 6038b2e35..2d1039343 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/main/java/com/earth2me/essentials/Teleport.java @@ -15,7 +15,6 @@ import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; -import java.math.BigDecimal; import java.util.Calendar; import java.util.GregorianCalendar; @@ -43,20 +42,15 @@ public class Teleport implements ITeleport { public void cooldown(final boolean check) throws Exception { final Calendar time = new GregorianCalendar(); if (teleportOwner.getLastTeleportTimestamp() > 0) { - // Take the current time, and remove the delay from it. final double cooldown = ess.getSettings().getTeleportCooldown(); final Calendar earliestTime = new GregorianCalendar(); earliestTime.add(Calendar.SECOND, -(int) cooldown); earliestTime.add(Calendar.MILLISECOND, -(int) ((cooldown * 1000.0) % 1000.0)); - // This value contains the most recent time a teleportPlayer could have been used that would allow another use. final long earliestLong = earliestTime.getTimeInMillis(); - // When was the last teleportPlayer used? final long lastTime = teleportOwner.getLastTeleportTimestamp(); if (lastTime > time.getTimeInMillis()) { - // This is to make sure time didn't get messed up on last teleportPlayer use. - // If this happens, let's give the user the benifit of the doubt. teleportOwner.setLastTeleportTimestamp(time.getTimeInMillis()); return; } else if (lastTime > earliestLong @@ -67,7 +61,6 @@ public class Teleport implements ITeleport { throw new Exception(tl("timeBeforeTeleport", DateUtil.formatDateDiff(time.getTimeInMillis()))); } } - // if justCheck is set, don't update lastTeleport; we're just checking if (!check) { teleportOwner.setLastTeleportTimestamp(time.getTimeInMillis()); } @@ -101,7 +94,6 @@ public class Teleport implements ITeleport { user.sendMessage(tl("dontMoveMessage", DateUtil.formatDateDiff(c.getTimeInMillis()))); } - //The now function is used when you want to skip tp delay when teleporting someone to a location or player. @Override @Deprecated public void now(final Location loc, final boolean cooldown, final TeleportCause cause) throws Exception { @@ -167,48 +159,43 @@ public class Teleport implements ITeleport { } } - //The teleportPlayer function is used when you want to normally teleportPlayer someone to a location or player. - //This method is nolonger used internally and will be removed. @Deprecated @Override - public void teleport(final Location loc, final Trade chargeFor) throws Exception { - teleport(loc, chargeFor, TeleportCause.PLUGIN); + public void teleport(final Location loc) throws Exception { + teleport(loc, TeleportCause.PLUGIN); } @Override @Deprecated - public void teleport(final Location loc, final Trade chargeFor, final TeleportCause cause) throws Exception { - teleport(teleportOwner, new LocationTarget(loc), chargeFor, cause); + public void teleport(final Location loc, final TeleportCause cause) throws Exception { + teleport(teleportOwner, new LocationTarget(loc), cause); } - //This is used when teleporting to a player @Override @Deprecated - public void teleport(final Player entity, final Trade chargeFor, final TeleportCause cause) throws Exception { + public void teleport(final Player entity, final TeleportCause cause) throws Exception { final ITarget target = new PlayerTarget(entity); teleportOwner.sendMessage(tl("teleportToPlayer", entity.getDisplayName())); - teleport(teleportOwner, target, chargeFor, cause); + teleport(teleportOwner, target, cause); } - //This is used when teleporting to stored location @Override @Deprecated - public void teleportPlayer(final IUser teleportee, final Location loc, final Trade chargeFor, final TeleportCause cause) throws Exception { - teleport(teleportee, new LocationTarget(loc), chargeFor, cause); + public void teleportPlayer(final IUser teleportee, final Location loc, final TeleportCause cause) throws Exception { + teleport(teleportee, new LocationTarget(loc), cause); } - //This is used on /tphere @Override @Deprecated - public void teleportPlayer(final IUser teleportee, final Player entity, final Trade chargeFor, final TeleportCause cause) throws Exception { + public void teleportPlayer(final IUser teleportee, final Player entity, final TeleportCause cause) throws Exception { final ITarget target = new PlayerTarget(entity); - teleport(teleportee, target, chargeFor, cause); + teleport(teleportee, target, cause); teleportee.sendMessage(tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ())); teleportOwner.sendMessage(tl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ())); } @Deprecated - private void teleport(final IUser teleportee, final ITarget target, final Trade chargeFor, final TeleportCause cause) throws Exception { + private void teleport(final IUser teleportee, final ITarget target, final TeleportCause cause) throws Exception { double delay = ess.getSettings().getTeleportDelay(); final TeleportWarmupEvent event = new TeleportWarmupEvent(teleportee, cause, target, delay); @@ -218,35 +205,20 @@ public class Teleport implements ITeleport { } delay = event.getDelay(); - Trade cashCharge = chargeFor; - - if (chargeFor != null) { - chargeFor.isAffordableFor(teleportOwner); - - //This code is to make sure that commandcosts are checked in the initial world, and not in the resulting world. - if (!chargeFor.getCommandCost(teleportOwner).equals(BigDecimal.ZERO)) { - //By converting a command cost to a regular cost, the command cost permission isn't checked when executing the charge after teleport. - cashCharge = new Trade(chargeFor.getCommandCost(teleportOwner), ess); - } - } - cooldown(true); if (delay <= 0 || teleportOwner.isAuthorized("essentials.teleport.timer.bypass") || teleportee.isAuthorized("essentials.teleport.timer.bypass")) { cooldown(false); now(teleportee, target, cause); - if (cashCharge != null) { - cashCharge.charge(teleportOwner); - } return; } cancel(false); warnUser(teleportee, delay); - initTimer((long) (delay * 1000.0), teleportee, target, cashCharge, cause, false); + initTimer((long) (delay * 1000.0), teleportee, target, cause, false); } @Deprecated - private void teleportOther(final IUser teleporter, final IUser teleportee, final ITarget target, final Trade chargeFor, final TeleportCause cause) throws Exception { + private void teleportOther(final IUser teleporter, final IUser teleportee, final ITarget target, final TeleportCause cause) throws Exception { double delay = ess.getSettings().getTeleportDelay(); final TeleportWarmupEvent event = new TeleportWarmupEvent(teleporter, teleportee, cause, target, delay); @@ -256,18 +228,6 @@ public class Teleport implements ITeleport { } delay = event.getDelay(); - Trade cashCharge = chargeFor; - - if (teleporter != null && chargeFor != null) { - chargeFor.isAffordableFor(teleporter); - - //This code is to make sure that commandcosts are checked in the initial world, and not in the resulting world. - if (!chargeFor.getCommandCost(teleporter).equals(BigDecimal.ZERO)) { - //By converting a command cost to a regular cost, the command cost permission isn't checked when executing the charge after teleport. - cashCharge = new Trade(chargeFor.getCommandCost(teleporter), ess); - } - } - cooldown(true); if (delay <= 0 || teleporter == null || teleporter.isAuthorized("essentials.teleport.timer.bypass") @@ -275,21 +235,17 @@ public class Teleport implements ITeleport { || teleportee.isAuthorized("essentials.teleport.timer.bypass")) { cooldown(false); now(teleportee, target, cause); - if (teleporter != null && cashCharge != null) { - cashCharge.charge(teleporter); - } return; } cancel(false); warnUser(teleportee, delay); - initTimer((long) (delay * 1000.0), teleportee, target, cashCharge, cause, false); + initTimer((long) (delay * 1000.0), teleportee, target, cause, false); } - //The respawn function is a wrapper used to handle tp fallback, on /jail and /home @Override @Deprecated - public void respawn(final Trade chargeFor, final TeleportCause cause) throws Exception { + public void respawn(final TeleportCause cause) throws Exception { double delay = ess.getSettings().getTeleportDelay(); final TeleportWarmupEvent event = new TeleportWarmupEvent(teleportOwner, cause, null, delay); @@ -299,22 +255,16 @@ public class Teleport implements ITeleport { } delay = event.getDelay(); - if (chargeFor != null) { - chargeFor.isAffordableFor(teleportOwner); - } cooldown(true); if (delay <= 0 || teleportOwner.isAuthorized("essentials.teleport.timer.bypass")) { cooldown(false); respawnNow(teleportOwner, cause); - if (chargeFor != null) { - chargeFor.charge(teleportOwner); - } return; } cancel(false); warnUser(teleportOwner, delay); - initTimer((long) (delay * 1000.0), teleportOwner, null, chargeFor, cause, true); + initTimer((long) (delay * 1000.0), teleportOwner, null, cause, true); } @Deprecated @@ -333,11 +283,10 @@ public class Teleport implements ITeleport { } } - //The warp function is a wrapper used to teleportPlayer a player to a /warp @Override @Deprecated - public void warp(final IUser teleportee, String warp, final Trade chargeFor, final TeleportCause cause) throws Exception { - final UserWarpEvent event = new UserWarpEvent(teleportee, warp, chargeFor); + public void warp(final IUser teleportee, String warp, final TeleportCause cause) throws Exception { + final UserWarpEvent event = new UserWarpEvent(teleportee, warp); Bukkit.getServer().getPluginManager().callEvent(event); if (event.isCancelled()) { return; @@ -349,39 +298,29 @@ public class Teleport implements ITeleport { if (!teleportee.equals(teleportOwner)) { teleportOwner.sendMessage(tl("warpingTo", warp, loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); } - teleport(teleportee, new LocationTarget(loc), chargeFor, cause); + teleport(teleportee, new LocationTarget(loc), cause); } - //The back function is a wrapper used to teleportPlayer a player /back to their previous location. - @Override - @Deprecated - public void back(final Trade chargeFor) throws Exception { - back(teleportOwner, chargeFor); - } - - //This function is a wrapper over the other back function for cases where another player performs back for them - @Override - @Deprecated - public void back(final IUser teleporter, final Trade chargeFor) throws Exception { - tpType = TeleportType.BACK; - final Location loc = teleportOwner.getLastLocation(); - teleportOwner.sendMessage(tl("backUsageMsg", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); - teleportOther(teleporter, teleportOwner, new LocationTarget(loc), chargeFor, TeleportCause.COMMAND); - } - - //This function is used to throw a user back after a jail sentence @Override @Deprecated public void back() throws Exception { now(teleportOwner, new LocationTarget(teleportOwner.getLastLocation()), TeleportCause.COMMAND); } + @Override + @Deprecated + public void back(final IUser teleporter) throws Exception { + tpType = TeleportType.BACK; + final Location loc = teleportOwner.getLastLocation(); + teleportOwner.sendMessage(tl("backUsageMsg", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); + teleportOther(teleporter, teleportOwner, new LocationTarget(loc), TeleportCause.COMMAND); + } + @Deprecated public void setTpType(final TeleportType tpType) { this.tpType = tpType; } - //If we need to cancelTimer a pending teleportPlayer call this method @Deprecated private void cancel(final boolean notifyUser) { if (timedTeleport != null) { @@ -391,8 +330,8 @@ public class Teleport implements ITeleport { } @Deprecated - private void initTimer(final long delay, final IUser teleportUser, final ITarget target, final Trade chargeFor, final TeleportCause cause, final boolean respawn) { - timedTeleport = new TimedTeleport(teleportOwner, ess, this, delay, teleportUser, target, chargeFor, cause, respawn); + private void initTimer(final long delay, final IUser teleportUser, final ITarget target, final TeleportCause cause, final boolean respawn) { + timedTeleport = new TimedTeleport(teleportOwner, ess, this, delay, teleportUser, target, cause, respawn); } public enum TeleportType { diff --git a/Essentials/src/main/java/com/earth2me/essentials/TimedTeleport.java b/Essentials/src/main/java/com/earth2me/essentials/TimedTeleport.java index 41e35b358..b15aa13b4 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/TimedTeleport.java +++ b/Essentials/src/main/java/com/earth2me/essentials/TimedTeleport.java @@ -27,12 +27,11 @@ public class TimedTeleport implements Runnable { private final ITarget timer_teleportTarget; private final boolean timer_respawn; private final boolean timer_canMove; - private final Trade timer_chargeFor; private final TeleportCause timer_cause; private int timer_task; private double timer_health; - TimedTeleport(final IUser user, final IEssentials ess, final Teleport teleport, final long delay, final IUser teleportUser, final ITarget target, final Trade chargeFor, final TeleportCause cause, final boolean respawn) { + TimedTeleport(final IUser user, final IEssentials ess, final Teleport teleport, final long delay, final IUser teleportUser, final ITarget target, final TeleportCause cause, final boolean respawn) { this.teleportOwner = user; this.ess = ess; this.teleport = teleport; @@ -44,7 +43,6 @@ public class TimedTeleport implements Runnable { this.timer_initZ = Math.round(teleportUser.getBase().getLocation().getZ() * MOVE_CONSTANT); this.timer_teleportee = teleportUser.getBase().getUniqueId(); this.timer_teleportTarget = target; - this.timer_chargeFor = chargeFor; this.timer_cause = cause; this.timer_respawn = respawn; this.timer_canMove = user.isAuthorized("essentials.teleport.timer.move"); @@ -98,18 +96,11 @@ public class TimedTeleport implements Runnable { cancelTimer(false); teleportUser.sendMessage(tl("teleportationCommencing")); - if (timer_chargeFor != null) { - timer_chargeFor.isAffordableFor(teleportOwner); - } if (timer_respawn) { teleport.respawnNow(teleportUser, timer_cause); } else { teleport.now(teleportUser, timer_teleportTarget, timer_cause); } - if (timer_chargeFor != null) { - timer_chargeFor.charge(teleportOwner); - } - } catch (final Exception ex) { ess.showError(teleportOwner.getSource(), ex, "\\ teleport"); } diff --git a/Essentials/src/main/java/com/earth2me/essentials/Trade.java b/Essentials/src/main/java/com/earth2me/essentials/Trade.java deleted file mode 100644 index c82bf51cb..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/Trade.java +++ /dev/null @@ -1,383 +0,0 @@ -package com.earth2me.essentials; - -import com.earth2me.essentials.craftbukkit.Inventories; -import com.earth2me.essentials.craftbukkit.SetExpFix; -import com.earth2me.essentials.utils.NumberUtil; -import com.earth2me.essentials.utils.VersionUtil; -import net.ess3.api.IEssentials; -import net.ess3.api.IUser; -import net.ess3.api.MaxMoneyException; -import org.bukkit.Location; -import org.bukkit.inventory.ItemStack; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.math.BigDecimal; -import java.text.DateFormat; -import java.util.Collections; -import java.util.Date; -import java.util.Locale; -import java.util.Map; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.logging.Level; - -import static com.earth2me.essentials.I18n.tl; - -public class Trade { - private static FileWriter fw = null; - private final transient String command; - private final transient Trade fallbackTrade; - private final transient BigDecimal money; - private final transient ItemStack itemStack; - private final transient Integer exp; - private final transient IEssentials ess; - - public Trade(final String command, final IEssentials ess) { - this(command, null, null, null, null, ess); - } - - public Trade(final String command, final Trade fallback, final IEssentials ess) { - this(command, fallback, null, null, null, ess); - } - - @Deprecated - public Trade(final double money, final com.earth2me.essentials.IEssentials ess) { - this(null, null, BigDecimal.valueOf(money), null, null, (IEssentials) ess); - } - - public Trade(final BigDecimal money, final IEssentials ess) { - this(null, null, money, null, null, ess); - } - - public Trade(final ItemStack items, final IEssentials ess) { - this(null, null, null, items, null, ess); - } - - public Trade(final int exp, final IEssentials ess) { - this(null, null, null, null, exp, ess); - } - - private Trade(final String command, final Trade fallback, final BigDecimal money, final ItemStack item, final Integer exp, final IEssentials ess) { - this.command = command; - this.fallbackTrade = fallback; - this.money = money; - this.itemStack = item; - this.exp = exp; - this.ess = ess; - } - - public static void log(final String type, final String subtype, final String event, final String sender, final Trade charge, final String receiver, final Trade pay, final Location loc, final BigDecimal endBalance, final IEssentials ess) { - //isEcoLogUpdateEnabled() - This refers to log entries with no location, ie API updates #EasterEgg - //isEcoLogEnabled() - This refers to log entries with with location, ie /pay /sell and eco signs. - - if ((loc == null && !ess.getSettings().isEcoLogUpdateEnabled()) || (loc != null && !ess.getSettings().isEcoLogEnabled())) { - return; - } - if (fw == null) { - try { - fw = new FileWriter(new File(ess.getDataFolder(), "trade.log"), true); - } catch (final IOException ex) { - Essentials.getWrappedLogger().log(Level.SEVERE, null, ex); - } - } - final StringBuilder sb = new StringBuilder(); - sb.append(type).append(",").append(subtype).append(",").append(event).append(",\""); - sb.append(DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL).format(new Date())); - sb.append("\",\""); - if (sender != null) { - sb.append(sender); - } - sb.append("\","); - if (charge == null) { - sb.append("\"\",\"\",\"\""); - } else { - if (charge.getItemStack() != null) { - sb.append(charge.getItemStack().getAmount()).append(","); - sb.append(charge.getItemStack().getType()).append(","); - if (VersionUtil.PRE_FLATTENING) { - sb.append(charge.getItemStack().getDurability()); - } - } - if (charge.getMoney() != null) { - sb.append(charge.getMoney()).append(","); - sb.append("money").append(","); - sb.append(ess.getSettings().getCurrencySymbol()); - } - if (charge.getExperience() != null) { - sb.append(charge.getExperience()).append(","); - sb.append("exp").append(","); - sb.append("\"\""); - } - } - sb.append(",\""); - if (receiver != null) { - sb.append(receiver); - } - sb.append("\","); - if (pay == null) { - sb.append("\"\",\"\",\"\""); - } else { - if (pay.getItemStack() != null) { - sb.append(pay.getItemStack().getAmount()).append(","); - sb.append(pay.getItemStack().getType()).append(","); - if (VersionUtil.PRE_FLATTENING) { - sb.append(pay.getItemStack().getDurability()); - } - } - if (pay.getMoney() != null) { - sb.append(pay.getMoney()).append(","); - sb.append("money").append(","); - sb.append(ess.getSettings().getCurrencySymbol()); - } - if (pay.getExperience() != null) { - sb.append(pay.getExperience()).append(","); - sb.append("exp").append(","); - sb.append("\"\""); - } - } - if (loc == null) { - sb.append(",\"\",\"\",\"\",\"\""); - } else { - sb.append(",\""); - sb.append(loc.getWorld().getName()).append("\","); - sb.append(loc.getBlockX()).append(","); - sb.append(loc.getBlockY()).append(","); - sb.append(loc.getBlockZ()).append(","); - } - - if (endBalance == null) { - sb.append(","); - } else { - sb.append(endBalance); - sb.append(","); - } - sb.append("\n"); - try { - fw.write(sb.toString()); - fw.flush(); - } catch (final IOException ex) { - Essentials.getWrappedLogger().log(Level.SEVERE, null, ex); - } - } - - public static void closeLog() { - if (fw != null) { - try { - fw.close(); - } catch (final IOException ex) { - Essentials.getWrappedLogger().log(Level.SEVERE, null, ex); - } - fw = null; - } - } - - public void isAffordableFor(final IUser user) throws ChargeException { - final CompletableFuture future = new CompletableFuture<>(); - isAffordableFor(user, future); - if (future.isCompletedExceptionally()) { - try { - future.get(); - } catch (final InterruptedException e) { //If this happens, we have bigger problems... - e.printStackTrace(); - } catch (final ExecutionException e) { - throw (ChargeException) e.getCause(); - } - } - } - - public void isAffordableFor(final IUser user, final CompletableFuture future) { - if (ess.getSettings().isDebug()) { - ess.getLogger().log(Level.INFO, "checking if " + user.getName() + " can afford charge."); - } - - if (getMoney() != null && getMoney().signum() > 0 && !user.canAfford(getMoney())) { - future.completeExceptionally(new ChargeException(tl("notEnoughMoney", NumberUtil.displayCurrency(getMoney(), ess)))); - return; - } - - if (getItemStack() != null && !Inventories.containsAtLeast(user.getBase(), itemStack, itemStack.getAmount())) { - future.completeExceptionally(new ChargeException(tl("missingItems", getItemStack().getAmount(), ess.getItemDb().name(getItemStack())))); - return; - } - - final BigDecimal money; - if (command != null && !command.isEmpty() && (money = getCommandCost(user)).signum() > 0 && !user.canAfford(money)) { - future.completeExceptionally(new ChargeException(tl("notEnoughMoney", NumberUtil.displayCurrency(money, ess)))); - return; - } - - if (exp != null && exp > 0 && SetExpFix.getTotalExperience(user.getBase()) < exp) { - future.completeExceptionally(new ChargeException(tl("notEnoughExperience"))); - } - } - - public boolean pay(final IUser user) throws MaxMoneyException { - return pay(user, OverflowType.ABORT) == null; - } - - public Map pay(final IUser user, final OverflowType type) throws MaxMoneyException { - if (getMoney() != null && getMoney().signum() > 0) { - if (ess.getSettings().isDebug()) { - ess.getLogger().log(Level.INFO, "paying user " + user.getName() + " via trade " + getMoney().toPlainString()); - } - user.giveMoney(getMoney()); - } - if (getItemStack() != null) { - if (type == OverflowType.ABORT && !Inventories.hasSpace(user.getBase(), 0, false, getItemStack())) { - if (ess.getSettings().isDebug()) { - ess.getLogger().log(Level.INFO, "abort paying " + user.getName() + " itemstack " + getItemStack().toString() + " due to lack of inventory space "); - } - return Collections.singletonMap(0, getItemStack()); - } - - final Map leftover = Inventories.addItem(user.getBase(), getItemStack()); - user.getBase().updateInventory(); - if (!leftover.isEmpty()) { - if (type == OverflowType.RETURN) { - if (ess.getSettings().isDebug()) { - ess.getLogger().log(Level.INFO, "paying " + user.getName() + " partial itemstack " + getItemStack().toString() + " with overflow " + leftover.get(0).toString()); - } - return leftover; - } else { - for (final ItemStack itemStack : leftover.values()) { - int spillAmount = itemStack.getAmount(); - itemStack.setAmount(Math.min(spillAmount, itemStack.getMaxStackSize())); - while (spillAmount > 0) { - user.getBase().getWorld().dropItemNaturally(user.getBase().getLocation(), itemStack); - spillAmount -= itemStack.getAmount(); - } - } - if (ess.getSettings().isDebug()) { - ess.getLogger().log(Level.INFO, "paying " + user.getName() + " partial itemstack " + getItemStack().toString() + " and dropping overflow " + leftover.get(0).toString()); - } - } - } else if (ess.getSettings().isDebug()) { - ess.getLogger().log(Level.INFO, "paying " + user.getName() + " itemstack " + getItemStack().toString()); - } - user.getBase().updateInventory(); - } - if (getExperience() != null) { - SetExpFix.setTotalExperience(user.getBase(), SetExpFix.getTotalExperience(user.getBase()) + getExperience()); - } - return null; - } - - public void charge(final IUser user) throws ChargeException { - final CompletableFuture future = new CompletableFuture<>(); - charge(user, future); - if (future.isCompletedExceptionally()) { - try { - future.get(); - } catch (final InterruptedException e) { //If this happens, we have bigger problems... - e.printStackTrace(); - } catch (final ExecutionException e) { - throw (ChargeException) e.getCause(); - } - } - } - - public void charge(final IUser user, final CompletableFuture future) { - if (ess.getSettings().isDebug()) { - ess.getLogger().log(Level.INFO, "attempting to charge user " + user.getName()); - } - if (getMoney() != null) { - if (ess.getSettings().isDebug()) { - ess.getLogger().log(Level.INFO, "charging user " + user.getName() + " money " + getMoney().toPlainString()); - } - if (!user.canAfford(getMoney()) && getMoney().signum() > 0) { - future.completeExceptionally(new ChargeException(tl("notEnoughMoney", NumberUtil.displayCurrency(getMoney(), ess)))); - return; - } - user.takeMoney(getMoney()); - } - if (getItemStack() != null) { - if (ess.getSettings().isDebug()) { - ess.getLogger().log(Level.INFO, "charging user " + user.getName() + " itemstack " + getItemStack().toString()); - } - if (!Inventories.containsAtLeast(user.getBase(), getItemStack(), getItemStack().getAmount())) { - future.completeExceptionally(new ChargeException(tl("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")))); - return; - } - Inventories.removeItemAmount(user.getBase(), getItemStack(), getItemStack().getAmount()); - user.getBase().updateInventory(); - } - if (command != null) { - final BigDecimal cost = getCommandCost(user); - if (!user.canAfford(cost) && cost.signum() > 0) { - future.completeExceptionally(new ChargeException(tl("notEnoughMoney", NumberUtil.displayCurrency(cost, ess)))); - return; - } - user.takeMoney(cost); - } - if (getExperience() != null) { - if (ess.getSettings().isDebug()) { - ess.getLogger().log(Level.INFO, "charging user " + user.getName() + " exp " + getExperience()); - } - final int experience = SetExpFix.getTotalExperience(user.getBase()); - if (experience < getExperience() && getExperience() > 0) { - future.completeExceptionally(new ChargeException(tl("notEnoughExperience"))); - return; - } - SetExpFix.setTotalExperience(user.getBase(), experience - getExperience()); - } - if (ess.getSettings().isDebug()) { - ess.getLogger().log(Level.INFO, "charge user " + user.getName() + " completed"); - } - } - - public BigDecimal getMoney() { - return money; - } - - public ItemStack getItemStack() { - return itemStack; - } - - public Integer getExperience() { - return exp; - } - - public TradeType getType() { - if (getExperience() != null) { - return TradeType.EXP; - } - - if (getItemStack() != null) { - return TradeType.ITEM; - } - - return TradeType.MONEY; - } - - public BigDecimal getCommandCost(final IUser user) { - BigDecimal cost = BigDecimal.ZERO; - if (command != null && !command.isEmpty()) { - cost = ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command); - if (cost.signum() == 0 && fallbackTrade != null) { - cost = fallbackTrade.getCommandCost(user); - } - - if (ess.getSettings().isDebug()) { - ess.getLogger().log(Level.INFO, "calculated command (" + command + ") cost for " + user.getName() + " as " + cost); - } - } - if (cost.signum() != 0 && (user.isAuthorized("essentials.nocommandcost.all") || user.isAuthorized("essentials.nocommandcost." + command))) { - return BigDecimal.ZERO; - } - return cost; - } - - public enum TradeType { - MONEY, - EXP, - ITEM - } - - public enum OverflowType { - ABORT, - DROP, - RETURN - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/User.java b/Essentials/src/main/java/com/earth2me/essentials/User.java index d8b6af86e..b39d6773b 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/User.java +++ b/Essentials/src/main/java/com/earth2me/essentials/User.java @@ -2,24 +2,18 @@ package com.earth2me.essentials; import com.earth2me.essentials.commands.IEssentialsCommand; import com.earth2me.essentials.craftbukkit.Inventories; -import com.earth2me.essentials.economy.EconomyLayer; -import com.earth2me.essentials.economy.EconomyLayers; import com.earth2me.essentials.messaging.IMessageRecipient; import com.earth2me.essentials.messaging.SimpleMessageRecipient; import com.earth2me.essentials.utils.DateUtil; import com.earth2me.essentials.utils.EnumUtil; import com.earth2me.essentials.utils.FormatUtil; -import com.earth2me.essentials.utils.NumberUtil; import com.earth2me.essentials.utils.TriState; import com.earth2me.essentials.utils.VersionUtil; import com.google.common.collect.Lists; import net.ess3.api.IEssentials; -import net.ess3.api.MaxMoneyException; import net.ess3.api.events.AfkStatusChangeEvent; import net.ess3.api.events.JailStatusChangeEvent; import net.ess3.api.events.MuteStatusChangeEvent; -import net.ess3.api.events.UserBalanceUpdateEvent; -import net.essentialsx.api.v2.events.TransactionEvent; import net.essentialsx.api.v2.services.mail.MailSender; import org.bukkit.Location; import org.bukkit.Material; @@ -30,7 +24,6 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.inventory.ItemStack; import org.checkerframework.checker.nullness.qual.Nullable; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.Calendar; import java.util.Collection; @@ -39,9 +32,7 @@ import java.util.GregorianCalendar; import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; -import java.util.Map; import java.util.UUID; -import java.util.WeakHashMap; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; @@ -56,9 +47,6 @@ public class User extends UserData implements Comparable, IMessageRecipien private transient final AsyncTeleport teleport; private transient final Teleport legacyTeleport; - // User command confirmation strings - private final Map confirmingPayments = new WeakHashMap<>(); - // User teleport variables private final transient LinkedHashMap teleportRequestQueue = new LinkedHashMap<>(); @@ -214,90 +202,6 @@ public class User extends UserData implements Comparable, IMessageRecipien setLastHealTimestamp(now.getTimeInMillis()); } - @Override - public void giveMoney(final BigDecimal value) throws MaxMoneyException { - giveMoney(value, null); - } - - @Override - public void giveMoney(final BigDecimal value, final CommandSource initiator) throws MaxMoneyException { - giveMoney(value, initiator, UserBalanceUpdateEvent.Cause.UNKNOWN); - } - - public void giveMoney(final BigDecimal value, final CommandSource initiator, final UserBalanceUpdateEvent.Cause cause) throws MaxMoneyException { - if (value.signum() == 0) { - return; - } - setMoney(getMoney().add(value), cause); - sendMessage(tl("addedToAccount", NumberUtil.displayCurrency(value, ess))); - if (initiator != null) { - initiator.sendMessage(tl("addedToOthersAccount", NumberUtil.displayCurrency(value, ess), this.getDisplayName(), NumberUtil.displayCurrency(getMoney(), ess))); - } - } - - @Override - public void payUser(final User reciever, final BigDecimal value) throws Exception { - payUser(reciever, value, UserBalanceUpdateEvent.Cause.UNKNOWN); - } - - public void payUser(final User reciever, final BigDecimal value, final UserBalanceUpdateEvent.Cause cause) throws Exception { - if (value.compareTo(BigDecimal.ZERO) < 1) { - throw new Exception(tl("payMustBePositive")); - } - - if (canAfford(value)) { - setMoney(getMoney().subtract(value), cause); - reciever.setMoney(reciever.getMoney().add(value), cause); - sendMessage(tl("moneySentTo", NumberUtil.displayCurrency(value, ess), reciever.getDisplayName())); - reciever.sendMessage(tl("moneyRecievedFrom", NumberUtil.displayCurrency(value, ess), getDisplayName())); - final TransactionEvent transactionEvent = new TransactionEvent(this.getSource(), reciever, value); - ess.getServer().getPluginManager().callEvent(transactionEvent); - } else { - throw new ChargeException(tl("notEnoughMoney", NumberUtil.displayCurrency(value, ess))); - } - } - - @Override - public void takeMoney(final BigDecimal value) { - takeMoney(value, null); - } - - @Override - public void takeMoney(final BigDecimal value, final CommandSource initiator) { - takeMoney(value, initiator, UserBalanceUpdateEvent.Cause.UNKNOWN); - } - - public void takeMoney(final BigDecimal value, final CommandSource initiator, final UserBalanceUpdateEvent.Cause cause) { - if (value.signum() == 0) { - return; - } - try { - setMoney(getMoney().subtract(value), cause); - } catch (final MaxMoneyException ex) { - ess.getLogger().log(Level.WARNING, "Invalid call to takeMoney, total balance can't be more than the max-money limit.", ex); - } - sendMessage(tl("takenFromAccount", NumberUtil.displayCurrency(value, ess))); - if (initiator != null) { - initiator.sendMessage(tl("takenFromOthersAccount", NumberUtil.displayCurrency(value, ess), this.getDisplayName(), NumberUtil.displayCurrency(getMoney(), ess))); - } - } - - @Override - public boolean canAfford(final BigDecimal cost) { - return canAfford(cost, true); - } - - public boolean canAfford(final BigDecimal cost, final boolean permcheck) { - if (cost.signum() <= 0) { - return true; - } - final BigDecimal remainingBalance = getMoney().subtract(cost); - if (!permcheck || isAuthorized("essentials.eco.loan")) { - return remainingBalance.compareTo(ess.getSettings().getMinMoney()) >= 0; - } - return remainingBalance.signum() >= 0; - } - public void dispose() { ess.runTaskAsynchronously(this::_dispose); } @@ -560,68 +464,6 @@ public class User extends UserData implements Comparable, IMessageRecipien lastOnlineActivity = timestamp; } - @Override - public BigDecimal getMoney() { - final long start = System.nanoTime(); - final BigDecimal value = _getMoney(); - final long elapsed = System.nanoTime() - start; - if (elapsed > ess.getSettings().getEconomyLagWarning()) { - ess.getLogger().log(Level.INFO, "Lag Notice - Slow Economy Response - Request took over {0}ms!", elapsed / 1000000.0); - } - return value; - } - - @Override - public void setMoney(final BigDecimal value) throws MaxMoneyException { - setMoney(value, UserBalanceUpdateEvent.Cause.UNKNOWN); - } - - private BigDecimal _getMoney() { - if (ess.getSettings().isEcoDisabled()) { - if (ess.getSettings().isDebug()) { - ess.getLogger().info("Internal economy functions disabled, aborting balance check."); - } - return BigDecimal.ZERO; - } - final EconomyLayer layer = EconomyLayers.getSelectedLayer(); - if (layer != null && (layer.hasAccount(getBase()) || layer.createPlayerAccount(getBase()))) { - return layer.getBalance(getBase()); - } - return super.getMoney(); - } - - public void setMoney(final BigDecimal value, final UserBalanceUpdateEvent.Cause cause) throws MaxMoneyException { - if (ess.getSettings().isEcoDisabled()) { - if (ess.getSettings().isDebug()) { - ess.getLogger().info("Internal economy functions disabled, aborting balance change."); - } - return; - } - final BigDecimal oldBalance = _getMoney(); - - final UserBalanceUpdateEvent updateEvent = new UserBalanceUpdateEvent(this.getBase(), oldBalance, value, cause); - ess.getServer().getPluginManager().callEvent(updateEvent); - final BigDecimal newBalance = updateEvent.getNewBalance(); - - final EconomyLayer layer = EconomyLayers.getSelectedLayer(); - if (layer != null && (layer.hasAccount(getBase()) || layer.createPlayerAccount(getBase()))) { - layer.set(getBase(), newBalance); - } - super.setMoney(newBalance, true); - Trade.log("Update", "Set", "API", getName(), new Trade(newBalance, ess), null, null, null, newBalance, ess); - } - - public void updateMoneyCache(final BigDecimal value) { - if (ess.getSettings().isEcoDisabled() || !EconomyLayers.isLayerSelected() || super.getMoney().equals(value)) { - return; - } - try { - super.setMoney(value, false); - } catch (final MaxMoneyException ex) { - // We don't want to throw any errors here, just updating a cache - } - } - @Override public void setAfk(final boolean set) { setAfk(set, AfkStatusChangeEvent.Cause.UNKNOWN); @@ -728,11 +570,11 @@ public class User extends UserData implements Comparable, IMessageRecipien final CompletableFuture future = new CompletableFuture<>(); getAsyncTeleport().back(future); future.exceptionally(e -> { - getAsyncTeleport().respawn(null, TeleportCause.PLUGIN, new CompletableFuture<>()); + getAsyncTeleport().respawn(TeleportCause.PLUGIN, new CompletableFuture<>()); return false; }); } else if (ess.getSettings().getTeleportWhenFreePolicy() == ISettings.TeleportWhenFreePolicy.SPAWN) { - getAsyncTeleport().respawn(null, TeleportCause.PLUGIN, new CompletableFuture<>()); + getAsyncTeleport().respawn(TeleportCause.PLUGIN, new CompletableFuture<>()); } return true; } @@ -1067,11 +909,6 @@ public class User extends UserData implements Comparable, IMessageRecipien return afkSince; } - @Override - public Map getConfirmingPayments() { - return confirmingPayments; - } - public String getConfirmingClearCommand() { return confirmingClearCommand; } @@ -1144,15 +981,6 @@ public class User extends UserData implements Comparable, IMessageRecipien this.freeze = freeze; } - public boolean isBaltopExempt() { - if (getBase().isOnline()) { - final boolean exempt = isAuthorized("essentials.balancetop.exclude"); - setBaltopExemptCache(exempt); - return exempt; - } - return isBaltopExcludeCache(); - } - @Override public Block getTargetBlock(int maxDistance) { final Block block; diff --git a/Essentials/src/main/java/com/earth2me/essentials/UserData.java b/Essentials/src/main/java/com/earth2me/essentials/UserData.java index c7f1f90ca..a204ac6ce 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/UserData.java +++ b/Essentials/src/main/java/com/earth2me/essentials/UserData.java @@ -10,7 +10,6 @@ import com.earth2me.essentials.utils.NumberUtil; import com.earth2me.essentials.utils.StringUtil; import com.google.common.base.Charsets; import net.ess3.api.IEssentials; -import net.ess3.api.MaxMoneyException; import net.essentialsx.api.v2.services.mail.MailMessage; import org.bukkit.ChatColor; import org.bukkit.Location; @@ -19,7 +18,6 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import java.io.File; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -37,7 +35,6 @@ public abstract class UserData extends PlayerExtension implements IConf { protected final transient IEssentials ess; private final EssentialsUserConfiguration config; private UserConfigHolder holder; - private BigDecimal money; protected UserData(final Player base, final IEssentials ess) { super(base); @@ -86,53 +83,6 @@ public abstract class UserData extends PlayerExtension implements IConf { ess.getLogger().log(Level.SEVERE, "Error while reading user config: " + config.getFile().getName(), e); throw new RuntimeException(e); } - money = _getMoney(); - } - - private BigDecimal _getMoney() { - BigDecimal result = ess.getSettings().getStartingBalance(); - final BigDecimal maxMoney = ess.getSettings().getMaxMoney(); - final BigDecimal minMoney = ess.getSettings().getMinMoney(); - - // NPC banks are not actual player banks, as such they do not have player starting balance. - if (isNPC()) { - result = BigDecimal.ZERO; - } - - if (holder.money() != null) { - result = holder.money(); - } - if (result.compareTo(maxMoney) > 0) { - result = maxMoney; - } - if (result.compareTo(minMoney) < 0) { - result = minMoney; - } - holder.money(result); - - return holder.money(); - } - - public BigDecimal getMoney() { - return money; - } - - public void setMoney(final BigDecimal value, final boolean throwError) throws MaxMoneyException { - final BigDecimal maxMoney = ess.getSettings().getMaxMoney(); - final BigDecimal minMoney = ess.getSettings().getMinMoney(); - if (value.compareTo(maxMoney) > 0) { - if (throwError) { - throw new MaxMoneyException(); - } - money = maxMoney; - } else { - money = value; - } - if (money.compareTo(minMoney) < 0) { - money = minMoney; - } - holder.money(money); - stopTransaction(); } private String getHomeName(String search) { @@ -681,24 +631,6 @@ public abstract class UserData extends PlayerExtension implements IConf { return false; } - public boolean isAcceptingPay() { - return holder.acceptingPay(); - } - - public void setAcceptingPay(final boolean acceptingPay) { - holder.acceptingPay(acceptingPay); - save(); - } - - public boolean isPromptingPayConfirm() { - return holder.confirmPay() != null ? holder.confirmPay() : ess.getSettings().isConfirmCommandEnabledByDefault("pay"); - } - - public void setPromptingPayConfirm(final boolean prompt) { - holder.confirmPay(prompt); - save(); - } - public boolean isPromptingClearConfirm() { return holder.confirmClear() != null ? holder.confirmClear() : ess.getSettings().isConfirmCommandEnabledByDefault("clearinventory"); } @@ -717,15 +649,6 @@ public abstract class UserData extends PlayerExtension implements IConf { save(); } - public boolean isBaltopExcludeCache() { - return holder.baltopExempt(); - } - - public void setBaltopExemptCache(boolean baltopExempt) { - holder.baltopExempt(baltopExempt); - config.save(); - } - public List getPastUsernames() { return holder.pastUsernames(); } diff --git a/Essentials/src/main/java/com/earth2me/essentials/Worth.java b/Essentials/src/main/java/com/earth2me/essentials/Worth.java deleted file mode 100644 index 5b48841f5..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/Worth.java +++ /dev/null @@ -1,163 +0,0 @@ -package com.earth2me.essentials; - -import com.earth2me.essentials.commands.NotEnoughArgumentsException; -import com.earth2me.essentials.config.ConfigurateUtil; -import com.earth2me.essentials.config.EssentialsConfiguration; -import com.earth2me.essentials.craftbukkit.Inventories; -import com.earth2me.essentials.utils.VersionUtil; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; -import org.spongepowered.configurate.CommentedConfigurationNode; - -import java.io.File; -import java.math.BigDecimal; -import java.util.Locale; - -import static com.earth2me.essentials.I18n.tl; - -public class Worth implements IConf { - private final EssentialsConfiguration config; - - public Worth(final File dataFolder) { - config = new EssentialsConfiguration(new File(dataFolder, "worth.yml"), "/worth.yml"); - config.load(); - } - - /** - * Get the value of an item stack from the config. - * - * @param ess The Essentials instance. - * @param itemStack The item stack to look up in the config. - * @return The price from the config. - */ - public BigDecimal getPrice(final IEssentials ess, final ItemStack itemStack) { - BigDecimal result = BigDecimal.ONE.negate(); - - final String itemname = itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""); - - if (VersionUtil.PRE_FLATTENING) { - // Check for matches with data value from stack - // Note that we always default to BigDecimal.ONE.negate(), equivalent to -1 - result = config.getBigDecimal("worth." + itemname + "." + itemStack.getDurability(), BigDecimal.ONE.negate()); - } - - // Check for matches with data value 0 - if (result.signum() < 0) { - final CommentedConfigurationNode itemNameMatch = config.getSection("worth." + itemname); - if (itemNameMatch != null && ConfigurateUtil.getKeys(itemNameMatch).size() == 1) { - result = config.getBigDecimal("worth." + itemname + ".0", BigDecimal.ONE.negate()); - } - } - - // Check for matches with data value wildcard - if (result.signum() < 0) { - result = config.getBigDecimal("worth." + itemname + ".*", BigDecimal.ONE.negate()); - } - - // Check for matches with item name alone - if (result.signum() < 0) { - result = config.getBigDecimal("worth." + itemname, BigDecimal.ONE.negate()); - } - - if (result.signum() < 0) { - return null; - } - return result; - } - - /** - * Get the amount of items to be sold from a player's inventory. - * - * @param ess The Essentials instance. - * @param user The user attempting to sell the item. - * @param is A stack of the item to search the inventory for. - * @param args The amount to try to sell. - * @param isBulkSell Whether or not to try and bulk sell all items. - * @return The amount of items to sell from the player's inventory. - * @throws Exception Thrown if trying to sell air or an invalid amount. - */ - public int getAmount(final IEssentials ess, final User user, final ItemStack is, final String[] args, final boolean isBulkSell) throws Exception { - if (is == null || is.getType() == Material.AIR) { - throw new Exception(tl("itemSellAir")); - } - - int amount = 0; - - if (args.length > 1) { - try { - amount = Integer.parseInt(args[1].replaceAll("[^0-9]", "")); - } catch (final NumberFormatException ex) { - throw new NotEnoughArgumentsException(ex); - } - if (args[1].startsWith("-")) { - amount = -amount; - } - } - - final boolean stack = args.length > 1 && args[1].endsWith("s"); - final boolean requireStack = ess.getSettings().isTradeInStacks(is.getType()); - - if (requireStack && !stack) { - throw new Exception(tl("itemMustBeStacked")); - } - - int max = 0; - for (final ItemStack s : Inventories.getInventory(user.getBase(), false)) { - if (s == null || !s.isSimilar(is)) { - continue; - } - max += s.getAmount(); - } - - if (stack) { - amount *= is.getType().getMaxStackSize(); - } - if (amount < 1) { - amount += max; - } - - if (requireStack) { - amount -= amount % is.getType().getMaxStackSize(); - } - if (amount > max || amount < 1) { - if (!isBulkSell) { - user.sendMessage(tl("itemNotEnough2")); - user.sendMessage(tl("itemNotEnough3")); - throw new Exception(tl("itemNotEnough1")); - } else { - return amount; - } - } - - return amount; - } - - /** - * Set the price of an item and save it to the config. - * - * @param ess The Essentials instance. - * @param itemStack A stack of the item to save. - * @param price The new price of the item. - */ - public void setPrice(final IEssentials ess, final ItemStack itemStack, final double price) { - String path = "worth." + itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""); - - // Spigot 1.13+ throws an exception if a 1.13+ plugin even *attempts* to do set data. - if (VersionUtil.PRE_FLATTENING && itemStack.getType().getData() == null) { - // Bukkit-bug: getDurability still contains the correct value, while getData().getData() is 0. - path = path + "." + itemStack.getDurability(); - } - - config.setProperty(path, price); - config.save(); - } - - public File getFile() { - return config.getFile(); - } - - @Override - public void reloadConfig() { - config.load(); - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/api/Economy.java b/Essentials/src/main/java/com/earth2me/essentials/api/Economy.java deleted file mode 100644 index 8fdcfa5a1..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/api/Economy.java +++ /dev/null @@ -1,922 +0,0 @@ -package com.earth2me.essentials.api; - -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; -import com.earth2me.essentials.config.EssentialsUserConfiguration; -import com.earth2me.essentials.userstorage.ModernUserMap; -import com.earth2me.essentials.utils.NumberUtil; -import com.earth2me.essentials.utils.StringUtil; -import com.google.common.base.Charsets; -import net.ess3.api.IEssentials; -import net.ess3.api.MaxMoneyException; -import net.ess3.api.events.UserBalanceUpdateEvent; -import org.bukkit.entity.Player; - -import java.io.File; -import java.math.BigDecimal; -import java.math.MathContext; -import java.text.MessageFormat; -import java.util.UUID; -import java.util.logging.Level; - -/** - * You should use Vault instead of directly using this class. - */ -public class Economy { - public static final MathContext MATH_CONTEXT = MathContext.DECIMAL128; - private static IEssentials ess; - - private static final String WARN_CALL_BEFORE_LOAD = "Essentials API is called before Essentials is loaded."; - private static final String WARN_EXISTING_NPC_CREATE = "Account creation was requested for NPC account {0}, but account already exists (UUID: {1}). Not creating an account."; - private static final String WARN_PLAYER_UUID_NO_NAME = "Found player {0} by UUID {1} but not by their actual name. They may have changed their username."; - private static final String WARN_NPC_RECREATE_1 = "Account creation was requested for NPC user {0}, but an account file with UUID {1} already exists."; - private static final String WARN_NPC_RECREATE_2 = "Essentials will create a new account as requested by the other plugin, but this is almost certainly a bug and should be reported."; - - protected Economy() { - } - - /** - * @param aEss the ess to set - */ - public static void setEss(final IEssentials aEss) { - ess = aEss; - } - - private static void createNPCFile(final String unsanitizedName) { - final File folder = new File(ess.getDataFolder(), "userdata"); - final String name = ess.getSettings().isSafeUsermap() ? StringUtil.safeString(unsanitizedName) : unsanitizedName; - if (!folder.exists()) { - if (!folder.mkdirs()) { - throw new RuntimeException("Error while creating userdata directory!"); - } - } - final UUID npcUUID = UUID.nameUUIDFromBytes(("NPC:" + name).getBytes(Charsets.UTF_8)); - final File npcFile = new File(folder, npcUUID + ".yml"); - if (npcFile.exists()) { - ess.getLogger().log(Level.SEVERE, MessageFormat.format(WARN_NPC_RECREATE_1, name, npcUUID.toString()), new RuntimeException()); - ess.getLogger().log(Level.SEVERE, WARN_NPC_RECREATE_2); - } - final EssentialsUserConfiguration npcConfig = new EssentialsUserConfiguration(name, npcUUID, npcFile); - npcConfig.load(); - npcConfig.setProperty("npc", true); - npcConfig.setProperty("last-account-name", name); - npcConfig.setProperty("npc-name", unsanitizedName); - npcConfig.setProperty("money", ess.getSettings().getStartingBalance()); - npcConfig.blockingSave(); - // This will load the NPC into the UserMap + UUID cache - ((ModernUserMap) ess.getUsers()).addCachedNpcName(npcUUID, name); - ess.getUsers().getUser(npcUUID); - } - - private static void deleteNPC(final String name) { - final User user = ess.getUser(name); - user.reset(); - } - - private static User getUserByName(final String name) { - if (ess == null) { - throw new RuntimeException(WARN_CALL_BEFORE_LOAD); - } - if (name == null) { - throw new IllegalArgumentException("Economy username cannot be null"); - } - - User user = ess.getUser(name); - if (user == null) { - /* - Attempt lookup using UUID - this prevents balance resets when accessing economy - via Vault during player join. - See: https://github.com/EssentialsX/Essentials/issues/2400 - */ - final Player player = ess.getServer().getPlayerExact(name); - if (player != null) { - user = ess.getUser(player.getUniqueId()); - if (user != null) { - ess.getLogger().log(Level.INFO, MessageFormat.format(WARN_PLAYER_UUID_NO_NAME, name, player.getUniqueId().toString()), new RuntimeException()); - } - } - } - - if (user == null) { - user = getUserByUUID(UUID.nameUUIDFromBytes(("NPC:" + StringUtil.safeString(name)).getBytes(Charsets.UTF_8))); - } - - return user; - } - - private static User getUserByUUID(final UUID uuid) { - if (ess == null) { - throw new RuntimeException(WARN_CALL_BEFORE_LOAD); - } - if (uuid == null) { - throw new IllegalArgumentException("Economy uuid cannot be null"); - } - return ess.getUser(uuid); - } - - /** - * Returns the balance of a user - * - * @param name Name of the user - * @return balance - * @throws UserDoesNotExistException - * @deprecated Use {@link Economy#getMoneyExact(UUID)} or {@link Economy#getMoneyExact(User)} - */ - @Deprecated - public static double getMoney(final String name) throws UserDoesNotExistException { - final BigDecimal exactAmount = getMoneyExact(name); - double amount = exactAmount.doubleValue(); - if (new BigDecimal(amount).compareTo(exactAmount) > 0) { - // closest double is bigger than the exact amount - // -> get the previous double value to not return more money than the user has - amount = Math.nextAfter(amount, Double.NEGATIVE_INFINITY); - } - return amount; - } - - /** - * @param name Name of user - * @return Exact balance of user - * @throws UserDoesNotExistException - * @deprecated Usernames can change, use {@link Economy#getMoneyExact(UUID)} or {@link Economy#getMoneyExact(User)} - */ - @Deprecated - public static BigDecimal getMoneyExact(final String name) throws UserDoesNotExistException { - final User user = getUserByName(name); - if (user == null) { - throw new UserDoesNotExistException(name); - } - return getMoneyExact(user); - } - - /** - * Get the exact balance of the account with the given UUID. - * - * @param uuid The UUID of the user account to retrieve the balance for - * @return The account's balance - * @throws UserDoesNotExistException If the user does not exist - */ - public static BigDecimal getMoneyExact(final UUID uuid) throws UserDoesNotExistException { - final User user = getUserByUUID(uuid); - if (user == null) { - throw new UserDoesNotExistException(uuid); - } - return getMoneyExact(user); - } - - /** - * Get the exact balance of the account with the given UUID. - * - * @param user The user account to retrieve the balance for - * @return The account's balance - */ - public static BigDecimal getMoneyExact(final User user) { - if (user == null) { - throw new IllegalArgumentException("Economy user cannot be null"); - } - return user.getMoney(); - } - - /** - * Sets the balance of a user - * - * @param name Name of the user - * @param balance The balance you want to set - * @throws UserDoesNotExistException If a user by that name does not exists - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - * @deprecated Use {@link Economy#setMoney(UUID, BigDecimal)} or {@link Economy#setMoney(User, BigDecimal)} - */ - @Deprecated - public static void setMoney(final String name, final double balance) throws UserDoesNotExistException, NoLoanPermittedException, MaxMoneyException { - try { - setMoney(name, BigDecimal.valueOf(balance)); - } catch (final ArithmeticException e) { - ess.getLogger().log(Level.WARNING, "Failed to set balance of " + name + " to " + balance + ": " + e.getMessage(), e); - } - } - - /** - * Sets the balance of a user - * - * @param name Name of user - * @param balance The balance you want to set - * @throws UserDoesNotExistException If a user by that name does not exist - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - * @deprecated Usernames can change use {@link Economy#setMoney(UUID, BigDecimal)} or {@link Economy#setMoney(User, BigDecimal)} - */ - @Deprecated - public static void setMoney(final String name, final BigDecimal balance) throws UserDoesNotExistException, NoLoanPermittedException, MaxMoneyException { - final User user = getUserByName(name); - if (user == null) { - throw new UserDoesNotExistException(name); - } - setMoney(user, balance); - } - - /** - * Sets the balance of a user - * - * @param uuid UUID of user - * @param balance The balance you want to set - * @throws UserDoesNotExistException If a user by that uuid does not exist - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - */ - public static void setMoney(final UUID uuid, final BigDecimal balance) throws NoLoanPermittedException, UserDoesNotExistException, MaxMoneyException { - final User user = getUserByUUID(uuid); - if (user == null) { - throw new UserDoesNotExistException(uuid); - } - setMoney(user, balance); - } - - /** - * Sets the balance of a user - * - * @param user User - * @param balance The balance you want to set - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - */ - public static void setMoney(final User user, final BigDecimal balance) throws NoLoanPermittedException, MaxMoneyException { - if (user == null) { - throw new IllegalArgumentException("Economy user cannot be null"); - } - if (balance.compareTo(ess.getSettings().getMinMoney()) < 0) { - throw new NoLoanPermittedException(); - } - if (balance.signum() < 0 && !user.isAuthorized("essentials.eco.loan")) { - throw new NoLoanPermittedException(); - } - user.setMoney(balance, UserBalanceUpdateEvent.Cause.API); - Trade.log("API", "Set", "API", user.getName(), new Trade(balance, ess), null, null, null, balance, ess); - } - - /** - * Adds money to the balance of a user - *

- * Use {@link Economy#add(UUID, BigDecimal)} or {@link Economy#add(User, BigDecimal)} - * - * @param name Name of the user - * @param amount The money you want to add - * @throws UserDoesNotExistException If a user by that name does not exists - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - */ - @Deprecated - public static void add(final String name, final double amount) throws UserDoesNotExistException, NoLoanPermittedException, MaxMoneyException { - try { - add(name, BigDecimal.valueOf(amount)); - } catch (final ArithmeticException e) { - ess.getLogger().log(Level.WARNING, "Failed to add " + amount + " to balance of " + name + ": " + e.getMessage(), e); - } - } - - /** - * Adds money to the balance of a user - * - * @param name Name of the user - * @param amount The amount of money to be added to the user's account - * @throws UserDoesNotExistException If a user by that name does not exist - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - * @deprecated Usernames can change, use {@link Economy#add(UUID, BigDecimal)} or {@link Economy#add(User, BigDecimal)} - */ - @Deprecated - public static void add(final String name, final BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException, MaxMoneyException { - final User user = getUserByName(name); - if (user == null) { - throw new UserDoesNotExistException(name); - } - add(user, amount); - } - - /** - * Adds money to the balance of a user - * - * @param uuid UUID of the user - * @param amount The money you want to add - * @throws UserDoesNotExistException If a user by that uuid does not exist - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - */ - public static void add(final UUID uuid, final BigDecimal amount) throws NoLoanPermittedException, ArithmeticException, UserDoesNotExistException, MaxMoneyException { - final User user = getUserByUUID(uuid); - if (user == null) { - throw new UserDoesNotExistException(uuid); - } - add(user, amount); - } - - /** - * Adds money to the balance of a user - * - * @param user User - * @param amount The money you want to add - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - */ - public static void add(final User user, final BigDecimal amount) throws NoLoanPermittedException, ArithmeticException, MaxMoneyException { - if (user == null) { - throw new IllegalArgumentException("Economy user cannot be null"); - } - final BigDecimal result = getMoneyExact(user).add(amount, MATH_CONTEXT); - setMoney(user, result); - Trade.log("API", "Add", "API", user.getName(), new Trade(amount, ess), null, null, null, result, ess); - } - - /** - * Subtracts money from the balance of a user - * - * @param name Name of the user - * @param amount The money you want to subtract - * @throws UserDoesNotExistException If a user by that name does not exists - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - * @deprecated Use {@link Economy#subtract(UUID, BigDecimal)} or {@link Economy#subtract(User, BigDecimal)} - */ - @Deprecated - public static void subtract(final String name, final double amount) throws UserDoesNotExistException, NoLoanPermittedException, MaxMoneyException { - try { - substract(name, BigDecimal.valueOf(amount)); - } catch (final ArithmeticException e) { - ess.getLogger().log(Level.WARNING, "Failed to subtract " + amount + " of balance of " + name + ": " + e.getMessage(), e); - } - } - - /** - * Subtracts money from the balance of a user - * - * @param name Name of the user - * @param amount The money you want to subtract - * @throws UserDoesNotExistException If a user by that name does not exist - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - * @deprecated Usernames can change, use {@link Economy#subtract(UUID, BigDecimal)} or {@link Economy#subtract(User, BigDecimal)} - */ - @Deprecated - public static void substract(final String name, final BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException, MaxMoneyException { - final BigDecimal result = getMoneyExact(name).subtract(amount, MATH_CONTEXT); - setMoney(name, result); - Trade.log("API", "Subtract", "API", name, new Trade(amount, ess), null, null, null, result, ess); - } - - /** - * Subtracts money from the balance of a user - * - * @param uuid UUID of the user - * @param amount The money you want to subtract - * @throws UserDoesNotExistException If a user by that UUID does not exist - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - */ - public static void subtract(final UUID uuid, final BigDecimal amount) throws NoLoanPermittedException, ArithmeticException, UserDoesNotExistException, MaxMoneyException { - final User user = getUserByUUID(uuid); - if (user == null) { - throw new UserDoesNotExistException(uuid); - } - subtract(user, amount); - } - - /** - * Subtracts money from the balance of a user - * - * @param user User - * @param amount The money you want to subtract - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - */ - public static void subtract(final User user, final BigDecimal amount) throws NoLoanPermittedException, ArithmeticException, MaxMoneyException { - if (user == null) { - throw new IllegalArgumentException("Economy user cannot be null"); - } - final BigDecimal result = getMoneyExact(user).subtract(amount, MATH_CONTEXT); - setMoney(user, result); - Trade.log("API", "Subtract", "API", user.getName(), new Trade(amount, ess), null, null, null, result, ess); - } - - /** - * Divides the balance of a user by a value - * - * @param name Name of the user - * @param amount The balance is divided by this value - * @throws UserDoesNotExistException If a user by that name does not exists - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - * @deprecated Use {@link Economy#divide(UUID, BigDecimal)} or {@link Economy#divide(User, BigDecimal)} - */ - @Deprecated - public static void divide(final String name, final double amount) throws UserDoesNotExistException, NoLoanPermittedException, MaxMoneyException { - try { - divide(name, BigDecimal.valueOf(amount)); - } catch (final ArithmeticException e) { - ess.getLogger().log(Level.WARNING, "Failed to divide balance of " + name + " by " + amount + ": " + e.getMessage(), e); - } - } - - /** - * Divides the balance of a user by a value - * - * @param name Name of the user - * @param amount The balance is divided by this value - * @throws UserDoesNotExistException If a user by that name does not exist - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - * @deprecated Usernames can change, use {@link Economy#divide(UUID, BigDecimal)} or {@link Economy#divide(User, BigDecimal)} - */ - @Deprecated - public static void divide(final String name, final BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException, MaxMoneyException { - final User user = getUserByName(name); - if (user == null) { - throw new UserDoesNotExistException(name); - } - divide(user, amount); - } - - /** - * Divides the balance of a user by a value - * - * @param uuid Name of the user - * @param amount The balance is divided by this value - * @throws UserDoesNotExistException If a user by that UUID does not exist - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - */ - public static void divide(final UUID uuid, final BigDecimal amount) throws NoLoanPermittedException, ArithmeticException, UserDoesNotExistException, MaxMoneyException { - final User user = getUserByUUID(uuid); - if (user == null) { - throw new UserDoesNotExistException(uuid); - } - divide(user, amount); - } - - /** - * Divides the balance of a user by a value - * - * @param user Name of the user - * @param amount The balance is divided by this value - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - */ - public static void divide(final User user, final BigDecimal amount) throws NoLoanPermittedException, ArithmeticException, MaxMoneyException { - if (user == null) { - throw new IllegalArgumentException("Economy user cannot be null"); - } - final BigDecimal result = getMoneyExact(user).divide(amount, MATH_CONTEXT); - setMoney(user, result); - Trade.log("API", "Divide", "API", user.getName(), new Trade(amount, ess), null, null, null, result, ess); - } - - /** - * Multiplies the balance of a user by a value - * - * @param name Name of the user - * @param amount The balance is multiplied by this value - * @throws UserDoesNotExistException If a user by that name does not exists - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - * @deprecated Use {@link Economy#multiply(UUID, BigDecimal)} or {@link Economy#multiply(User, BigDecimal)} - */ - @Deprecated - public static void multiply(final String name, final double amount) throws UserDoesNotExistException, NoLoanPermittedException, MaxMoneyException { - try { - multiply(name, BigDecimal.valueOf(amount)); - } catch (final ArithmeticException e) { - ess.getLogger().log(Level.WARNING, "Failed to multiply balance of " + name + " by " + amount + ": " + e.getMessage(), e); - } - } - - /** - * Multiplies the balance of a user by a value - * - * @param name Name of the user - * @param amount The balance is multiplied by the this value - * @throws UserDoesNotExistException If a user by that name does not exist - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - * @deprecated Usernames can change, use {@link Economy#multiply(UUID, BigDecimal)} or {@link Economy#multiply(User, BigDecimal)} - */ - @Deprecated - public static void multiply(final String name, final BigDecimal amount) throws UserDoesNotExistException, NoLoanPermittedException, ArithmeticException, MaxMoneyException { - final User user = getUserByName(name); - if (user == null) { - throw new UserDoesNotExistException(name); - } - multiply(user, amount); - } - - /** - * Multiplies the balance of a user by a value - * - * @param uuid Name of the user - * @param amount The balance is multiplied by the this value - * @throws UserDoesNotExistException If a user by that uuid does not exist - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - */ - public static void multiply(final UUID uuid, final BigDecimal amount) throws NoLoanPermittedException, ArithmeticException, UserDoesNotExistException, MaxMoneyException { - final User user = getUserByUUID(uuid); - if (user == null) { - throw new UserDoesNotExistException(uuid); - } - multiply(user, amount); - } - - /** - * Multiplies the balance of a user by a value - * - * @param user Name of the user - * @param amount The balance is multiplied by the this value - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - */ - public static void multiply(final User user, final BigDecimal amount) throws NoLoanPermittedException, ArithmeticException, MaxMoneyException { - if (user == null) { - throw new IllegalArgumentException("Economy user cannot be null"); - } - final BigDecimal result = getMoneyExact(user).multiply(amount, MATH_CONTEXT); - setMoney(user, result); - Trade.log("API", "Multiply", "API", user.getName(), new Trade(amount, ess), null, null, null, result, ess); - } - - /** - * Resets the balance of a user to the starting balance - * - * @param name Name of the user - * @throws UserDoesNotExistException If a user by that name does not exists - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - * @deprecated Usernames can change, use {@link Economy#resetBalance(UUID)} or {@link Economy#resetBalance(User)} - */ - @Deprecated - public static void resetBalance(final String name) throws UserDoesNotExistException, NoLoanPermittedException, MaxMoneyException { - if (ess == null) { - throw new RuntimeException(WARN_CALL_BEFORE_LOAD); - } - setMoney(name, ess.getSettings().getStartingBalance()); - Trade.log("API", "Reset", "API", name, new Trade(BigDecimal.ZERO, ess), null, null, null, ess.getSettings().getStartingBalance(), ess); - } - - /** - * Resets the balance of a user to the starting balance - * - * @param uuid UUID of the user - * @throws UserDoesNotExistException If a user by that UUID does not exists - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - */ - public static void resetBalance(final UUID uuid) throws NoLoanPermittedException, UserDoesNotExistException, MaxMoneyException { - final User user = getUserByUUID(uuid); - if (user == null) { - throw new UserDoesNotExistException(uuid); - } - resetBalance(user); - } - - /** - * Resets the balance of a user to the starting balance - * - * @param user User - * @throws NoLoanPermittedException If the user is not allowed to have a negative balance - * @throws MaxMoneyException If this transaction has but the user over the maximum amount of money - */ - public static void resetBalance(final User user) throws NoLoanPermittedException, MaxMoneyException { - if (ess == null) { - throw new RuntimeException(WARN_CALL_BEFORE_LOAD); - } - if (user == null) { - throw new IllegalArgumentException("Economy user cannot be null"); - } - setMoney(user, ess.getSettings().getStartingBalance()); - Trade.log("API", "Reset", "API", user.getName(), new Trade(BigDecimal.ZERO, ess), null, null, null, ess.getSettings().getStartingBalance(), ess); - } - - /** - * @param name Name of the user - * @param amount The amount of money the user should have - * @return true, if the user has more or an equal amount of money - * @throws UserDoesNotExistException If a user by that name does not exists - * @deprecated Use {@link Economy#hasEnough(UUID, BigDecimal)} or {@link Economy#hasEnough(User, BigDecimal)} - */ - @Deprecated - public static boolean hasEnough(final String name, final double amount) throws UserDoesNotExistException { - try { - return hasEnough(name, BigDecimal.valueOf(amount)); - } catch (final ArithmeticException e) { - ess.getLogger().log(Level.WARNING, "Failed to compare balance of " + name + " with " + amount + ": " + e.getMessage(), e); - return false; - } - } - - /** - * @param name Name of the user - * @param amount The amount of money the user should have - * @return true, if the user has more or an equal amount of money - * @throws UserDoesNotExistException If a user by that name does not exist - * @throws ArithmeticException - * @deprecated Usernames can change, use {@link Economy#hasEnough(UUID, BigDecimal)} or {@link Economy#hasEnough(User, BigDecimal)} - */ - public static boolean hasEnough(final String name, final BigDecimal amount) throws UserDoesNotExistException, ArithmeticException { - final User user = getUserByName(name); - if (user == null) { - throw new UserDoesNotExistException(name); - } - return hasEnough(user, amount); - } - - /** - * @param uuid UUID of the user - * @param amount The amount of money the user should have - * @return true, if the user has more or an equal amount of money - * @throws UserDoesNotExistException If a user by that UUID does not exist - * @throws ArithmeticException - */ - public static boolean hasEnough(final UUID uuid, final BigDecimal amount) throws ArithmeticException, UserDoesNotExistException { - final User user = getUserByUUID(uuid); - if (user == null) { - throw new UserDoesNotExistException(uuid); - } - return hasEnough(user, amount); - } - - /** - * @param user User - * @param amount The amount of money the user should have - * @return true, if the user has more or an equal amount of money - * @throws ArithmeticException - */ - public static boolean hasEnough(final User user, final BigDecimal amount) throws ArithmeticException { - if (user == null) { - throw new IllegalArgumentException("Economy user cannot be null"); - } - return amount.compareTo(getMoneyExact(user)) <= 0; - } - - /** - * @param name Name of the user - * @param amount The amount of money the user should have - * @return true, if the user has more money - * @throws UserDoesNotExistException If a user by that name does not exists - * @deprecated Use {@link Economy#hasMore(UUID, BigDecimal)} or {@link Economy#hasMore(User, BigDecimal)} - */ - @Deprecated - public static boolean hasMore(final String name, final double amount) throws UserDoesNotExistException { - try { - return hasMore(name, BigDecimal.valueOf(amount)); - } catch (final ArithmeticException e) { - ess.getLogger().log(Level.WARNING, "Failed to compare balance of " + name + " with " + amount + ": " + e.getMessage(), e); - return false; - } - } - - /** - * @param name Name of the user - * @param amount The amount of money the user should have - * @return true, if the user has more money - * @throws UserDoesNotExistException If a user by that name does not exists - * @throws ArithmeticException - * @deprecated Usernames can change, use {@link Economy#hasMore(UUID, BigDecimal)} or {@link Economy#hasMore(User, BigDecimal)} - */ - @Deprecated - public static boolean hasMore(final String name, final BigDecimal amount) throws UserDoesNotExistException, ArithmeticException { - final User user = getUserByName(name); - if (user == null) { - throw new UserDoesNotExistException(name); - } - return hasMore(user, amount); - } - - /** - * @param uuid UUID of the user - * @param amount The amount of money the user should have - * @return true, if the user has more money - * @throws UserDoesNotExistException If a user by that UUID does not exists - * @throws ArithmeticException - */ - public static boolean hasMore(final UUID uuid, final BigDecimal amount) throws ArithmeticException, UserDoesNotExistException { - final User user = getUserByUUID(uuid); - if (user == null) { - throw new UserDoesNotExistException(uuid); - } - return hasMore(user, amount); - } - - /** - * @param user User - * @param amount The amount of money the user should have - * @return true, if the user has more money - * @throws ArithmeticException - */ - public static boolean hasMore(final User user, final BigDecimal amount) throws ArithmeticException { - if (user == null) { - throw new IllegalArgumentException("Economy user cannot be null"); - } - return amount.compareTo(getMoneyExact(user)) < 0; - } - - /** - * @param name Name of the user - * @param amount The amount of money the user should not have - * @return true, if the user has less money - * @throws UserDoesNotExistException If a user by that name does not exists - * @deprecated Use {@link Economy#hasLess(UUID, BigDecimal)} or {@link Economy#hasLess(User, BigDecimal)} - */ - @Deprecated - public static boolean hasLess(final String name, final double amount) throws UserDoesNotExistException { - try { - return hasLess(name, BigDecimal.valueOf(amount)); - } catch (final ArithmeticException e) { - ess.getLogger().log(Level.WARNING, "Failed to compare balance of " + name + " with " + amount + ": " + e.getMessage(), e); - return false; - } - } - - /** - * @param name Name of the user - * @param amount The amount of money the user should not have - * @return true, if the user has less money - * @throws UserDoesNotExistException If a user by that name does not exist - * @throws ArithmeticException - * @deprecated Usernames can change, use {@link Economy#hasLess(UUID, BigDecimal)} or {@link Economy#hasLess(User, BigDecimal)} - */ - @Deprecated - public static boolean hasLess(final String name, final BigDecimal amount) throws UserDoesNotExistException, ArithmeticException { - final User user = getUserByName(name); - if (user == null) { - throw new UserDoesNotExistException(name); - } - return hasLess(user, amount); - } - - /** - * @param uuid UUID of the user - * @param amount The amount of money the user should not have - * @return true, if the user has less money - * @throws UserDoesNotExistException If a user by that UUID does not exist - * @throws ArithmeticException - */ - public static boolean hasLess(final UUID uuid, final BigDecimal amount) throws ArithmeticException, UserDoesNotExistException { - final User user = getUserByUUID(uuid); - if (user == null) { - throw new UserDoesNotExistException(uuid); - } - return hasLess(user, amount); - } - - /** - * @param user User - * @param amount The amount of money the user should not have - * @return true, if the user has less money - * @throws ArithmeticException - */ - public static boolean hasLess(final User user, final BigDecimal amount) throws ArithmeticException { - if (user == null) { - throw new IllegalArgumentException("Economy user cannot be null"); - } - return amount.compareTo(getMoneyExact(user)) > 0; - } - - /** - * Test if the user has a negative balance - * - * @param name Name of the user - * @return true, if the user has a negative balance - * @throws UserDoesNotExistException If a user by that name does not exists - * @deprecated Usernames can change, use {@link Economy#isNegative(UUID)} or {@link Economy#isNegative(User)} - */ - @Deprecated - public static boolean isNegative(final String name) throws UserDoesNotExistException { - final User user = getUserByName(name); - if (user == null) { - throw new UserDoesNotExistException(name); - } - return isNegative(user); - } - - /** - * Test if the user has a negative balance - * - * @param uuid UUID of the user - * @return true, if the user has a negative balance - * @throws UserDoesNotExistException If a user by that UUID does not exists - */ - public static boolean isNegative(final UUID uuid) throws UserDoesNotExistException { - final User user = getUserByUUID(uuid); - if (user == null) { - throw new UserDoesNotExistException(uuid); - } - return isNegative(user); - } - - /** - * Test if the user has a negative balance - * - * @param user User - * @return true, if the user has a negative balance - */ - public static boolean isNegative(final User user) { - if (user == null) { - throw new IllegalArgumentException("Economy user cannot be null"); - } - return getMoneyExact(user).signum() < 0; - } - - /** - * Formats the amount of money like all other Essentials functions. Example: $100000 or $12345.67 - * - * @param amount The amount of money - * @return Formatted money - * @deprecated Use {@link #format(BigDecimal)} if your input is already a {@link BigDecimal}. - */ - @Deprecated - public static String format(final double amount) { - try { - return format(BigDecimal.valueOf(amount)); - } catch (final NumberFormatException e) { - ess.getLogger().log(Level.WARNING, "Failed to display " + amount + ": " + e.getMessage(), e); - return "NaN"; - } - } - - /** - * Formats the amount of money like all other Essentials functions. Example: $100000 or $12345.67 - * - * @param amount The amount of money - * @return Formatted money - */ - public static String format(final BigDecimal amount) { - if (ess == null) { - throw new RuntimeException(WARN_CALL_BEFORE_LOAD); - } - return NumberUtil.displayCurrency(amount, ess); - } - - /** - * Test if a player exists to avoid the UserDoesNotExistException - * - * @param name Name of the user - * @return true, if the user exists - * @deprecated Essentials is moving away from username based economy methods. This may be removed in the future. - */ - @Deprecated - public static boolean playerExists(final String name) { - return getUserByName(name) != null; - } - - /** - * Test if a player exists to avoid the UserDoesNotExistException - * - * @param uuid UUID of the user - * @return true, if the user exists - */ - public static boolean playerExists(final UUID uuid) { - return getUserByUUID(uuid) != null; - } - - /** - * Test if a player is a npc - * - * @param name Name of the player - * @return true, if it's a npc - * @throws UserDoesNotExistException - */ - public static boolean isNPC(final String name) throws UserDoesNotExistException { - final User user = getUserByName(name); - if (user == null) { - throw new UserDoesNotExistException(name); - } - return user.isNPC(); - } - - /** - * Creates dummy files for a npc, if there is no player yet with that name. - * - * @param name Name of the player - * @return true, if a new npc was created - */ - public static boolean createNPC(final String name) { - final User user = getUserByName(name); - if (user == null) { - createNPCFile(name); - return true; - } - ess.getLogger().log(Level.WARNING, MessageFormat.format(WARN_EXISTING_NPC_CREATE, name, user.getConfigUUID()), new RuntimeException()); - return false; - } - - /** - * Deletes a user, if it is marked as npc. - * - * @param name Name of the player - * @throws UserDoesNotExistException - */ - public static void removeNPC(final String name) throws UserDoesNotExistException { - final User user = getUserByName(name); - if (user == null) { - throw new UserDoesNotExistException(name); - } - deleteNPC(name); - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/api/IAsyncTeleport.java b/Essentials/src/main/java/com/earth2me/essentials/api/IAsyncTeleport.java index a6e6b82ca..85f2c6d29 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/api/IAsyncTeleport.java +++ b/Essentials/src/main/java/com/earth2me/essentials/api/IAsyncTeleport.java @@ -1,6 +1,5 @@ package com.earth2me.essentials.api; -import com.earth2me.essentials.Trade; import net.ess3.api.IUser; import org.bukkit.Location; import org.bukkit.entity.Player; @@ -8,128 +7,27 @@ import org.bukkit.event.player.PlayerTeleportEvent; import java.util.concurrent.CompletableFuture; -/** - * Manages EssentialsX's teleport functionality for a player. - * Use this if you want to access EssentialsX's async/safe teleport functionality and teleport warmups and cooldowns. - */ public interface IAsyncTeleport { - /** - * Used to skip teleportPlayer delay when teleporting someone to a location or player. - * - * @param loc - Where should the player end up - * @param cooldown - If cooldown should be enforced - * @param cause - The reported teleportPlayer cause - * @param future - Future which is completed with the success status of the execution - */ void now(Location loc, boolean cooldown, PlayerTeleportEvent.TeleportCause cause, CompletableFuture future); - /** - * Used to skip teleportPlayer delay when teleporting someone to a location or player. - * - * @param entity - Where should the player end up - * @param cooldown - If cooldown should be enforced - * @param cause - The reported teleportPlayer cause - * @param future - Future which is completed with the success status of the execution - */ void now(Player entity, boolean cooldown, PlayerTeleportEvent.TeleportCause cause, CompletableFuture future); - /** - * Used to skip all safety checks while teleporting a player asynchronously. - * - * @param loc - Where should the player end up - * @param cause - The reported teleportPlayer cause - * @param future - Future which is completed with the success status of the execution - */ void nowUnsafe(Location loc, PlayerTeleportEvent.TeleportCause cause, CompletableFuture future); - /** - * Teleport a player to a specific location - * - * @param loc - Where should the player end up - * @param chargeFor - What the user will be charged if teleportPlayer is successful - * @param cause - The reported teleportPlayer cause. - * @param future - Future which is completed with the success status of the execution - */ - void teleport(Location loc, Trade chargeFor, PlayerTeleportEvent.TeleportCause cause, CompletableFuture future); + void teleport(Location loc, PlayerTeleportEvent.TeleportCause cause, CompletableFuture future); - /** - * Teleport a player to a specific player - * - * @param entity - Where should the player end up - * @param chargeFor - What the user will be charged if teleportPlayer is successful - * @param cause - The reported teleportPlayer cause - * @param future - Future which is completed with the success status of the execution - */ - void teleport(Player entity, Trade chargeFor, PlayerTeleportEvent.TeleportCause cause, CompletableFuture future); + void teleport(Player entity, PlayerTeleportEvent.TeleportCause cause, CompletableFuture future); - /** - * Teleport a player to a specific location - * - * @param otherUser - Which user will be teleported - * @param loc - Where should the player end up - * @param chargeFor - What the user will be charged if teleportPlayer is successful - * @param cause - The reported teleportPlayer cause - * @param future - Future which is completed with the success status of the execution - */ - void teleportPlayer(IUser otherUser, Location loc, Trade chargeFor, PlayerTeleportEvent.TeleportCause cause, CompletableFuture future); + void teleportPlayer(IUser otherUser, Location loc, PlayerTeleportEvent.TeleportCause cause, CompletableFuture future); - /** - * Teleport a player to a specific player - * - * @param otherUser - Which user will be teleported - * @param entity - Where should the player end up - * @param chargeFor - What the user will be charged if teleportPlayer is successful - * @param cause - The reported teleportPlayer cause - * @param future - Future which is completed with the success status of the execution - */ - void teleportPlayer(IUser otherUser, Player entity, Trade chargeFor, PlayerTeleportEvent.TeleportCause cause, CompletableFuture future); + void teleportPlayer(IUser otherUser, Player entity, PlayerTeleportEvent.TeleportCause cause, CompletableFuture future); - /** - * Teleport wrapper used to handle tp fallback on /jail and /home - * - * @param chargeFor - What the user will be charged if teleportPlayer is successful - * @param cause - The reported teleportPlayer cause - * @param future - Future which is completed with the success status of the execution - */ - void respawn(final Trade chargeFor, PlayerTeleportEvent.TeleportCause cause, CompletableFuture future); + void respawn(PlayerTeleportEvent.TeleportCause cause, CompletableFuture future); - /** - * Teleport wrapper used to handle /warp teleports - * - * @param otherUser - Which user will be teleported - * @param warp - The name of the warp the user will be teleported too. - * @param chargeFor - What the user will be charged if teleportPlayer is successful - * @param cause - The reported teleportPlayer cause - * @param future - Future which is completed with the success status of the execution - */ - void warp(IUser otherUser, String warp, Trade chargeFor, PlayerTeleportEvent.TeleportCause cause, CompletableFuture future); + void warp(IUser otherUser, String warp, PlayerTeleportEvent.TeleportCause cause, CompletableFuture future); - /** - * Teleport wrapper used to handle /back teleports - * - * @param chargeFor - What the user will be charged if teleportPlayer is successful - * @param future - Future which is completed with the success status of the execution - */ - void back(Trade chargeFor, CompletableFuture future); - - /** - * Teleport wrapper used to handle /back teleports that - * are executed by a different player with this - * instance of teleport as a target. - * - * @param teleporter - The user performing the /back command. - * This value may be {@code null} to indicate console. - * @param chargeFor - What the {@code teleporter} will be charged if teleportPlayer is successful - * @param future - Future which is completed with the success status of the execution - */ - void back(IUser teleporter, Trade chargeFor, CompletableFuture future); - - /** - * Teleport wrapper used to handle throwing user home after a jail sentence - * - * @param future - Future which is completed with the success status of the execution - */ void back(CompletableFuture future); + void back(IUser teleporter, CompletableFuture future); } diff --git a/Essentials/src/main/java/com/earth2me/essentials/api/ITeleport.java b/Essentials/src/main/java/com/earth2me/essentials/api/ITeleport.java index 4bc66bffe..2307a4525 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/api/ITeleport.java +++ b/Essentials/src/main/java/com/earth2me/essentials/api/ITeleport.java @@ -1,6 +1,5 @@ package com.earth2me.essentials.api; -import com.earth2me.essentials.Trade; import net.ess3.api.IUser; import org.bukkit.Location; import org.bukkit.entity.Player; @@ -10,134 +9,36 @@ import org.bukkit.event.player.PlayerTeleportEvent; * @deprecated This API is not asynchronous and is no longer maintained. Use {@link com.earth2me.essentials.api.IAsyncTeleport IAsyncTeleport}. */ public interface ITeleport { - /** - * Used to skip teleportPlayer delay when teleporting someone to a location or player. - * - * @param loc - Where should the player end up - * @param cooldown - If cooldown should be enforced - * @param cause - The reported teleportPlayer cause - * @throws Exception - */ @Deprecated void now(Location loc, boolean cooldown, PlayerTeleportEvent.TeleportCause cause) throws Exception; - /** - * Used to skip teleportPlayer delay when teleporting someone to a location or player. - * - * @param entity - Where should the player end up - * @param cooldown - If cooldown should be enforced - * @param cause - The reported teleportPlayer cause - * @throws Exception - */ @Deprecated void now(Player entity, boolean cooldown, PlayerTeleportEvent.TeleportCause cause) throws Exception; - /** - * Teleport a player to a specific location - * - * @param loc - Where should the player end up - * @param chargeFor - What the user will be charged if teleportPlayer is successful - * @throws Exception - */ @Deprecated - void teleport(Location loc, Trade chargeFor) throws Exception; + void teleport(Location loc) throws Exception; - /** - * Teleport a player to a specific location - * - * @param loc - Where should the player end up - * @param chargeFor - What the user will be charged if teleportPlayer is successful - * @param cause - The reported teleportPlayer cause - * @throws Exception - */ @Deprecated - void teleport(Location loc, Trade chargeFor, PlayerTeleportEvent.TeleportCause cause) throws Exception; + void teleport(Location loc, PlayerTeleportEvent.TeleportCause cause) throws Exception; - /** - * Teleport a player to a specific player - * - * @param entity - Where should the player end up - * @param chargeFor - What the user will be charged if teleportPlayer is successful - * @param cause - The reported teleportPlayer cause - * @throws Exception - */ @Deprecated - void teleport(Player entity, Trade chargeFor, PlayerTeleportEvent.TeleportCause cause) throws Exception; + void teleport(Player entity, PlayerTeleportEvent.TeleportCause cause) throws Exception; - /** - * Teleport a player to a specific location - * - * @param otherUser - Which user will be teleported - * @param loc - Where should the player end up - * @param chargeFor - What the user will be charged if teleportPlayer is successful - * @param cause - The reported teleportPlayer cause - * @throws Exception - */ @Deprecated - void teleportPlayer(IUser otherUser, Location loc, Trade chargeFor, PlayerTeleportEvent.TeleportCause cause) throws Exception; + void teleportPlayer(IUser otherUser, Location loc, PlayerTeleportEvent.TeleportCause cause) throws Exception; - /** - * Teleport a player to a specific player - * - * @param otherUser - Which user will be teleported - * @param entity - Where should the player end up - * @param chargeFor - What the user will be charged if teleportPlayer is successful - * @param cause - The reported teleportPlayer cause - * @throws Exception - */ @Deprecated - void teleportPlayer(IUser otherUser, Player entity, Trade chargeFor, PlayerTeleportEvent.TeleportCause cause) throws Exception; + void teleportPlayer(IUser otherUser, Player entity, PlayerTeleportEvent.TeleportCause cause) throws Exception; - /** - * Teleport wrapper used to handle tp fallback on /jail and /home - * - * @param chargeFor - What the user will be charged if teleportPlayer is successful - * @param cause - The reported teleportPlayer cause - * @throws Exception - */ @Deprecated - void respawn(final Trade chargeFor, PlayerTeleportEvent.TeleportCause cause) throws Exception; + void respawn(PlayerTeleportEvent.TeleportCause cause) throws Exception; - /** - * Teleport wrapper used to handle /warp teleports - * - * @param otherUser - Which user will be teleported - * @param warp - The name of the warp the user will be teleported too. - * @param chargeFor - What the user will be charged if teleportPlayer is successful - * @param cause - The reported teleportPlayer cause - * @throws Exception - */ @Deprecated - void warp(IUser otherUser, String warp, Trade chargeFor, PlayerTeleportEvent.TeleportCause cause) throws Exception; + void warp(IUser otherUser, String warp, PlayerTeleportEvent.TeleportCause cause) throws Exception; - /** - * Teleport wrapper used to handle /back teleports - * - * @param chargeFor - What the user will be charged if teleportPlayer is successful - * @throws Exception - */ - @Deprecated - void back(Trade chargeFor) throws Exception; - - /** - * Teleport wrapper used to handle /back teleports that - * are executed by a different player with this - * instance of teleport as a target. - * - * @param teleporter - The user performing the /back command. - * This value may be {@code null} to indicate console. - * @param chargeFor - What the {@code teleporter} will be charged if teleportPlayer is successful - * @throws Exception - */ - @Deprecated - void back(IUser teleporter, Trade chargeFor) throws Exception; - - /** - * Teleport wrapper used to handle throwing user home after a jail sentence - * - * @throws Exception - */ @Deprecated void back() throws Exception; + @Deprecated + void back(IUser teleporter) throws Exception; } diff --git a/Essentials/src/main/java/com/earth2me/essentials/api/NoLoanPermittedException.java b/Essentials/src/main/java/com/earth2me/essentials/api/NoLoanPermittedException.java deleted file mode 100644 index b26d3ccb7..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/api/NoLoanPermittedException.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.earth2me.essentials.api; - -/** - * Thrown when a user does not have the balance for a transaction and cannot take a loan. - */ -public class NoLoanPermittedException extends net.ess3.api.NoLoanPermittedException { - -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandback.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandback.java index 186d24c3c..c59db2918 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandback.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandback.java @@ -1,7 +1,6 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import org.bukkit.Server; @@ -62,17 +61,12 @@ public class Commandback extends EssentialsCommand { } if (requester == null) { - user.getAsyncTeleport().back(null, null, getNewExceptionFuture(sender, commandLabel)); + user.getAsyncTeleport().back(null, getNewExceptionFuture(sender, commandLabel)); } else if (!requester.equals(user)) { - final Trade charge = new Trade(this.getName(), this.ess); - charge.isAffordableFor(requester); - user.getAsyncTeleport().back(requester, charge, getNewExceptionFuture(sender, commandLabel)); + user.getAsyncTeleport().back(requester, getNewExceptionFuture(sender, commandLabel)); } else { - final Trade charge = new Trade(this.getName(), this.ess); - charge.isAffordableFor(user); - user.getAsyncTeleport().back(charge, getNewExceptionFuture(sender, commandLabel)); + user.getAsyncTeleport().back(getNewExceptionFuture(sender, commandLabel)); } - throw new NoChargeException(); } @Override diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbalance.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbalance.java deleted file mode 100644 index bcf1cb72d..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbalance.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.earth2me.essentials.commands; - -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.NumberUtil; -import org.bukkit.Server; - -import java.util.Collections; -import java.util.List; - -import static com.earth2me.essentials.I18n.tl; - -public class Commandbalance extends EssentialsCommand { - public Commandbalance() { - super("balance"); - } - - @Override - protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception { - if (args.length == 0) { - throw new NotEnoughArgumentsException(); - } - - final User target = getPlayer(server, args, 0, false, true); - sender.sendMessage(tl("balanceOther", target.isHidden() ? target.getName() : target.getDisplayName(), NumberUtil.displayCurrency(target.getMoney(), ess))); - } - - @Override - public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { - if (args.length == 1 && user.isAuthorized("essentials.balance.others")) { - final User target = getPlayer(server, args, 0, true, true); - user.sendMessage(tl("balanceOther", target.isHidden() ? target.getName() : target.getDisplayName(), NumberUtil.displayCurrency(target.getMoney(), ess))); - } else if (args.length < 2) { - user.sendMessage(tl("balance", NumberUtil.displayCurrency(user.getMoney(), ess))); - } else { - throw new NotEnoughArgumentsException(); - } - } - - @Override - protected List getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) { - if (args.length == 1 && sender.isAuthorized("essentials.balance.others", ess)) { - return getPlayers(server, sender); - } else { - return Collections.emptyList(); - } - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbalancetop.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbalancetop.java deleted file mode 100644 index a0846e43d..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbalancetop.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.earth2me.essentials.commands; - -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.textreader.SimpleTextInput; -import com.earth2me.essentials.textreader.TextPager; -import com.earth2me.essentials.utils.NumberUtil; -import com.google.common.collect.Lists; -import net.essentialsx.api.v2.services.BalanceTop; -import org.bukkit.Server; -import org.bukkit.command.BlockCommandSender; - -import java.math.BigDecimal; -import java.text.DateFormat; -import java.util.Calendar; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.CompletableFuture; - -import static com.earth2me.essentials.I18n.tl; - -public class Commandbalancetop extends EssentialsCommand { - public static final int MINUSERS = 50; - private static final int CACHETIME = 2 * 60 * 1000; - private static SimpleTextInput cache = new SimpleTextInput(); - - public Commandbalancetop() { - super("balancetop"); - } - - private void outputCache(final CommandSource sender, final int page) { - final Calendar cal = Calendar.getInstance(); - cal.setTimeInMillis(ess.getBalanceTop().getCacheAge()); - final DateFormat format = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT); - final Runnable runnable = () -> { - sender.sendMessage(tl("balanceTop", format.format(cal.getTime()))); - new TextPager(cache).showPage(Integer.toString(page), null, "balancetop", sender); - }; - if (sender.getSender() instanceof BlockCommandSender) { - ess.scheduleSyncDelayedTask(runnable); - } else { - runnable.run(); - } - } - - @Override - protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception { - int page = 0; - boolean force = false; - if (args.length > 0) { - try { - page = Integer.parseInt(args[0]); - } catch (final NumberFormatException ex) { - if (args[0].equalsIgnoreCase("force") && (!sender.isPlayer() || ess.getUser(sender.getPlayer()).isAuthorized("essentials.balancetop.force"))) { - force = true; - } - } - } - - if (!force && ess.getBalanceTop().getCacheAge() > System.currentTimeMillis() - CACHETIME) { - outputCache(sender, page); - return; - } - - // If there are less than 50 users in our usermap, there is no need to display a warning as these calculations should be done quickly - if (ess.getUsers().getUserCount() > MINUSERS) { - sender.sendMessage(tl("orderBalances", ess.getUsers().getUserCount())); - } - - ess.runTaskAsynchronously(new Viewer(sender, page, force)); - } - - @Override - protected List getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) { - if (args.length == 1) { - final List options = Lists.newArrayList("1"); - if (!sender.isPlayer() || ess.getUser(sender.getPlayer()).isAuthorized("essentials.balancetop.force")) { - options.add("force"); - } - return options; - } else { - return Collections.emptyList(); - } - } - - private class Viewer implements Runnable { - private final transient CommandSource sender; - private final transient int page; - private final transient boolean force; - - Viewer(final CommandSource sender, final int page, final boolean force) { - this.sender = sender; - this.page = page; - this.force = force; - } - - @Override - public void run() { - if (ess.getSettings().isEcoDisabled()) { - if (ess.getSettings().isDebug()) { - ess.getLogger().info("Internal economy functions disabled, aborting baltop."); - } - return; - } - - final boolean fresh = force || ess.getBalanceTop().isCacheLocked() || ess.getBalanceTop().getCacheAge() <= System.currentTimeMillis() - CACHETIME; - final CompletableFuture future = fresh ? ess.getBalanceTop().calculateBalanceTopMapAsync() : CompletableFuture.completedFuture(null); - future.thenRun(() -> { - if (fresh) { - final SimpleTextInput newCache = new SimpleTextInput(); - newCache.getLines().add(tl("serverTotal", NumberUtil.displayCurrency(ess.getBalanceTop().getBalanceTopTotal(), ess))); - int pos = 1; - for (final Map.Entry entry : ess.getBalanceTop().getBalanceTopCache().entrySet()) { - if (ess.getSettings().showZeroBaltop() || entry.getValue().getBalance().compareTo(BigDecimal.ZERO) > 0) { - newCache.getLines().add(tl("balanceTopLine", pos, entry.getValue().getDisplayName(), NumberUtil.displayCurrency(entry.getValue().getBalance(), ess))); - } - pos++; - } - cache = newCache; - } - - outputCache(sender, page); - }); - } - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbottom.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbottom.java index 4c3d0d5b9..bd0715c33 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbottom.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbottom.java @@ -1,6 +1,5 @@ package com.earth2me.essentials.commands; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import com.earth2me.essentials.utils.LocationUtil; import org.bukkit.Location; @@ -31,6 +30,6 @@ public class Commandbottom extends EssentialsCommand { user.sendMessage(tl("teleportBottom", safe.getWorld().getName(), safe.getBlockX(), safe.getBlockY(), safe.getBlockZ())); } }); - user.getAsyncTeleport().teleport(safe, new Trade(this.getName(), ess), PlayerTeleportEvent.TeleportCause.COMMAND, future); + user.getAsyncTeleport().teleport(safe, PlayerTeleportEvent.TeleportCause.COMMAND, future); } } diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandcondense.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandcondense.java deleted file mode 100644 index c17389983..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandcondense.java +++ /dev/null @@ -1,217 +0,0 @@ -package com.earth2me.essentials.commands; - -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.Trade.OverflowType; -import com.earth2me.essentials.User; -import com.earth2me.essentials.craftbukkit.Inventories; -import com.earth2me.essentials.utils.VersionUtil; -import net.ess3.api.MaxMoneyException; -import org.bukkit.Material; -import org.bukkit.Server; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.Recipe; -import org.bukkit.inventory.ShapedRecipe; -import org.bukkit.inventory.ShapelessRecipe; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import static com.earth2me.essentials.I18n.tl; - -public class Commandcondense extends EssentialsCommand { - private final Map condenseList = new HashMap<>(); - - public Commandcondense() { - super("condense"); - } - - @Override - public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { - List is = new ArrayList<>(); - - boolean validateReverse = false; - if (args.length > 0) { - is = ess.getItemDb().getMatching(user, args); - } else { - for (final ItemStack stack : Inventories.getInventory(user.getBase(), false)) { - if (stack == null || stack.getType() == Material.AIR) { - continue; - } - is.add(stack); - } - validateReverse = true; - } - - boolean didConvert = false; - for (final ItemStack itemStack : is) { - if (condenseStack(user, itemStack, validateReverse)) { - didConvert = true; - } - } - user.getBase().updateInventory(); - - if (didConvert) { - user.sendMessage(tl("itemsConverted")); - } else { - user.sendMessage(tl("itemsNotConverted")); - throw new NoChargeException(); - } - } - - private boolean condenseStack(final User user, final ItemStack stack, final boolean validateReverse) throws ChargeException, MaxMoneyException { - final SimpleRecipe condenseType = getCondenseType(stack); - if (condenseType != null) { - final ItemStack input = condenseType.getInput(); - final ItemStack result = condenseType.getResult(); - - if (validateReverse) { - boolean pass = false; - for (final Recipe revRecipe : ess.getServer().getRecipesFor(input)) { - if (getStackOnRecipeMatch(revRecipe, result) != null) { - pass = true; - break; - } - } - if (!pass) { - return false; - } - } - - int amount = 0; - - for (final ItemStack contents : Inventories.getInventory(user.getBase(), false)) { - if (contents != null && contents.isSimilar(stack)) { - amount += contents.getAmount(); - } - } - - final int output = (amount / input.getAmount()) * result.getAmount(); - amount -= amount % input.getAmount(); - - if (amount > 0) { - input.setAmount(amount); - result.setAmount(output); - final Trade remove = new Trade(input, ess); - final Trade add = new Trade(result, ess); - remove.charge(user); - add.pay(user, OverflowType.DROP); - return true; - } - } - return false; - } - - private SimpleRecipe getCondenseType(final ItemStack stack) { - if (condenseList.containsKey(stack)) { - return condenseList.get(stack); - } - - final Iterator intr = ess.getServer().recipeIterator(); - final List bestRecipes = new ArrayList<>(); - while (intr.hasNext()) { - final Recipe recipe = intr.next(); - final Collection recipeItems = getStackOnRecipeMatch(recipe, stack); - - if (recipeItems != null && (recipeItems.size() == 4 || recipeItems.size() == 9) && (recipeItems.size() > recipe.getResult().getAmount())) { - final ItemStack input = stack.clone(); - input.setAmount(recipeItems.size()); - final SimpleRecipe newRecipe = new SimpleRecipe(recipe.getResult(), input); - bestRecipes.add(newRecipe); - } - } - if (!bestRecipes.isEmpty()) { - if (bestRecipes.size() > 1) { - bestRecipes.sort(SimpleRecipeComparator.INSTANCE); - } - final SimpleRecipe recipe = bestRecipes.get(0); - condenseList.put(stack, recipe); - return recipe; - } - condenseList.put(stack, null); - return null; - } - - private Collection getStackOnRecipeMatch(final Recipe recipe, final ItemStack stack) { - final Collection inputList; - - if (recipe instanceof ShapedRecipe) { - final ShapedRecipe sRecipe = (ShapedRecipe) recipe; - if (sRecipe.getShape().length != sRecipe.getShape()[0].length()) { - // Only accept square recipes - return null; - } - inputList = sRecipe.getIngredientMap().values(); - } else if (recipe instanceof ShapelessRecipe) { - final ShapelessRecipe slRecipe = (ShapelessRecipe) recipe; - inputList = slRecipe.getIngredientList(); - } else { - return null; - } - - boolean match = true; - final Iterator iter = inputList.iterator(); - while (iter.hasNext()) { - final ItemStack inputSlot = iter.next(); - if (inputSlot == null) { - iter.remove(); - continue; - } - if (VersionUtil.PRE_FLATTENING && inputSlot.getDurability() == Short.MAX_VALUE) { - inputSlot.setDurability((short) 0); - } - if (!inputSlot.isSimilar(stack)) { - match = false; - } - } - - if (match) { - return inputList; - } - return null; - } - - @Override - protected List getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) { - if (args.length == 1) { - return getMatchingItems(args[0]); - } else { - return Collections.emptyList(); - } - } - - private static final class SimpleRecipe implements Recipe { - private final ItemStack result; - private final ItemStack input; - - private SimpleRecipe(final ItemStack result, final ItemStack input) { - this.result = result; - this.input = input; - } - - @Override - public ItemStack getResult() { - return result.clone(); - } - - public ItemStack getInput() { - return input.clone(); - } - } - - private static class SimpleRecipeComparator implements Comparator { - - private static final SimpleRecipeComparator INSTANCE = new SimpleRecipeComparator(); - - @Override - public int compare(final SimpleRecipe o1, final SimpleRecipe o2) { - return Integer.compare(o2.getInput().getAmount(), o1.getInput().getAmount()); - } - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandeco.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandeco.java deleted file mode 100644 index a619841c3..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandeco.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.earth2me.essentials.commands; - -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.NumberUtil; -import com.google.common.collect.Lists; -import net.ess3.api.MaxMoneyException; -import net.ess3.api.events.UserBalanceUpdateEvent; -import org.bukkit.Server; - -import java.math.BigDecimal; -import java.util.Collections; -import java.util.List; -import java.util.Locale; - -import static com.earth2me.essentials.I18n.tl; - -public class Commandeco extends EssentialsLoopCommand { - - public Commandeco() { - super("eco"); - } - - @Override - public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception { - if (args.length < 2) { - throw new NotEnoughArgumentsException(); - } - - final EcoCommands cmd; - final boolean isPercent; - final BigDecimal amount; - try { - cmd = EcoCommands.valueOf(args[0].toUpperCase(Locale.ENGLISH)); - isPercent = cmd != EcoCommands.RESET && args[2].endsWith("%"); - amount = (cmd == EcoCommands.RESET) ? ess.getSettings().getStartingBalance() : new BigDecimal(args[2].replaceAll("[^0-9\\.]", "")); - } catch (final Exception ex) { - throw new NotEnoughArgumentsException(ex); - } - - loopOfflinePlayersConsumer(server, sender, false, true, args[1], player -> { - BigDecimal userAmount = amount; - if (isPercent) { - userAmount = player.getMoney().multiply(userAmount).scaleByPowerOfTen(-2); - } - - switch (cmd) { - case GIVE: { - player.giveMoney(userAmount, sender, UserBalanceUpdateEvent.Cause.COMMAND_ECO); - break; - } - case TAKE: { - if (player.getMoney().subtract(userAmount).compareTo(ess.getSettings().getMinMoney()) >= 0) { - player.takeMoney(userAmount, sender, UserBalanceUpdateEvent.Cause.COMMAND_ECO); - } else { - ess.showError(sender, new Exception(tl("minimumBalanceError", NumberUtil.displayCurrency(ess.getSettings().getMinMoney(), ess))), commandLabel); - } - break; - } - case RESET: - case SET: { - final BigDecimal minBal = ess.getSettings().getMinMoney(); - final BigDecimal maxBal = ess.getSettings().getMaxMoney(); - final boolean underMin = userAmount.compareTo(minBal) < 0; - final boolean aboveMax = userAmount.compareTo(maxBal) > 0; - player.setMoney(underMin ? minBal : aboveMax ? maxBal : userAmount, UserBalanceUpdateEvent.Cause.COMMAND_ECO); - player.sendMessage(tl("setBal", NumberUtil.displayCurrency(player.getMoney(), ess))); - sender.sendMessage(tl("setBalOthers", player.getDisplayName(), NumberUtil.displayCurrency(player.getMoney(), ess))); - break; - } - } - }); - } - - @Override - protected void updatePlayer(final Server server, final CommandSource sender, final User user, final String[] args) throws NotEnoughArgumentsException, PlayerExemptException, ChargeException, MaxMoneyException { - - } - - @Override - protected List getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) { - if (args.length == 1) { - final List options = Lists.newArrayList(); - for (final EcoCommands command : EcoCommands.values()) { - options.add(command.name().toLowerCase(Locale.ENGLISH)); - } - return options; - } else if (args.length == 2) { - return getPlayers(server, sender); - } else if (args.length == 3 && !args[0].equalsIgnoreCase(EcoCommands.RESET.name())) { - if (args[0].equalsIgnoreCase(EcoCommands.SET.name())) { - return Lists.newArrayList("0", ess.getSettings().getStartingBalance().toString()); - } else { - return Lists.newArrayList("1", "10", "100", "1000"); - } - } else { - return Collections.emptyList(); - } - } - - private enum EcoCommands { - GIVE, TAKE, SET, RESET - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandenchant.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandenchant.java index 19a6c4c98..41ed3c966 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandenchant.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandenchant.java @@ -25,7 +25,6 @@ public class Commandenchant extends EssentialsCommand { super("enchant"); } - //TODO: Implement charge costs: final Trade charge = new Trade("enchant-" + enchantmentName, ess); @Override protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { final ItemStack stack = user.getItemInHand(); diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java index a7178e05a..bc7d6114d 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java @@ -4,8 +4,6 @@ import com.earth2me.essentials.CommandSource; import com.earth2me.essentials.EssentialsUpgrade; import com.earth2me.essentials.User; import com.earth2me.essentials.craftbukkit.Inventories; -import com.earth2me.essentials.economy.EconomyLayer; -import com.earth2me.essentials.economy.EconomyLayers; import com.earth2me.essentials.userstorage.ModernUserMap; import com.earth2me.essentials.utils.CommandMapUtil; import com.earth2me.essentials.utils.DateUtil; @@ -73,8 +71,6 @@ public class Commandessentials extends EssentialsCommand { private static final String[] CONSOLE_MOO = new String[] {" (__)", " (oo)", " /------\\/", " / | ||", " * /\\---/\\", " ~~ ~~", "....\"Have you mooed today?\"..."}; private static final String[] PLAYER_MOO = new String[] {" (__)", " (oo)", " /------\\/", " / | | |", " * /\\---/\\", " ~~ ~~", "....\"Have you mooed today?\"..."}; private static final List versionPlugins = Arrays.asList( - "Vault", // API - "Reserve", // API "PlaceholderAPI", // API "CMI", // potential for issues "Towny", // past issues; admins should ensure latest @@ -283,14 +279,6 @@ public class Commandessentials extends EssentialsCommand { updateData.addProperty("branch", ess.getUpdateChecker().getVersionBranch()); updateData.addProperty("dev", ess.getUpdateChecker().isDevBuild()); essData.add("update-data", updateData); - final JsonObject econLayer = new JsonObject(); - econLayer.addProperty("enabled", !ess.getSettings().isEcoDisabled()); - econLayer.addProperty("selected-layer", EconomyLayers.isLayerSelected()); - final EconomyLayer layer = EconomyLayers.getSelectedLayer(); - econLayer.addProperty("name", layer == null ? "null" : layer.getName()); - econLayer.addProperty("layer-version", layer == null ? "null" : layer.getPluginVersion()); - econLayer.addProperty("backend-name", layer == null ? "null" : layer.getBackendName()); - essData.add("economy-layer", econLayer); final JsonArray addons = new JsonArray(); final JsonArray plugins = new JsonArray(); final ArrayList alphabetical = new ArrayList<>(); @@ -340,7 +328,6 @@ public class Commandessentials extends EssentialsCommand { boolean discord = false; boolean kits = false; boolean log = false; - boolean worth = false; boolean tpr = false; boolean spawns = false; boolean commands = false; @@ -350,7 +337,6 @@ public class Commandessentials extends EssentialsCommand { discord = true; kits = true; log = true; - worth = true; tpr = true; spawns = true; commands = true; @@ -363,8 +349,6 @@ public class Commandessentials extends EssentialsCommand { kits = true; } else if (arg.equalsIgnoreCase("log")) { log = true; - } else if (arg.equalsIgnoreCase("worth")) { - worth = true; } else if (arg.equalsIgnoreCase("tpr")) { tpr = true; } else if (arg.equalsIgnoreCase("spawns")) { @@ -419,14 +403,6 @@ public class Commandessentials extends EssentialsCommand { } } - if (worth) { - try { - files.add(new PasteUtil.PasteFile("worth.yml", new String(Files.readAllBytes(ess.getWorth().getFile().toPath()), StandardCharsets.UTF_8))); - } catch (IOException e) { - sender.sendMessage(tl("dumpErrorUpload", "worth.yml", e.getMessage())); - } - } - if (tpr) { try { files.add(new PasteUtil.PasteFile("tpr.yml", new String(Files.readAllBytes(ess.getRandomTeleport().getFile().toPath()), StandardCharsets.UTF_8))); @@ -532,15 +508,14 @@ public class Commandessentials extends EssentialsCommand { if (args.length < 2 || !NumberUtil.isInt(args[1])) { sender.sendMessage("This sub-command will delete users who haven't logged in in the last days."); sender.sendMessage("Optional parameters define the minimum amount required to prevent deletion."); - sender.sendMessage("Unless you define larger default values, this command will ignore people who have more than 0 money/homes."); - throw new Exception("/ cleanup [money] [homes]"); + sender.sendMessage("Unless you define larger default values, this command will ignore people who have more than 0 homes."); + throw new Exception("/ cleanup [homes]"); } sender.sendMessage(tl("cleaning")); final long daysArg = Long.parseLong(args[1]); - final double moneyArg = args.length >= 3 ? FloatUtil.parseDouble(args[2].replaceAll("[^0-9\\.]", "")) : 0; - final int homesArg = args.length >= 4 && NumberUtil.isInt(args[3]) ? Integer.parseInt(args[3]) : 0; + final int homesArg = args.length >= 3 && NumberUtil.isInt(args[2]) ? Integer.parseInt(args[2]) : 0; ess.runTaskAsynchronously(() -> { final long currTime = System.currentTimeMillis(); @@ -565,14 +540,13 @@ public class Commandessentials extends EssentialsCommand { final long timeDiff = currTime - lastLog; final long milliDays = daysArg * 24L * 60L * 60L * 1000L; final int homeCount = user.getHomes().size(); - final double moneyCount = user.getMoney().doubleValue(); - if ((lastLog == 0) || (timeDiff < milliDays) || (homeCount > homesArg) || (moneyCount > moneyArg)) { + if ((lastLog == 0) || (timeDiff < milliDays) || (homeCount > homesArg)) { continue; } if (ess.getSettings().isDebug()) { - ess.getLogger().info("Deleting user: " + user.getName() + " Money: " + moneyCount + " Homes: " + homeCount + " Last seen: " + DateUtil.formatDateDiff(lastLog)); + ess.getLogger().info("Deleting user: " + user.getName() + " Homes: " + homeCount + " Last seen: " + DateUtil.formatDateDiff(lastLog)); } user.reset(); @@ -723,7 +697,7 @@ public class Commandessentials extends EssentialsCommand { if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.version")) return; boolean isMismatched = false; - boolean isVaultInstalled = false; + boolean isLuckPermsInstalled = false; boolean isUnsupported = false; final VersionUtil.SupportStatus supportStatus = VersionUtil.getServerSupportStatus(); final PluginManager pm = server.getPluginManager(); @@ -773,26 +747,15 @@ public class Commandessentials extends EssentialsCommand { } } - if (name.equals("Vault")) isVaultInstalled = true; + if (name.equals("LuckPerms")) isLuckPermsInstalled = true; } - final String layer; - if (ess.getSettings().isEcoDisabled()) { - layer = "Disabled"; - } else if (EconomyLayers.isLayerSelected()) { - final EconomyLayer economyLayer = EconomyLayers.getSelectedLayer(); - layer = economyLayer.getName() + " (" + economyLayer.getBackendName() + ")"; - } else { - layer = "None"; - } - sender.sendMessage(tl("versionOutputEconLayer", layer)); - if (isMismatched) { sender.sendMessage(tl("versionMismatchAll")); } - if (!isVaultInstalled) { - sender.sendMessage(tl("versionOutputVaultMissing")); + if (!isLuckPermsInstalled) { + sender.sendMessage(tl("versionOutputLuckPermsMissing")); } if (isUnsupported) { @@ -875,7 +838,7 @@ public class Commandessentials extends EssentialsCommand { } break; case "dump": - final List list = Lists.newArrayList("config", "kits", "log", "discord", "worth", "tpr", "spawns", "commands", "all"); + final List list = Lists.newArrayList("config", "kits", "log", "discord", "tpr", "spawns", "commands", "all"); for (String arg : args) { if (arg.equals("*") || arg.equalsIgnoreCase("all")) { list.clear(); diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandhome.java index b1754d1e1..3ee71d01e 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandhome.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandhome.java @@ -1,7 +1,6 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.OfflinePlayerStub; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import com.earth2me.essentials.utils.StringUtil; import io.papermc.lib.PaperLib; @@ -25,7 +24,6 @@ public class Commandhome extends EssentialsCommand { // This method contains an undocumented translation parameters #EasterEgg @Override public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { - final Trade charge = new Trade(this.getName(), ess); User player = user; String homeName = ""; final String[] nameParts; @@ -58,14 +56,14 @@ public class Commandhome extends EssentialsCommand { user.sendMessage(tl("teleportHome", "bed")); } }); - user.getAsyncTeleport().teleport(location, charge, TeleportCause.COMMAND, future); + user.getAsyncTeleport().teleport(location, TeleportCause.COMMAND, future); } else { showError(user.getBase(), new Exception(tl("bedMissing")), commandLabel); } }); - throw new NoChargeException(); + return; } - goHome(user, player, homeName.toLowerCase(Locale.ENGLISH), charge, getNewExceptionFuture(user.getSource(), commandLabel)); + goHome(user, player, homeName.toLowerCase(Locale.ENGLISH), getNewExceptionFuture(user.getSource(), commandLabel)); } catch (final NotEnoughArgumentsException e) { final User finalPlayer = player; final CompletableFuture message = new CompletableFuture<>(); @@ -76,7 +74,7 @@ public class Commandhome extends EssentialsCommand { final UserTeleportHomeEvent event = new UserTeleportHomeEvent(user, null, bed != null ? bed : finalPlayer.getWorld().getSpawnLocation(), bed != null ? UserTeleportHomeEvent.HomeType.BED : UserTeleportHomeEvent.HomeType.SPAWN); server.getPluginManager().callEvent(event); if (!event.isCancelled()) { - user.getAsyncTeleport().respawn(charge, TeleportCause.COMMAND, getNewExceptionFuture(user.getSource(), commandLabel)); + user.getAsyncTeleport().respawn(TeleportCause.COMMAND, getNewExceptionFuture(user.getSource(), commandLabel)); } } else { showError(user.getBase(), new Exception(tl("noHomeSetPlayer")), commandLabel); @@ -85,7 +83,7 @@ public class Commandhome extends EssentialsCommand { showError(user.getBase(), new Exception(tl("noHomeSetPlayer")), commandLabel); } else if (homes.size() == 1 && finalPlayer.equals(user)) { try { - goHome(user, finalPlayer, homes.get(0), charge, getNewExceptionFuture(user.getSource(), commandLabel)); + goHome(user, finalPlayer, homes.get(0), getNewExceptionFuture(user.getSource(), commandLabel)); } catch (final Exception exception) { showError(user.getBase(), exception, commandLabel); } @@ -107,7 +105,6 @@ public class Commandhome extends EssentialsCommand { } PaperLib.getBedSpawnLocationAsync(player.getBase(), true).thenAccept(message::complete); } - throw new NoChargeException(); } private String getHomeLimit(final User player) { @@ -120,7 +117,7 @@ public class Commandhome extends EssentialsCommand { return Integer.toString(ess.getSettings().getHomeLimit(player)); } - private void goHome(final User user, final User player, final String home, final Trade charge, final CompletableFuture future) throws Exception { + private void goHome(final User user, final User player, final String home, final CompletableFuture future) throws Exception { if (home.length() < 1) { throw new NotEnoughArgumentsException(); } @@ -134,7 +131,7 @@ public class Commandhome extends EssentialsCommand { final UserTeleportHomeEvent event = new UserTeleportHomeEvent(user, home, loc, UserTeleportHomeEvent.HomeType.HOME); user.getServer().getPluginManager().callEvent(event); if (!event.isCancelled()) { - user.getAsyncTeleport().teleport(loc, charge, TeleportCause.COMMAND, future); + user.getAsyncTeleport().teleport(loc, TeleportCause.COMMAND, future); future.thenAccept(success -> { if (success) { user.sendMessage(tl("teleportHome", home)); diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandice.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandice.java index 99bc0412d..fdbbb866c 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandice.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandice.java @@ -1,11 +1,9 @@ package com.earth2me.essentials.commands; -import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.CommandSource; import com.earth2me.essentials.User; import com.earth2me.essentials.utils.VersionUtil; import net.ess3.api.IUser; -import net.ess3.api.MaxMoneyException; import org.bukkit.Server; import java.util.Collections; @@ -38,7 +36,7 @@ public class Commandice extends EssentialsLoopCommand { } @Override - protected void updatePlayer(Server server, CommandSource sender, User user, String[] args) throws NotEnoughArgumentsException, PlayerExemptException, ChargeException, MaxMoneyException { + protected void updatePlayer(Server server, CommandSource sender, User user, String[] args) throws NotEnoughArgumentsException, PlayerExemptException { freezePlayer(user); sender.sendMessage(tl("iceOther", user.getDisplayName())); } diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandjump.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandjump.java index 5a4cb7f63..58becd23e 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandjump.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandjump.java @@ -1,6 +1,5 @@ package com.earth2me.essentials.commands; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import com.earth2me.essentials.utils.LocationUtil; import com.google.common.collect.Lists; @@ -44,11 +43,7 @@ public class Commandjump extends EssentialsCommand { throw new Exception(tl("jumpError"), ex); } - final Trade charge = new Trade(this.getName(), ess); - charge.isAffordableFor(user); - user.getAsyncTeleport().teleport(loc, charge, TeleportCause.COMMAND, getNewExceptionFuture(user.getSource(), commandLabel)); - - throw new NoChargeException(); + user.getAsyncTeleport().teleport(loc, TeleportCause.COMMAND, getNewExceptionFuture(user.getSource(), commandLabel)); } @Override diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandkit.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandkit.java index 28fc58911..95a27a1d5 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandkit.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandkit.java @@ -65,7 +65,6 @@ public class Commandkit extends EssentialsCommand { final Kit kit = new Kit(kitName, ess); kit.checkPerms(userFrom); kit.checkDelay(userFrom); - kit.checkAffordable(userFrom); kits.add(kit); } @@ -73,11 +72,9 @@ public class Commandkit extends EssentialsCommand { try { kit.checkDelay(userFrom); - kit.checkAffordable(userFrom); if (!kit.expandItems(userTo)) continue; kit.setTime(userFrom); - kit.chargeUser(userTo); if (!userFrom.equals(userTo)) { userFrom.sendMessage(tl("kitGiveTo", kit.getName(), userTo.getDisplayName())); diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandpay.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandpay.java deleted file mode 100644 index 444f80e77..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandpay.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.earth2me.essentials.commands; - -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.NumberUtil; -import com.earth2me.essentials.utils.StringUtil; -import com.google.common.collect.Lists; -import net.ess3.api.MaxMoneyException; -import net.ess3.api.events.UserBalanceUpdateEvent; -import org.bukkit.Server; - -import java.math.BigDecimal; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.atomic.AtomicBoolean; - -import static com.earth2me.essentials.I18n.tl; - -public class Commandpay extends EssentialsLoopCommand { - private static final BigDecimal THOUSAND = new BigDecimal(1000); - private static final BigDecimal MILLION = new BigDecimal(1_000_000); - private static final BigDecimal BILLION = new BigDecimal(1_000_000_000); - private static final BigDecimal TRILLION = new BigDecimal(1_000_000_000_000L); - - public Commandpay() { - super("pay"); - } - - @Override - public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { - if (args.length < 2) { - throw new NotEnoughArgumentsException(); - } - - final String ogStr = args[1]; - - if (ogStr.contains("-")) { - throw new Exception(tl("payMustBePositive")); - } - - final String sanitizedString = ogStr.replaceAll("[^0-9.]", ""); - - if (sanitizedString.isEmpty()) { - throw new NotEnoughArgumentsException(); - } - - BigDecimal tempAmount = new BigDecimal(sanitizedString); - switch (Character.toLowerCase(ogStr.charAt(ogStr.length() - 1))) { - case 'k': { - tempAmount = tempAmount.multiply(THOUSAND); - break; - } - case 'm': { - tempAmount = tempAmount.multiply(MILLION); - break; - } - case 'b': { - tempAmount = tempAmount.multiply(BILLION); - break; - } - case 't': { - tempAmount = tempAmount.multiply(TRILLION); - break; - } - default: { - break; - } - } - - final BigDecimal amount = tempAmount; - - if (amount.compareTo(ess.getSettings().getMinimumPayAmount()) < 0) { // Check if amount is less than minimum-pay-amount - throw new Exception(tl("minimumPayAmount", NumberUtil.displayCurrencyExactly(ess.getSettings().getMinimumPayAmount(), ess))); - } - final AtomicBoolean informToConfirm = new AtomicBoolean(false); - final boolean canPayOffline = user.isAuthorized("essentials.pay.offline"); - if (!canPayOffline && args[0].equals("**")) { - user.sendMessage(tl("payOffline")); - return; - } - loopOfflinePlayersConsumer(server, user.getSource(), false, user.isAuthorized("essentials.pay.multiple"), args[0], player -> { - try { - if (player.getBase() != null && (!player.getBase().isOnline() || player.isHidden(user.getBase())) && !canPayOffline) { - user.sendMessage(tl("payOffline")); - return; - } - - if (!player.isAcceptingPay() || (ess.getSettings().isPayExcludesIgnoreList() && player.isIgnoredPlayer(user))) { - user.sendMessage(tl("notAcceptingPay", player.getDisplayName())); - return; - } - if (user.isPromptingPayConfirm() && !amount.equals(user.getConfirmingPayments().get(player))) { // checks if exists and if command needs to be repeated. - // Used to reset confirmations and inform to confirm when a new pay command has been inserted. - if (!informToConfirm.get()) { - // User hasnt been asked to confirm payment to this player, reset all confirmed payments and ask to confirm again. - // Clear previous confirmations to ensure that a new confirmation message is brought up. - user.getConfirmingPayments().clear(); - informToConfirm.set(true); - } - user.getConfirmingPayments().put(player, amount); - return; - } - user.payUser(player, amount, UserBalanceUpdateEvent.Cause.COMMAND_PAY); - user.getConfirmingPayments().remove(player); - Trade.log("Command", "Pay", "Player", user.getName(), new Trade(amount, ess), player.getName(), new Trade(amount, ess), user.getLocation(), user.getMoney(), ess); - } catch (final MaxMoneyException ex) { - user.sendMessage(tl("maxMoney")); - try { - user.setMoney(user.getMoney().add(amount)); - } catch (final MaxMoneyException ignored) { - } - } catch (final Exception e) { - user.sendMessage(e.getMessage()); - } - }); - if (informToConfirm.get()) { - final String cmd = "/" + commandLabel + " " + StringUtil.joinList(" ", args); - user.sendMessage(tl("confirmPayment", NumberUtil.displayCurrency(amount, ess), cmd)); - } - } - - @Override - protected void updatePlayer(final Server server, final CommandSource sender, final User player, final String[] args) { - - } - - @Override - protected List getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) { - if (args.length == 1) { - return getPlayers(server, sender); - } else if (args.length == 2) { - return Lists.newArrayList(ess.getSettings().getMinimumPayAmount().toString()); - } else { - return Collections.emptyList(); - } - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandpayconfirmtoggle.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandpayconfirmtoggle.java deleted file mode 100644 index f34ebe04a..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandpayconfirmtoggle.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.earth2me.essentials.commands; - -import com.earth2me.essentials.User; -import org.bukkit.Server; - -import static com.earth2me.essentials.I18n.tl; - -public class Commandpayconfirmtoggle extends EssentialsCommand { - - public Commandpayconfirmtoggle() { - super("payconfirmtoggle"); - } - - @Override - public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { - boolean confirmingPay = !user.isPromptingPayConfirm(); - if (commandLabel.contains("payconfirmon")) { - confirmingPay = true; - } else if (commandLabel.contains("payconfirmoff")) { - confirmingPay = false; - } - user.setPromptingPayConfirm(confirmingPay); - user.sendMessage(confirmingPay ? tl("payConfirmToggleOn") : tl("payConfirmToggleOff")); - user.getConfirmingPayments().clear(); // Clear any outstanding confirmations. - } -} - diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandpaytoggle.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandpaytoggle.java deleted file mode 100644 index 2a0ffc42a..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandpaytoggle.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.earth2me.essentials.commands; - -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.User; -import org.bukkit.Server; - -import static com.earth2me.essentials.I18n.tl; - -public class Commandpaytoggle extends EssentialsToggleCommand { - - public Commandpaytoggle() { - super("paytoggle", "essentials.paytoggle.others"); - } - - @Override - protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception { - toggleOtherPlayers(server, sender, args); - } - - @Override - public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { - if (commandLabel.contains("payon")) { - togglePlayer(user.getSource(), user, true); - } else if (commandLabel.contains("payoff")) { - togglePlayer(user.getSource(), user, false); - } else { - handleToggleWithArgs(server, user, args); - } - } - - @Override - protected void togglePlayer(final CommandSource sender, final User user, Boolean enabled) { - if (enabled == null) { - enabled = !user.isAcceptingPay(); - } - - user.setAcceptingPay(enabled); - - user.sendMessage(enabled ? tl("payToggleOn") : tl("payToggleOff")); - if (!sender.isPlayer() || !user.getBase().equals(sender.getPlayer())) { - sender.sendMessage(enabled ? tl("payEnabledFor", user.getDisplayName()) : tl("payDisabledFor", user.getDisplayName())); - } - } -} - diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandrepair.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandrepair.java index e466c7e6d..19d1d5ac6 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandrepair.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandrepair.java @@ -1,12 +1,9 @@ package com.earth2me.essentials.commands; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import com.earth2me.essentials.craftbukkit.Inventories; import com.earth2me.essentials.utils.MaterialUtil; import com.earth2me.essentials.utils.StringUtil; -import com.earth2me.essentials.utils.VersionUtil; import com.google.common.collect.Lists; import net.ess3.api.IUser; import org.bukkit.Material; @@ -30,10 +27,7 @@ public class Commandrepair extends EssentialsCommand { if (args.length == 0 || args[0].equalsIgnoreCase("hand") || !user.isAuthorized("essentials.repair.all")) { repairHand(user); } else if (args[0].equalsIgnoreCase("all")) { - final Trade charge = new Trade("repair-all", ess); - charge.isAffordableFor(user); repairAll(user); - charge.charge(user); } else { throw new NotEnoughArgumentsException(); } @@ -50,13 +44,9 @@ public class Commandrepair extends EssentialsCommand { } final String itemName = item.getType().toString().toLowerCase(Locale.ENGLISH); - final Trade charge = getCharge(item.getType()); - - charge.isAffordableFor(user); repairItem(item); - charge.charge(user); user.getBase().updateInventory(); user.sendMessage(tl("repair", itemName.replace('_', ' '))); } @@ -97,14 +87,7 @@ public class Commandrepair extends EssentialsCommand { } final String itemName = item.getType().toString().toLowerCase(Locale.ENGLISH); - final Trade charge = getCharge(item.getType()); - try { - charge.isAffordableFor(user); - } catch (final ChargeException ex) { - user.sendMessage(ex.getMessage()); - continue; - } if (!item.getEnchantments().isEmpty() && !ess.getSettings().getRepairEnchanted() && !user.isAuthorized("essentials.repair.enchanted")) { continue; } @@ -114,25 +97,10 @@ public class Commandrepair extends EssentialsCommand { } catch (final Exception e) { continue; } - try { - charge.charge(user); - } catch (final ChargeException ex) { - user.sendMessage(ex.getMessage()); - } repaired.add(itemName.replace('_', ' ')); } } - private Trade getCharge(final Material material) { - final String itemName = material.toString().toLowerCase(Locale.ENGLISH); - if (VersionUtil.PRE_FLATTENING) { - final int itemId = material.getId(); - return new Trade("repair-" + itemName.replace('_', '-'), new Trade("repair-" + itemId, new Trade("repair-item", ess), ess), ess); - } else { - return new Trade("repair-" + itemName.replace('_', '-'), new Trade("repair-item", ess), ess); - } - } - @Override protected List getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) { if (args.length == 1) { diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandsell.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandsell.java deleted file mode 100644 index 98b19c04a..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandsell.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.earth2me.essentials.commands; - -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; -import com.earth2me.essentials.craftbukkit.Inventories; -import com.earth2me.essentials.utils.NumberUtil; -import com.google.common.collect.Lists; -import net.ess3.api.events.UserBalanceUpdateEvent; -import org.bukkit.ChatColor; -import org.bukkit.Server; -import org.bukkit.inventory.ItemStack; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Locale; -import java.util.logging.Level; - -import static com.earth2me.essentials.I18n.tl; - -public class Commandsell extends EssentialsCommand { - public Commandsell() { - super("sell"); - } - - @Override - public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { - BigDecimal totalWorth = BigDecimal.ZERO; - if (args.length < 1) { - throw new NotEnoughArgumentsException(); - } - - if (args[0].equalsIgnoreCase("hand") && !user.isAuthorized("essentials.sell.hand")) { - throw new Exception(tl("sellHandPermission")); - } else if ((args[0].equalsIgnoreCase("inventory") || args[0].equalsIgnoreCase("invent") || args[0].equalsIgnoreCase("all")) && !user.isAuthorized("essentials.sell.bulk")) { - throw new Exception(tl("sellBulkPermission")); - } - - final List is = ess.getItemDb().getMatching(user, args); - int count = 0; - - final boolean isBulk = is.size() > 1; - - final List notSold = new ArrayList<>(); - for (ItemStack stack : is) { - if (!ess.getSettings().isAllowSellNamedItems()) { - if (stack.getItemMeta() != null && stack.getItemMeta().hasDisplayName()) { - if (isBulk) { - notSold.add(stack); - continue; - } - throw new Exception(tl("cannotSellNamedItem")); - } - } - try { - if (stack.getAmount() > 0) { - totalWorth = totalWorth.add(sellItem(user, stack, args, isBulk)); - stack = stack.clone(); - count++; - for (final ItemStack zeroStack : is) { - if (zeroStack.isSimilar(stack)) { - zeroStack.setAmount(0); - } - } - } - } catch (final Exception e) { - if (!isBulk) { - throw e; - } - } - } - if (!notSold.isEmpty()) { - final List names = new ArrayList<>(); - for (final ItemStack stack : notSold) { - if (stack.getItemMeta() != null) { //This was already validated but IDE still freaks out - names.add(stack.getItemMeta().getDisplayName()); - } - } - ess.showError(user.getSource(), new Exception(tl("cannotSellTheseNamedItems", String.join(ChatColor.RESET + ", ", names))), commandLabel); - } - if (count != 1) { - final String totalWorthStr = NumberUtil.displayCurrency(totalWorth, ess); - if (args[0].equalsIgnoreCase("blocks")) { - user.sendMessage(tl("totalWorthBlocks", totalWorthStr, totalWorthStr)); - } else { - user.sendMessage(tl("totalWorthAll", totalWorthStr, totalWorthStr)); - } - } - } - - private BigDecimal sellItem(final User user, final ItemStack is, final String[] args, final boolean isBulkSell) throws Exception { - final int amount = ess.getWorth().getAmount(ess, user, is, args, isBulkSell); - final BigDecimal worth = ess.getWorth().getPrice(ess, is); - - if (worth == null) { - throw new Exception(tl("itemCannotBeSold")); - } - - if (amount <= 0) { - if (!isBulkSell) { - user.sendMessage(tl("itemSold", NumberUtil.displayCurrency(BigDecimal.ZERO, ess), BigDecimal.ZERO, is.getType().toString().toLowerCase(Locale.ENGLISH), NumberUtil.displayCurrency(worth, ess))); - } - return BigDecimal.ZERO; - } - - final BigDecimal result = worth.multiply(BigDecimal.valueOf(amount)); - - //TODO: Prices for Enchantments - final ItemStack ris = is.clone(); - ris.setAmount(amount); - if (!Inventories.containsAtLeast(user.getBase(), ris, amount)) { - // This should never happen. - throw new IllegalStateException("Trying to remove more items than are available."); - } - Inventories.removeItemAmount(user.getBase(), ris, ris.getAmount()); - user.getBase().updateInventory(); - Trade.log("Command", "Sell", "Item", user.getName(), new Trade(ris, ess), user.getName(), new Trade(result, ess), user.getLocation(), user.getMoney(), ess); - user.giveMoney(result, null, UserBalanceUpdateEvent.Cause.COMMAND_SELL); - user.sendMessage(tl("itemSold", NumberUtil.displayCurrency(result, ess), amount, is.getType().toString().toLowerCase(Locale.ENGLISH), NumberUtil.displayCurrency(worth, ess))); - ess.getLogger().log(Level.INFO, tl("itemSoldConsole", user.getName(), is.getType().toString().toLowerCase(Locale.ENGLISH), NumberUtil.displayCurrency(result, ess), amount, NumberUtil.displayCurrency(worth, ess), user.getDisplayName())); - return result; - } - - @Override - protected List getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) { - if (args.length == 1) { - return getMatchingItems(args[0]); - } else if (args.length == 2) { - return Lists.newArrayList("1", "64"); - } else { - return Collections.emptyList(); - } - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandsetworth.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandsetworth.java deleted file mode 100644 index baa01a4bc..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandsetworth.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.earth2me.essentials.commands; - -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.FloatUtil; -import org.bukkit.Server; -import org.bukkit.inventory.ItemStack; - -import static com.earth2me.essentials.I18n.tl; - -public class Commandsetworth extends EssentialsCommand { - public Commandsetworth() { - super("setworth"); - } - - @Override - public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { - if (args.length < 1) { - throw new NotEnoughArgumentsException(); - } - - final ItemStack stack; - final String price; - if (args.length == 1) { - stack = user.getItemInHand(); - price = args[0]; - } else { - stack = ess.getItemDb().get(args[0]); - price = args[1]; - } - - ess.getWorth().setPrice(ess, stack, FloatUtil.parseDouble(price)); - user.sendMessage(tl("worthSet")); - } - - @Override - public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception { - if (args.length < 2) { - throw new NotEnoughArgumentsException(); - } - - ess.getWorth().setPrice(ess, ess.getItemDb().get(args[0]), FloatUtil.parseDouble(args[1])); - sender.sendMessage(tl("worthSet")); - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandspawner.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandspawner.java index 601643c59..ad7bc6f8a 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandspawner.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandspawner.java @@ -1,7 +1,6 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.Mob; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import com.earth2me.essentials.utils.EnumUtil; import com.earth2me.essentials.utils.LocationUtil; @@ -55,8 +54,6 @@ public class Commandspawner extends EssentialsCommand { if (args.length > 1 && NumberUtil.isInt(args[1]) && user.isAuthorized("essentials.spawner.delay")) { delay = Integer.parseInt(args[1]); } - final Trade charge = new Trade("spawner-" + mob.name.toLowerCase(Locale.ENGLISH), ess); - charge.isAffordableFor(user); try { final CreatureSpawner spawner = (CreatureSpawner) target.getBlock().getState(); spawner.setSpawnedType(mob.getType()); @@ -72,7 +69,6 @@ public class Commandspawner extends EssentialsCommand { } catch (final Throwable ex) { throw new Exception(tl("mobSpawnError"), ex); } - charge.charge(user); user.sendMessage(tl("setSpawner", mob.name)); } diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtogglejail.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtogglejail.java index 648779c0b..8db7f1eae 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtogglejail.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtogglejail.java @@ -142,12 +142,12 @@ public class Commandtogglejail extends EssentialsCommand { if (ess.getSettings().getTeleportWhenFreePolicy() == ISettings.TeleportWhenFreePolicy.BACK) { player.getAsyncTeleport().back(future); future.exceptionally(e -> { - player.getAsyncTeleport().respawn(null, PlayerTeleportEvent.TeleportCause.PLUGIN, new CompletableFuture<>()); + player.getAsyncTeleport().respawn(PlayerTeleportEvent.TeleportCause.PLUGIN, new CompletableFuture<>()); sender.sendMessage(tl("jailReleased", player.getName())); return false; }); } else if (ess.getSettings().getTeleportWhenFreePolicy() == ISettings.TeleportWhenFreePolicy.SPAWN) { - player.getAsyncTeleport().respawn(null, PlayerTeleportEvent.TeleportCause.PLUGIN, future); + player.getAsyncTeleport().respawn(PlayerTeleportEvent.TeleportCause.PLUGIN, future); } return; } diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtop.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtop.java index 705828500..e5c168780 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtop.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtop.java @@ -1,6 +1,5 @@ package com.earth2me.essentials.commands; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import com.earth2me.essentials.utils.LocationUtil; import org.bukkit.Location; @@ -30,6 +29,6 @@ public class Commandtop extends EssentialsCommand { user.sendMessage(tl("teleportTop", safe.getWorld().getName(), safe.getBlockX(), safe.getBlockY(), safe.getBlockZ())); } }); - user.getAsyncTeleport().teleport(safe, new Trade(this.getName(), ess), TeleportCause.COMMAND, future); + user.getAsyncTeleport().teleport(safe, TeleportCause.COMMAND, future); } } diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtp.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtp.java index bb1a38ece..b84728c75 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtp.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtp.java @@ -2,7 +2,6 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.CommandSource; import com.earth2me.essentials.Console; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import org.bukkit.Location; import org.bukkit.Server; @@ -42,10 +41,8 @@ public class Commandtp extends EssentialsCommand { if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + player.getWorld().getName())) { throw new Exception(tl("noPerm", "essentials.worlds." + player.getWorld().getName())); } - final Trade charge = new Trade(this.getName(), ess); - charge.isAffordableFor(user); - user.getAsyncTeleport().teleport(player.getBase(), charge, TeleportCause.COMMAND, future); - throw new NoChargeException(); + user.getAsyncTeleport().teleport(player.getBase(), TeleportCause.COMMAND, future); + break; case 3: if (!user.isAuthorized("essentials.tp.position")) { throw new Exception(tl("noPerm", "essentials.tp.position")); diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtpa.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtpa.java index 1bd771ffd..a517c22be 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtpa.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtpa.java @@ -1,7 +1,6 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.AsyncTeleport; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import net.ess3.api.events.TPARequestEvent; import org.bukkit.Server; @@ -44,18 +43,17 @@ public class Commandtpa extends EssentialsCommand { } if (player.isAutoTeleportEnabled() && !player.isIgnoredPlayer(user)) { - final Trade charge = new Trade(this.getName(), ess); final AsyncTeleport teleport = user.getAsyncTeleport(); teleport.setTpType(AsyncTeleport.TeleportType.TPA); final CompletableFuture future = getNewExceptionFuture(user.getSource(), commandLabel); - teleport.teleport(player.getBase(), charge, PlayerTeleportEvent.TeleportCause.COMMAND, future); + teleport.teleport(player.getBase(), PlayerTeleportEvent.TeleportCause.COMMAND, future); future.thenAccept(success -> { if (success) { player.sendMessage(tl("requestAcceptedAuto", user.getDisplayName())); user.sendMessage(tl("requestAcceptedFromAuto", player.getDisplayName())); } }); - throw new NoChargeException(); + return; } if (!player.isIgnoredPlayer(user)) { diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtpaccept.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtpaccept.java index f97a8faf4..04efb72e1 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtpaccept.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtpaccept.java @@ -2,7 +2,6 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.AsyncTeleport; import com.earth2me.essentials.IUser; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import net.essentialsx.api.v2.events.TeleportRequestResponseEvent; import org.bukkit.Bukkit; @@ -38,7 +37,7 @@ public class Commandtpaccept extends EssentialsCommand { if (args.length > 0) { if (acceptAll) { acceptAllRequests(user, commandLabel); - throw new NoChargeException(); + return; } user.sendMessage(tl("requestAccepted")); handleTeleport(user, user.getOutstandingTpaRequest(getPlayer(server, user, args, 0).getName(), true), commandLabel); @@ -46,7 +45,6 @@ public class Commandtpaccept extends EssentialsCommand { user.sendMessage(tl("requestAccepted")); handleTeleport(user, user.getNextTpaRequest(true, false, false), commandLabel); } - throw new NoChargeException(); } private void acceptAllRequests(final User user, final String commandLabel) throws Exception { @@ -104,7 +102,6 @@ public class Commandtpaccept extends EssentialsCommand { return; } - final Trade charge = new Trade(this.getName(), ess); requester.sendMessage(tl("requestAcceptedFrom", user.getDisplayName())); final CompletableFuture future = getNewExceptionFuture(requester.getSource(), commandLabel); @@ -121,11 +118,11 @@ public class Commandtpaccept extends EssentialsCommand { requester.sendMessage(tl("teleporting", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); } }); - teleport.teleportPlayer(user, loc, charge, TeleportCause.COMMAND, future); + teleport.teleportPlayer(user, loc, TeleportCause.COMMAND, future); } else { final AsyncTeleport teleport = requester.getAsyncTeleport(); teleport.setTpType(AsyncTeleport.TeleportType.TPA); - teleport.teleport(user.getBase(), charge, TeleportCause.COMMAND, future); + teleport.teleport(user.getBase(), TeleportCause.COMMAND, future); } user.removeTpaRequest(request.getName()); } diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtphere.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtphere.java index ff2e43015..37159d549 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtphere.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtphere.java @@ -1,6 +1,5 @@ package com.earth2me.essentials.commands; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import org.bukkit.Server; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; @@ -24,8 +23,7 @@ public class Commandtphere extends EssentialsCommand { if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + user.getWorld().getName())) { throw new Exception(tl("noPerm", "essentials.worlds." + user.getWorld().getName())); } - user.getAsyncTeleport().teleportPlayer(player, user.getBase(), new Trade(this.getName(), ess), TeleportCause.COMMAND, getNewExceptionFuture(user.getSource(), commandLabel)); - throw new NoChargeException(); + user.getAsyncTeleport().teleportPlayer(player, user.getBase(), TeleportCause.COMMAND, getNewExceptionFuture(user.getSource(), commandLabel)); } @Override diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtppos.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtppos.java index 5711fc406..ad22d746d 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtppos.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtppos.java @@ -1,7 +1,6 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import com.earth2me.essentials.utils.FloatUtil; import com.google.common.collect.Lists; @@ -51,12 +50,8 @@ public class Commandtppos extends EssentialsCommand { if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000) { throw new NotEnoughArgumentsException(tl("teleportInvalidLocation")); } - final Trade charge = new Trade(this.getName(), ess); - charge.isAffordableFor(user); user.sendMessage(tl("teleporting", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); - user.getAsyncTeleport().teleport(loc, charge, TeleportCause.COMMAND, getNewExceptionFuture(user.getSource(), commandLabel)); - - throw new NoChargeException(); + user.getAsyncTeleport().teleport(loc, TeleportCause.COMMAND, getNewExceptionFuture(user.getSource(), commandLabel)); } @Override @@ -85,7 +80,7 @@ public class Commandtppos extends EssentialsCommand { } sender.sendMessage(tl("teleporting", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); user.sendMessage(tl("teleporting", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); - user.getAsyncTeleport().teleport(loc, null, TeleportCause.COMMAND, getNewExceptionFuture(user.getSource(), commandLabel)); + user.getAsyncTeleport().teleport(loc, TeleportCause.COMMAND, getNewExceptionFuture(user.getSource(), commandLabel)); } @Override diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtpr.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtpr.java index d4679db50..94d63b3f1 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtpr.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtpr.java @@ -1,7 +1,6 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.RandomTeleport; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import net.ess3.api.events.UserRandomTeleportEvent; import org.bukkit.Server; @@ -21,8 +20,6 @@ public class Commandtpr extends EssentialsCommand { @Override protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { - final Trade charge = new Trade(this.getName(), ess); - charge.isAffordableFor(user); final RandomTeleport randomTeleport = ess.getRandomTeleport(); final UserRandomTeleportEvent event = new UserRandomTeleportEvent(user, randomTeleport.getCenter(), randomTeleport.getMinRange(), randomTeleport.getMaxRange()); server.getPluginManager().callEvent(event); @@ -31,14 +28,13 @@ public class Commandtpr extends EssentialsCommand { } randomTeleport.getRandomLocation(event.getCenter(), event.getMinRange(), event.getMaxRange()).thenAccept(location -> { final CompletableFuture future = getNewExceptionFuture(user.getSource(), commandLabel); - user.getAsyncTeleport().teleport(location, charge, PlayerTeleportEvent.TeleportCause.COMMAND, future); + user.getAsyncTeleport().teleport(location, PlayerTeleportEvent.TeleportCause.COMMAND, future); future.thenAccept(success -> { if (success) { user.sendMessage(tl("tprSuccess")); } }); }); - throw new NoChargeException(); } @Override diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandwarp.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandwarp.java index 86d9fa759..767797a1e 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandwarp.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandwarp.java @@ -1,7 +1,6 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import com.earth2me.essentials.api.IWarps; import com.earth2me.essentials.utils.NumberUtil; @@ -10,11 +9,9 @@ import net.ess3.api.IUser; import org.bukkit.Server; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Locale; import java.util.stream.Collectors; import static com.earth2me.essentials.I18n.tl; @@ -33,28 +30,26 @@ public class Commandwarp extends EssentialsCommand { throw new Exception(tl("warpListPermission")); } warpList(user.getSource(), args, user); - throw new NoChargeException(); + return; } //TODO: Remove 'otherplayers' permission. if (args.length == 2 && (user.isAuthorized("essentials.warp.otherplayers") || user.isAuthorized("essentials.warp.others"))) { final User otherUser = getPlayer(server, user, args, 1); warpUser(user, otherUser, args[0], commandLabel); - throw new NoChargeException(); + return; } warpUser(user, user, args[0], commandLabel); - throw new NoChargeException(); } @Override public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception { if (args.length < 2 || NumberUtil.isInt(args[0])) { warpList(sender, args, null); - throw new NoChargeException(); + return; } final User otherUser = getPlayer(server, args, 1, true, false); - otherUser.getAsyncTeleport().warp(otherUser, args[0], null, TeleportCause.COMMAND, getNewExceptionFuture(sender, commandLabel)); - throw new NoChargeException(); + otherUser.getAsyncTeleport().warp(otherUser, args[0], TeleportCause.COMMAND, getNewExceptionFuture(sender, commandLabel)); } //TODO: Use one of the new text classes, like /help ? @@ -88,15 +83,10 @@ public class Commandwarp extends EssentialsCommand { } private void warpUser(final User owner, final User user, final String name, final String commandLabel) throws Exception { - final Trade chargeWarp = new Trade("warp-" + name.toLowerCase(Locale.ENGLISH).replace('_', '-'), ess); - final Trade chargeCmd = new Trade(this.getName(), ess); - final BigDecimal fullCharge = chargeWarp.getCommandCost(user).add(chargeCmd.getCommandCost(user)); - final Trade charge = new Trade(fullCharge, ess); - charge.isAffordableFor(owner); if (ess.getSettings().getPerWarpPermission() && !owner.isAuthorized("essentials.warps." + name)) { throw new Exception(tl("warpUsePermission")); } - owner.getAsyncTeleport().warp(user, name, charge, TeleportCause.COMMAND, getNewExceptionFuture(user.getSource(), commandLabel)); + owner.getAsyncTeleport().warp(user, name, TeleportCause.COMMAND, getNewExceptionFuture(user.getSource(), commandLabel)); } private List getAvailableWarpsFor(final IUser user) { diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandwhois.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandwhois.java index 38d130fe6..0a88b5106 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandwhois.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandwhois.java @@ -5,7 +5,6 @@ import com.earth2me.essentials.User; import com.earth2me.essentials.craftbukkit.SetExpFix; import com.earth2me.essentials.utils.DateUtil; import com.earth2me.essentials.utils.EnumUtil; -import com.earth2me.essentials.utils.NumberUtil; import org.bukkit.Server; import org.bukkit.Statistic; @@ -42,9 +41,6 @@ public class Commandwhois extends EssentialsCommand { sender.sendMessage(tl("whoisLocation", user.getLocation().getWorld().getName(), user.getLocation().getBlockX(), user.getLocation().getBlockY(), user.getLocation().getBlockZ())); final long playtimeMs = System.currentTimeMillis() - (user.getBase().getStatistic(PLAY_ONE_TICK) * 50L); sender.sendMessage(tl("whoisPlaytime", DateUtil.formatDateDiff(playtimeMs))); - if (!ess.getSettings().isEcoDisabled()) { - sender.sendMessage(tl("whoisMoney", NumberUtil.displayCurrency(user.getMoney(), ess))); - } if (!sender.isPlayer() || ess.getUser(sender.getPlayer()).isAuthorized("essentials.whois.ip")) { sender.sendMessage(tl("whoisIPAddress", user.getBase().getAddress().getAddress().toString())); } diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandworld.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandworld.java index c183e993d..c0895e7e8 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandworld.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandworld.java @@ -1,6 +1,5 @@ package com.earth2me.essentials.commands; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import com.google.common.collect.Lists; import org.bukkit.Location; @@ -43,7 +42,7 @@ public class Commandworld extends EssentialsCommand { user.sendMessage(tl("invalidWorld")); user.sendMessage(tl("possibleWorlds", server.getWorlds().size() - 1)); user.sendMessage(tl("typeWorldName")); - throw new NoChargeException(); + return; } } @@ -63,11 +62,7 @@ public class Commandworld extends EssentialsCommand { final Location loc = user.getLocation(); final Location target = new Location(world, loc.getBlockX() * factor + .5, loc.getBlockY(), loc.getBlockZ() * factor + .5); - final Trade charge = new Trade(this.getName(), ess); - charge.isAffordableFor(user); - user.getAsyncTeleport().teleport(target, charge, TeleportCause.COMMAND, getNewExceptionFuture(user.getSource(), commandLabel)); - - throw new NoChargeException(); + user.getAsyncTeleport().teleport(target, TeleportCause.COMMAND, getNewExceptionFuture(user.getSource(), commandLabel)); } @Override diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandworth.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandworth.java deleted file mode 100644 index b8cca0db2..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandworth.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.earth2me.essentials.commands; - -import com.earth2me.essentials.CommandSource; -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.MaterialUtil; -import com.earth2me.essentials.utils.NumberUtil; -import com.google.common.collect.Lists; -import org.bukkit.Server; -import org.bukkit.inventory.ItemStack; - -import java.math.BigDecimal; -import java.util.Collections; -import java.util.List; -import java.util.Locale; - -import static com.earth2me.essentials.I18n.tl; - -public class Commandworth extends EssentialsCommand { - public Commandworth() { - super("worth"); - } - - @Override - public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { - final List is = ess.getItemDb().getMatching(user, args); - int count = 0; - final boolean isBulk = is.size() > 1; - BigDecimal totalWorth = BigDecimal.ZERO; - for (ItemStack stack : is) { - try { - if (stack.getAmount() > 0) { - totalWorth = totalWorth.add(itemWorth(user.getSource(), user, stack, args)); - stack = stack.clone(); - count++; - for (final ItemStack zeroStack : is) { - if (zeroStack.isSimilar(stack)) { - zeroStack.setAmount(0); - } - } - } - - } catch (final Exception e) { - if (!isBulk) { - throw e; - } - } - } - if (count > 1) { - final String totalWorthStr = NumberUtil.displayCurrency(totalWorth, ess); - if (args.length > 0 && args[0].equalsIgnoreCase("blocks")) { - user.sendMessage(tl("totalSellableBlocks", totalWorthStr, totalWorthStr)); - return; - } - user.sendMessage(tl("totalSellableAll", totalWorthStr, totalWorthStr)); - } - } - - @Override - public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception { - if (args.length == 0) { - throw new NotEnoughArgumentsException(); - } - itemWorth(sender, null, ess.getItemDb().get(args[0]), args); - } - - private BigDecimal itemWorth(final CommandSource sender, final User user, final ItemStack is, final String[] args) throws Exception { - int amount = 1; - if (user == null) { - if (args.length > 1) { - try { - amount = Integer.parseInt(args[1].replaceAll("[^0-9]", "")); - } catch (final NumberFormatException ex) { - throw new NotEnoughArgumentsException(ex); - } - - } - } else { - amount = ess.getWorth().getAmount(ess, user, is, args, true); - } - - final BigDecimal worth = ess.getWorth().getPrice(ess, is); - if (worth == null) { - throw new Exception(tl("itemCannotBeSold")); - } - - if (amount < 0) { - amount = 0; - } - - final BigDecimal result = worth.multiply(BigDecimal.valueOf(amount)); - sender.sendMessage(MaterialUtil.getDamage(is) != 0 ? tl("worthMeta", is.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), MaterialUtil.getDamage(is), NumberUtil.displayCurrency(result, ess), amount, NumberUtil.displayCurrency(worth, ess)) : tl("worth", is.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), NumberUtil.displayCurrency(result, ess), amount, NumberUtil.displayCurrency(worth, ess))); - return result; - } - - @Override - protected List getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) { - if (args.length == 1) { - return getMatchingItems(args[0]); - } else if (args.length == 2) { - return Lists.newArrayList("1", "64"); - } else { - return Collections.emptyList(); - } - } - - @Override - protected List getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) { - if (args.length == 1) { - return getItems(); - } else if (args.length == 2) { - return Lists.newArrayList("1", "64"); - } else { - return Collections.emptyList(); - } - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsCommand.java b/Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsCommand.java index 2c96d7bbf..15e5c937d 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsCommand.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsCommand.java @@ -2,7 +2,6 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.CommandSource; import com.earth2me.essentials.IEssentialsModule; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import com.earth2me.essentials.utils.FormatUtil; import com.google.common.collect.ImmutableList; @@ -165,10 +164,7 @@ public abstract class EssentialsCommand implements IEssentialsCommand { @Override public final void run(final Server server, final User user, final String commandLabel, final Command cmd, final String[] args) throws Exception { - final Trade charge = new Trade(this.getName(), ess); - charge.isAffordableFor(user); run(server, user, commandLabel, args); - charge.charge(user); } protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsLoopCommand.java b/Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsLoopCommand.java index 75c22bdcf..46b03f570 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsLoopCommand.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsLoopCommand.java @@ -1,11 +1,9 @@ package com.earth2me.essentials.commands; -import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.CommandSource; import com.earth2me.essentials.User; import com.earth2me.essentials.utils.FormatUtil; import com.earth2me.essentials.utils.StringUtil; -import net.ess3.api.MaxMoneyException; import org.bukkit.Server; import org.bukkit.entity.Player; @@ -18,11 +16,11 @@ public abstract class EssentialsLoopCommand extends EssentialsCommand { super(command); } - protected void loopOfflinePlayers(final Server server, final CommandSource sender, final boolean multipleStringMatches, final boolean matchWildcards, final String searchTerm, final String[] commandArgs) throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException, ChargeException, MaxMoneyException { + protected void loopOfflinePlayers(final Server server, final CommandSource sender, final boolean multipleStringMatches, final boolean matchWildcards, final String searchTerm, final String[] commandArgs) throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException { loopOfflinePlayersConsumer(server, sender, multipleStringMatches, matchWildcards, searchTerm, user -> updatePlayer(server, sender, user, commandArgs)); } - protected void loopOfflinePlayersConsumer(final Server server, final CommandSource sender, final boolean multipleStringMatches, final boolean matchWildcards, final String searchTerm, final UserConsumer userConsumer) throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException, ChargeException, MaxMoneyException { + protected void loopOfflinePlayersConsumer(final Server server, final CommandSource sender, final boolean multipleStringMatches, final boolean matchWildcards, final String searchTerm, final UserConsumer userConsumer) throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException { if (searchTerm.isEmpty()) { throw new PlayerNotFoundException(); } @@ -67,11 +65,11 @@ public abstract class EssentialsLoopCommand extends EssentialsCommand { } } - protected void loopOnlinePlayers(final Server server, final CommandSource sender, final boolean multipleStringMatches, final boolean matchWildcards, final String searchTerm, final String[] commandArgs) throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException, ChargeException, MaxMoneyException { + protected void loopOnlinePlayers(final Server server, final CommandSource sender, final boolean multipleStringMatches, final boolean matchWildcards, final String searchTerm, final String[] commandArgs) throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException { loopOnlinePlayersConsumer(server, sender, multipleStringMatches, matchWildcards, searchTerm, user -> updatePlayer(server, sender, user, commandArgs)); } - protected void loopOnlinePlayersConsumer(final Server server, final CommandSource sender, final boolean multipleStringMatches, final boolean matchWildcards, final String searchTerm, final UserConsumer userConsumer) throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException, ChargeException, MaxMoneyException { + protected void loopOnlinePlayersConsumer(final Server server, final CommandSource sender, final boolean multipleStringMatches, final boolean matchWildcards, final String searchTerm, final UserConsumer userConsumer) throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException { if (searchTerm.isEmpty()) { throw new PlayerNotFoundException(); } @@ -121,7 +119,7 @@ public abstract class EssentialsLoopCommand extends EssentialsCommand { } } - protected abstract void updatePlayer(Server server, CommandSource sender, User user, String[] args) throws NotEnoughArgumentsException, PlayerExemptException, ChargeException, MaxMoneyException; + protected abstract void updatePlayer(Server server, CommandSource sender, User user, String[] args) throws NotEnoughArgumentsException, PlayerExemptException; @Override protected List getPlayers(final Server server, final CommandSource interactor) { @@ -140,6 +138,6 @@ public abstract class EssentialsLoopCommand extends EssentialsCommand { } public interface UserConsumer { - void accept(User user) throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException, ChargeException, MaxMoneyException; + void accept(User user) throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException; } } diff --git a/Essentials/src/main/java/com/earth2me/essentials/economy/EconomyLayer.java b/Essentials/src/main/java/com/earth2me/essentials/economy/EconomyLayer.java deleted file mode 100644 index 1bf347536..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/economy/EconomyLayer.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.earth2me.essentials.economy; - -import org.bukkit.OfflinePlayer; -import org.bukkit.plugin.Plugin; - -import java.math.BigDecimal; - -public interface EconomyLayer { - String getName(); - - String getBackendName(); - - void enable(Plugin plugin); - - boolean onServerLoad(); - - void disable(); - - String getPluginName(); - - String getPluginVersion(); - - boolean hasAccount(OfflinePlayer player); - - boolean createPlayerAccount(OfflinePlayer player); - - BigDecimal getBalance(OfflinePlayer player); - - boolean deposit(OfflinePlayer player, BigDecimal amount); - - boolean withdraw(OfflinePlayer player, BigDecimal amount); - - default boolean set(OfflinePlayer player, BigDecimal amount) { - if (!withdraw(player, getBalance(player))) { - return false; - } - return amount.equals(BigDecimal.ZERO) || deposit(player, amount); - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/economy/EconomyLayers.java b/Essentials/src/main/java/com/earth2me/essentials/economy/EconomyLayers.java deleted file mode 100644 index a4184e558..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/economy/EconomyLayers.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.earth2me.essentials.economy; - -import com.earth2me.essentials.Essentials; -import com.earth2me.essentials.economy.layers.VaultLayer; -import org.bukkit.Bukkit; -import org.bukkit.plugin.Plugin; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; - -/** - * Abstraction layer for economy abstraction layers. - */ -public final class EconomyLayers { - private static final Map registeredLayers = new HashMap<>(); - private static final List availableLayers = new ArrayList<>(); - private static EconomyLayer selectedLayer = null; - private static boolean serverStarted = false; - - private EconomyLayers() { - } - - public static void init() { - if (!registeredLayers.isEmpty()) { - throw new IllegalStateException("Economy layers have already been registered!"); - } - - registerLayer(new VaultLayer()); - } - - public static void onEnable(final Essentials ess) { - ess.scheduleSyncDelayedTask(() -> { - serverStarted = true; - for (final Plugin plugin : Bukkit.getPluginManager().getPlugins()) { - if (!plugin.isEnabled()) { - continue; - } - final EconomyLayer layer = onPluginEnable(plugin); - if (layer != null) { - ess.getLogger().log(Level.INFO, "Essentials found a compatible payment resolution method: " + layer.getName() + " (v" + layer.getPluginVersion() + ")!"); - } - } - - onServerLoad(); - }); - } - - public static boolean isServerStarted() { - return serverStarted; - } - - public static EconomyLayer getSelectedLayer() { - return selectedLayer; - } - - public static boolean isLayerSelected() { - return getSelectedLayer() != null; - } - - public static EconomyLayer onPluginEnable(final Plugin plugin) { - if (!registeredLayers.containsKey(plugin.getName())) { - return null; - } - - final EconomyLayer layer = registeredLayers.get(plugin.getName()); - layer.enable(plugin); - availableLayers.add(plugin.getName()); - if (selectedLayer != null) { - return null; - } - - selectedLayer = layer; - selectedLayer.enable(plugin); - return selectedLayer; - } - - public static boolean onPluginDisable(final Plugin plugin) { - if (!availableLayers.contains(plugin.getName())) { - return false; - } - - registeredLayers.get(plugin.getName()).disable(); - availableLayers.remove(plugin.getName()); - - if (selectedLayer.getPluginName().equals(plugin.getName())) { - selectedLayer = availableLayers.isEmpty() ? null : registeredLayers.get(availableLayers.get(0)); - if (selectedLayer != null && serverStarted) { - selectedLayer.onServerLoad(); - } - return true; - } - return false; - } - - public static void onServerLoad() { - if (!isLayerSelected() || getSelectedLayer().onServerLoad()) { - return; - } - - availableLayers.remove(getSelectedLayer().getPluginName()); - selectedLayer = null; - if (!availableLayers.isEmpty()) { - selectedLayer = registeredLayers.get(availableLayers.get(0)); - onServerLoad(); - } - } - - public static void registerLayer(final EconomyLayer economyLayer) { - registeredLayers.put(economyLayer.getPluginName(), economyLayer); - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/economy/layers/VaultLayer.java b/Essentials/src/main/java/com/earth2me/essentials/economy/layers/VaultLayer.java deleted file mode 100644 index c9077397b..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/economy/layers/VaultLayer.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.earth2me.essentials.economy.layers; - -import com.earth2me.essentials.economy.EconomyLayer; -import net.milkbowl.vault.economy.Economy; -import org.bukkit.Bukkit; -import org.bukkit.OfflinePlayer; -import org.bukkit.plugin.Plugin; - -import java.math.BigDecimal; - -public class VaultLayer implements EconomyLayer { - private Plugin plugin; - private Economy adapter; - - @Override - public boolean hasAccount(OfflinePlayer player) { - return adapter.hasAccount(player); - } - - @Override - public boolean createPlayerAccount(OfflinePlayer player) { - return adapter.createPlayerAccount(player); - } - - @Override - public BigDecimal getBalance(OfflinePlayer player) { - return BigDecimal.valueOf(adapter.getBalance(player)); - } - - @Override - public boolean deposit(OfflinePlayer player, BigDecimal amount) { - return adapter.depositPlayer(player, amount.doubleValue()).transactionSuccess(); - } - - @Override - public boolean withdraw(OfflinePlayer player, BigDecimal amount) { - return adapter.withdrawPlayer(player, amount.doubleValue()).transactionSuccess(); - } - - @Override - public String getName() { - return "Vault Compatibility Layer"; - } - - @Override - public String getBackendName() { - return adapter.getName(); - } - - @Override - public void enable(Plugin plugin) { - this.plugin = plugin; - } - - @Override - public boolean onServerLoad() { - this.adapter = Bukkit.getServicesManager().load(Economy.class); - return adapter != null && !adapter.getName().equals("Essentials Economy") && !adapter.getName().equals("EssentialsX Economy"); - } - - @Override - public void disable() { - this.plugin = null; - this.adapter = null; - } - - @Override - public String getPluginName() { - return "Vault"; - } - - @Override - public String getPluginVersion() { - return plugin == null ? null : plugin.getDescription().getVersion(); - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/economy/vault/VaultEconomyProvider.java b/Essentials/src/main/java/com/earth2me/essentials/economy/vault/VaultEconomyProvider.java deleted file mode 100644 index 18257fbbf..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/economy/vault/VaultEconomyProvider.java +++ /dev/null @@ -1,405 +0,0 @@ -package com.earth2me.essentials.economy.vault; - -import com.earth2me.essentials.Essentials; -import com.earth2me.essentials.OfflinePlayerStub; -import com.earth2me.essentials.api.NoLoanPermittedException; -import com.earth2me.essentials.api.UserDoesNotExistException; -import com.earth2me.essentials.config.EssentialsUserConfiguration; -import com.earth2me.essentials.utils.NumberUtil; -import com.earth2me.essentials.utils.StringUtil; -import com.google.common.base.Charsets; -import net.ess3.api.MaxMoneyException; -import net.milkbowl.vault.economy.Economy; -import net.milkbowl.vault.economy.EconomyResponse; -import org.bukkit.OfflinePlayer; -import org.bukkit.entity.Player; - -import java.io.File; -import java.math.BigDecimal; -import java.text.MessageFormat; -import java.util.Collections; -import java.util.List; -import java.util.UUID; -import java.util.logging.Level; - -/** - * A goddamn Vault adapter, what more do you want? - * Provides access to the EssentialsX economy for plugins that use the Vault API. - *

- * Developer note: for accessing Essentials/Vault economy functions from EssentialsX code, see - * {@link com.earth2me.essentials.User}. - */ -public class VaultEconomyProvider implements Economy { - private static final String WARN_NPC_RECREATE_1 = "Account creation was requested for NPC user {0}, but an account file with UUID {1} already exists."; - private static final String WARN_NPC_RECREATE_2 = "Essentials will create a new account as requested by the other plugin, but this is almost certainly a bug and should be reported."; - - private final Essentials ess; - - public VaultEconomyProvider(Essentials essentials) { - this.ess = essentials; - } - - @Override - public boolean isEnabled() { - return ess.isEnabled(); - } - - @Override - public String getName() { - return "EssentialsX Economy"; - } - - @Override - public boolean hasBankSupport() { - return false; - } - - @Override - public int fractionalDigits() { - return -1; - } - - @Override - public String format(double amount) { - return NumberUtil.displayCurrency(BigDecimal.valueOf(amount), ess); - } - - @Override - public String currencyNamePlural() { - return currencyNameSingular(); - } - - @Override - public String currencyNameSingular() { - return ess.getSettings().getCurrencySymbol(); - } - - @SuppressWarnings("deprecation") - @Override - public boolean hasAccount(String playerName) { - if (com.earth2me.essentials.api.Economy.playerExists(playerName)) { - return true; - } - // We may not have the player name in the usermap, let's double check an NPC account with this name doesn't exist. - return com.earth2me.essentials.api.Economy.playerExists(UUID.nameUUIDFromBytes(("NPC:" + StringUtil.safeString(playerName)).getBytes(Charsets.UTF_8))); - } - - @Override - public boolean hasAccount(OfflinePlayer player) { - return com.earth2me.essentials.api.Economy.playerExists(player.getUniqueId()); - } - - @Override - public boolean hasAccount(String playerName, String worldName) { - return hasAccount(playerName); - } - - @Override - public boolean hasAccount(OfflinePlayer player, String worldName) { - return hasAccount(player); - } - - @SuppressWarnings("deprecation") - @Override - public double getBalance(String playerName) { - try { - return getDoubleValue(com.earth2me.essentials.api.Economy.getMoneyExact(playerName)); - } catch (UserDoesNotExistException e) { - createPlayerAccount(playerName); - return getDoubleValue(ess.getSettings().getStartingBalance()); - } - } - - @Override - public double getBalance(OfflinePlayer player) { - try { - return getDoubleValue(com.earth2me.essentials.api.Economy.getMoneyExact(player.getUniqueId())); - } catch (UserDoesNotExistException e) { - createPlayerAccount(player); - return getDoubleValue(ess.getSettings().getStartingBalance()); - } - } - - private double getDoubleValue(final BigDecimal value) { - double amount = value.doubleValue(); - if (new BigDecimal(amount).compareTo(value) > 0) { - // closest double is bigger than the exact amount - // -> get the previous double value to not return more money than the user has - amount = Math.nextAfter(amount, Double.NEGATIVE_INFINITY); - } - return amount; - } - - @Override - public double getBalance(String playerName, String world) { - return getBalance(playerName); - } - - @Override - public double getBalance(OfflinePlayer player, String world) { - return getBalance(player); - } - - @SuppressWarnings("deprecation") - @Override - public boolean has(String playerName, double amount) { - try { - return com.earth2me.essentials.api.Economy.hasEnough(playerName, amount); - } catch (UserDoesNotExistException e) { - return false; - } - } - - @Override - public boolean has(OfflinePlayer player, double amount) { - try { - return com.earth2me.essentials.api.Economy.hasEnough(player.getUniqueId(), BigDecimal.valueOf(amount)); - } catch (UserDoesNotExistException e) { - return false; - } - } - - @Override - public boolean has(String playerName, String worldName, double amount) { - return has(playerName, amount); - } - - @Override - public boolean has(OfflinePlayer player, String worldName, double amount) { - return has(player, amount); - } - - @SuppressWarnings("deprecation") - @Override - public EconomyResponse withdrawPlayer(String playerName, double amount) { - if (playerName == null) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.FAILURE, "Player name cannot be null!"); - } - if (amount < 0) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.FAILURE, "Cannot withdraw negative funds!"); - } - - try { - com.earth2me.essentials.api.Economy.subtract(playerName, amount); - return new EconomyResponse(amount, getBalance(playerName), EconomyResponse.ResponseType.SUCCESS, null); - } catch (UserDoesNotExistException e) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.FAILURE, "User does not exist!"); - } catch (NoLoanPermittedException e) { - return new EconomyResponse(0, getBalance(playerName), EconomyResponse.ResponseType.FAILURE, "Loan was not permitted!"); - } catch (MaxMoneyException e) { - return new EconomyResponse(0, getBalance(playerName), EconomyResponse.ResponseType.FAILURE, "User goes over maximum money limit!"); - } - } - - @Override - public EconomyResponse withdrawPlayer(OfflinePlayer player, double amount) { - if (player == null) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.FAILURE, "Player cannot be null!"); - } - if (amount < 0) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.FAILURE, "Cannot withdraw negative funds!"); - } - - try { - com.earth2me.essentials.api.Economy.subtract(player.getUniqueId(), BigDecimal.valueOf(amount)); - return new EconomyResponse(amount, getBalance(player), EconomyResponse.ResponseType.SUCCESS, null); - } catch (UserDoesNotExistException e) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.FAILURE, "User does not exist!"); - } catch (NoLoanPermittedException e) { - return new EconomyResponse(0, getBalance(player), EconomyResponse.ResponseType.FAILURE, "Loan was not permitted!"); - } catch (MaxMoneyException e) { - return new EconomyResponse(0, getBalance(player), EconomyResponse.ResponseType.FAILURE, "User goes over maximum money limit!"); - } - } - - @Override - public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) { - return withdrawPlayer(playerName, amount); - } - - @Override - public EconomyResponse withdrawPlayer(OfflinePlayer player, String worldName, double amount) { - return withdrawPlayer(player, amount); - } - - @SuppressWarnings("deprecation") - @Override - public EconomyResponse depositPlayer(String playerName, double amount) { - if (playerName == null) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.FAILURE, "Player name can not be null."); - } - if (amount < 0) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.FAILURE, "Cannot deposit negative funds"); - } - - try { - com.earth2me.essentials.api.Economy.add(playerName, amount); - return new EconomyResponse(amount, getBalance(playerName), EconomyResponse.ResponseType.SUCCESS, null); - } catch (UserDoesNotExistException e) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.FAILURE, "User does not exist!"); - } catch (NoLoanPermittedException e) { - return new EconomyResponse(0, getBalance(playerName), EconomyResponse.ResponseType.FAILURE, "Loan was not permitted!"); - } catch (MaxMoneyException e) { - return new EconomyResponse(0, getBalance(playerName), EconomyResponse.ResponseType.FAILURE, "User goes over maximum money limit!"); - } - } - - @Override - public EconomyResponse depositPlayer(OfflinePlayer player, double amount) { - if (player == null) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.FAILURE, "Player can not be null."); - } - if (amount < 0) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.FAILURE, "Cannot deposit negative funds"); - } - - try { - com.earth2me.essentials.api.Economy.add(player.getUniqueId(), BigDecimal.valueOf(amount)); - return new EconomyResponse(amount, getBalance(player), EconomyResponse.ResponseType.SUCCESS, null); - } catch (UserDoesNotExistException e) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.FAILURE, "User does not exist!"); - } catch (NoLoanPermittedException e) { - return new EconomyResponse(0, getBalance(player), EconomyResponse.ResponseType.FAILURE, "Loan was not permitted!"); - } catch (MaxMoneyException e) { - return new EconomyResponse(0, getBalance(player), EconomyResponse.ResponseType.FAILURE, "User goes over maximum money limit!"); - } - } - - @Override - public EconomyResponse depositPlayer(String playerName, String worldName, double amount) { - return depositPlayer(playerName, amount); - } - - @Override - public EconomyResponse depositPlayer(OfflinePlayer player, String worldName, double amount) { - return depositPlayer(player, amount); - } - - @Override - public boolean createPlayerAccount(String playerName) { - if (hasAccount(playerName)) { - return false; - } - // Assume we're creating an NPC here? If not, it's a lost cause anyway! - return com.earth2me.essentials.api.Economy.createNPC(playerName); - } - - @Override - public boolean createPlayerAccount(OfflinePlayer player) { - if (hasAccount(player)) { - return false; - } - - // String based UUIDs are version 3 and are used for NPC and OfflinePlayers - // Citizens uses v2 UUIDs, yeah I don't know either! - if (player.getUniqueId().version() == 3 || player.getUniqueId().version() == 2) { - final File folder = new File(ess.getDataFolder(), "userdata"); - if (!folder.exists()) { - if (!folder.mkdirs()) { - throw new RuntimeException("Error while creating userdata directory!"); - } - } - final File npcFile = new File(folder, player.getUniqueId() + ".yml"); - if (npcFile.exists()) { - ess.getLogger().log(Level.SEVERE, MessageFormat.format(WARN_NPC_RECREATE_1, player.getName(), player.getUniqueId().toString()), new RuntimeException()); - ess.getLogger().log(Level.SEVERE, WARN_NPC_RECREATE_2); - } - final EssentialsUserConfiguration npcConfig = new EssentialsUserConfiguration(player.getName(), player.getUniqueId(), npcFile); - npcConfig.load(); - npcConfig.setProperty("npc", true); - npcConfig.setProperty("last-account-name", player.getName()); - npcConfig.setProperty("money", ess.getSettings().getStartingBalance()); - npcConfig.blockingSave(); - // This will load the NPC into the UserMap + UUID cache - ess.getUsers().addCachedNpcName(player.getUniqueId(), player.getName()); - ess.getUsers().getUser(player.getUniqueId()); - return true; - } - - // Loading a v4 UUID that we somehow didn't track, mark it as a normal player and hope for the best, vault sucks :/ - if (ess.getSettings().isDebug()) { - ess.getLogger().info("Vault requested a player account creation for a v4 UUID: " + player); - } - - final Player userPlayer; - if (player instanceof Player) { - userPlayer = (Player) player; - } else { - final OfflinePlayerStub essPlayer = new OfflinePlayerStub(player.getUniqueId(), ess.getServer()); - essPlayer.setName(player.getName()); - userPlayer = essPlayer; - } - ess.getUsers().getUser(userPlayer); - return true; - } - - @Override - public boolean createPlayerAccount(String playerName, String worldName) { - return createPlayerAccount(playerName); - } - - @Override - public boolean createPlayerAccount(OfflinePlayer player, String worldName) { - return createPlayerAccount(player); - } - - @Override - public EconomyResponse createBank(String name, String player) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "EssentialsX does not support bank accounts!"); - } - - @Override - public EconomyResponse createBank(String name, OfflinePlayer player) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "EssentialsX does not support bank accounts!"); - } - - @Override - public EconomyResponse deleteBank(String name) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "EssentialsX does not support bank accounts!"); - } - - @Override - public EconomyResponse bankBalance(String name) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "EssentialsX does not support bank accounts!"); - } - - @Override - public EconomyResponse bankHas(String name, double amount) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "EssentialsX does not support bank accounts!"); - } - - @Override - public EconomyResponse bankWithdraw(String name, double amount) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "EssentialsX does not support bank accounts!"); - } - - @Override - public EconomyResponse bankDeposit(String name, double amount) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "EssentialsX does not support bank accounts!"); - } - - @Override - public EconomyResponse isBankOwner(String name, String playerName) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "EssentialsX does not support bank accounts!"); - } - - @Override - public EconomyResponse isBankOwner(String name, OfflinePlayer player) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "EssentialsX does not support bank accounts!"); - } - - @Override - public EconomyResponse isBankMember(String name, String playerName) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "EssentialsX does not support bank accounts!"); - } - - @Override - public EconomyResponse isBankMember(String name, OfflinePlayer player) { - return new EconomyResponse(0, 0, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "EssentialsX does not support bank accounts!"); - } - - @Override - public List getBanks() { - return Collections.emptyList(); - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/perm/PermissionsHandler.java b/Essentials/src/main/java/com/earth2me/essentials/perm/PermissionsHandler.java index 82dcba37e..6ed46be8c 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/perm/PermissionsHandler.java +++ b/Essentials/src/main/java/com/earth2me/essentials/perm/PermissionsHandler.java @@ -2,11 +2,8 @@ package com.earth2me.essentials.perm; import com.earth2me.essentials.Essentials; import com.earth2me.essentials.User; -import com.earth2me.essentials.perm.impl.AbstractVaultHandler; import com.earth2me.essentials.perm.impl.ConfigPermissionsHandler; -import com.earth2me.essentials.perm.impl.GenericVaultHandler; import com.earth2me.essentials.perm.impl.LuckPermsHandler; -import com.earth2me.essentials.perm.impl.ModernVaultHandler; import com.earth2me.essentials.perm.impl.SuperpermsHandler; import com.earth2me.essentials.utils.TriState; import com.google.common.collect.ImmutableSet; @@ -157,8 +154,6 @@ public class PermissionsHandler implements IPermissionsHandler { // load and assign a handler final List> providerClazz = Arrays.asList( LuckPermsHandler.class, - ModernVaultHandler.class, - GenericVaultHandler.class, SuperpermsHandler.class ); for (final Class providerClass : providerClazz) { @@ -194,16 +189,14 @@ public class PermissionsHandler implements IPermissionsHandler { lastHandler = handlerClass; // output handler info - if (handler instanceof AbstractVaultHandler) { - String enabledPermsPlugin = ((AbstractVaultHandler) handler).getEnabledPermsPlugin(); - if (enabledPermsPlugin == null) enabledPermsPlugin = "generic"; - ess.getLogger().info("Using Vault based permissions (" + enabledPermsPlugin + ")"); + if (handler instanceof LuckPermsHandler) { + ess.getLogger().info("Using LuckPerms permissions."); } else if (handler.getClass() == SuperpermsHandler.class) { if (handler.tryProvider(ess)) { ess.getLogger().warning("Detected supported permissions plugin " + - ((SuperpermsHandler) handler).getEnabledPermsPlugin() + " without Vault installed."); + ((SuperpermsHandler) handler).getEnabledPermsPlugin() + " without LuckPerms installed."); ess.getLogger().warning("Features such as chat prefixes/suffixes and group-related functionality will not " + - "work until you install Vault."); + "work until you install LuckPerms."); } ess.getLogger().info("Using superperms-based permissions."); } else if (handler.getClass() == ConfigPermissionsHandler.class) { diff --git a/Essentials/src/main/java/com/earth2me/essentials/perm/impl/AbstractVaultHandler.java b/Essentials/src/main/java/com/earth2me/essentials/perm/impl/AbstractVaultHandler.java deleted file mode 100644 index 3e7f745c6..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/perm/impl/AbstractVaultHandler.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.earth2me.essentials.perm.impl; - -import net.milkbowl.vault.chat.Chat; -import net.milkbowl.vault.permission.Permission; -import org.bukkit.Bukkit; -import org.bukkit.OfflinePlayer; -import org.bukkit.entity.Player; -import org.bukkit.plugin.RegisteredServiceProvider; -import org.bukkit.plugin.java.JavaPlugin; - -import java.util.Arrays; -import java.util.List; - -public abstract class AbstractVaultHandler extends SuperpermsHandler { - protected static Permission perms = null; - protected static Chat chat = null; - - private boolean setupProviders() { - try { - Class.forName("net.milkbowl.vault.permission.Permission"); - Class.forName("net.milkbowl.vault.chat.Chat"); - } catch (final ClassNotFoundException e) { - return false; - } - - final RegisteredServiceProvider permsProvider = Bukkit.getServer().getServicesManager().getRegistration(Permission.class); - final RegisteredServiceProvider chatProvider = Bukkit.getServer().getServicesManager().getRegistration(Chat.class); - if (permsProvider == null || chatProvider == null) return false; - - perms = permsProvider.getProvider(); - chat = chatProvider.getProvider(); - return perms != null && chat != null; - } - - @Override - public String getGroup(final OfflinePlayer base) { - if (base.isOnline()) { - return perms.getPrimaryGroup(base.getPlayer()); - } - return perms.getPrimaryGroup(null, base); - } - - @Override - public List getGroups(final OfflinePlayer base) { - if (base.isOnline()) { - return Arrays.asList(perms.getPlayerGroups(base.getPlayer())); - } - return Arrays.asList(perms.getPlayerGroups(null, base)); - } - - @Override - public List getGroups() { - return Arrays.asList(perms.getGroups()); - } - - @Override - public boolean addToGroup(OfflinePlayer base, String group) { - return perms.playerAddGroup(null, base, group); - } - - @Override - public boolean removeFromGroup(OfflinePlayer base, String group) { - return perms.playerRemoveGroup(null, base, group); - } - - @Override - public boolean inGroup(final Player base, final String group) { - return perms.playerInGroup(base, group); - } - - @Override - public String getPrefix(final Player base) { - final String playerPrefix = chat.getPlayerPrefix(base); - if (playerPrefix != null) { - return playerPrefix; - } - - final String playerGroup = perms.getPrimaryGroup(base); - if (playerGroup != null) { - return chat.getGroupPrefix(base.getWorld().getName(), playerGroup); - } - - return null; - } - - @Override - public String getSuffix(final Player base) { - final String playerSuffix = chat.getPlayerSuffix(base); - if (playerSuffix != null) { - return playerSuffix; - } - - final String playerGroup = perms.getPrimaryGroup(base); - if (playerGroup != null) { - return chat.getGroupSuffix(base.getWorld().getName(), playerGroup); - } - - return null; - } - - @Override - public String getBackendName() { - final String reportedPlugin = perms.getName(); - final String classPlugin = JavaPlugin.getProvidingPlugin(perms.getClass()).getName(); - - if (reportedPlugin.equals(classPlugin)) { - return reportedPlugin; - } - return reportedPlugin + " (" + classPlugin + ")"; - } - - boolean canLoad() { - if (Bukkit.getPluginManager().getPlugin("Vault") == null) return false; - try { - return setupProviders(); - } catch (final Throwable t) { - return false; - } - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/perm/impl/GenericVaultHandler.java b/Essentials/src/main/java/com/earth2me/essentials/perm/impl/GenericVaultHandler.java deleted file mode 100644 index ff63ab9db..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/perm/impl/GenericVaultHandler.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.earth2me.essentials.perm.impl; - -import com.earth2me.essentials.Essentials; - -public class GenericVaultHandler extends AbstractVaultHandler { - @Override - public boolean tryProvider(Essentials ess) { - return super.canLoad(); - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/perm/impl/LuckPermsHandler.java b/Essentials/src/main/java/com/earth2me/essentials/perm/impl/LuckPermsHandler.java index b8d928799..47d807e89 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/perm/impl/LuckPermsHandler.java +++ b/Essentials/src/main/java/com/earth2me/essentials/perm/impl/LuckPermsHandler.java @@ -4,24 +4,194 @@ import com.earth2me.essentials.Essentials; import com.earth2me.essentials.User; import net.luckperms.api.LuckPerms; +import net.luckperms.api.cacheddata.CachedMetaData; import net.luckperms.api.context.ContextCalculator; import net.luckperms.api.context.ContextConsumer; import net.luckperms.api.context.ContextSet; import net.luckperms.api.context.ImmutableContextSet; +import net.luckperms.api.model.group.Group; +import net.luckperms.api.model.user.UserManager; +import net.luckperms.api.node.NodeType; +import net.luckperms.api.node.types.InheritanceNode; +import net.luckperms.api.query.QueryOptions; import org.bukkit.Bukkit; +import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; import org.bukkit.plugin.RegisteredServiceProvider; +import java.util.ArrayList; +import java.util.Collections; import java.util.HashSet; +import java.util.List; import java.util.Set; +import java.util.UUID; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; import java.util.function.Function; import java.util.function.Supplier; +import java.util.stream.Collectors; -public class LuckPermsHandler extends ModernVaultHandler { +public class LuckPermsHandler extends SuperpermsHandler { private LuckPerms luckPerms; private Essentials ess; private CombinedCalculator calculator; + @Override + protected boolean emulateWildcards() { + return false; + } + + @Override + public boolean tryProvider(Essentials ess) { + if (Bukkit.getPluginManager().getPlugin("LuckPerms") == null) { + return false; + } + try { + Class.forName("net.luckperms.api.LuckPerms"); + } catch (final ClassNotFoundException e) { + return false; + } + final RegisteredServiceProvider provider = Bukkit.getServicesManager().getRegistration(LuckPerms.class); + if (provider == null) { + return false; + } + this.luckPerms = provider.getProvider(); + this.ess = ess; + return this.luckPerms != null; + } + + @Override + public String getBackendName() { + return "LuckPerms"; + } + + @Override + public String getEnabledPermsPlugin() { + return "LuckPerms"; + } + + @Override + public boolean canBuild(final Player base, final String group) { + if (super.canBuild(base, group)) { + return true; + } + final CachedMetaData meta = playerMeta(base); + if (meta == null) { + return false; + } + final String value = meta.getMetaValue("build"); + return value != null && Boolean.parseBoolean(value); + } + + @Override + public String getGroup(final OfflinePlayer base) { + final net.luckperms.api.model.user.User lpUser = loadUser(base.getUniqueId()); + if (lpUser == null) { + return null; + } + return lpUser.getPrimaryGroup(); + } + + @Override + public List getGroups(final OfflinePlayer base) { + final net.luckperms.api.model.user.User lpUser = loadUser(base.getUniqueId()); + if (lpUser == null) { + return Collections.emptyList(); + } + final QueryOptions options = lpUser.getQueryOptions(); + return lpUser.resolveInheritedNodes(options).stream() + .filter(NodeType.INHERITANCE::matches) + .map(NodeType.INHERITANCE::cast) + .map(InheritanceNode::getGroupName) + .distinct() + .collect(Collectors.toList()); + } + + @Override + public List getGroups() { + final List groups = new ArrayList<>(); + for (final Group group : luckPerms.getGroupManager().getLoadedGroups()) { + groups.add(group.getName()); + } + return groups; + } + + @Override + public boolean inGroup(final Player base, final String group) { + final net.luckperms.api.model.user.User lpUser = luckPerms.getUserManager().getUser(base.getUniqueId()); + if (lpUser == null) { + return super.inGroup(base, group); + } + return lpUser.resolveInheritedNodes(lpUser.getQueryOptions()).stream() + .filter(NodeType.INHERITANCE::matches) + .map(NodeType.INHERITANCE::cast) + .anyMatch(node -> node.getGroupName().equalsIgnoreCase(group)); + } + + @Override + public boolean addToGroup(OfflinePlayer base, String group) { + return modifyGroup(base.getUniqueId(), group, true); + } + + @Override + public boolean removeFromGroup(OfflinePlayer base, String group) { + return modifyGroup(base.getUniqueId(), group, false); + } + + private boolean modifyGroup(final UUID uuid, final String group, final boolean add) { + final Group lpGroup = luckPerms.getGroupManager().getGroup(group); + if (lpGroup == null) { + return false; + } + final UserManager userManager = luckPerms.getUserManager(); + try { + return userManager.modifyUser(uuid, user -> { + final InheritanceNode node = InheritanceNode.builder(lpGroup).build(); + if (add) { + user.data().add(node); + } else { + user.data().remove(node); + } + }).thenApply(v -> true).get(); + } catch (final InterruptedException | ExecutionException e) { + return false; + } + } + + @Override + public String getPrefix(final Player base) { + final CachedMetaData meta = playerMeta(base); + return meta == null ? null : meta.getPrefix(); + } + + @Override + public String getSuffix(final Player base) { + final CachedMetaData meta = playerMeta(base); + return meta == null ? null : meta.getSuffix(); + } + + private CachedMetaData playerMeta(final Player base) { + final net.luckperms.api.model.user.User lpUser = luckPerms.getUserManager().getUser(base.getUniqueId()); + if (lpUser == null) { + return null; + } + return lpUser.getCachedData().getMetaData(QueryOptions.contextual(luckPerms.getContextManager().getContext(base))); + } + + private net.luckperms.api.model.user.User loadUser(final UUID uuid) { + final UserManager userManager = luckPerms.getUserManager(); + net.luckperms.api.model.user.User lpUser = userManager.getUser(uuid); + if (lpUser != null) { + return lpUser; + } + try { + final CompletableFuture future = userManager.loadUser(uuid); + return future.get(); + } catch (final InterruptedException | ExecutionException e) { + return null; + } + } + @Override public void registerContext(final String context, final Function> calculator, final Supplier> suggestions) { if (this.calculator == null) { @@ -39,16 +209,6 @@ public class LuckPermsHandler extends ModernVaultHandler { } } - @Override - public boolean tryProvider(Essentials ess) { - final RegisteredServiceProvider provider = Bukkit.getServicesManager().getRegistration(LuckPerms.class); - if (provider != null) { - this.luckPerms = provider.getProvider(); - this.ess = ess; - } - return luckPerms != null && super.tryProvider(ess); - } - private static final class Calculator { private final String id; private final Function> function; @@ -61,24 +221,16 @@ public class LuckPermsHandler extends ModernVaultHandler { } } - // By combining all calculators into one, we only need to make one call to ess.getUser(). private class CombinedCalculator implements ContextCalculator { private final Set calculators = new HashSet<>(); @Override public void calculate(final Player target, final ContextConsumer consumer) { - // If the player doesn't exist in the UserMap, just skip - // Ess will cause performance problems for permissions checks if it attempts to - // perform i/o to load the user data otherwise. if (!ess.getUsers().getAllUserUUIDs().contains(target.getUniqueId())) { return; } final User user = ess.getUsers().loadUncachedUser(target.getUniqueId()); - - // This will occur for first time players during join, - // None of our contexts would apply to that kind of person anyway, - // lets just skip :O if (user == null) { return; } @@ -94,7 +246,6 @@ public class LuckPermsHandler extends ModernVaultHandler { for (Calculator calculator : this.calculators) { calculator.suggestions.get().forEach(value -> builder.add(calculator.id, value)); } - return builder.build(); } } diff --git a/Essentials/src/main/java/com/earth2me/essentials/perm/impl/ModernVaultHandler.java b/Essentials/src/main/java/com/earth2me/essentials/perm/impl/ModernVaultHandler.java deleted file mode 100644 index 5d4a87c49..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/perm/impl/ModernVaultHandler.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.earth2me.essentials.perm.impl; - -import com.earth2me.essentials.Essentials; - -import org.bukkit.entity.Player; - -import java.util.Arrays; -import java.util.List; -import java.util.Objects; - -public class ModernVaultHandler extends AbstractVaultHandler { - private final List supportedPlugins = Arrays.asList("PermissionsEx", "LuckPerms"); - - @Override - protected boolean emulateWildcards() { - return false; - } - - @Override - public boolean canBuild(final Player base, final String group) { - Objects.requireNonNull(base, "Can't check build override for nonexistent player!"); - return super.canBuild(base, group) || chat.getPlayerInfoBoolean(base.getWorld().getName(), base, "build", false); - } - - @Override - public boolean tryProvider(Essentials ess) { - return super.canLoad() && supportedPlugins.contains(getEnabledPermsPlugin()); - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/EssentialsSign.java b/Essentials/src/main/java/com/earth2me/essentials/signs/EssentialsSign.java index 203a9589b..eadfde919 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/EssentialsSign.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/EssentialsSign.java @@ -1,16 +1,12 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.CommandSource; import com.earth2me.essentials.MetaItemStack; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import com.earth2me.essentials.utils.FormatUtil; import com.earth2me.essentials.utils.MaterialUtil; -import com.earth2me.essentials.utils.NumberUtil; import com.earth2me.essentials.utils.VersionUtil; import net.ess3.api.IEssentials; -import net.ess3.api.MaxMoneyException; import net.ess3.api.events.SignBreakEvent; import net.ess3.api.events.SignCreateEvent; import net.ess3.api.events.SignInteractEvent; @@ -24,7 +20,6 @@ import org.bukkit.entity.Player; import org.bukkit.event.block.SignChangeEvent; import org.bukkit.inventory.ItemStack; -import java.math.BigDecimal; import java.util.HashSet; import java.util.Locale; import java.util.Set; @@ -33,7 +28,6 @@ import static com.earth2me.essentials.I18n.tl; public class EssentialsSign { private static final String SIGN_OWNER_KEY = "sign-owner"; - protected static final BigDecimal MINTRANSACTION = new BigDecimal("0.01"); private static final Set EMPTY_SET = new HashSet<>(); protected transient final String signName; @@ -120,7 +114,7 @@ public class EssentialsSign { sign.setLine(0, getSuccessName(ess)); } return ret; - } catch (final ChargeException | SignException ex) { + } catch (final SignException ex) { showError(ess, user.getSource(), ex, signName); } setOwnerData(ess, user, sign); @@ -213,7 +207,7 @@ public class EssentialsSign { } } - protected final boolean onSignBreak(final Block block, final Player player, final IEssentials ess) throws MaxMoneyException { + protected final boolean onSignBreak(final Block block, final Player player, final IEssentials ess) { final ISign sign = new BlockSign(block); final User user = ess.getUser(player); try { @@ -234,15 +228,15 @@ public class EssentialsSign { } } - protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { + protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { return true; } - protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException, MaxMoneyException { + protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { return true; } - protected boolean onSignBreak(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, MaxMoneyException { + protected boolean onSignBreak(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { return true; } @@ -250,7 +244,7 @@ public class EssentialsSign { final User user = ess.getUser(player); try { return onBlockPlace(block, user, getUsername(user), ess); - } catch (final ChargeException | SignException ex) { + } catch (final SignException ex) { showError(ess, user.getSource(), ex, signName); } return false; @@ -260,13 +254,13 @@ public class EssentialsSign { final User user = ess.getUser(player); try { return onBlockInteract(block, user, getUsername(user), ess); - } catch (final ChargeException | SignException ex) { + } catch (final SignException ex) { showError(ess, user.getSource(), ex, signName); } return false; } - protected final boolean onBlockBreak(final Block block, final Player player, final IEssentials ess) throws MaxMoneyException { + protected final boolean onBlockBreak(final Block block, final Player player, final IEssentials ess) { final User user = ess.getUser(player); try { return onBlockBreak(block, user, getUsername(user), ess); @@ -296,15 +290,15 @@ public class EssentialsSign { return true; } - protected boolean onBlockPlace(final Block block, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { + protected boolean onBlockPlace(final Block block, final User player, final String username, final IEssentials ess) throws SignException { return true; } - protected boolean onBlockInteract(final Block block, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { + protected boolean onBlockInteract(final Block block, final User player, final String username, final IEssentials ess) throws SignException { return true; } - protected boolean onBlockBreak(final Block block, final User player, final String username, final IEssentials ess) throws SignException, MaxMoneyException { + protected boolean onBlockBreak(final Block block, final User player, final String username, final IEssentials ess) throws SignException { return true; } @@ -320,51 +314,6 @@ public class EssentialsSign { return sign.getLine(lineNumber).trim(); } - protected final void validateTrade(final ISign sign, final int index, final IEssentials ess) throws SignException { - final String line = getSignText(sign, index); - if (line.isEmpty()) { - return; - } - final Trade trade = getTrade(sign, index, 0, ess); - final BigDecimal money = trade.getMoney(); - if (money != null) { - sign.setLine(index, NumberUtil.shortCurrency(money, ess)); - } - } - - protected final void validateTrade(final ISign sign, final int amountIndex, final int itemIndex, final User player, final IEssentials ess) throws SignException { - final String itemType = getSignText(sign, itemIndex); - if (itemType.equalsIgnoreCase("exp") || itemType.equalsIgnoreCase("xp")) { - final int amount = getIntegerPositive(getSignText(sign, amountIndex)); - sign.setLine(amountIndex, Integer.toString(amount)); - sign.setLine(itemIndex, "exp"); - return; - } - final Trade trade = getTrade(sign, amountIndex, itemIndex, player, ess); - final ItemStack item = trade.getItemStack(); - sign.setLine(amountIndex, Integer.toString(item.getAmount())); - sign.setLine(itemIndex, itemType); - } - - protected final Trade getTrade(final ISign sign, final int amountIndex, final int itemIndex, final User player, final IEssentials ess) throws SignException { - return getTrade(sign, amountIndex, itemIndex, player, false, ess); - } - - protected final Trade getTrade(final ISign sign, final int amountIndex, final int itemIndex, final User player, final boolean allowId, final IEssentials ess) throws SignException { - final String itemType = getSignText(sign, itemIndex); - if (itemType.equalsIgnoreCase("exp") || itemType.equalsIgnoreCase("xp")) { - final int amount = getIntegerPositive(getSignText(sign, amountIndex)); - return new Trade(amount, ess); - } - final ItemStack item = getItemStack(itemType, 1, allowId, ess); - final int amount = Math.min(getIntegerPositive(getSignText(sign, amountIndex)), item.getType().getMaxStackSize() * player.getBase().getInventory().getSize()); - if (item.getType() == Material.AIR || amount < 1) { - throw new SignException(tl("moreThanZero")); - } - item.setAmount(amount); - return new Trade(item, ess); - } - protected final void validateInteger(final ISign sign, final int index) throws SignException { final String line = getSignText(sign, index); if (line.isEmpty()) { @@ -430,67 +379,6 @@ public class EssentialsSign { return stack; } - protected final BigDecimal getMoney(final String line, final IEssentials ess) throws SignException { - final boolean isMoney = line.matches("^[^0-9-.]?[.0-9]+[^0-9-.]?$"); - return isMoney ? getBigDecimalPositive(line, ess) : null; - } - - protected final BigDecimal getBigDecimalPositive(final String line, final IEssentials ess) throws SignException { - final BigDecimal quantity = getBigDecimal(line, ess); - if (quantity.compareTo(MINTRANSACTION) < 0) { - throw new SignException(tl("moreThanZero")); - } - return quantity; - } - - protected final BigDecimal getBigDecimal(final String line, final IEssentials ess) throws SignException { - try { - return new BigDecimal(NumberUtil.sanitizeCurrencyString(line, ess)); - } catch (final ArithmeticException | NumberFormatException ex) { - throw new SignException(ex.getMessage(), ex); - } - } - - protected final Trade getTrade(final ISign sign, final int index, final IEssentials ess) throws SignException { - return getTrade(sign, index, 1, ess); - } - - protected final Trade getTrade(final ISign sign, final int index, final int decrement, final IEssentials ess) throws SignException { - return getTrade(sign, index, decrement, false, ess); - } - - protected final Trade getTrade(final ISign sign, final int index, final int decrement, final boolean allowId, final IEssentials ess) throws SignException { - final String line = getSignText(sign, index); - if (line.isEmpty()) { - return new Trade(signName.toLowerCase(Locale.ENGLISH) + "sign", ess); - } - - final BigDecimal money = getMoney(line, ess); - if (money == null) { - final String[] split = line.split("[ :]+", 2); - if (split.length != 2) { - throw new SignException(tl("invalidCharge")); - } - final int quantity = getIntegerPositive(split[0]); - - final String item = split[1].toLowerCase(Locale.ENGLISH); - if (item.equalsIgnoreCase("times")) { - sign.setLine(index, (quantity - decrement) + " times"); - sign.updateSign(); - return new Trade(signName.toLowerCase(Locale.ENGLISH) + "sign", ess); - } else if (item.equalsIgnoreCase("exp") || item.equalsIgnoreCase("xp")) { - sign.setLine(index, quantity + " exp"); - return new Trade(quantity, ess); - } else { - final ItemStack stack = getItemStack(item, quantity, allowId, ess); - sign.setLine(index, quantity + " " + item); - return new Trade(stack, ess); - } - } else { - return new Trade(money, ess); - } - } - private void showError(final IEssentials ess, final CommandSource sender, final Throwable exception, final String signName) { ess.showError(sender, exception, "\\ sign: " + signName); } diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignBalance.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignBalance.java deleted file mode 100644 index b1fabbb89..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignBalance.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.earth2me.essentials.signs; - -import com.earth2me.essentials.User; -import com.earth2me.essentials.utils.NumberUtil; -import net.ess3.api.IEssentials; - -import static com.earth2me.essentials.I18n.tl; - -public class SignBalance extends EssentialsSign { - public SignBalance() { - super("Balance"); - } - - @Override - protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { - player.sendMessage(tl("balance", NumberUtil.displayCurrency(player.getMoney(), ess))); - return true; - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignBlockListener.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignBlockListener.java index 5b238fe7a..2f51e77a0 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignBlockListener.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignBlockListener.java @@ -5,7 +5,6 @@ import com.earth2me.essentials.User; import com.earth2me.essentials.utils.FormatUtil; import com.earth2me.essentials.utils.MaterialUtil; import net.ess3.api.IEssentials; -import net.ess3.api.MaxMoneyException; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.block.Block; @@ -37,16 +36,12 @@ public class SignBlockListener implements Listener { event.getHandlers().unregister(this); return; } - try { - if (protectSignsAndBlocks(event.getBlock(), event.getPlayer())) { - event.setCancelled(true); - } - } catch (final MaxMoneyException ex) { + if (protectSignsAndBlocks(event.getBlock(), event.getPlayer())) { event.setCancelled(true); } } - public boolean protectSignsAndBlocks(final Block block, final Player player) throws MaxMoneyException { + public boolean protectSignsAndBlocks(final Block block, final Player player) { // prevent any signs be broken by destroying the block they are attached to if (EssentialsSign.checkIfBlockBreaksSigns(block)) { if (ess.getSettings().isDebug()) { diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java deleted file mode 100644 index 76ca2045b..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.earth2me.essentials.signs; - -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.User; -import net.ess3.api.IEssentials; -import net.ess3.api.MaxMoneyException; -import org.bukkit.inventory.ItemStack; - -import java.math.BigDecimal; - -public class SignBuy extends EssentialsSign { - public SignBuy() { - super("Buy"); - } - - @Override - protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { - validateTrade(sign, 1, 2, player, ess); - validateTrade(sign, 3, ess); - return true; - } - - @Override - protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException, MaxMoneyException { - Trade items = getTrade(sign, 1, 2, player, ess); - Trade charge = getTrade(sign, 3, ess); - - // Check if the player is trying to buy in bulk. - if (ess.getSettings().isAllowBulkBuySell() && player.getBase().isSneaking()) { - final ItemStack heldItem = player.getItemInHand(); - if (items.getItemStack().isSimilar(heldItem)) { - final int initialItemAmount = items.getItemStack().getAmount(); - final int newItemAmount = heldItem.getAmount(); - final ItemStack item = items.getItemStack(); - item.setAmount(newItemAmount); - items = new Trade(item, ess); - - final BigDecimal chargeAmount = charge.getMoney(); - //noinspection BigDecimalMethodWithoutRoundingCalled - BigDecimal pricePerSingleItem = chargeAmount.divide(new BigDecimal(initialItemAmount)); - pricePerSingleItem = pricePerSingleItem.multiply(new BigDecimal(newItemAmount)); - charge = new Trade(pricePerSingleItem, ess); - } - } - - charge.isAffordableFor(player); - if (!items.pay(player)) { - throw new ChargeException("Inventory full"); //TODO: TL - } - charge.charge(player); - Trade.log("Sign", "Buy", "Interact", username, charge, username, items, sign.getBlock().getLocation(), player.getMoney(), ess); - return true; - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignDisposal.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignDisposal.java index a189e1522..eba047474 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignDisposal.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignDisposal.java @@ -1,6 +1,5 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.User; import net.ess3.api.IEssentials; @@ -12,7 +11,7 @@ public class SignDisposal extends EssentialsSign { } @Override - protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { + protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { if (!player.isAuthorized("essentials.signs.disposal.name")) { sign.setLine(1, ""); sign.setLine(2, ""); diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignEnchant.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignEnchant.java index dfadfc50d..a2333b5f0 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignEnchant.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignEnchant.java @@ -1,8 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.Enchantments; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import com.earth2me.essentials.craftbukkit.Inventories; import net.ess3.api.IEssentials; @@ -20,7 +18,7 @@ public class SignEnchant extends EssentialsSign { } @Override - protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { + protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { final ItemStack stack; final String itemName = sign.getLine(1); final MaterialTagProvider tagProvider = ess.getMaterialTagProvider(); @@ -61,18 +59,15 @@ public class SignEnchant extends EssentialsSign { } catch (final Throwable ex) { throw new SignException(ex.getMessage(), ex); } - getTrade(sign, 3, ess); return true; } @Override - protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { + protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { final ItemStack playerHand = Inventories.getItemInHand(player.getBase()); final MaterialTagProvider tagProvider = ess.getMaterialTagProvider(); final String itemName = sign.getLine(1); final ItemStack search = itemName.equals("*") || itemName.equalsIgnoreCase("any") || (tagProvider != null && tagProvider.tagExists(itemName) && tagProvider.isTagged(itemName, playerHand.getType())) ? null : getItemStack(itemName, 1, ess); - final Trade charge = getTrade(sign, 3, ess); - charge.isAffordableFor(player); final String[] enchantLevel = sign.getLine(2).split(":"); final Enchantment enchantment = Enchantments.getByName(enchantLevel[0]); if (enchantment == null) { @@ -115,8 +110,6 @@ public class SignEnchant extends EssentialsSign { player.sendMessage(tl("enchantmentApplied", enchantmentName.replace('_', ' '))); } - charge.charge(player); - Trade.log("Sign", "Enchant", "Interact", username, charge, username, charge, sign.getBlock().getLocation(), player.getMoney(), ess); player.getBase().updateInventory(); return true; } diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignFree.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignFree.java index 0e455c218..2a9f6aad0 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignFree.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignFree.java @@ -1,6 +1,5 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import net.ess3.api.IEssentials; import org.bukkit.Material; @@ -49,7 +48,6 @@ public class SignFree extends EssentialsSign { invent.addItem(item); } player.getBase().openInventory(invent); - Trade.log("Sign", "Free", "Interact", username, null, username, new Trade(item, ess), sign.getBlock().getLocation(), player.getMoney(), ess); return true; } } diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignGameMode.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignGameMode.java index a58a32de2..ec731182d 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignGameMode.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignGameMode.java @@ -1,7 +1,5 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import net.ess3.api.IEssentials; import org.bukkit.GameMode; @@ -22,27 +20,19 @@ public class SignGameMode extends EssentialsSign { if (gamemode.isEmpty()) { sign.setLine(1, "Survival"); } - - validateTrade(sign, 2, ess); - return true; } @Override - protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { - final Trade charge = getTrade(sign, 2, ess); + protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { final String mode = sign.getLine(1).trim(); if (mode.isEmpty()) { throw new SignException(tl("invalidSignLine", 2)); } - charge.isAffordableFor(player); - performSetMode(mode.toLowerCase(Locale.ENGLISH), player.getBase()); player.sendMessage(tl("gameMode", tl(player.getBase().getGameMode().toString().toLowerCase(Locale.ENGLISH)), player.getDisplayName())); - Trade.log("Sign", "gameMode", "Interact", username, null, username, charge, sign.getBlock().getLocation(), player.getMoney(), ess); - charge.charge(player); return true; } diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignHeal.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignHeal.java index dfddd55f5..b8b81a11a 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignHeal.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignHeal.java @@ -1,7 +1,5 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import net.ess3.api.IEssentials; @@ -14,23 +12,18 @@ public class SignHeal extends EssentialsSign { @Override protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { - validateTrade(sign, 1, ess); return true; } @Override - protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { + protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { if (player.getBase().getHealth() == 0) { throw new SignException(tl("healDead")); } - final Trade charge = getTrade(sign, 1, ess); - charge.isAffordableFor(player); player.getBase().setHealth(20); player.getBase().setFoodLevel(20); player.getBase().setFireTicks(0); player.sendMessage(tl("youAreHealed")); - charge.charge(player); - Trade.log("Sign", "Heal", "Interact", username, null, username, charge, sign.getBlock().getLocation(), player.getMoney(), ess); return true; } } diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignInfo.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignInfo.java index cd618aca3..c7c3b5da1 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignInfo.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignInfo.java @@ -1,7 +1,5 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import com.earth2me.essentials.textreader.IText; import com.earth2me.essentials.textreader.KeywordReplacer; @@ -18,15 +16,11 @@ public class SignInfo extends EssentialsSign { @Override protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { - validateTrade(sign, 3, ess); return true; } @Override - protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { - final Trade charge = getTrade(sign, 3, ess); - charge.isAffordableFor(player); - + protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { final String chapter = sign.getLine(1); final String page = sign.getLine(2); @@ -42,8 +36,6 @@ public class SignInfo extends EssentialsSign { throw new SignException(ex.getMessage(), ex); } - charge.charge(player); - Trade.log("Sign", "Info", "Interact", username, null, username, charge, sign.getBlock().getLocation(), player.getMoney(), ess); return true; } } diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignKit.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignKit.java index cb5498b39..1c9877110 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignKit.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignKit.java @@ -1,8 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.Kit; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import com.earth2me.essentials.commands.NoChargeException; import net.ess3.api.IEssentials; @@ -18,8 +16,6 @@ public class SignKit extends EssentialsSign { @Override protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { - validateTrade(sign, 3, ess); - final String kitName = sign.getLine(1).toLowerCase(Locale.ENGLISH).trim(); if (kitName.isEmpty()) { @@ -40,20 +36,15 @@ public class SignKit extends EssentialsSign { } @Override - protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { + protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { final String kitName = sign.getLine(1).toLowerCase(Locale.ENGLISH).trim(); final String group = sign.getLine(2).trim(); if ((!group.isEmpty() && ("§2Everyone".equals(group) || player.inGroup(group))) || (group.isEmpty() && player.isAuthorized("essentials.kits." + kitName))) { - final Trade charge = getTrade(sign, 3, ess); - charge.isAffordableFor(player); try { final Kit kit = new Kit(kitName, ess); kit.checkDelay(player); kit.setTime(player); kit.expandItems(player); - - charge.charge(player); - Trade.log("Sign", "Kit", "Interact", username, null, username, charge, sign.getBlock().getLocation(), player.getMoney(), ess); } catch (final NoChargeException ex) { return false; } catch (final Exception ex) { diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignProtection.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignProtection.java index bd2f27bcd..6ffdd9a88 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignProtection.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignProtection.java @@ -1,19 +1,14 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.Trade.OverflowType; import com.earth2me.essentials.User; import com.earth2me.essentials.utils.EnumUtil; import com.earth2me.essentials.utils.MaterialUtil; import net.ess3.api.IEssentials; -import net.ess3.api.MaxMoneyException; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.block.Sign; -import org.bukkit.inventory.ItemStack; import java.util.HashMap; import java.util.Locale; @@ -35,7 +30,7 @@ public class SignProtection extends EssentialsSign { } @Override - protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { + protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { sign.setLine(3, "§4" + username); if (hasAdjacentBlock(sign.getBlock())) { final SignProtectionState state = isBlockProtected(sign.getBlock(), player, username, true); @@ -69,15 +64,14 @@ public class SignProtection extends EssentialsSign { return false; } - private void checkIfSignsAreBroken(final Block block, final User player, final String username, final IEssentials ess) throws MaxMoneyException { + private void checkIfSignsAreBroken(final Block block, final User player, final String username, final IEssentials ess) { final Map signs = getConnectedSigns(block, player, username, false); for (final Map.Entry entry : signs.entrySet()) { if (entry.getValue() != SignProtectionState.NOSIGN) { final Block sign = entry.getKey().getBlock(); if (!hasAdjacentBlock(sign, block)) { block.setType(Material.AIR); - final Trade trade = new Trade(new ItemStack(sign.getType(), 1), ess); - trade.pay(player, OverflowType.DROP); + player.getWorld().dropItemNaturally(player.getLocation(), new org.bukkit.inventory.ItemStack(sign.getType(), 1)); } } } @@ -226,7 +220,7 @@ public class SignProtection extends EssentialsSign { } @Override - protected boolean onBlockBreak(final Block block, final User player, final String username, final IEssentials ess) throws SignException, MaxMoneyException { + protected boolean onBlockBreak(final Block block, final User player, final String username, final IEssentials ess) throws SignException { final SignProtectionState state = isBlockProtected(block, player, username, false); if (state == SignProtectionState.OWNER || state == SignProtectionState.NOSIGN) { diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignRepair.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignRepair.java index 397a8de3c..0e50bde1f 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignRepair.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignRepair.java @@ -1,7 +1,5 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import com.earth2me.essentials.commands.Commandrepair; import com.earth2me.essentials.commands.NotEnoughArgumentsException; @@ -23,15 +21,11 @@ public class SignRepair extends EssentialsSign { sign.setLine(1, "§c"); throw new SignException(tl("invalidSignLine", 2)); } - validateTrade(sign, 2, ess); return true; } @Override - protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { - final Trade charge = getTrade(sign, 2, ess); - charge.isAffordableFor(player); - + protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { final Commandrepair command = new Commandrepair(); command.setEssentials(ess); @@ -48,8 +42,6 @@ public class SignRepair extends EssentialsSign { throw new SignException(ex.getMessage(), ex); } - charge.charge(player); - Trade.log("Sign", "Repair", "Interact", username, null, username, charge, sign.getBlock().getLocation(), player.getMoney(), ess); return true; } } diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignSell.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignSell.java deleted file mode 100644 index 1e1079f25..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignSell.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.earth2me.essentials.signs; - -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.Trade.OverflowType; -import com.earth2me.essentials.User; -import net.ess3.api.IEssentials; -import net.ess3.api.MaxMoneyException; -import org.bukkit.inventory.ItemStack; - -import java.math.BigDecimal; - -public class SignSell extends EssentialsSign { - public SignSell() { - super("Sell"); - } - - @Override - protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { - validateTrade(sign, 1, 2, player, ess); - validateTrade(sign, 3, ess); - return true; - } - - @Override - protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException, MaxMoneyException { - Trade charge = getTrade(sign, 1, 2, player, ess); - Trade money = getTrade(sign, 3, ess); - - // Check if the player is trying to sell in bulk. - if (ess.getSettings().isAllowBulkBuySell() && player.getBase().isSneaking()) { - final ItemStack heldItem = player.getItemInHand(); - if (charge.getItemStack().isSimilar(heldItem)) { - final int initialItemAmount = charge.getItemStack().getAmount(); - final int newItemAmount = heldItem.getAmount(); - final ItemStack item = charge.getItemStack(); - item.setAmount(newItemAmount); - charge = new Trade(item, ess); - - final BigDecimal chargeAmount = money.getMoney(); - //noinspection BigDecimalMethodWithoutRoundingCalled - BigDecimal pricePerSingleItem = chargeAmount.divide(new BigDecimal(initialItemAmount)); - pricePerSingleItem = pricePerSingleItem.multiply(new BigDecimal(newItemAmount)); - money = new Trade(pricePerSingleItem, ess); - } - } - - charge.isAffordableFor(player); - money.pay(player, OverflowType.DROP); - charge.charge(player); - Trade.log("Sign", "Sell", "Interact", username, charge, username, money, sign.getBlock().getLocation(), player.getMoney(), ess); - return true; - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignSpawnmob.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignSpawnmob.java index 71eaf8042..4cc7db40d 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignSpawnmob.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignSpawnmob.java @@ -1,8 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.SpawnMob; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import net.ess3.api.IEssentials; @@ -14,17 +12,13 @@ public class SignSpawnmob extends EssentialsSign { } @Override - protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { + protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { validateInteger(sign, 1); - validateTrade(sign, 3, ess); return true; } @Override - protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { - final Trade charge = getTrade(sign, 3, ess); - charge.isAffordableFor(player); - + protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { try { final List mobParts = SpawnMob.mobParts(sign.getLine(2)); final List mobData = SpawnMob.mobData(sign.getLine(2)); @@ -32,9 +26,6 @@ public class SignSpawnmob extends EssentialsSign { } catch (final Exception ex) { throw new SignException(ex.getMessage(), ex); } - - charge.charge(player); - Trade.log("Sign", "Spawnmob", "Interact", username, null, username, charge, sign.getBlock().getLocation(), player.getMoney(), ess); return true; } } diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignTime.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignTime.java index 5bb0db41f..9391a1736 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignTime.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignTime.java @@ -1,7 +1,5 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import com.earth2me.essentials.utils.DescParseTickFormat; import net.ess3.api.IEssentials; @@ -19,7 +17,6 @@ public class SignTime extends EssentialsSign { return true; } - validateTrade(sign, 2, ess); final String timeString = sign.getLine(1); if ("Day".equalsIgnoreCase(timeString)) { sign.setLine(1, "§2Day"); @@ -33,27 +30,21 @@ public class SignTime extends EssentialsSign { } @Override - protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { + protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { if (sign.getLine(1).isEmpty() && sign.getLine(2).isEmpty() && sign.getLine(3).isEmpty()) { player.sendMessage(tl("timeWorldCurrentSign", DescParseTickFormat.format(player.getWorld().getTime()))); return true; } - final Trade charge = getTrade(sign, 2, ess); - charge.isAffordableFor(player); final String timeString = sign.getLine(1); long time = player.getWorld().getTime(); time -= time % 24000; if ("§2Day".equalsIgnoreCase(timeString)) { player.getWorld().setTime(time + 24000); - charge.charge(player); - Trade.log("Sign", "TimeDay", "Interact", username, null, username, charge, sign.getBlock().getLocation(), player.getMoney(), ess); return true; } if ("§2Night".equalsIgnoreCase(timeString)) { player.getWorld().setTime(time + 37700); - charge.charge(player); - Trade.log("Sign", "TimeNight", "Interact", username, null, username, charge, sign.getBlock().getLocation(), player.getMoney(), ess); return true; } throw new SignException(tl("onlyDayNight")); diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignTrade.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignTrade.java deleted file mode 100644 index cd27f501d..000000000 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignTrade.java +++ /dev/null @@ -1,365 +0,0 @@ -package com.earth2me.essentials.signs; - -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.Trade; -import com.earth2me.essentials.Trade.OverflowType; -import com.earth2me.essentials.Trade.TradeType; -import com.earth2me.essentials.User; -import com.earth2me.essentials.craftbukkit.Inventories; -import com.earth2me.essentials.utils.MaterialUtil; -import com.earth2me.essentials.utils.NumberUtil; -import net.ess3.api.IEssentials; -import net.ess3.api.MaxMoneyException; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; - -import java.math.BigDecimal; -import java.util.Map; - -import static com.earth2me.essentials.I18n.tl; - -//TODO: TL exceptions -public class SignTrade extends EssentialsSign { - private static final int MAX_STOCK_LINE_LENGTH = 15; - - public SignTrade() { - super("Trade"); - } - - @Override - protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { - validateTrade(sign, 1, false, ess); - validateTrade(sign, 2, true, ess); - final Trade trade = getTrade(sign, 2, AmountType.ROUNDED, true, true, ess); - final Trade charge = getTrade(sign, 1, AmountType.ROUNDED, false, true, ess); - if (trade.getType() == charge.getType() && (trade.getType() != TradeType.ITEM || trade.getItemStack().isSimilar(charge.getItemStack()))) { - throw new SignException("You cannot trade for the same item type."); - } - trade.isAffordableFor(player); - setOwner(ess, player, sign, 3, "§8"); - trade.charge(player); - Trade.log("Sign", "Trade", "Create", username, trade, username, null, sign.getBlock().getLocation(), player.getMoney(), ess); - return true; - } - - @Override - protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException, MaxMoneyException { - if (isOwner(ess, player, sign, 3, "§8")) { - final Trade store = rechargeSign(sign, ess, player); - final Trade stored; - try { - stored = getTrade(sign, 1, AmountType.TOTAL, true, true, ess); - subtractAmount(sign, 1, stored, ess); - - final Map withdraw = stored.pay(player, OverflowType.RETURN); - - if (withdraw == null) { - Trade.log("Sign", "Trade", "Withdraw", username, store, username, null, sign.getBlock().getLocation(), player.getMoney(), ess); - } else { - setAmount(sign, 1, BigDecimal.valueOf(withdraw.get(0).getAmount()), ess); - Trade.log("Sign", "Trade", "Withdraw", username, stored, username, new Trade(withdraw.get(0), ess), sign.getBlock().getLocation(), player.getMoney(), ess); - } - } catch (final SignException e) { - if (store == null) { - throw new SignException(tl("tradeSignEmptyOwner"), e); - } - } - Trade.log("Sign", "Trade", "Deposit", username, store, username, null, sign.getBlock().getLocation(), player.getMoney(), ess); - } else { - final Trade charge = getTrade(sign, 1, AmountType.COST, false, true, ess); - final Trade trade = getTrade(sign, 2, AmountType.COST, true, true, ess); - charge.isAffordableFor(player); - addAmount(sign, 1, charge, ess); - subtractAmount(sign, 2, trade, ess); - if (!trade.pay(player)) { - subtractAmount(sign, 1, charge, ess); - addAmount(sign, 2, trade, ess); - throw new ChargeException("Full inventory"); - } - charge.charge(player); - Trade.log("Sign", "Trade", "Interact", sign.getLine(3).substring(2), charge, username, trade, sign.getBlock().getLocation(), player.getMoney(), ess); - } - sign.updateSign(); - return true; - } - - private Trade rechargeSign(final ISign sign, final IEssentials ess, final User player) throws SignException, ChargeException { - final Trade trade = getTrade(sign, 2, AmountType.COST, false, true, ess); - ItemStack stack = Inventories.getItemInHand(player.getBase()); - if (trade.getItemStack() != null && stack != null && !MaterialUtil.isAir(stack.getType()) && trade.getItemStack().getType() == stack.getType() && MaterialUtil.getDamage(trade.getItemStack()) == MaterialUtil.getDamage(stack) && trade.getItemStack().getEnchantments().equals(stack.getEnchantments())) { - if (MaterialUtil.isPotion(trade.getItemStack().getType()) && !trade.getItemStack().isSimilar(stack)) { - return null; - } - final int amount = trade.getItemStack().getAmount(); - if (Inventories.containsAtLeast(player.getBase(), trade.getItemStack(), amount)) { - stack = stack.clone(); - stack.setAmount(amount); - final Trade store = new Trade(stack, ess); - addAmount(sign, 2, store, ess); - store.charge(player); - return store; - } - } - return null; - } - - @Override - protected boolean onSignBreak(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, MaxMoneyException { - final String signOwner = sign.getLine(3); - - final boolean isOwner = isOwner(ess, player, sign, 3, "§8"); - final boolean canBreak = isOwner || player.isAuthorized("essentials.signs.trade.override"); - final boolean canCollect = isOwner || player.isAuthorized("essentials.signs.trade.override.collect"); - - if (canBreak) { - try { - final Trade stored1 = getTrade(sign, 1, AmountType.TOTAL, false, true, ess); - final Trade stored2 = getTrade(sign, 2, AmountType.TOTAL, false, true, ess); - - if (!canCollect) { - Trade.log("Sign", "Trade", "Destroy", signOwner.substring(2), stored2, username, stored1, sign.getBlock().getLocation(), player.getMoney(), ess); - return true; - } - - final Map withdraw1 = stored1.pay(player, OverflowType.DROP); - final Map withdraw2 = stored2.pay(player, OverflowType.DROP); - - if (withdraw1 == null && withdraw2 == null) { - Trade.log("Sign", "Trade", "Break", signOwner.substring(2), stored2, username, stored1, sign.getBlock().getLocation(), player.getMoney(), ess); - return true; - } - - setAmount(sign, 1, BigDecimal.valueOf(withdraw1 == null ? 0L : withdraw1.get(0).getAmount()), ess); - Trade.log("Sign", "Trade", "Withdraw", signOwner.substring(2), stored1, username, withdraw1 == null ? null : new Trade(withdraw1.get(0), ess), sign.getBlock().getLocation(), player.getMoney(), ess); - - setAmount(sign, 2, BigDecimal.valueOf(withdraw2 == null ? 0L : withdraw2.get(0).getAmount()), ess); - Trade.log("Sign", "Trade", "Withdraw", signOwner.substring(2), stored2, username, withdraw2 == null ? null : new Trade(withdraw2.get(0), ess), sign.getBlock().getLocation(), player.getMoney(), ess); - - sign.updateSign(); - } catch (final SignException e) { - if (player.isAuthorized("essentials.signs.trade.override")) { - return true; - } - throw e; - } - return false; - } else { - return false; - } - } - - private void validateSignLength(final String newLine) throws SignException { - if (newLine.length() > MAX_STOCK_LINE_LENGTH) { - throw new SignException("This sign is full!"); - } - } - - protected final void validateTrade(final ISign sign, final int index, final boolean amountNeeded, final IEssentials ess) throws SignException { - final String line = sign.getLine(index).trim(); - if (line.isEmpty()) { - throw new SignException("Empty line"); - } - final String[] split = line.split("[ :]+"); - - if (split.length == 1 && !amountNeeded) { - final BigDecimal money = getMoney(split[0], ess); - if (money != null) { - final String newLine = NumberUtil.shortCurrency(money, ess) + ":0"; - validateSignLength(newLine); - sign.setLine(index, newLine); - return; - } - } - - if (split.length == 2 && amountNeeded) { - final BigDecimal money = getMoney(split[0], ess); - BigDecimal amount = getBigDecimalPositive(split[1], ess); - if (money != null && amount != null) { - amount = amount.subtract(amount.remainder(money)); - if (amount.compareTo(MINTRANSACTION) < 0 || money.compareTo(MINTRANSACTION) < 0) { - throw new SignException(tl("moreThanZero")); - } - final String newLine = NumberUtil.shortCurrency(money, ess) + ":" + NumberUtil.formatAsCurrency(amount); - validateSignLength(newLine); - sign.setLine(index, newLine); - return; - } - } - - if (split.length == 2 && !amountNeeded) { - final int amount = getIntegerPositive(split[0]); - - if (amount < 1) { - throw new SignException(tl("moreThanZero")); - } - if (!(split[1].equalsIgnoreCase("exp") || split[1].equalsIgnoreCase("xp")) && getItemStack(split[1], amount, ess).getType() == Material.AIR) { - throw new SignException(tl("moreThanZero")); - } - final String newline = amount + " " + split[1] + ":0"; - validateSignLength(newline); - sign.setLine(index, newline); - return; - } - - if (split.length == 3 && amountNeeded) { - final int stackamount = getIntegerPositive(split[0]); - int amount = getIntegerPositive(split[2]); - amount -= amount % stackamount; - if (amount < 1 || stackamount < 1) { - throw new SignException(tl("moreThanZero")); - } - if (!(split[1].equalsIgnoreCase("exp") || split[1].equalsIgnoreCase("xp")) && getItemStack(split[1], stackamount, ess).getType() == Material.AIR) { - throw new SignException(tl("moreThanZero")); - } - final String newline = stackamount + " " + split[1] + ":" + amount; - validateSignLength(newline); - sign.setLine(index, newline); - return; - } - throw new SignException(tl("invalidSignLine", index + 1)); - } - - protected final Trade getTrade(final ISign sign, final int index, final AmountType amountType, final boolean notEmpty, final IEssentials ess) throws SignException { - return getTrade(sign, index, amountType, notEmpty, false, ess); - } - - protected final Trade getTrade(final ISign sign, final int index, final AmountType amountType, final boolean notEmpty, final boolean allowId, final IEssentials ess) throws SignException { - final String line = sign.getLine(index).trim(); - if (line.isEmpty()) { - throw new SignException("Empty line"); - } - final String[] split = line.split("[ :]+"); - - if (split.length == 2) { - try { - final BigDecimal money = getMoney(split[0], ess); - final BigDecimal amount = notEmpty ? getBigDecimalPositive(split[1], ess) : getBigDecimal(split[1], ess); - if (money != null && amount != null) { - return new Trade(amountType == AmountType.COST ? money : amount, ess); - } - } catch (final SignException e) { - throw new SignException(tl("tradeSignEmpty"), e); - } - } - - if (split.length == 3) { - final int stackAmount = getIntegerPositive(split[0]); - if (split[1].equalsIgnoreCase("exp") || split[1].equalsIgnoreCase("xp")) { - int amount = getInteger(split[2]); - if (amountType == AmountType.ROUNDED) { - amount -= amount % stackAmount; - } - if (notEmpty && (amount < 1 || stackAmount < 1)) { - throw new SignException(tl("tradeSignEmpty")); - } - return new Trade(amountType == AmountType.COST ? stackAmount : amount, ess); - } else { - final ItemStack item = getItemStack(split[1], stackAmount, allowId, ess); - int amount = getInteger(split[2]); - if (amountType == AmountType.ROUNDED) { - amount -= amount % stackAmount; - } - if (notEmpty && (amount < 1 || stackAmount < 1 || item.getType() == Material.AIR || amount < stackAmount)) { - throw new SignException(tl("tradeSignEmpty")); - } - item.setAmount(amountType == AmountType.COST ? stackAmount : amount); - return new Trade(item, ess); - } - } - throw new SignException(tl("invalidSignLine", index + 1)); - } - - protected final void subtractAmount(final ISign sign, final int index, final Trade trade, final IEssentials ess) throws SignException { - final BigDecimal money = trade.getMoney(); - if (money != null) { - changeAmount(sign, index, money.negate(), ess); - } - final ItemStack item = trade.getItemStack(); - if (item != null) { - changeAmount(sign, index, BigDecimal.valueOf(-item.getAmount()), ess); - } - final Integer exp = trade.getExperience(); - if (exp != null) { - changeAmount(sign, index, BigDecimal.valueOf(-exp), ess); - } - } - - protected final void addAmount(final ISign sign, final int index, final Trade trade, final IEssentials ess) throws SignException { - final BigDecimal money = trade.getMoney(); - if (money != null) { - changeAmount(sign, index, money, ess); - } - final ItemStack item = trade.getItemStack(); - if (item != null) { - changeAmount(sign, index, BigDecimal.valueOf(item.getAmount()), ess); - } - final Integer exp = trade.getExperience(); - if (exp != null) { - changeAmount(sign, index, BigDecimal.valueOf(exp), ess); - } - } - - //TODO: Translate these exceptions. - private void changeAmount(final ISign sign, final int index, final BigDecimal value, final IEssentials ess) throws SignException { - final String line = sign.getLine(index).trim(); - if (line.isEmpty()) { - throw new SignException("Empty line"); - } - final String[] split = line.split("[ :]+"); - - if (split.length == 2) { - final BigDecimal amount = getBigDecimal(split[1], ess).add(value); - setAmount(sign, index, amount, ess); - return; - } - if (split.length == 3) { - final BigDecimal amount = getBigDecimal(split[2], ess).add(value); - setAmount(sign, index, amount, ess); - return; - } - throw new SignException(tl("invalidSignLine", index + 1)); - } - - //TODO: Translate these exceptions. - private void setAmount(final ISign sign, final int index, final BigDecimal value, final IEssentials ess) throws SignException { - - final String line = sign.getLine(index).trim(); - if (line.isEmpty()) { - throw new SignException("Empty line"); - } - final String[] split = line.split("[ :]+"); - - if (split.length == 2) { - final BigDecimal money = getMoney(split[0], ess); - final BigDecimal amount = getBigDecimal(split[1], ess); - if (money != null && amount != null) { - final String newline = NumberUtil.shortCurrency(money, ess) + ":" + NumberUtil.formatAsCurrency(value); - validateSignLength(newline); - sign.setLine(index, newline); - return; - } - } - - if (split.length == 3) { - final int stackAmount = getIntegerPositive(split[0]); - if (split[1].equalsIgnoreCase("exp") || split[1].equalsIgnoreCase("xp")) { - final String newline = stackAmount + " " + split[1] + ":" + value.intValueExact(); - validateSignLength(newline); - sign.setLine(index, newline); - } else { - getItemStack(split[1], stackAmount, ess); - final String newline = stackAmount + " " + split[1] + ":" + value.intValueExact(); - validateSignLength(newline); - sign.setLine(index, newline); - } - return; - } - throw new SignException(tl("invalidSignLine", index + 1)); - } - - public enum AmountType { - TOTAL, - ROUNDED, - COST - } -} diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignWarp.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignWarp.java index 964c5c28c..177a6706c 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignWarp.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignWarp.java @@ -1,7 +1,5 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import net.ess3.api.IEssentials; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; @@ -17,7 +15,6 @@ public class SignWarp extends EssentialsSign { @Override protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { - validateTrade(sign, 3, ess); final String warpName = sign.getLine(1); if (warpName.isEmpty()) { @@ -38,7 +35,7 @@ public class SignWarp extends EssentialsSign { } @Override - protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { + protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { final String warpName = sign.getLine(1); final String group = sign.getLine(2); @@ -52,14 +49,8 @@ public class SignWarp extends EssentialsSign { } } - final Trade charge = getTrade(sign, 3, ess); final CompletableFuture future = new CompletableFuture<>(); - player.getAsyncTeleport().warp(player, warpName, charge, TeleportCause.PLUGIN, future); - future.thenAccept(success -> { - if (success) { - Trade.log("Sign", "Warp", "Interact", username, null, username, charge, sign.getBlock().getLocation(), player.getMoney(), ess); - } - }); + player.getAsyncTeleport().warp(player, warpName, TeleportCause.PLUGIN, future); future.exceptionally(e -> { ess.showError(player.getSource(), e, "\\ sign: " + signName); return false; diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignWeather.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignWeather.java index 05034866c..45f72d33f 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignWeather.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignWeather.java @@ -1,7 +1,5 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import net.ess3.api.IEssentials; @@ -18,7 +16,6 @@ public class SignWeather extends EssentialsSign { return true; } - validateTrade(sign, 2, ess); final String timeString = sign.getLine(1); if ("Sun".equalsIgnoreCase(timeString)) { sign.setLine(1, "§2Sun"); @@ -33,7 +30,7 @@ public class SignWeather extends EssentialsSign { } @Override - protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { + protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException { if (sign.getLine(1).isEmpty() && sign.getLine(2).isEmpty() && sign.getLine(3).isEmpty()) { if (player.getWorld().hasStorm()) { player.sendMessage(tl("weatherSignStorm")); @@ -43,19 +40,13 @@ public class SignWeather extends EssentialsSign { return true; } - final Trade charge = getTrade(sign, 2, ess); - charge.isAffordableFor(player); final String weatherString = sign.getLine(1); if ("§2Sun".equalsIgnoreCase(weatherString)) { player.getWorld().setStorm(false); - charge.charge(player); - Trade.log("Sign", "WeatherSun", "Interact", username, null, username, charge, sign.getBlock().getLocation(), player.getMoney(), ess); return true; } if ("§2Storm".equalsIgnoreCase(weatherString)) { player.getWorld().setStorm(true); - charge.charge(player); - Trade.log("Sign", "WeatherStorm", "Interact", username, null, username, charge, sign.getBlock().getLocation(), player.getMoney(), ess); return true; } throw new SignException(tl("onlySunStorm")); diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/Signs.java b/Essentials/src/main/java/com/earth2me/essentials/signs/Signs.java index 1d2fab980..f37d4a849 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/Signs.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/Signs.java @@ -3,8 +3,6 @@ package com.earth2me.essentials.signs; //This enum is used when checking to see what signs are enabled public enum Signs { ANVIL(new SignAnvil()), - BALANCE(new SignBalance()), - BUY(new SignBuy()), CARTOGRAPHY(new SignCartography()), DISPOSAL(new SignDisposal()), ENCHANT(new SignEnchant()), @@ -18,11 +16,9 @@ public enum Signs { MAIL(new SignMail()), PROTECTION(new SignProtection()), REPAIR(new SignRepair()), - SELL(new SignSell()), SMITHING(new SignSmithing()), SPAWNMOB(new SignSpawnmob()), TIME(new SignTime()), - TRADE(new SignTrade()), WARP(new SignWarp()), WEATHER(new SignWeather()), WORKBENCH(new SignWorkbench()); diff --git a/Essentials/src/main/java/com/earth2me/essentials/textreader/KeywordReplacer.java b/Essentials/src/main/java/com/earth2me/essentials/textreader/KeywordReplacer.java index 12001cc5b..740e3f76c 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/textreader/KeywordReplacer.java +++ b/Essentials/src/main/java/com/earth2me/essentials/textreader/KeywordReplacer.java @@ -41,7 +41,6 @@ enum KeywordType { PREFIX(KeywordCachable.CACHEABLE), SUFFIX(KeywordCachable.CACHEABLE), GROUP(KeywordCachable.CACHEABLE), - BALANCE(KeywordCachable.CACHEABLE), MAILS(KeywordCachable.CACHEABLE), PLAYTIME(KeywordCachable.CACHEABLE), WORLD(KeywordCachable.CACHEABLE), @@ -227,11 +226,6 @@ public class KeywordReplacer implements IText { replacer = user.getGroup(); } break; - case BALANCE: - if (user != null) { - replacer = NumberUtil.displayCurrency(user.getMoney(), ess); - } - break; case MAILS: if (user != null) { replacer = Integer.toString(user.getMailAmount()); diff --git a/Essentials/src/main/java/com/earth2me/essentials/utils/NumberUtil.java b/Essentials/src/main/java/com/earth2me/essentials/utils/NumberUtil.java index 38b464344..380456d6f 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/utils/NumberUtil.java +++ b/Essentials/src/main/java/com/earth2me/essentials/utils/NumberUtil.java @@ -1,100 +1,31 @@ package com.earth2me.essentials.utils; -import net.ess3.api.IEssentials; - -import java.math.BigDecimal; import java.math.RoundingMode; import java.text.DecimalFormat; -import java.text.DecimalFormatSymbols; import java.text.NumberFormat; -import java.util.Locale; - -import static com.earth2me.essentials.I18n.tl; public final class NumberUtil { private static final DecimalFormat twoDPlaces = new DecimalFormat("#,###.##"); - private static final DecimalFormat currencyFormat = new DecimalFormat("#0.00", DecimalFormatSymbols.getInstance(Locale.US)); - // This field is likely to be modified in com.earth2me.essentials.Settings when loading currency format. - // This ensures that we can supply a constant formatting. - private static NumberFormat PRETTY_FORMAT = NumberFormat.getInstance(Locale.US); + // Kept as a no-op setter for legacy compatibility. + private static NumberFormat PRETTY_FORMAT = NumberFormat.getInstance(); static { twoDPlaces.setRoundingMode(RoundingMode.HALF_UP); - currencyFormat.setRoundingMode(RoundingMode.FLOOR); - - PRETTY_FORMAT.setRoundingMode(RoundingMode.FLOOR); - PRETTY_FORMAT.setGroupingUsed(true); - PRETTY_FORMAT.setMinimumFractionDigits(2); - PRETTY_FORMAT.setMaximumFractionDigits(2); } private NumberUtil() { } - // this method should only be called by Essentials public static void internalSetPrettyFormat(final NumberFormat prettyFormat) { PRETTY_FORMAT = prettyFormat; } - public static String shortCurrency(final BigDecimal value, final IEssentials ess) { - if (ess.getSettings().isCurrencySymbolSuffixed()) { - return formatAsCurrency(value) + ess.getSettings().getCurrencySymbol(); - } - return ess.getSettings().getCurrencySymbol() + formatAsCurrency(value); - } - public static String formatDouble(final double value) { return twoDPlaces.format(value); } - public static String formatAsCurrency(final BigDecimal value) { - String str = currencyFormat.format(value); - if (str.endsWith(".00")) { - str = str.substring(0, str.length() - 3); - } - return str; - } - - public static String formatAsPrettyCurrency(final BigDecimal value) { - String str = PRETTY_FORMAT.format(value); - if (str.endsWith(".00")) { - str = str.substring(0, str.length() - 3); - } - return str; - } - - public static String displayCurrency(final BigDecimal value, final IEssentials ess) { - String currency = formatAsPrettyCurrency(value); - String sign = ""; - if (value.signum() < 0) { - currency = currency.substring(1); - sign = "-"; - } - if (ess.getSettings().isCurrencySymbolSuffixed()) { - return sign + tl("currency", currency, ess.getSettings().getCurrencySymbol()); - } - return sign + tl("currency", ess.getSettings().getCurrencySymbol(), currency); - } - - public static String displayCurrencyExactly(final BigDecimal value, final IEssentials ess) { - String currency = value.toPlainString(); - String sign = ""; - if (value.signum() < 0) { - currency = currency.substring(1); - sign = "-"; - } - if (ess.getSettings().isCurrencySymbolSuffixed()) { - return sign + tl("currency", currency, ess.getSettings().getCurrencySymbol()); - } - return sign + tl("currency", ess.getSettings().getCurrencySymbol(), currency); - } - - public static String sanitizeCurrencyString(final String input, final IEssentials ess) { - return input.replace(ess.getSettings().getCurrencySymbol(), ""); - } - public static boolean isInt(final String sInt) { try { Integer.parseInt(sInt); @@ -129,9 +60,6 @@ public final class NumberUtil { return true; } - /** - * Backport from Guava. - */ public static int constrainToRange(int value, int min, int max) { return Math.min(Math.max(value, min), max); } diff --git a/Essentials/src/main/java/net/ess3/api/Economy.java b/Essentials/src/main/java/net/ess3/api/Economy.java deleted file mode 100644 index 7e2aab7b9..000000000 --- a/Essentials/src/main/java/net/ess3/api/Economy.java +++ /dev/null @@ -1,12 +0,0 @@ -package net.ess3.api; - -/** - * Do not use this class. - * This class proxies {@link com.earth2me.essentials.api.Economy}. - *

- * If you want to interact with EssentialsX's economy, we recommend using Vault or {@link com.earth2me.essentials.api.Economy}. - */ -@Deprecated -public class Economy extends com.earth2me.essentials.api.Economy { - -} diff --git a/Essentials/src/main/java/net/ess3/api/MaxMoneyException.java b/Essentials/src/main/java/net/ess3/api/MaxMoneyException.java deleted file mode 100644 index 54bd573fb..000000000 --- a/Essentials/src/main/java/net/ess3/api/MaxMoneyException.java +++ /dev/null @@ -1,12 +0,0 @@ -package net.ess3.api; - -import static com.earth2me.essentials.I18n.tl; - -/** - * Thrown when a transaction would put the player's balance above the maximum balance allowed. - */ -public class MaxMoneyException extends Exception { - public MaxMoneyException() { - super(tl("maxMoney")); - } -} diff --git a/Essentials/src/main/java/net/ess3/api/NoLoanPermittedException.java b/Essentials/src/main/java/net/ess3/api/NoLoanPermittedException.java deleted file mode 100644 index 9633a8204..000000000 --- a/Essentials/src/main/java/net/ess3/api/NoLoanPermittedException.java +++ /dev/null @@ -1,13 +0,0 @@ -package net.ess3.api; - -import static com.earth2me.essentials.I18n.tl; - -/** - * @deprecated You should use {@link com.earth2me.essentials.api.NoLoanPermittedException} instead of this class. - */ -@Deprecated -public class NoLoanPermittedException extends Exception { - public NoLoanPermittedException() { - super(tl("negativeBalanceError")); - } -} diff --git a/Essentials/src/main/java/net/ess3/api/events/UserBalanceUpdateEvent.java b/Essentials/src/main/java/net/ess3/api/events/UserBalanceUpdateEvent.java deleted file mode 100644 index fbba422cb..000000000 --- a/Essentials/src/main/java/net/ess3/api/events/UserBalanceUpdateEvent.java +++ /dev/null @@ -1,80 +0,0 @@ -package net.ess3.api.events; - -import com.google.common.base.Preconditions; -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; - -import java.math.BigDecimal; - -/** - * Fired when a user's balance updates. - */ -public class UserBalanceUpdateEvent extends Event { - private static final HandlerList handlers = new HandlerList(); - private final Player player; - private final BigDecimal originalBalance; - private final Cause cause; - private BigDecimal balance; - - @Deprecated - public UserBalanceUpdateEvent(final Player player, final BigDecimal originalBalance, final BigDecimal balance) { - this(player, originalBalance, balance, Cause.UNKNOWN); - } - - public UserBalanceUpdateEvent(final Player player, final BigDecimal originalBalance, final BigDecimal balance, final Cause cause) { - super(!Bukkit.getServer().isPrimaryThread()); - this.player = player; - this.originalBalance = originalBalance; - this.balance = balance; - this.cause = cause; - } - - public static HandlerList getHandlerList() { - return handlers; - } - - @Override - public HandlerList getHandlers() { - return handlers; - } - - public Player getPlayer() { - return player; - } - - public BigDecimal getNewBalance() { - return balance; - } - - /** - * Override the value that the user's balance will be changed to. - * - * @param newBalance The user's new balance - */ - public void setNewBalance(final BigDecimal newBalance) { - Preconditions.checkNotNull(newBalance, "newBalance cannot be null."); - this.balance = newBalance; - } - - public BigDecimal getOldBalance() { - return originalBalance; - } - - public Cause getCause() { - return cause; - } - - /** - * The cause of the balance update. - */ - public enum Cause { - COMMAND_ECO, - COMMAND_PAY, - COMMAND_SELL, - API, - SPECIAL, // Reserved for API usage - UNKNOWN - } -} diff --git a/Essentials/src/main/java/net/ess3/api/events/UserWarpEvent.java b/Essentials/src/main/java/net/ess3/api/events/UserWarpEvent.java index d3b01eb22..e4003f73d 100644 --- a/Essentials/src/main/java/net/ess3/api/events/UserWarpEvent.java +++ b/Essentials/src/main/java/net/ess3/api/events/UserWarpEvent.java @@ -1,6 +1,5 @@ package net.ess3.api.events; -import com.earth2me.essentials.Trade; import net.ess3.api.IUser; import org.bukkit.Bukkit; import org.bukkit.event.Cancellable; @@ -14,15 +13,13 @@ public class UserWarpEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); private final IUser user; - private final Trade trade; private String warp; private boolean cancelled = false; - public UserWarpEvent(final IUser user, final String warp, final Trade trade) { + public UserWarpEvent(final IUser user, final String warp) { super(!Bukkit.getServer().isPrimaryThread()); this.user = user; this.warp = warp; - this.trade = trade; } public static HandlerList getHandlerList() { @@ -41,15 +38,6 @@ public class UserWarpEvent extends Event implements Cancellable { this.warp = warp; } - /** - * Getting payment handling information - * - * @return The payment handling class - */ - public Trade getTrade() { - return trade; - } - @Override public boolean isCancelled() { return cancelled; diff --git a/Essentials/src/main/java/net/essentialsx/api/v2/services/BalanceTop.java b/Essentials/src/main/java/net/essentialsx/api/v2/services/BalanceTop.java deleted file mode 100644 index 5426c85d8..000000000 --- a/Essentials/src/main/java/net/essentialsx/api/v2/services/BalanceTop.java +++ /dev/null @@ -1,102 +0,0 @@ -package net.essentialsx.api.v2.services; - -import java.math.BigDecimal; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.CompletableFuture; - -/** - * A class which provides numerous methods to interact with Essentials' balance top calculations. - *

- * Note: Implementations of this class should be thread-safe and thus do not need to be called from the server thread. - */ -public interface BalanceTop { - /** - * Re-calculates the balance top cache asynchronously. - *

- * This method will return a {@link CompletableFuture CompletableFuture<Void>} which - * will be completed upon the recalculation of the balance top map. - * After which you should run {@link BalanceTop#getBalanceTopCache()} - * to get the newly updated cache - * - * @return A future which completes after the balance top cache has been calculated. - */ - CompletableFuture calculateBalanceTopMapAsync(); - - /** - * Gets the balance top cache or an empty list if one has not been calculated yet. The balance top cache is a {@link Map} - * which maps the UUID of the player to a {@link BalanceTop.Entry} object which stores the user's display name and balance. - * The returned map is sorted by greatest to least wealth. - *

- * There is no guarantee the returned cache is up to date. The balancetop command is directly responsible for updating - * this cache and does so every two minutes (if executed). See {@link BalanceTop#calculateBalanceTopMapAsync()} to - * manually update this cache yourself. - * - * @return The balance top cache. - * @see BalanceTop#calculateBalanceTopMapAsync() - */ - Map getBalanceTopCache(); - - /** - * Gets the epoch time (in mills.) that the baltop cache was last updated at. A value of zero indicates the cache - * has not been calculated yet at all. - * - * @return The epoch time (in mills.) since last cache update or zero. - */ - long getCacheAge(); - - /** - * Gets the total amount of money in the economy at the point of the last balance top cache calculation or returns zero - * if no baltop calculation has been made as of yet. - * - * @return The total amount of money in the economy or zero. - * @see BalanceTop#getCacheAge() to find last baltop cache calculation - */ - BigDecimal getBalanceTopTotal(); - - /** - * Checks to see if {@link BalanceTop#calculateBalanceTopMapAsync()} is still in the process of calculating the map. - * - * @return true if the balance top cache is still in the process of being calculated, otherwise false. - */ - boolean isCacheLocked(); - - /** - * This class represents a user's name/balance in the balancetop cache. - */ - class Entry { - private final UUID uuid; - private final String displayName; - private final BigDecimal balance; - - public Entry(UUID uuid, String displayName, BigDecimal balance) { - this.uuid = uuid; - this.displayName = displayName; - this.balance = balance; - } - - /** - * Gets the UUID of the user. - * @return The uuid of this user. - */ - public UUID getUuid() { - return uuid; - } - - /** - * Gets the display name of the user at the time of cache population. - * @return The display name of this user. - */ - public String getDisplayName() { - return displayName; - } - - /** - * Gets the balance of the user at the time of cache population. - * @return The balance of this user. - */ - public BigDecimal getBalance() { - return balance; - } - } -} diff --git a/Essentials/src/main/resources/config.yml b/Essentials/src/main/resources/config.yml index cfdaf0f16..4ddfc2117 100644 --- a/Essentials/src/main/resources/config.yml +++ b/Essentials/src/main/resources/config.yml @@ -171,34 +171,22 @@ overridden-commands: # You should not have to disable commands used in other plugins, they will automatically get priority. # See https://bukkit.fandom.com/wiki/Commands.yml#aliases to map commands to other plugins. disabled-commands: - - bal - - balance - - balancetop - - baltop - buy - clear - - ebal - - ebalance - - ebalancetop - - ebaltop - emsg - epm - er - ereply - ewhisper - - eco - give - kill - locate - m - message - - money - msg - - pay - pm - r - reply - - sell - shop - t - tell @@ -278,9 +266,6 @@ player-commands: - afk.auto - back - back.ondeath - - balance - - balance.others - - balancetop - build - chat.color - chat.format @@ -310,7 +295,6 @@ player-commands: - msg.color - nick - near - - pay - ping - protect - r @@ -318,15 +302,10 @@ player-commands: - renamehome - realname - seen - - sell - sethome - setxmpp - signs.create.protection - - signs.create.trade - signs.break.protection - - signs.break.trade - - signs.use.balance - - signs.use.buy - signs.use.disposal - signs.use.enchant - signs.use.free @@ -337,9 +316,7 @@ player-commands: - signs.use.mail - signs.use.protection - signs.use.repair - - signs.use.sell - signs.use.time - - signs.use.trade - signs.use.warp - signs.use.weather - spawn @@ -352,7 +329,6 @@ player-commands: - warp - warp.list - world - - worth - xmpp # Use this option to force superperms-based permissions handler regardless of detected installed perms plugin. @@ -391,10 +367,6 @@ use-nbt-serialization-in-createkit: true enabledSigns: - color - #- balance - #- buy - #- sell - #- trade #- free #- warp #- kit @@ -689,17 +661,6 @@ command-cooldowns: # Whether command cooldowns should be persistent past server shutdowns command-cooldown-persistence: true -# Whether NPC balances should be listed in balance ranking features such as /balancetop. -# NPC balances can include features like factions from FactionsUUID plugin. -npcs-in-balance-ranking: false - -# Allow bulk buying and selling signs when the player is sneaking. -# This is useful when a sign sells or buys one item at a time and the player wants to sell a bunch at once. -allow-bulk-buy-sell: true - -# Allow selling of items with custom names with the /sell command. -# This may be useful to prevent players accidentally selling named items. -allow-selling-named-items: false # Delay for the MOTD display for players on join, in milliseconds. # This has no effect if the MOTD command or permission are disabled. @@ -808,75 +769,6 @@ spawn-if-no-home: false # Should players be asked to provide confirmation for homes which they attempt to overwrite? confirm-home-overwrite: true -############################################################ -# +------------------------------------------------------+ # -# | Economy | # -# +------------------------------------------------------+ # -############################################################ - -# For more information, visit http://wiki.ess3.net/wiki/Essentials_Economy - -# You can control the values of items that are sold to the server by using the /setworth command. - -# Defines the balance with which new players begin. Defaults to 0. -starting-balance: 0 - -# Defines the cost to use the given commands PER USE. -# Some commands like /repair have sub-costs, check the wiki for more information. -command-costs: - # /example costs $1000 PER USE - #example: 1000 - # /kit tools costs $1500 PER USE - #kit-tools: 1500 - -# Set this to a currency symbol you want to use. -# Remember, if you want to use special characters in this document, -# such as accented letters, you MUST save the file as UTF-8, not ANSI. -currency-symbol: 'Diamonds: ' - -# Enable this to make the currency symbol appear at the end of the amount rather than at the start. -# For example, the euro symbol typically appears after the current amount. -currency-symbol-suffix: false - -# Set the maximum amount of money a player can have. -# The amount is always limited to 10 trillion because of the limitations of a java double. -max-money: 0 - -# Set the minimum amount of money a player can have (must be above the negative of max-money). -# Setting this to 0, will disable overdrafts/loans completely. Users need 'essentials.eco.loan' perm to go below 0. -min-money: 0 - -# Enable this to log all interactions with trade/buy/sell signs and sell command. -economy-log-enabled: false - -# Enable this to also log all transactions from other plugins through Vault. -# This can cause the economy log to fill up quickly so should only be enabled for testing purposes! -economy-log-update-enabled: false - -# Minimum acceptable amount to be used in /pay. -minimum-pay-amount: 0 - -# Enable this to block users who try to /pay another user which ignore them. -pay-excludes-ignore-list: true - -# Whether or not users with a balance less than or equal to $0 should be shown in balance-top. -# Setting to false will not show people with balances <= 0 in balance-top. -# NOTE: After reloading the config, you must also run '/baltop force' for this to appear -show-zero-baltop: true - -# The format of currency, excluding symbols. See currency-symbol-format-locale for symbol configuration. -# -# "#,##0.00" is how the majority of countries display currency. -currency-format: "#,##0.00" - -# Format currency symbols. Some locales use , and . interchangeably. -# Some formats do not display properly in-game due to faulty Minecraft font rendering. -# -# For 1.234,50 use de-DE -# For 1,234.50 use en-US -# For 1'234,50 use fr-ch -currency-symbol-format-locale: en-US - ############################################################ # +------------------------------------------------------+ # # | Help | # diff --git a/Essentials/src/main/resources/messages.properties b/Essentials/src/main/resources/messages.properties index 3fbf0b2fd..32b976ead 100644 --- a/Essentials/src/main/resources/messages.properties +++ b/Essentials/src/main/resources/messages.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=\u00a75* {0} \u00a75{1} -addedToAccount=\u00a7a{0} has been added to your account. -addedToOthersAccount=\u00a7a{0} added to {1}\u00a7a account. New balance\: {2} adventure=adventure afkCommandDescription=Marks you as away-from-keyboard. afkCommandUsage=/ [player/message...] @@ -47,20 +45,6 @@ backupFinished=\u00a76Backup finished. backupStarted=\u00a76Backup started. backupInProgress=\u00a76An external backup script is currently in progress! Halting plugin disable until finished. backUsageMsg=\u00a76Returning to previous location. -balance=\u00a7aBalance\:\u00a7c {0} -balanceCommandDescription=States the current balance of a player. -balanceCommandUsage=/ [player] -balanceCommandUsage1=/ -balanceCommandUsage1Description=States your current balance -balanceCommandUsage2=/ -balanceCommandUsage2Description=Displays the balance of the specified player -balanceOther=\u00a7aBalance of {0}\u00a7a\:\u00a7c {1} -balanceTop=\u00a76Top balances ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Gets the top balance values. -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] -balancetopCommandUsage1Description=Displays the first (or specified) page of the top balance values banCommandDescription=Bans a player. banCommandUsage=/ [reason] banCommandUsage1=/ [reason] @@ -161,16 +145,9 @@ consoleCannotUseCommand=This command cannot be used by Console. compassBearing=\u00a76Bearing\: {0} ({1} degrees). compassCommandDescription=Describes your current bearing. compassCommandUsage=/ -condenseCommandDescription=Condenses items into a more compact blocks. -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Condenses all items in your inventory -condenseCommandUsage2=/ -condenseCommandUsage2Description=Condenses the specified item in your inventory configFileMoveError=Failed to move config.yml to backup location. configFileRenameError=Failed to rename temp file to config.yml. confirmClear=\u00a77To \u00a7lCONFIRM\u00a77 inventory clear, please repeat command: \u00a76{0} -confirmPayment=\u00a77To \u00a7lCONFIRM\u00a77 payment of \u00a76{0}\u00a77, please repeat command: \u00a76{1} connectedPlayers=\u00a76Connected players\u00a7r connectionFailed=Failed to open connection. consoleName=Console @@ -189,7 +166,6 @@ createKitUnsupported=\u00a74NBT item serialization has been enabled, but this se creatingConfigFromTemplate=Creating config from template\: {0} creatingEmptyConfig=Creating empty config\: {0} creative=creative -currency={0}{1} currentWorld=\u00a76Current World\:\u00a7c {0} customtextCommandDescription=Allows you to create custom text commands. customtextCommandUsage=/ - Define in bukkit.yml @@ -313,16 +289,6 @@ dumpUrl=\u00a76Created server dump: \u00a7c{0} duplicatedUserdata=Duplicated userdata\: {0} and {1}. durability=\u00a76This tool has \u00a7c{0}\u00a76 uses left. east=E -ecoCommandDescription=Manages the server economy. -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=Gives the specified player the specified amount of money -ecoCommandUsage2=/ take -ecoCommandUsage2Description=Takes the specified amount of money from the specified player -ecoCommandUsage3=/ set -ecoCommandUsage3Description=Sets the specified player's balance to the specified amount of money -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=Resets the specified player's balance to the server's starting balance editBookContents=\u00a7eYou may now edit the contents of this book. enabled=enabled enchantCommandDescription=Enchants the item the user is holding. @@ -541,9 +507,7 @@ infoCommandDescription=Shows information set by the server owner. infoCommandUsage=/ [chapter] [page] infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 Page \u00a7c{0}\u00a76/\u00a7c{1} \u00a7e---- infoUnknownChapter=\u00a74Unknown chapter. -insufficientFunds=\u00a74Insufficient funds available. invalidBanner=\u00a74Invalid banner syntax. -invalidCharge=\u00a74Invalid charge. invalidFireworkFormat=\u00a74The option \u00a7c{0} \u00a74is not a valid value for \u00a7c{1}\u00a74. invalidHome=\u00a74Home\u00a7c {0} \u00a74doesn''t exist\! invalidHomeName=\u00a74Invalid home name\! @@ -661,7 +625,6 @@ kitCommandUsage1Description=Lists all available kits kitCommandUsage2=/ [player] kitCommandUsage2Description=Gives the specified kit to you or another player if specified kitContains=\u00a76Kit \u00a7c{0} \u00a76contains: -kitCost=\ \u00a77\u00a7o({0})\u00a7r kitDelay=\u00a7m{0}\u00a7r kitError=\u00a74There are no valid kits. kitError2=\u00a74That kit is improperly defined. Contact an administrator. @@ -747,7 +710,6 @@ mailTooLong=\u00a74Mail message too long. Try to keep it below 1000 characters. markMailAsRead=\u00a76To mark your mail as read, type\u00a7c /mail clear\u00a76. matchingIPAddress=\u00a76The following players previously logged in from that IP address\: maxHomes=\u00a74You cannot set more than\u00a7c {0} \u00a74homes. -maxMoney=\u00a74This transaction would exceed the balance limit for this account. mayNotJail=\u00a74You may not jail that person\! mayNotJailOffline=\u00a74You may not jail offline players. meCommandDescription=Describes an action in the context of the player. @@ -756,7 +718,6 @@ meCommandUsage1=/ meCommandUsage1Description=Describes an action meSender=me meRecipient=me -minimumBalanceError=\u00a74The minimum balance a user can have is {0}. minimumPayAmount=\u00a7cThe minimum amount you can pay is {0}. minute=minute minutes=minutes @@ -766,8 +727,6 @@ mobsAvailable=\u00a76Mobs\:\u00a7r {0} mobSpawnError=\u00a74Error while changing mob spawner. mobSpawnLimit=Mob quantity limited to server limit. mobSpawnTarget=\u00a74Target block must be a mob spawner. -moneyRecievedFrom=\u00a7a{0}\u00a76 has been received from\u00a7a {1}\u00a76. -moneySentTo=\u00a7a{0} has been sent to {1}. month=month months=months moreCommandDescription=Fills the item stack in hand to specified amount, or to maximum size if none is specified. @@ -792,7 +751,6 @@ msgtoggleCommandDescription=Blocks receiving all private messages. msgtoggleCommandUsage=/ [player] [on|off] msgtoggleCommandUsage1=/ [player] msgtoggleCommandUsage1Description=Toggles fly for yourself or another player if specified -multipleCharges=\u00a74You cannot apply more than one charge to this firework. multiplePotionEffects=\u00a74You cannot apply more than one effect to this potion. muteCommandDescription=Mutes or unmutes a player. muteCommandUsage=/ [datediff] [reason] @@ -823,7 +781,6 @@ nearCommandUsage4=/ nearCommandUsage4Description=Lists all players within the given radius of the specified player nearbyPlayers=\u00a76Players nearby\:\u00a7r {0} nearbyPlayersList={0}\u00a7f(\u00a7c{1}m\u00a7f) -negativeBalanceError=\u00a74User is not allowed to have a negative balance. nickChanged=\u00a76Nickname changed. nickCommandDescription=Change your nickname or that of another player. nickCommandUsage=/ [player] @@ -876,12 +833,10 @@ noPermToSpawnMob=\u00a74You don''t have permission to spawn this mob. noPlacePermission=\u00a74You do not have permission to place a block near that sign. noPotionEffectPerm=\u00a74You do not have permission to apply potion effect \u00a7c{0} \u00a74to this potion. noPowerTools=\u00a76You have no power tools assigned. -notAcceptingPay=\u00a74{0} \u00a74is not accepting payment. notAllowedToLocal=\u00a74You don't have permission to speak in local chat. notAllowedToQuestion=\u00a74You don't have permission to use question. notAllowedToShout=\u00a74You don't have permission to shout. notEnoughExperience=\u00a74You do not have enough experience. -notEnoughMoney=\u00a74You do not have sufficient funds. notFlying=not flying nothingInHand=\u00a74You have nothing in your hand. now=now @@ -897,28 +852,9 @@ onlyPlayers=\u00a74Only in-game players can use \u00a7c{0}\u00a74. onlyPlayerSkulls=\u00a74You can only set the owner of player skulls (\u00a7c397\:3\u00a74). onlySunStorm=\u00a74/weather only supports sun/storm. openingDisposal=\u00a76Opening disposal menu... -orderBalances=\u00a76Ordering balances of\u00a7c {0} \u00a76users, please wait... oversizedMute=§4You may not mute a player for this period of time. oversizedTempban=\u00a74You may not ban a player for this period of time. passengerTeleportFail=\u00a74You cannot be teleported while carrying passengers. -payCommandDescription=Pays another player from your balance. -payCommandUsage=/ -payCommandUsage1=/ -payCommandUsage1Description=Pays the specified player the given amount of money -payConfirmToggleOff=\u00a76You will no longer be prompted to confirm payments. -payConfirmToggleOn=\u00a76You will now be prompted to confirm payments. -payDisabledFor=\u00a76Disabled accepting payments for \u00a7c{0}\u00a76. -payEnabledFor=\u00a76Enabled accepting payments for \u00a7c{0}\u00a76. -payMustBePositive=\u00a74Amount to pay must be positive. -payOffline=\u00a74You cannot pay offline users. -payToggleOff=\u00a76You are no longer accepting payments. -payToggleOn=\u00a76You are now accepting payments. -payconfirmtoggleCommandDescription=Toggles whether you are prompted to confirm payments. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Toggles whether you are accepting payments. -paytoggleCommandUsage=/ [player] -paytoggleCommandUsage1=/ [player] -paytoggleCommandUsage1Description=Toggles if you, or another player if specified, are accepting payments pendingTeleportCancelled=\u00a74Pending teleportation request cancelled. pingCommandDescription=Pong! pingCommandUsage=/ @@ -1086,8 +1022,6 @@ requestSent=\u00a76Request sent to\u00a7c {0}\u00a76. requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request. requestTimedOut=\u00a74Teleport request has timed out. requestTimedOutFrom=\u00a74Teleport request from \u00a7c{0} \u00a74has timed out. -resetBal=\u00a76Balance has been reset to \u00a7c{0} \u00a76for all online players. -resetBalAll=\u00a76Balance has been reset to \u00a7c{0} \u00a76for all players. rest=\u00a76You feel well rested. restCommandDescription=Rests you or the given player. restCommandUsage=/ [player] @@ -1109,18 +1043,6 @@ seenCommandUsage1=/ seenCommandUsage1Description=Shows the logout time, ban, mute, and UUID information of the specified player seenOffline=\u00a76Player\u00a7c {0} \u00a76has been \u00a74offline\u00a76 since \u00a7c{1}\u00a76. seenOnline=\u00a76Player\u00a7c {0} \u00a76has been \u00a7aonline\u00a76 since \u00a7c{1}\u00a76. -sellBulkPermission=\u00a76You do not have permission to bulk sell. -sellCommandDescription=Sells the item currently in your hand. -sellCommandUsage=/ <||hand|inventory|blocks> [amount] -sellCommandUsage1=/ [amount] -sellCommandUsage1Description=Sells all (or the given amount, if specified) of the given item in your inventory -sellCommandUsage2=/ hand [amount] -sellCommandUsage2Description=Sells all (or the given amount, if specified) of the held item -sellCommandUsage3=/ all -sellCommandUsage3Description=Sells all possible items in your inventory -sellCommandUsage4=/ blocks [amount] -sellCommandUsage4Description=Sells all (or the given amount, if specified) of blocks in your inventory -sellHandPermission=\u00a76You do not have permission to hand sell. serverFull=Server is full\! serverReloading=There's a good chance you're reloading your server right now. If that's the case, why do you hate yourself? Expect no support from the EssentialsX team when using /reload. serverTotal=\u00a76Server Total\:\u00a7c {0} @@ -1131,8 +1053,6 @@ serverUnsupportedDangerous=You are running a server fork that is known to be ext serverUnsupportedLimitedApi=You are running a server with limited API functionality. EssentialsX will still work, but certain features may be disabled. serverUnsupportedDumbPlugins=You are using plugins known to cause severe issues with EssentialsX and other plugins. serverUnsupportedMods=You are running a server that does not properly support Bukkit plugins. Bukkit plugins should not be used with Forge/Fabric mods! For Forge: Consider using ForgeEssentials, or SpongeForge + Nucleus. -setBal=\u00a7aYour balance was set to {0}. -setBalOthers=\u00a7aYou set {0}\u00a7a''s balance to {1}. setSpawner=\u00a76Changed spawner type to\u00a7c {0}\u00a76. sethomeCommandDescription=Set your home to your current location. sethomeCommandUsage=/ [[player:]name] @@ -1158,12 +1078,6 @@ setwarpCommandDescription=Creates a new warp. setwarpCommandUsage=/ setwarpCommandUsage1=/ setwarpCommandUsage1Description=Sets the warp with the specified name to your location -setworthCommandDescription=Set the sell value of an item. -setworthCommandUsage=/ [itemname|id] -setworthCommandUsage1=/ -setworthCommandUsage1Description=Sets the worth of your held item to the given price -setworthCommandUsage2=/ -setworthCommandUsage2Description=Sets the worth of the specified item to the given price sheepMalformedColor=\u00a74Malformed color. shoutDisabled=\u00a76Shout mode \u00a7cdisabled\u00a76. shoutDisabledFor=\u00a76Shout mode \u00a7cdisabled \u00a76for \u00a7c{0}\u00a76. @@ -1256,8 +1170,6 @@ suicideCommandUsage=/ suicideMessage=\u00a76Goodbye cruel world... suicideSuccess=\u00a76Player \u00a7c{0} \u00a76took their own life. survival=survival -takenFromAccount=\u00a7e{0}\u00a7a has been taken from your account. -takenFromOthersAccount=\u00a7e{0}\u00a7a taken from\u00a7e {1}\u00a7a account. New balance\:\u00a7e {2} teleportAAll=\u00a76Teleport request sent to all players... teleportAll=\u00a76Teleporting all players... teleportationCommencing=\u00a76Teleportation commencing... @@ -1411,8 +1323,6 @@ tptoggleCommandDescription=Blocks all forms of teleportation. tptoggleCommandUsage=/ [player] [on|off] tptoggleCommandUsage1=/ [player] tptoggleCommandUsageDescription=Toggles if teleports are enabled for yourself or another player if specified -tradeSignEmpty=\u00a74The trade sign has nothing available for you. -tradeSignEmptyOwner=\u00a74There is nothing to collect from this trade sign. treeCommandDescription=Spawn a tree where you are looking. treeCommandUsage=/ treeCommandUsage1=/ @@ -1494,12 +1404,11 @@ versionDevLatest=\u00a76You''re running the latest EssentialsX dev build! versionError=\u00a74Error while fetching EssentialsX version information! Build information: \u00a7c{0}\u00a76. versionErrorPlayer=\u00a76Error while checking EssentialsX version information! versionFetching=\u00a76Fetching version information... -versionOutputVaultMissing=\u00a74Vault is not installed. Chat and permissions may not work. +versionOutputLuckPermsMissing=\u00a74LuckPerms is not installed. Chat prefixes/suffixes and group features will not work. versionOutputFine=\u00a76{0} version: \u00a7a{1} versionOutputWarn=\u00a76{0} version: \u00a7c{1} versionOutputUnsupported=\u00a7d{0} \u00a76version: \u00a7d{1} versionOutputUnsupportedPlugins=\u00a76You are running \u00a7dunsupported plugins\u00a76! -versionOutputEconLayer=\u00a76Economy Layer: \u00a7r{0} versionMismatch=\u00a74Version mismatch\! Please update {0} to the same version. versionMismatchAll=\u00a74Version mismatch\! Please update all Essentials jars to the same version. versionReleaseLatest=\u00a76You''re running the latest stable version of EssentialsX! @@ -1561,7 +1470,6 @@ whoisHunger=\u00a76 - Hunger\:\u00a7r {0}/20 (+{1} saturation) whoisIPAddress=\u00a76 - IP Address\:\u00a7r {0} whoisJail=\u00a76 - Jail\:\u00a7r {0} whoisLocation=\u00a76 - Location\:\u00a7r ({0}, {1}, {2}, {3}) -whoisMoney=\u00a76 - Money\:\u00a7r {0} whoisMuted=\u00a76 - Muted\:\u00a7r {0} whoisMutedReason=\u00a76 - Muted\:\u00a7r {0} \u00a76Reason\: \u00a7c{1} whoisNick=\u00a76 - Nick\:\u00a7r {0} @@ -1579,19 +1487,6 @@ worldCommandUsage1=/ worldCommandUsage1Description=Teleports to your corresponding location in the nether or overworld worldCommandUsage2=/ worldCommandUsage2Description=Teleports to your location in the given world -worth=\u00a7aStack of {0} worth \u00a7c{1}\u00a7a ({2} item(s) at {3} each) -worthCommandDescription=Calculates the worth of items in hand or as specified. -worthCommandUsage=/ <||hand|inventory|blocks> [-][amount] -worthCommandUsage1=/ [amount] -worthCommandUsage1Description=Checks the worth of all (or the given amount, if specified) of the given item in your inventory -worthCommandUsage2=/ hand [amount] -worthCommandUsage2Description=Checks the worth of all (or the given amount, if specified) of the held item -worthCommandUsage3=/ all -worthCommandUsage3Description=Checks the worth of all possible items in your inventory -worthCommandUsage4=/ blocks [amount] -worthCommandUsage4Description=Checks the worth of all (or the given amount, if specified) of blocks in your inventory -worthMeta=\u00a7aStack of {0} with metadata of {1} worth \u00a7c{2}\u00a7a ({3} item(s) at {4} each) -worthSet=\u00a76Worth value set year=year years=years youAreHealed=\u00a76You have been healed. diff --git a/Essentials/src/main/resources/messages_bg.properties b/Essentials/src/main/resources/messages_bg.properties index a0f56852c..a4cfff347 100644 --- a/Essentials/src/main/resources/messages_bg.properties +++ b/Essentials/src/main/resources/messages_bg.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} бяха добавени към вашият акаунт. -addedToOthersAccount=§a{0} бяха добавени към акаунта на {1}. Нов баланс\: {2} adventure=приключенски afkCommandDescription=Маркира ви като далеч-от-клавиятурата. afkCommandUsage=/ [player/message...] @@ -47,20 +45,6 @@ backupFinished=§6Архивирането е завършено. backupStarted=§6Създаване на архив. backupInProgress=§6В момента се изпълнява външен скрипт за резервно копие\! Спиране на плъгина до приключване. backUsageMsg=§6Връщане до предишната локация. -balance=§aБаланс\:§c {0} -balanceCommandDescription=Показва текущия баланс на играч. -balanceCommandUsage=/ [player] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Показва вашия текущ баланс -balanceCommandUsage2=/ -balanceCommandUsage2Description=Показва баланса на специфичен играч -balanceOther=§aБалансът на {0}§a\:§c {1} -balanceTop=§6Топ богаташи ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Показва топ играчите по баланс. -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] -balancetopCommandUsage1Description=Показва първата (или специфична) страница на играчите с най-висок баланс banCommandDescription=Ограничава играч. banCommandUsage=/ [reason] banCommandUsage1=/ [reason] @@ -161,15 +145,9 @@ consoleCannotUseCommand=Тази команда не може да бъде из compassBearing=§6Посока\: {0} ({1} градуса). compassCommandDescription=Описва текущото ви държание. compassCommandUsage=/ -condenseCommandDescription=Кондензира предметите в по-компактни блокове. -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Кондензира всички предмети от вашия инвентар -condenseCommandUsage2Description=Кондензира специфицирания предмет от вашия инвентар configFileMoveError=Грешка при прехвърлянето на config.yml в архива. configFileRenameError=Грешка при преименуването на временния файл към config.yml. confirmClear=§7За да §lпотвърдите§7 изчистването на инвентара, повторете командата\: §6{0} -confirmPayment=§7За да §lПОТВЪРДИТЕ§7 заплащането на §6{0}§7, моля повторете командата\: §6{1} connectedPlayers=§6Свързани играчи§r connectionFailed=Неуспешно отваряне на връзка. consoleName=Конзола @@ -188,7 +166,6 @@ createKitUnsupported=§4Предметна NBT сериализация е вк creatingConfigFromTemplate=Създаване на конфигурация от шаблон\: {0} creatingEmptyConfig=Създаване на празна конфигурация\: {0} creative=творчески -currency={0}{1} currentWorld=§6Текущ свят\:§c {0} customtextCommandDescription=Позволява ви създаването на персонализирани текстови команди. customtextCommandUsage=/ - Определете в bukkit.yml @@ -290,8 +267,6 @@ downloadingGeoIp=Изтегля се GeoIP база данни... това мо duplicatedUserdata=Дублирани данни на играчи\: {0} и {1}. durability=§6Този инструмент има §c{0}§6 оставащи използвания. east=И -ecoCommandDescription=Управлява икономиката на сървъра. -ecoCommandUsage=/ editBookContents=§eСега можете да редактирате съдържанието на тази книга. enabled=включен enchantCommandDescription=Омагьосва предмета, който държите. @@ -458,9 +433,7 @@ infoCommandDescription=Показва информация зададена от infoCommandUsage=/ [chapter] [page] infoPages=§e ---- §6{2} §e--§6 Страница §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Непозната глава. -insufficientFunds=§4Нямате достатъчно средства. invalidBanner=§4Невалиден синтаксис на банер. -invalidCharge=§4Неправилен заряд. invalidFireworkFormat=§4Опцията §c{0} §4е не е валидна стойност за §c{1}§4. invalidHome=§4Дом с име§c {0} §4не съществува\! invalidHomeName=§4Няма дом с такова име\! @@ -535,7 +508,6 @@ killCommandUsage1=/ killExempt=§4Не можете да убиете §c{0}§4. kitCommandUsage1=/ kitContains=§6Кит §c{0} §6съдържа\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Няма китове. kitError2=§4Този кит е неправилно дефиниран. Свържете се с администратор. @@ -574,7 +546,6 @@ mailTooLong=§4Писмото е твърде дълго. Максимумът markMailAsRead=§6За да маркирате всички писма като прочетени, напишете§c /mail clear§6. matchingIPAddress=§6Следните играчи са влизали от този IP адрес\: maxHomes=§4Не можете да имате повече от§c {0} §4домове. -maxMoney=§4Тази транзакция ще надвиши лимитът на сметката за този акаунт. mayNotJail=§4Не можете да затворите този играч\! mayNotJailOffline=§4Не може да затворите играчи извън линия. meCommandUsage1Description=Описва действие @@ -589,8 +560,6 @@ mobsAvailable=§6Същества\:§r {0} mobSpawnError=§4Грешка при сменянето на вида на размножителя. mobSpawnLimit=Броят на съществата беше намален до лимита на сървъра. mobSpawnTarget=§4Целта трябва да е размножител. -moneyRecievedFrom=§a{0} беше получено от {1}. -moneySentTo=§a{0} бяха пратени на {1}. month=месец months=месеца moreThanZero=§4Сумата трябва да е повече от 0. @@ -604,7 +573,6 @@ msgFormat=§6[§c{0}§6 -> §c{1}§6] §r{2} msgIgnore=§cСъобщенията за {0} §4са изключени. msgtoggleCommandUsage=/ [player] [on|off] msgtoggleCommandUsage1=/ [player] -multipleCharges=§4Не можете да зареждате фойерверка с повече от един заряд. multiplePotionEffects=§4Не можете да приложете повече от един ефект на тази отвара. muteCommandUsage1=/ mutedPlayer=§6Играчът§c {0} §6бе перманентно заглушен. @@ -623,7 +591,6 @@ nearCommandUsage1=/ nearCommandUsage2Description=Показва всички играчи с даденият радиус от вас nearCommandUsage3=/ nearbyPlayers=§6Играчи наблизо\:§r {0} -negativeBalanceError=§4Играчът няма право да има негативен баланс. nickChanged=§6Прякорът ви беше променен. nickDisplayName=§4Трябва да активирате change-displayname в Essentials конфигурацията. nickInUse=§4Това име вече се използва. @@ -663,9 +630,7 @@ noPermToSpawnMob=§4Нямате право да разпространите т noPlacePermission=§4Нямате права да поставяте блокчета около тази табела. noPotionEffectPerm=§4Нямате право да прилагате ефект §c{0} §4на тази отвара. noPowerTools=§6Нямате предмети със зададени команди. -notAcceptingPay=§4{0} §4не приема плащания. notEnoughExperience=§4Нямате достатъчно опит. -notEnoughMoney=§4Нямате достатъчно средства. notFlying=не лети nothingInHand=§4Нямате нищо в ръката си. now=сега @@ -678,18 +643,9 @@ onlyPlayers=§4Командата §c{0} §4може да се изпълни е onlyPlayerSkulls=§4Можете да задавате единствено собственика на главите (§c397\:3§4). onlySunStorm=§4/weather приема единствено sun/storm. openingDisposal=§6Отваряне на кошчето за боклук... -orderBalances=§6Подреждане на баланските на§c {0} §6играчи, моля изчакайте... oversizedMute=§4Не може да заглушите играч за този период от време. oversizedTempban=§4Не може да ограничите играч за този период от време. passengerTeleportFail=§4Не може да бъдете телепортиран докато носите пасажери. -payConfirmToggleOff=§6Вече няма да бъдете питани за потвърждение на плащания. -payConfirmToggleOn=§6Вече ще бъдете питани за потвърждение на плащания. -payMustBePositive=§4Сумата трябва да е положителна. -payToggleOff=§6Вече ще отхвърляте всички плащания. -payToggleOn=§6Вече няма да отхвърляте всички плащания. -payconfirmtoggleCommandUsage=/ -paytoggleCommandUsage=/ [player] -paytoggleCommandUsage1=/ [player] pendingTeleportCancelled=§4Заявката за телепортиране беше отказана. pingCommandDescription=Понг\! pingCommandUsage=/ @@ -785,8 +741,6 @@ requestDeniedFrom=§c{0} §6отказва вашата заявка за тел requestSent=§6Изпратихте заявка на§c {0}§6. requestSentAlready=§4Вече сте пратили заявка за телепортиране на {0}§4. requestTimedOut=§4Заявката за телепортиране изтече. -resetBal=§6Балансът бе рестартиран на §c{0} §6за всички активни играчи. -resetBalAll=§6Балансът бе рестартиран на §c{0} §6за всички играчи. restCommandUsage=/ [player] restCommandUsage1=/ [player] returnPlayerToJailError=§4Възникна грешка при опит да върнете играча§c {0} §4в затвора\: §c{1}§4\! @@ -798,14 +752,10 @@ seconds=секунди seenAccounts=§6Играчът е също познат като\:§c {0} seenOffline=§6Играчът§c {0} §6е §4неактивен/на§6 от §c{1}§6. seenOnline=§6Играчът§c {0} §6е §4активен/на§6 от §c{1}§6. -sellBulkPermission=§6Нямате право да продавате на куп. -sellHandPermission=§6Нямате право да продавате предмета в ръката си. serverFull=Сървърът е пълен\! serverTotal=§6Общо играчи\:§c {0} serverUnsupported=Имате неподдържана версия на сървъра\! serverUnsupportedDangerous=Използвате сървърен форк, за който се знае, че е изключително опасен и може да доведе до загуба на данни. Препоръчително е да преминете към по-стабилен сървърен софтуер като Paper. -setBal=§aВашият баланс беше зададен на {0}. -setBalOthers=§aЗададохте баланса на {0}§a на {1}. setSpawner=§6Променихте вида на размножителя на§c {0}§6. sethomeCommandUsage1=/ sethomeCommandUsage2=/ \: @@ -846,8 +796,6 @@ suicideCommandUsage=/ suicideMessage=§6Сбогом, жесток свят... suicideSuccess=§6Играчът §c{0} §6се самоуби. survival=оцеляване -takenFromAccount=§a{0} бяха взети от сметката ви. -takenFromOthersAccount=§a{0} взети от сметката на {1}§a. Нова наличност\: {2} teleportAAll=§6Беше изпратена покана за телепорт до всички играчи... teleportAll=§6Телепортиране на всички играчи... teleportationCommencing=§6Телепортирането започва... @@ -923,8 +871,6 @@ tprCommandUsage1=/ tps=§6Текущ TPS \= {0} tptoggleCommandUsage=/ [player] [on|off] tptoggleCommandUsage1=/ [player] -tradeSignEmpty=§4Тази търговска табела няма нищо налично за вас. -tradeSignEmptyOwner=§4Няма нищо за събиране от тази търговска табела. treeFailure=§4Провал при създаване на дърво. Опитайте върху пръст или трева. treeSpawned=§6Създадено е дърво. true=§aда§r @@ -972,7 +918,6 @@ vanishCommandDescription=Скрий себе си от другите играч vanishCommandUsage=/ [player] [on|off] vanishCommandUsage1=/ [player] vanished=§6Сега сте напълно невидим за нормалните играчи и скрит от командите в сървъра. -versionOutputVaultMissing=§4Vault не е инсталиран. Чатът и правата може да не работят. versionOutputFine=§6{0} версия\: §a{1} versionOutputWarn=§6{0} версия\: §a{1} versionOutputUnsupported=§d{0} §6версия\: §d{1} @@ -1024,7 +969,6 @@ whoisHunger=§6 - Глад\:§r {0}/20 (+{1} наситеност) whoisIPAddress=§6 - IP Адрес\:§r {0} whoisJail=§6 - Затворен/а\:§r {0} whoisLocation=§6 - Локация\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Пари\:§r {0} whoisMuted=§6 - Заглушен/а\:§r {0} whoisMutedReason=§6 - Заглушен/а\:§r {0} §6Причина\: §c{1} whoisNick=§6 - Прякор\:§r {0} @@ -1039,9 +983,6 @@ worldCommandDescription=Превключвате между светове. worldCommandUsage=/ [world] worldCommandUsage1=/ worldCommandUsage2Description=Телепортира на твойта локация в даден свят -worth=§aСтак от {0} струва §c{1}§a ({2} предмет(а) по {3} всеки) -worthMeta=§aСтак от {0} с метаданни на {1} струва §c{2}§a ({3} предмет(а) по {4} всеки) -worthSet=§6Цената е зададена year=година years=години youAreHealed=§6Вие бяхте излекувани. diff --git a/Essentials/src/main/resources/messages_bs.properties b/Essentials/src/main/resources/messages_bs.properties index 4b971aa0c..eee459dcf 100644 --- a/Essentials/src/main/resources/messages_bs.properties +++ b/Essentials/src/main/resources/messages_bs.properties @@ -2,8 +2,6 @@ #version: ${full.version} # Single quotes have to be doubled: '' # by: -addedToAccount=§a{0} je dodano na vas racun. -addedToOthersAccount=dodan §a {0} {1} §a račun. Novo ravnotežu\: {2} adventure=pustolovina afkCommandDescription=Označava da ste trenutno odsutni. afkCommandUsage=/ [Igrač/poruka...] @@ -25,9 +23,6 @@ backupDisabled=§7Jedna vanjska sigurnosna kopija nije konfigurirana. backupFinished=§7Backup je zavrsen. backupStarted=§7Backup je zapoceo. backUsageMsg=§7Vracanje na prethodnu lokaciju. -balance=§aStanje na racunu\:§c {0} -balanceOther=§aStanje na racunu od {0}§a\:§c {1} -balanceTop=§6Top stanje na racunu ({0}) banExempt=§4Nemozes banati tog igraca. banFormat=§cBanovani ste sa servera\!\!\nNe poksuavajte praviti nove acconte, inace nikada necete dobiti unban\nRazlog\:\n§r{0} bed=§oKrevet§r @@ -125,7 +120,6 @@ missingItems=§4Ti nemas §c{0}x {1}§4. mobSpawnError=&7Greska u promjenjivanju spawnera. mobSpawnLimit=&7Mob kolicina je ogranicena na ovom serveru. mobSpawnTarget=&7Moras gledati u spawner da ga pretvoris u drugi spawner. -moneySentTo=§a{0} je poslano do {1}. moreThanZero=&7Quantities mora biti veci od 0. multiplePotionEffects=&7Nije moguce primjeniti vise efekta ovaj napitak. mutedPlayer=&7Igrac &3{0} &7muted. @@ -133,7 +127,6 @@ mutedPlayerFor=&7Igrac&3 {0} &7je mutovan za &3{1}&7. muteExempt=&7Nemozes mute ovog igraca. muteNotify=&3{0} &7je mutovao igraca &3{1}&7. nearbyPlayers=&7Igraci u blizini\: &3{0} -negativeBalanceError=&7Igrac nesmije imati negativne novce. nickChanged=&7Ime je promjenjeno. nickDisplayName=&7Moras promjeniti displayname u Essentials config. nickInUse=&7Ovo ime vec postoji. @@ -144,7 +137,6 @@ nuke=&7Bombe ce poceti padat. onlyDayNight=/Time samo podržava dan/noć. onlyPlayers=§4Samo igrači u igri mogu koristiti §c{0}§4. onlyPlayerSkulls=Možeš postaviti samo igračevu lubanju (§c397\:3§4). -orderBalances=&7Ucitavamo stanja novaca &3{0} &figraca, molimo pricekajte... oversizedTempban=&7Nemozes banovati igraca na to vrijeme. pendingTeleportCancelled=&7Ponistio si teleport zahtijev. playerBanIpAddress=&7Igrac &3{0} &7je banovao IP Adresu &3{1} &7za\: &3{2}&7. @@ -173,8 +165,6 @@ pWeatherPlayers=&7Ovi igraci imaju svoje vrijeme\: &r pWeatherReset=&7Igracevo vrijeme je vraceno na\: &3{0} pWeatherSet=&7Igracevo vrijeme je stavljeno na &3{0}&7 za\: &3{1}&7. serverTotal=&7Server ukupno\: &3{0} -setBal=&7Tvoj novac je postavljen na &3{0}. -setBalOthers=&7Stavio si &3{0} &7novce za &3{1}&7. setSpawner=§6Promijenjen spawner tip to§c {0}§6. signProtectInvalidLocation=§4Nemas dozvolu da postavis sign ovdje. similarWarpExist=§4Warp sa slicnim imenom vec postoji. @@ -219,9 +209,6 @@ whoisGeoLocation=&7Lokacija\: &3 {0} whoisHealth=&7 - Zdravlje\: &3 {0}/20 whoisHunger=&7 - glad\: &3 {0}/20 (+{1} Zasicenje) whoisIPAddress=&7 - IP Adresa\: &3 {0} -whoisMoney=&7 - Novac\: &3 {0} whoisMuted=&7 - Mutovan\:&3 {0} -worth=§aStack {0} vrijednosti §c{1}§a ({2} stavke u {3} svaki) -worthSet=§6Vrijednost je stavljena youAreHealed=§6Izlječen si. youHaveNewMail=§6Imaš§c {0} §6poruka\! Kucaj §c/mail read§6 da vidiš poštu. diff --git a/Essentials/src/main/resources/messages_cs.properties b/Essentials/src/main/resources/messages_cs.properties index ddea80731..9444da632 100644 --- a/Essentials/src/main/resources/messages_cs.properties +++ b/Essentials/src/main/resources/messages_cs.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} bylo připsáno na tvůj účet. -addedToOthersAccount=§aNa účet hráče {1}§a bylo připsáno {0}. Nový zůstatek\: {2} adventure=dobrodružná hra afkCommandDescription=Označuje tě jako mimo počítač. afkCommandUsage=/ [hráč/zpráva...] @@ -47,20 +45,6 @@ backupFinished=§6Záloha dokončena. backupStarted=§6Začalo zálohování. backupInProgress=§6Probíhá externí zálohovací skript\! Dokud nedoběhne, tak je zastavení zásuvného modulu znemožněno. backUsageMsg=§6Návrat na předchozí polohu. -balance=§aZůstatek\:§c {0} -balanceCommandDescription=Zobrazí aktuální zůstatek hráče. -balanceCommandUsage=/ [hráč] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Aktuální zůstatek tvého účtu -balanceCommandUsage2=/ -balanceCommandUsage2Description=Zobrazí zůstatek zadaného hráče -balanceOther=§aZůstatek hráče {0}§a\:§c {1} -balanceTop=§6Nejvyšší zůstatky ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Vypíše žebříček nejvyšších zůstatků. -balancetopCommandUsage=/ [strana] -balancetopCommandUsage1=/ [strana] -balancetopCommandUsage1Description=Zobrazí první (nebo zadanou) stránku seznamu nejvyšších zůstatků banCommandDescription=Zablokuje hráče. banCommandUsage=/ [důvod] banCommandUsage1=/ [důvod] @@ -161,16 +145,9 @@ consoleCannotUseCommand=Tento příkaz nelze použít na konzoli. compassBearing=§6Kurs\: {0} ({1} stupňů). compassCommandDescription=Zobrazuje tvůj aktuální azimut. compassCommandUsage=/ -condenseCommandDescription=Zhustí předměty do kompaktnějších bloků. -condenseCommandUsage=/ [předmět] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Zhustí všechny předměty ve tvém inventáři -condenseCommandUsage2=/ -condenseCommandUsage2Description=Zhustí zadaný předmět ve tvém inventáři configFileMoveError=Nepodařilo se přesunout config.yml do zálohy. configFileRenameError=Dočasný soubor se nepodařilo přejmenovat na config.yml. confirmClear=§7Smazání inventáře je třeba §lPOTVRDIT§7, opakuj příkaz\: §6{0} -confirmPayment=§7Platbu je třeba §lPOTVRDIT§7 §6{0}§7, opakuj příkaz\: §6{1} connectedPlayers=§6Připojení hráči§r connectionFailed=Pokus o otevření připojení selhal. consoleName=Konzole @@ -189,7 +166,6 @@ createKitUnsupported=§4NBT serializace předmětů byla povolena, avšak tento creatingConfigFromTemplate=Vytváří se konfigurace podle šablony\: {0} creatingEmptyConfig=Vytváří se prázdná konfigurace\: {0} creative=tvořivá hra -currency={0}{1} currentWorld=§6Součaný svět\:§c {0} customtextCommandDescription=Umožňuje vytvářet vlastní textové příkazy. customtextCommandUsage=/ - definuj v souboru bukkit.yml @@ -313,16 +289,6 @@ dumpUrl=§6Vytvořen výpis serveru\: §c{0} duplicatedUserdata=Duplicitní uživatelská data\: {0} a {1}. durability=§6U tohoto nástroje zbývá ještě §c{0}§6 použití. east=V -ecoCommandDescription=Spravuje ekonomiku serveru. -ecoCommandUsage=/ <částka> -ecoCommandUsage1=/ give -ecoCommandUsage1Description=Dá zadanému hráči uvedený počet peněz -ecoCommandUsage2=/ take -ecoCommandUsage2Description=Vezme zadanému hráči uvedený počet peněz -ecoCommandUsage3=/ set -ecoCommandUsage3Description=Nastaví zadanému hráči uvedený počet peněz -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=Nastaví zadanému hráči zůstatek na počáteční částku editBookContents=§eNyní můžeš upravovat obsah této knihy. enabled=povoleno enchantCommandDescription=Očaruje předmět, který uživatel drží. @@ -540,9 +506,7 @@ infoCommandDescription=Zobrazí informace nastavené vlastníkem serveru. infoCommandUsage=/ [kapitola] [strana] infoPages=§e ---- §6{2} §e--§6 Strana §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Neznámá kapitola. -insufficientFunds=§4Nedostatek prostředků. invalidBanner=§4Neplatná definice praporu. -invalidCharge=§4Neplatný poplatek. invalidFireworkFormat=§4Možnost §c{0} §4není platná hodnota pro §c{1}§4. invalidHome=§4Domov§c {0} §4neexistuje\! invalidHomeName=§4Neplatný název domova\! @@ -659,7 +623,6 @@ kitCommandUsage1Description=Zobrazí veškeré dostupné sady kitCommandUsage2=/ [hráč] kitCommandUsage2Description=Dá uvedenou sadu tobě nebo jinému hráč, byl-li zadán kitContains=§6Sada §c{0} §6obsahuje\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Neexistují žádné platné sady. kitError2=§4Tato sada není správně definována. Kontaktuj správce. @@ -739,7 +702,6 @@ mailTooLong=§4Zpráva je příliš dlouhá, může obsahovat nejvýše 1000 zna markMailAsRead=§6Příkazem§c /mail clear§6 označíš poštu jako přečtenou. matchingIPAddress=§6Z této IP adresy se v minulosti připojili následující hráči\: maxHomes=§4Nemůžeš si nastavit více než§c {0} §4domovů. -maxMoney=§4Tato transakce by překročila limit tohoto účtu. mayNotJail=§4Tohoto hráče nemůžeš uvrhnout do vězení\! mayNotJailOffline=§Nemůžeš uvěznit hráče, který není ve hře. meCommandDescription=Umožňuje napsat o sobě ve třetí osobě. @@ -748,7 +710,6 @@ meCommandUsage1=/ meCommandUsage1Description=Popisuje akci meSender=já meRecipient=já -minimumBalanceError=§4Nejnižší možný zůstatek uživatele je {0}. minimumPayAmount=§cNejméně můžeš zaplatit {0}. minute=minuta minutes=minut @@ -758,8 +719,6 @@ mobsAvailable=§6Stvoření\:§r {0} mobSpawnError=§4Chyba při změně líhně. mobSpawnLimit=Počet stvoření je omezen limitem serveru. mobSpawnTarget=§4Musíš se dívat na líheň. -moneyRecievedFrom=§6Obdržel jsi §a{0}§6 od hráče§a {1}§6. -moneySentTo=§a{0} bylo odesláno hráči {1}. month=měsíc months=měsíců moreCommandDescription=Vyplní stack v ruce na stanovené množství nebo na maximum, není-li množství uvedeno. @@ -784,7 +743,6 @@ msgtoggleCommandDescription=Blokuje příjem všech soukromých zpráv. msgtoggleCommandUsage=/ [hráč] [on|off] msgtoggleCommandUsage1=/ [hráč] msgtoggleCommandUsage1Description=Přepíná létání pro sebe nebo jiného hráče, je-li zadán -multipleCharges=§4Na tento ohňostroj nemůžeš použít více než jeden náboj. multiplePotionEffects=§4Na tento lektvar nelze použít více než jeden efekt. muteCommandDescription=Umlčí hráče nebo mu povolí mluvit. muteCommandUsage=/ [trvání] [důvod] @@ -815,7 +773,6 @@ nearCommandUsage4=/ nearCommandUsage4Description=Vypíše všechny hráče nebo specifického hráče kolem tebe v daném poloměru nearbyPlayers=§6Hráči v okolí\:§r {0} nearbyPlayersList={0}§f(§c{1} m§f) -negativeBalanceError=§4Hráč nemůže mít záporný zůstatek. nickChanged=§6Přezdívka změněna. nickCommandDescription=Změní tvou přezdívku nebo přezdívku jiného hráče. nickCommandUsage=/ [hráč] @@ -867,12 +824,10 @@ noPermToSpawnMob=§4Nemáš oprávnění vyvolat toto stvoření. noPlacePermission=§4Nemáš oprávnění pokládat bloky poblíž této cedule. noPotionEffectPerm=§4Nemáš oprávnění používat u tohoto lektvaru účinek §c{0}§4. noPowerTools=§6Nemáš přiřazen žádný výkonný nástroj. -notAcceptingPay=§4{0} §4nepřijímá platby. notAllowedToLocal=§4Nemáš oprávnění mluvit v místním chatu. notAllowedToQuestion=§4Nemáš oprávnění položit dotaz. notAllowedToShout=§4Nemáš oprávnění k hlučnému módu. notEnoughExperience=§4Nemáš dostatek zkušeností. -notEnoughMoney=§4Nemáš dost prostředků. notFlying=nelétá nothingInHand=§4Nic nedržíš v ruce. now=nyní @@ -888,28 +843,9 @@ onlyPlayers=§4Pouze hráči ve hře mohou použít §c{0}§4. onlyPlayerSkulls=§4Vlastníka můžeš nastavit pouze hlavám hráčů (§c397\:3§4). onlySunStorm=§4/weather podporuje pouze sun/storm. openingDisposal=§6Otevírá se odpadkový koš... -orderBalances=§6Seřazuji zůstatky§c {0} §6hráčů, chvilku strpení... oversizedMute=§4Nemůžeš umlčet hráče na tak dlouhou dobu. oversizedTempban=§4Nemůžeš potrestat hráče na tak dlouhou dobu. passengerTeleportFail=§4Nemůžeš být teleportován během přepravy cestujících. -payCommandDescription=Převede peníze jinému hráči z tvého zůstatku. -payCommandUsage=/ [částka] -payCommandUsage1=/ [částka] -payCommandUsage1Description=Zaplatí zadanému hráči uvedený počet peněz -payConfirmToggleOff=§6Od této chvíle se nebude požadovat potvrzení platby. -payConfirmToggleOn=§6Od této chvíle se bude požadovat potvrzení platby. -payDisabledFor=§6Přijímání plateb bylo pro §c{0}§6 vypnuto. -payEnabledFor=§6Přijímání plateb bylo pro §c{0}§6 zapnuto. -payMustBePositive=§4Převáděná částka musí být kladná. -payOffline=§4Nemůžeš platit hráčům, kteří nejsou ve hře. -payToggleOff=§6Od této chvíle nepřijímáš platby. -payToggleOn=§6Od této chvíle přijímáš platby. -payconfirmtoggleCommandDescription=Přepíná, zda je třeba potvrzovat platby. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Přepíná, zda přijímáš platby. -paytoggleCommandUsage=/ [hráč] -paytoggleCommandUsage1=/ [hráč] -paytoggleCommandUsage1Description=Přepíná, zda ty nebo případný zadaný hráč, přijímáte platby pendingTeleportCancelled=§4Nevyřízená žádost o teleportování byla zrušena. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -1077,8 +1013,6 @@ requestSent=§6Žádost odeslána hráči §c{0}§6. requestSentAlready=§4Žádost o teleportování byla hráči §c{0}§4 už poslána. requestTimedOut=§4Žádost o teleportování vypršela. requestTimedOutFrom=§4Žádost o teleportování od §c{0} §4vypršela. -resetBal=§6Stav účtu všech připojených hráčů byl obnoven na §c{0}§6. -resetBalAll=§6Stav účtu všech hráčů byl obnoven na §c{0}§6. rest=§6Cítíš se dobře odpočatý. restCommandDescription=Poskytne odpočinek tobě nebo zadanému hráči. restCommandUsage=/ [hráč] @@ -1100,18 +1034,6 @@ seenCommandUsage1=/ seenCommandUsage1Description=Ukáže informace o času odpojení, banu, umlčení a UUID specifikovaného hráče seenOffline=§6Hráč §c{0} §6je §4odpojen§6 od §c{1}§6. seenOnline=§6Hráč §c{0} §6je §apřipojen§6 od §c{1}§6. -sellBulkPermission=§6Nemáš oprávnění prodávat ve velkém. -sellCommandDescription=Prodá předmět, který je právě v ruce. -sellCommandUsage=/ <||hand|inventory|blocks> [množství] -sellCommandUsage1=/ [množství] -sellCommandUsage1Description=Prodá všechny (nebo daný počet, pokud je specifikován) dané předměty z tvého inventáře -sellCommandUsage2=/ hand [počet] -sellCommandUsage2Description=Prodá všechny (nebo daný počet, pokud je specifikován) předměty, které máš v ruce -sellCommandUsage3=/ all -sellCommandUsage3Description=Prodá úplně všechny předměty ve tvém inventáři -sellCommandUsage4=/ blocks [počet] -sellCommandUsage4Description=Prodá všechny (nebo daný počet, pokud je specifikován) bloky z tvého inventáře -sellHandPermission=§6Nemáš oprávnění prodávat z ruky. serverFull=Server je plný\! serverReloading=Je zde značná pravděpodobnost, že právě opětovně načítáte server. Pokud je tomu tak, tak proč se nenávidíte? Při používání /reload neočekávejte od týmu EssentialsX žádnou podporu. serverTotal=§6Server celkem\:§c {0} @@ -1122,8 +1044,6 @@ serverUnsupportedDangerous=Máte verzi serveru, o níž je známo, že je velmi serverUnsupportedLimitedApi=Používáte server s omezenou funkčností API. EssentialsX bude stále fungovat, ale některé funkce mohou být zakázány. serverUnsupportedDumbPlugins=Používáš zásuvné moduly, o nichž je známo, že způsobují vážné problémy s EssentialsX a dalšími zásuvnými moduly. serverUnsupportedMods=Používáte server, který nepodporuje Bukkit pluginy. Bukkit pluginy by se neměly používat s Forge/Fabric módy\! Pro Forge módy zvažte použití ForgeEssentials nebo SpongeForge + Nucleus. -setBal=§aStav tvého účtu byl nastaven na {0}. -setBalOthers=§aNastavil jsi stav účtu hráče {0}§a na {1}. setSpawner=§6Typ líhně změněn na§c {0}§6. sethomeCommandDescription=Nastaví tvůj domov na aktuální polohu. sethomeCommandUsage=/ [[hráč\:]název] @@ -1149,12 +1069,6 @@ setwarpCommandDescription=Vytvoří nový warp. setwarpCommandUsage=/ setwarpCommandUsage1=/ setwarpCommandUsage1Description=Vytvoří warp s určitým jménem tam, kde stojíš -setworthCommandDescription=Nastaví prodejní cenu předmětu. -setworthCommandUsage=/ [předmět|id] -setworthCommandUsage1=/ -setworthCommandUsage1Description=Nastaví hodnotu předmětu, který máš v ruce na danou cenu -setworthCommandUsage2=/ -setworthCommandUsage2Description=Nastaví hodnotu určitého předmětu na danou cenu sheepMalformedColor=§4Neplatná barva. shoutDisabled=§6Hlučný mód §cvypnut§6. shoutDisabledFor=§6Hlučný mód §cvypnut §6 pro hráče §c{0}§6. @@ -1244,8 +1158,6 @@ suicideCommandUsage=/ suicideMessage=§6Sbohem, krutý světe... suicideSuccess=§6Hráč §c{0} §6si vzal život. survival=hra o přežití -takenFromAccount=§e{0}§a bylo strženo ze tvého účtu. -takenFromOthersAccount=§aZ účtu hráče§e {1}§a bylo strženo §e{0}§a. Nový zůstatek\:§e {2} teleportAAll=§6Žádost o teleportování zaslána všem hráčům... teleportAll=§6Teleportují se všichni hráči... teleportationCommencing=§6Teleportování zahájeno... @@ -1399,8 +1311,6 @@ tptoggleCommandDescription=Blokuje všechny druhy teleportace. tptoggleCommandUsage=/ [hráč] [on|off] tptoggleCommandUsage1=/ [hráč] tptoggleCommandUsageDescription=Přepne, jestli jsou pro tebe, nebo pro jiného hráče, pokud je uveden, povoleny teleporty -tradeSignEmpty=§4Tato obchodní cedule již nemá pro tebe nic dostupného. -tradeSignEmptyOwner=§4Z této obchodní cedule už není co brát. treeCommandDescription=Vytvoří strom na místě, kam se díváš. treeCommandUsage=/ treeCommandUsage1=/ @@ -1481,12 +1391,10 @@ versionDevLatest=§6Používáš nejnovější vývojové sestavení EssentialsX versionError=§4Chyba při načítání informací o verzi EssentialsX\! Informace o sestavení\: §c{0}§6. versionErrorPlayer=§6Chyba při zjišťování informací o verzi EssentialsX\! versionFetching=§6Získávání informací o verzi… -versionOutputVaultMissing=§4Vault není nainstalován. Chat a oprávnění nemusejí fungovat. versionOutputFine=§6{0} verze\: §a{1} versionOutputWarn=§6{0} verze\: §c{1} versionOutputUnsupported=§d{0} §6verze\: §d{1} versionOutputUnsupportedPlugins=§6Používáte §dnepodporované zásuvné moduly§6\! -versionOutputEconLayer=§6Ekonomická vrstva\: §r{0} versionMismatch=§4Nesprávná verze\! Aktualizuj§r {0} §4na stejnou verzi. versionMismatchAll=§4Nesprávná verze\! Aktualizuj všechny soubory Essentials .jar na stejnou verzi. versionReleaseLatest=§6Používáš nejnovější stabilní verzi EssentialsX\! @@ -1548,7 +1456,6 @@ whoisHunger=§6 - Hlad\:§r {0}/20 (+{1} sytost) whoisIPAddress=§6 - IP adresa\:§r {0} whoisJail=§6 - Vězení\:§r {0} whoisLocation=§6 - Poloha\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Peníze\:§r {0} whoisMuted=§6 - Umlčen\:§r {0} whoisMutedReason=§6 - Umlčen\:§r {0} §6Důvod\: §c{1} whoisNick=§6 - Přezdívka\:§r {0} @@ -1565,19 +1472,6 @@ worldCommandUsage1=/ worldCommandUsage1Description=Teleportuje tě na odpovídající umístění v netheru nebo v overworldu worldCommandUsage2=/ worldCommandUsage2Description=Teleportuje tě na umístění v daném světě -worth=§aStack {0} ceny §c{1}§a ({2} kus(u) za {3} kus) -worthCommandDescription=Vypočte hodnotu předmětů v ruce nebo předmětů zadaných. -worthCommandUsage=/ <||hand|inventory|blocks> [-][počet] -worthCommandUsage1=/ [množství] -worthCommandUsage1Description=Spočítá hodnotu všech (nebo daného množství, pokud je uvedeno) daných předmětů ve tvém inventáři -worthCommandUsage2=/ hand [počet] -worthCommandUsage2Description=Spočítá hodnotu všech (nebo daného množství, pokud je uvedeno) držených předmětů -worthCommandUsage3=/ all -worthCommandUsage3Description=Spočítá hodnotu úplně všech předmětů ve tvém inventáři -worthCommandUsage4=/ blocks [počet] -worthCommandUsage4Description=Spočítá hodnotu všech (nebo daného množství, pokud je uvedeno) bloků ve tvém inventáři -worthMeta=§aStack {0} s metadaty {1} ceny §c{2}§a ({3} kus(u) za {4} kus) -worthSet=§6Cena nastavena year=rok years=roky youAreHealed=§6Byl jsi uzdraven. diff --git a/Essentials/src/main/resources/messages_da.properties b/Essentials/src/main/resources/messages_da.properties index 609fe57bd..8a23c57bc 100644 --- a/Essentials/src/main/resources/messages_da.properties +++ b/Essentials/src/main/resources/messages_da.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} er blevet tilføjet til din konto. -addedToOthersAccount=§a{0} tilføjet til {1}§a konto. Ny saldo\: {2} adventure=eventyr afkCommandDescription=Markerer dig som værende inaktiv. afkCommandUsage=/ [spiller/besked...] @@ -46,19 +44,6 @@ backupFinished=§6Backup afsluttet. backupStarted=§6Backup startet. backupInProgress=§6Et eksternt backup-script er i gang\! Stop plugin deaktiveret indtil færdig. backUsageMsg=§6Retunerer til tidligere lokation. -balance=§aSaldo\:§c {0} -balanceCommandDescription=Angiver den aktuelle balance for en spiller. -balanceCommandUsage=/ [player] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Viser din nuværende saldo -balanceCommandUsage2Description=Viser den specificerede spillers saldo -balanceOther=§aSaldo for {0}§a\:§c {1} -balanceTop=§6Top saldi ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Henter listen over top balanceværdier. -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] -balancetopCommandUsage1Description=Viser den første (eller specificerede) side af de øverste saldoværdier banCommandDescription=Udelukker en spiller. banCommandUsage=/ [reason] banCommandUsage1=/ [reason] @@ -135,12 +120,9 @@ commandNotLoaded=§4Kommandoen {0} er indlæst forkert. compassBearing=§6Pejling\: {0} ({1} degrees). compassCommandDescription=Beskriver din nuværende retning. compassCommandUsage=/ -condenseCommandDescription=Kondenserer genstande i en mere kompakt block. -condenseCommandUsage1=/ configFileMoveError=Kunne ikke flytte config.yml til backup-lokation. configFileRenameError=Kunne ikke omdøbe midlertidig fil til config.yml. confirmClear=§7To §lCONFIRM§7 inventory clear, please repeat command\: §6{0} -confirmPayment=§7To §lCONFIRM§7 payment of §6{0}§7, please repeat command\: §6{1} connectedPlayers=§6Tilsluttede spillere§r connectionFailed=Kunne ikke åbne forbindelse. consoleName=Konsol @@ -155,7 +137,6 @@ createKitSuccess=§6Created Kit\: §f{0}\n§6Delay\: §f{1}\n§6Link\: §f{2}\n creatingConfigFromTemplate=Opretter konfig fra skabelon\: {0} creatingEmptyConfig=Opretter tom konfig\: {0} creative=kreativ -currency={0}{1} currentWorld=§6Nuværende Verden\:§c {0} customtextCommandDescription=Tillader dig at oprette brugerdefinerede tekstkommandoer. day=dag @@ -290,9 +271,7 @@ infoChapter=§6Vælg kapitel\: infoChapterPages=§e ---- §6{0} §e--§6 Side §c{1}§6 af §c{2} §e---- infoPages=§e ---- §6{2} §e--§6 Side §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Ukendt kapitel. -insufficientFunds=§4Ikke tilstrækkelige midler. invalidBanner=§4Invalid banner syntax. -invalidCharge=§4Ugyldig ladning. invalidFireworkFormat=§4Muligheden §c{0} §4er ikke en gyldig værdi til §c{1}§4. invalidHome=§4Hjemmet§c {0} §4eksisterer ikke\! invalidHomeName=§4Ugyldigt navn til dit hjem. @@ -352,7 +331,6 @@ kill=§6Dræbte§c {0}§6. killExempt=§4Du kan ikke dræbe §c{0}§4. kitCommandUsage1=/ kitContains=§6Kit §c{0} §6contains\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Der er ingen gyldige kits. kitError2=§4Det kit er ikke defineret korrekt. Kontakt en administrator. @@ -390,7 +368,6 @@ mailTooLong=§4Mailbeskeden er for lang. Prøv at holde den under 1000 tegn. markMailAsRead=§6For at markere alt post som læst, skriv§c /mail clear§6. matchingIPAddress=§6De følgende spillere er tidligere logget ind fra den IP adresse\: maxHomes=§4Du kan ikke lave mere end§c {0} §4hjem. -maxMoney=§4Denne transaktion vil overstige saldoen af denne konto. mayNotJail=§4Du kan ikke sætte den person i fængsel\! mayNotJailOffline=§4Du kan ikke sætte offline spillere i fængsel. meSender=mig @@ -404,8 +381,6 @@ mobsAvailable=§6Mobs\:§r {0} mobSpawnError=§4Fejl under ændring af mob spawner. mobSpawnLimit=Mob mængde begrænset til serverens grænse. mobSpawnTarget=§4Målblokken skal være en mob spawner. -moneyRecievedFrom=§a{0}§6 blev modtaget fra§a {1}§6. -moneySentTo=§a{0} er blevet sendt til {1}. month=måned months=måneder moreThanZero=§4Mængder skal være større end 0. @@ -417,7 +392,6 @@ msgEnabledFor=§6Receiving messages §cenabled §6for §c{0}§6. msgFormat=§6[§c{0}§6 -> §c{1}§6] §r{2} msgIgnore=§c{0} §4has messages disabled. msgtoggleCommandUsage1=/ [player] -multipleCharges=§4Du kan ikke tilføje mere end én ladning til dette fyrværkeri. multiplePotionEffects=§4Du kan ikke tilføje mere end én effekt til denne eliksir. mutedPlayer=§6Spilleren§c {0} §6 er gjort tavs. mutedPlayerFor=§6Spilleren§c {0} §6blev gjort tavs i§c {1}§6. @@ -432,7 +406,6 @@ muteNotifyForReason=§c{0} §6har dæmpet spiller §c{1}§6 for§c {2}§6. Grund muteNotifyReason=§c{0} §6har dæmpet spiller §c{1}§6. Grund\: §c{2} nearCommandUsage1=/ nearbyPlayers=§6Spillere i nærheden\:§r {0} -negativeBalanceError=§4Brugeren er ikke tilladt at have en negativ saldo. nickChanged=§6Kaldenavn ændret. nickDisplayName=§4Du skal aktivere change-displayname i Essentials-konfiggen. nickInUse=§4Det navn bruges allerede. @@ -472,9 +445,7 @@ noPermToSpawnMob=§4Du har ikke tilladelse til at spawne det mob. noPlacePermission=§4Du har ikke tilladelse til at placere en blok i nærheden af det skilt. noPotionEffectPerm=§4Du har ikke tilladelse til at tilføje effekten §c{0} §4til denne eliksir. noPowerTools=§6Du har ingen magtværktøjer tildelt. -notAcceptingPay=§4{0} §4is not accepting payment. notEnoughExperience=§4Du har ikke nok experience. -notEnoughMoney=§4Du har ikke tilstrækkelige midler. notFlying=flyver ikke nothingInHand=§4Du har intet i din hånd. now=nu @@ -487,18 +458,9 @@ onlyPlayers=§4Kun spillere på serveren kan bruge §c{0}§4. onlyPlayerSkulls=§4Du kan kun indstille ejeren af spillerkranier (§c397\:3§4). onlySunStorm=§4/weather understøtter kun sun/storm. openingDisposal=§6Opening disposal menu... -orderBalances=§6Tjekker saldi af§c {0} §6brugere. Vent venligst... oversizedMute=§4Du må ikke mute en spiller i dette tidsrum. oversizedTempban=§4Du kan ikke bandlyse den spiller i det tidsrum. passengerTeleportFail=§4Du kan ikke teleporteres mens du har passagerer. -payConfirmToggleOff=§6You will no longer be prompted to confirm payments. -payConfirmToggleOn=§6You will now be prompted to confirm payments. -payMustBePositive=§4Amount to pay must be positive. -payToggleOff=§6You are no longer accepting payments. -payToggleOn=§6You are now accepting payments. -payconfirmtoggleCommandUsage=/ -paytoggleCommandUsage=/ [player] -paytoggleCommandUsage1=/ [player] pendingTeleportCancelled=§4Afventende teleporteringsanmodning afvist. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -589,8 +551,6 @@ requestDeniedFrom=§c{0} §6afviste din teleporteringsanmodning. requestSent=§6Anmodning sendt til§c {0}§6. requestSentAlready=§4You have already sent {0}§4 a teleport request. requestTimedOut=§4Teleporteringsanmoding udløb. -resetBal=§6Saldo er blevet nulstillet til §c{0} §6for alle online spillere. -resetBalAll=§6Saldo er blevet nulstillet til §c{0} §6for alle spillere. restCommandUsage=/ [player] restCommandUsage1=/ [player] returnPlayerToJailError=§4Der opstod en fejl under forsøget på at returnere spilleren§c {0} §4til fængsel\: §c{1}§4\! @@ -600,13 +560,9 @@ seconds=sekunder seenAccounts=§6Spilleren er også kendt som\:§c {0} seenOffline=§6Spilleren§c {0} §6har været §4offline§6 siden §c{1}§6. seenOnline=§6Spilleren§c {0} §6har været §aonline§6 siden §c{1}§6. -sellBulkPermission=§6You do not have permission to bulk sell. -sellHandPermission=§6You do not have permission to hand sell. serverFull=Serveren er fyldt op\! serverTotal=§6Server Total\:§c {0} serverUnsupported=Du kører en ikke-understøttet serverversion\! -setBal=§aDin saldo blev ændret til {0}. -setBalOthers=§aDu ændrede {0}§a''s saldo til {1}. setSpawner=§6Ændrede spawner type til§c {0}§6. sheepMalformedColor=§4Forkert udformet farve. shoutFormat=§6[Råb]§r {0} @@ -638,8 +594,6 @@ suicideCommandUsage=/ suicideMessage=§6Farvel, grusomme verden... suicideSuccess=§6{0} §6tog sit eget liv. survival=overlevelse -takenFromAccount=§e{0}§a er taget fra din konto. -takenFromOthersAccount=§e{0}§a taget fra§e {1}§a konto. Ny saldo\:§e {2} teleportAAll=§6Teleporteringsanmodning sendt til alle spillere... teleportAll=§6Teleporterer alle spillere... teleportationCommencing=§6Teleportering begynder... @@ -696,8 +650,6 @@ tprCommandUsage=/ tprCommandUsage1=/ tps=§6Nuværende TPS \= {0} tptoggleCommandUsage1=/ [player] -tradeSignEmpty=§4Handelsskiltet har ikke noget tilgængeligt til dig. -tradeSignEmptyOwner=§4Der er ikke noget at hente fra dette handelsskilt. treeFailure=§4Fejl ved generering af træ. Prøv igen på græs eller jord. treeSpawned=§6Træ spawnet. true=§asandt§r @@ -739,7 +691,6 @@ usingTempFolderForTesting=Bruger temp mappe til testning\: vanish=§6Vanish for {0}§6\: {1} vanishCommandUsage1=/ [player] vanished=§6Du er nu helt usynlig over for normale spillere, og er skjult fra in-game kommandoer. -versionOutputVaultMissing=§4Vault er ikke installeret. Chat og tilladelser virker måske ikke. versionOutputFine=§6{0} version\: §a{1} versionOutputWarn=§6{0} version\: §c{1} versionOutputUnsupported=§d{0} §6version\: §d{1} @@ -780,7 +731,6 @@ whoisHunger=§6 - Sult\:§r {0}/20 (+{1} mætning) whoisIPAddress=§6 - IP Adresse\:§r {0} whoisJail=§6 - Fængsel\:§r {0} whoisLocation=§6 - Lokation\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Penge\:§r {0} whoisMuted=§6 - Gjort tavs\:§r {0} whoisMutedReason=§6 - Tavs\:§r {0} §6Grund\: §c{1} whoisNick=§6 - Nick\:§r {0} @@ -791,9 +741,6 @@ whoisTop=§6 \=\=\=\=\=\= WhoIs\:§c {0} §6\=\=\=\=\=\= whoisUuid=§6 - UUID\:§r {0} workbenchCommandUsage=/ worldCommandUsage1=/ -worth=§aStak af {0} med en værdi af §c{1}§a ({2} ting á {3} hver) -worthMeta=§aStak af {0} med metadata af {1} med en værdi af §c{2}§a ({3} element(er) á {4} hver) -worthSet=§6Værdi ændret year=år years=år youAreHealed=§6Du er blevet helbredt. diff --git a/Essentials/src/main/resources/messages_de.properties b/Essentials/src/main/resources/messages_de.properties index 40be13eda..7043eb8e5 100644 --- a/Essentials/src/main/resources/messages_de.properties +++ b/Essentials/src/main/resources/messages_de.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§c{0} §awurden deinem Konto hinzugefügt. -addedToOthersAccount=§aAuf §6{1}§as Konto wurden §c{0} §agutgeschrieben. Neuer Kontostand\: §6{2} adventure=Abenteuermodus afkCommandDescription=Markiert dich als abwesend. afkCommandUsage=/ [spieler/nachricht...] @@ -47,20 +45,6 @@ backupFinished=§6Backup beendet. backupStarted=§6Backup gestartet. backupInProgress=§6Ein externes Backup-Skript ist derzeit in Arbeit\! Das Plugin wird bis zur Fertigstellung deaktiviert. backUsageMsg=§6Du kehrst zur letzten Position zurück. -balance=§aKontostand\:§c {0} -balanceCommandDescription=Gibt den aktuellen Kontostand des Spielers an. -balanceCommandUsage=/ [spieler] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Gibt deinen aktuellen Kontostand an -balanceCommandUsage2=/ -balanceCommandUsage2Description=Zeigt den Kontostand des angegebenen Spielers an -balanceOther=§aKontostand von {0}§a\:§c {1} -balanceTop=§6Die höchsten Kontostände ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Ermittelt die obersten Kontostand-Werte. -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] -balancetopCommandUsage1Description=Zeigt die erste (oder angegebene) Seite der höchsten Bilanzwerte an banCommandDescription=Sperrt einen Spieler. banCommandUsage=/ [grund] banCommandUsage1=/ [grund] @@ -161,16 +145,9 @@ consoleCannotUseCommand=&cDieser Befehl kann nur per Konsole ausgeführt werden. compassBearing=§6Peilung\: {0} ({1} Grad). compassCommandDescription=Beschreibt deine momentane Haltung. compassCommandUsage=/ -condenseCommandDescription=Bündelt Gegenstände into kompaktere Blöcke. -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Kondensiert alle Gegenstände in deinem Inventar -condenseCommandUsage2=/ -condenseCommandUsage2Description=Fasst den angegebenen Gegenstand in deinem Inventar zusammen configFileMoveError=Es ist ein Fehler beim Verschieben der config.yml in das Backupverzeichnis aufgetreten. configFileRenameError=Das Umbenennen einer temporären Datei nach config.yml gescheitert. confirmClear=§7Um das Inventar zu leeren, musst du zuerst §lBESTÄTIGEN§7. Wiederhole dafür bitte §6{0}§7. -confirmPayment=§7Um die Zahlung in der Höhe von §6{0}§7 zu §lBESTÄTIGEN§7, wiederhole bitte den Befehl\: §6{1} connectedPlayers=§6Verbundene Spieler§r connectionFailed=Beim Verbindungsaufbau ist ein Fehler aufgetreten. consoleName=Konsole @@ -189,7 +166,6 @@ createKitUnsupported=§4NBT-Item-Serialisierung wurde aktiviert, aber dieser Ser creatingConfigFromTemplate=Erstelle Konfiguration aus der Vorlage\: {0} creatingEmptyConfig=Erstelle eine leere Konfiguration\: {0} creative=Kreativmodus -currency={0}{1} currentWorld=§6Aktuelle Welt\:§c {0} customtextCommandDescription=Erlaubt dir, benutzerdefinierte Text-Befehle zu erstellen. customtextCommandUsage=/ - In bukkit.yml definieren @@ -313,16 +289,6 @@ dumpUrl=§6Serverdump\: §c{0} erstellt duplicatedUserdata=Duplizierte Benutzerdaten\: {0} und {1}. durability=§6Dieses Werkzeug kann noch §c{0}§6 mal benutzt werden. east=O -ecoCommandDescription=Verwaltet die Sever-Wirtschaft. -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=Gibt dem angegebenen Spieler den angegebenen Betrag an Geld -ecoCommandUsage2=/ take -ecoCommandUsage2Description=Nimmt den angegebenen Geldbetrag vom angegebenen Spieler -ecoCommandUsage3= set -ecoCommandUsage3Description=Setzt den angegebenen Spieler für die angegebene Anzahl von Sekunden in Brand -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=Setzt den Guthaben des angegebenen Spielers auf den Startsaldo des Servers zurück editBookContents=§eDu darfst den Inhalt dieses Buches jetzt bearbeiten. enabled=aktiviert enchantCommandDescription=Verzaubert den Gegenstand, den ein Benutzer hält. @@ -540,9 +506,7 @@ infoCommandDescription=Zeigt vom Serverbesitzer gesetzte Informationen an. infoCommandUsage=/ [kapitel] [seite] infoPages=§e ---- §6{2} §e--§6 Seite §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Unbekanntes Kapitel. -insufficientFunds=§4Nicht genug Guthaben. invalidBanner=§4Ungültige Banner-Syntax. -invalidCharge=§4Ungültige Kosten. invalidFireworkFormat=§6Die Option §4{0} §6ist kein gültiger Wert für §4{1}§6. invalidHome=§4Zuhause§c {0} §4existiert nicht\! invalidHomeName=§4Ungültiger Name\! @@ -659,7 +623,6 @@ kitCommandUsage1Description=Zeigt alle verfügbaren Kits kitCommandUsage2=/ [player] kitCommandUsage2Description=Gibt dir, oder einem angegebenen Spieler, das ausgewählt Kit kitContains=§6Ausrüstung §c{0} §6enthält\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Es gibt keine gültigen Kits. kitError2=§4Dieses Kit ist nicht korrekt definiert. Kontaktiere einen Administrator. @@ -739,7 +702,6 @@ mailTooLong=§4Die Nachricht ist zu lang. Benutze weniger als 1000 Zeichen. markMailAsRead=§6Um deine Nachrichten zu löschen, schreibe§c /mail clear. matchingIPAddress=\\u00a76Die folgenden Spieler haben sich vorher schonmal mit dieser IP-Adresse eingeloggt\: maxHomes=§4Du kannst nicht mehr als§c {0} §4Wohnorte setzen. -maxMoney=§4Diese Überweisung überschreitet das Limit des Empfängers. mayNotJail=§4Du kannst diese Person nicht einsperren. mayNotJailOffline=§4Du darfst abgemeldete Spieler nicht einsperren. meCommandDescription=Beschreibt eine Aktion im Kontext des Spielers. @@ -748,7 +710,6 @@ meCommandUsage1=/ meCommandUsage1Description=Beschreibt eine Aktion meSender=mir meRecipient=dir -minimumBalanceError=§4Den Mindestkontostand, den ein Benutzer haben kann ist {0}. minimumPayAmount=§c{0}§4 ist der Mindestbetrag, den du für eine überweisung aufbringen musst. minute=Minute minutes=Minuten @@ -758,8 +719,6 @@ mobsAvailable=§6Mobs\:§r {0} mobSpawnError=§4Beim Ändern des Monster-Spawners ist ein Fehler aufgetreten. mobSpawnLimit=Die Anzahl an Monstern wurde auf das festgelegte Limit beschränkt. mobSpawnTarget=§4Zielblock muss ein Monster-Spawner sein. -moneyRecievedFrom=§a{1}§6 hat dir§a {0}§6 gegeben. -moneySentTo=§aDu hast §6{1} {0} §agegeben. month=Monat months=Monate moreCommandDescription=Füllt den Gegenstandsstapel in der Hand mit der angegebenen Anzahl, oder zu maximaler Größe falls keine angegeben ist. @@ -784,7 +743,6 @@ msgtoggleCommandDescription=Blockiert das Erhalten aller privaten Nachrichten. msgtoggleCommandUsage=/ [spieler] [on|off] msgtoggleCommandUsage1=/ [spieler] msgtoggleCommandUsage1Description=Schaltet das Fliegen für sich selbst oder einen anderen Spieler ein, falls angegeben -multipleCharges=§4Du kannst einem Feuerwerk nur einen Feuerwerksstern geben. multiplePotionEffects=§4Du kannst diesem Trank nur einen Effekt geben. muteCommandDescription=Stummschalten oder Aufhebung einer Stummschaltung eines Spielers. muteCommandUsage=/ [datumsunterschied] [grund] @@ -815,7 +773,6 @@ nearCommandUsage4=/ nearCommandUsage4Description=Listet alle Spieler innerhalb des angegebenen Radius von dir auf nearbyPlayers=§6Spieler in der Nähe\:§r {0} nearbyPlayersList={0}§f(§c{1}m§f) -negativeBalanceError=§4Spieler dürfen keine Schulden machen. nickChanged=§6Spitzname geändert. nickCommandDescription=Ändere deinen Nicknamen oder den eines anderen Spielers. nickCommandUsage=/ [spieler] @@ -867,12 +824,10 @@ noPermToSpawnMob=§4Du bist nicht berechtigt diesen Mob zu spawnen. noPlacePermission=§cDu bist nicht berechtigt, einen Block in der Nähe des Schildes zu platzieren. noPotionEffectPerm=§4Du darfst den Zaubertrankeffekt §c{0} §4diesem Trank nicht hinzufügen. noPowerTools=§6Du hast keine Powertools zugewiesen. -notAcceptingPay=§4{0} §4akzeptiert keine Zahlungen. notAllowedToLocal=§4Du hast keine Berechtigung, im lokalen Chat zu sprechen. notAllowedToQuestion=§4Du hast keine Berechtigung das Frage System zu benutzen. notAllowedToShout=§4Du hast nicht die Erlaubnis zu schreien. notEnoughExperience=§4Du hast nicht genug Erfahrung. -notEnoughMoney=§4Du hast nicht genug Guthaben. notFlying=fliegt nicht nothingInHand=§4Du hast nichts in der Hand. now=jetzt @@ -888,28 +843,9 @@ onlyPlayers=§4Nur Ingame-Spieler können §c{0} §4benutzen. onlyPlayerSkulls=§4Du kannst nur den Besitzer von Spielerköpfen (§c397\:3§4) ändern. onlySunStorm=§4/weather unterstützt nur sun und storm. openingDisposal=§6öffne das Entsorgungsmenü... -orderBalances=§6Ordne die Kontostände von§c {0} §6Benutzern, bitte warten ... oversizedMute=§4Du darfst einen Spieler nicht so lange stummschalten. oversizedTempban=§4Du darfst einen Spieler nicht für eine so lange Zeit sperren. passengerTeleportFail=§4Du kannst nicht teleportiert werden, während du Passagiere beförderst. -payCommandDescription=Bezahlt einen anderen Spieler von deinem Kontostand. -payCommandUsage=/ -payCommandUsage1=/ -payCommandUsage1Description=Gibt dem angegebenen Spieler den angegebenen Betrag an Geld -payConfirmToggleOff=§6Du wirst nicht länger aufgefordert, Zahlungen zu bestätigen. -payConfirmToggleOn=§6Du wirst ab jetzt aufgefordert, Zahlungen zu bestätigen. -payDisabledFor=§6Deaktivierte die Annahme von Zahlungen für §c{0}§6. -payEnabledFor=§6Aktivierte die Annahme von Zahlungen für §c{0}§6. -payMustBePositive=§4Du kannst nur positive Beträge überweisen. -payOffline=§4Du kannst Spieler, die offline sind, nicht bezahlen. -payToggleOff=§6Du akzeptierst keine Zahlungen mehr. -payToggleOn=§6Du akzeptierst nun Zahlungen. -payconfirmtoggleCommandDescription=Bestimmt, ob du Zahlungen bestätigen musst. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Bestimmt, ob du Zahlungen akzeptierst. -paytoggleCommandUsage=/ [spieler] -paytoggleCommandUsage1=/ [spieler] -paytoggleCommandUsage1Description=Schalte um, ob du oder ein anderer Spieler wenn angegeben, Zahlungen akzeptieren pendingTeleportCancelled=§4Die laufende Teleportation wurde abgebrochen. pingCommandDescription=§b..\:\:§4Pông§b\:\:..\! pingCommandUsage=/ @@ -1075,8 +1011,6 @@ requestSent=§6Eine Anfrage wurde an§c {0}§6 gesendet. requestSentAlready=§4Du hast {0}§4 bereits eine Teleportierungsanfrage gesendet. requestTimedOut=§4Die Teleportierungsanfrage ist abgelaufen. requestTimedOutFrom=§4Die Teleportierungsanfrage von §c{0} §4ist ausgelaufen. -resetBal=§6Du hast den Kontostand aller Spieler auf §a{0} §6gesetzt. -resetBalAll=§6Guthaben wurde für alle Spieler auf §c{0} zurückgesetzt. rest=§6Du fühlst dich gut ausgeruht. restCommandDescription=Ruht dich oder den gegebenen Spieler aus. restCommandUsage=/ [spieler] @@ -1098,18 +1032,6 @@ seenCommandUsage1=/ seenCommandUsage1Description=Zeigt die Logout-Zeit, Sperrung, Stummschaltung und UUID-Information des angegebenen Spielers an seenOffline=§6Spieler§c {0} §6ist seit §c{1}§4 offline§6. seenOnline=§6Spieler§c {0} §6ist seit §c{1}§a online. -sellBulkPermission=§6Du hast keine Berechtigung, in Massen zu verkaufen. -sellCommandDescription=Verkauft den Gegenstand, der momentan in deiner Hand ist. -sellCommandUsage=/ <||hand|inventory|blocks> [menge] -sellCommandUsage1=/ [amount] -sellCommandUsage1Description=Verkauft alle (oder die angegebene Anzahl) des ausgewählten Items in deinem Inventar -sellCommandUsage2=/ hand [amount] -sellCommandUsage2Description=Verkauft alle (oder die angegebene Anzahl) des gehaltenen Items -sellCommandUsage3=/ all -sellCommandUsage3Description=Verkauft alle verkäuflichen Gegenstände in deinem Inventar -sellCommandUsage4=/ blocks [amount] -sellCommandUsage4Description=Verkauft alle (oder die angegebene Zahl, wenn angegeben) Blöcke in deinem Inventar -sellHandPermission=§6Du hast keine Berechtigung, einzeln zu verkaufen. serverFull=Server ist voll\! serverReloading=Es gibt eine gute Chance, dass du den Server gerade reloadest. Falls das der Fall ist, wieso hasst du dich selber? Erwarte keine Unterstützung des EssentialsX-Teams wenn du /reload verwendest. serverTotal=§6Server insgesamt\:§c {0} @@ -1120,8 +1042,6 @@ serverUnsupportedDangerous=Sie betreiben einen Server Fork, der als extrem gefä serverUnsupportedLimitedApi=Sie verwenden einen Server mit eingeschränkter API-Funktionalität. EssentialsX wird weiterhin funktionieren, aber bestimmte Funktionen können deaktiviert sein. serverUnsupportedDumbPlugins=Du verwendest Plugins, wo bekannt ist, dass diese schwerwiegende Probleme mit EssentialsX und anderen Plugins verursachen. serverUnsupportedMods=Du verwendest einen Server der Bukkit Plugins nicht korrekt unterstützt. Bukkit Plugins sollten nicht mit Forge/Fabric mods verwendet werden. Für Forge\: Überlege ForgeEssentials, oder SpongeForge + Nucleus zu verwenden. -setBal=§aDein Kontostand wurde auf §c{0} §agesetzt. -setBalOthers=§aDu hast den Kontostand von §6{0}§a auf §c{1} §a gesetzt. setSpawner=§6Mob-Spawner-Typ geändert zu §c{0}§6. sethomeCommandDescription=Setze dein Zuhause auf deinen momentanen Standort. sethomeCommandUsage=/ [[spieler\:]name] @@ -1147,12 +1067,6 @@ setwarpCommandDescription=Erstellt einen neuen Warp-Punkt. setwarpCommandUsage=/ setwarpCommandUsage1=/ setwarpCommandUsage1Description=Legt den Warp-Punkt mit dem angegebenen Namen an deinem Standort fest -setworthCommandDescription=Setze den Verkaufswert eines Gegenstands. -setworthCommandUsage=/ [itemname|id] -setworthCommandUsage1=/ -setworthCommandUsage1Description=Legt den Wert des gehaltenen Gegenstandes auf den angegebenen Preis fest -setworthCommandUsage2=/ -setworthCommandUsage2Description=Legt den Verkaufswert des angegebenen Items zum angegebenen Preis fest sheepMalformedColor=§4Ungültige Farbe. shoutDisabled=§6Rufmodus §cdeaktiviert§6. shoutDisabledFor=§6Rufmodus §cdeaktiviert §6für §c{0}§6. @@ -1232,8 +1146,6 @@ suicideCommandUsage=/ suicideMessage=§6Adé, du schnöde Welt... suicideSuccess=§6{0} §6ist von uns gegangen. Rest in Peace \:-( survival=Überleben -takenFromAccount=§e{0}§a wurde von deinem Konto abgezogen. -takenFromOthersAccount=§e{0}§a von§e {1}s Konto genommen. Neuer Kontostand\:§e {2} teleportAAll=§6Du hast an allen Spielern eine Teleportationsanfrage geschickt. teleportAll=§6Teleportation läuft für alle Spieler... teleportationCommencing=§6Teleportation gestartet... @@ -1359,8 +1271,6 @@ tps=§6Aktuelle TPS \= {0} tptoggleCommandDescription=Blockiere alle Formen der Teleportation. tptoggleCommandUsage=/ [spieler] [on|off] tptoggleCommandUsage1=/ [spieler] -tradeSignEmpty=Der Bestand des Trade-Schild ist aufgebraucht. -tradeSignEmptyOwner=Es gibt nichts mehr von diesem Trade-Schild zu sammeln. treeCommandDescription=Erschaffe einen Baum, wo du schaust. treeCommandUsage=/ treeCommandUsage1=/ @@ -1419,7 +1329,6 @@ vanishCommandDescription=Verstecke dich vor anderen Spielern. vanishCommandUsage=/ [spieler] [on|off] vanishCommandUsage1=/ [spieler] vanished=§6Du bist nun vollständig unsichtbar für normale Benutzer und ihre Befehle. -versionOutputVaultMissing=§4Vault ist nicht installiert. Der Chat und die Rechte könnten nicht funktionieren. versionOutputFine=§6{0} Version\: §a{1} versionOutputWarn=§6{0} Version\: §c{1} versionOutputUnsupported=§d{0} §6Version\: §d{1} @@ -1484,7 +1393,6 @@ whoisHunger=§6 - Hunger\:§r {0}/20 (+{1} Sättigung) whoisIPAddress=§6 - IP-Adresse\:§r {0} whoisJail=§6 - Gefängnis\:§r {0} whoisLocation=§6 - Position\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Kontostand\:§r {0} whoisMuted=§6 - Stummgeschaltet\:§r {0} whoisMutedReason=§6 - Stummgeschaltet\:§r {0} §6Grund\: §c{1} whoisNick=§6 - Spitzname\:§r {0} @@ -1501,15 +1409,6 @@ worldCommandUsage1=/ worldCommandUsage1Description=Teleportiert dich an den entsprechenden Standort im Nether oder in der Oberwelt worldCommandUsage2=/ worldCommandUsage2Description=Teleportiert dich zu einer Location in der gegebenen Welt -worth=§aEin Stapel {0} ist §c{1}§a wert. ({2} Stück je {3}) -worthCommandDescription=Berechnet den Wert der Gegenstände in der Hand oder wie angegeben. -worthCommandUsage=/ <||hand|inventory|blocks> [-][anzahl] -worthCommandUsage1=/ [amount] -worthCommandUsage2=/ hand [amount] -worthCommandUsage3=/ all -worthCommandUsage4=/ blocks [amount] -worthMeta=§aEin Stapel von {0} mit Metadaten {1} ist §c{2}§a wert. ({3} Stück je {4}) -worthSet=§6Wert des Gegenstands gesetzt. year=Jahr years=Jahre youAreHealed=§6Du wurdest geheilt. diff --git a/Essentials/src/main/resources/messages_el.properties b/Essentials/src/main/resources/messages_el.properties index f38f8df3b..10f59c867 100644 --- a/Essentials/src/main/resources/messages_el.properties +++ b/Essentials/src/main/resources/messages_el.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} έχει προστεθεί στο λογαριασμό σας. -addedToOthersAccount=§a{0} προστέθηκαν στον {1}§a λογαριασμό. Νέο υπόλοιπο\: {2} adventure=περιπέτεια afkCommandDescription=Σας χαρακτηρίζει ως μακριά-από-το-πληκτρολόγιο. afkCommandUsage=/ [παίχτης/μήνυμα...] @@ -36,18 +34,6 @@ backupDisabled=§4Δεν έχει ρυθμιστεί κάποιο εξωτερι backupFinished=§6Η δημιουργία αντίγραφου ασφαλείας ολοκληρώθηκε. backupStarted=§6Η δημιουργία αντίγραφου ασφαλείας ξεκίνησε. backUsageMsg=§6Επιστροφή στην προηγούμενη τοποθεσία. -balance=§aΥπόλοιπο\:§c {0} -balanceCommandDescription=Δηλώνει τo τρέχον υπόλοιπο ενός παίκτη. -balanceCommandUsage=/ [παίκτης] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Δηλώνει το τρέχον υπόλοιπό σας -balanceCommandUsage2Description=Εμφανίζει το υπόλοιπο του καθορισμένου παίκτη -balanceOther=§aΥπόλοιπο του {0}§a\:§c {1} -balanceTop=§6Κορυφαία υπόλοιπα ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandUsage=/ [σελίδα] -balancetopCommandUsage1=/ [σελίδα] -balancetopCommandUsage1Description=Εμφανίζει την πρώτη (ή καθορισμένη) σελίδα των μεγαλύτερων τιμών υπολοίπου banCommandDescription=Αποκλείει έναν παίκτη. banCommandUsage=/ [λόγος] banCommandUsage1=/ [λόγος] @@ -129,10 +115,7 @@ commandHelpLine3=§6Χρήση(-εις), commandHelpLineUsage={0} §6- {1} commandNotLoaded=§4Η εντολή {0} δεν φόρτωσε σωστά. compassCommandUsage=/ -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ configFileMoveError=Αποτυχία μετακίνησης του config.yml στη θέση του αντιγράφου ασφαλείας. -confirmPayment=§7Για να §lΕΠΙΒΕΒΑΙΩΣΕΤΕ§7 την πληρωμή των §6{0}§7, παρακαλώ επαναλάβετε την εντολή\: §6{1} connectedPlayers=§6Συνδεδεμένοι παίκτες§r connectionFailed=Αποτυχία ανοίγματος σύνδεσης. consoleName=Κονσόλα @@ -144,7 +127,6 @@ createKitSeparator=§m----------------------- creatingConfigFromTemplate=Δημιουργία διαμόρφωσης από πρότυπο\: {0} creatingEmptyConfig=Δημιουργία κενών ρυθμίσεων\: {0} creative=δημιουργία -currency={0}{1} currentWorld=§6Τρέχον Κόσμος\:§c {0} day=ημέρα days=ημέρες @@ -233,8 +215,6 @@ infoChapter=Επιλέξτε κεφάλαιο\: infoChapterPages=§e---§6{0} §e--§6 Σελίδα §c{1}§6 του §c{2} §e--- infoPages=§e---§6{2} §e--Σελίδα §6 §c{0}§6/§c{1} §e--- infoUnknownChapter=§4Άγνωστο κεφάλαιο. -insufficientFunds=§4Aνεπαρκής διαθέσιμων κεφαλαίων. -invalidCharge=§4Άκυρη χρέωση. invalidFireworkFormat=§4Η §c{0} επιλογή δεν είναι μια έγκυρη τιμή για το §c{1}§4. invalidHome=§4Το σπίτι§c {0} §4δεν υπάρχει\! invalidHomeName=§4Μη έγκυρο όνομα στο σπίτι\! @@ -289,9 +269,6 @@ noKits=§6Δεν υπάρχουν διαθέσιμα kits. noNewMail=§6Δεν έχεις νέα αλληλογραφία. now=τώρα nukeCommandUsage=/ [παίκτης] -payconfirmtoggleCommandUsage=/ -paytoggleCommandUsage=/ [παίκτης] -paytoggleCommandUsage1=/ [παίκτης] pingCommandUsage=/ playtimeCommandUsage=/ [παίκτης] playtimeCommandUsage1=/ @@ -337,7 +314,6 @@ warpSet=§6Περιοχή§c {0} §6ορίστηκε. whoisBanned=§6 - Αποκλεισμένος\:§r {0} whoisJail=§6 - Φυλακή\:§r {0} whoisLocation=§6 - Τοποθεσία\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Χρήματα\:§r {0} workbenchCommandUsage=/ worldCommandUsage1=/ year=χρόνος diff --git a/Essentials/src/main/resources/messages_en.properties b/Essentials/src/main/resources/messages_en.properties index f449ab14c..c77473b39 100644 --- a/Essentials/src/main/resources/messages_en.properties +++ b/Essentials/src/main/resources/messages_en.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} has been added to your account. -addedToOthersAccount=§a{0} added to {1}§a account. New balance\: {2} adventure=adventure afkCommandDescription=Marks you as away-from-keyboard. afkCommandUsage=/ [player/message...] @@ -47,20 +45,6 @@ backupFinished=§6Backup finished. backupStarted=§6Backup started. backupInProgress=§6An external backup script is currently in progress\! Halting plugin disable until finished. backUsageMsg=§6Returning to previous location. -balance=§aBalance\:§c {0} -balanceCommandDescription=States the current balance of a player. -balanceCommandUsage=/ [player] -balanceCommandUsage1=/ -balanceCommandUsage1Description=States your current balance -balanceCommandUsage2=/ -balanceCommandUsage2Description=Displays the balance of the specified player -balanceOther=§aBalance of {0}§a\:§c {1} -balanceTop=§6Top balances ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Gets the top balance values. -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] -balancetopCommandUsage1Description=Displays the first (or specified) page of the top balance values banCommandDescription=Bans a player. banCommandUsage=/ [reason] banCommandUsage1=/ [reason] @@ -161,16 +145,9 @@ consoleCannotUseCommand=This command cannot be used by Console. compassBearing=§6Bearing\: {0} ({1} degrees). compassCommandDescription=Describes your current bearing. compassCommandUsage=/ -condenseCommandDescription=Condenses items into a more compact blocks. -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Condenses all items in your inventory -condenseCommandUsage2=/ -condenseCommandUsage2Description=Condenses the specified item in your inventory configFileMoveError=Failed to move config.yml to backup location. configFileRenameError=Failed to rename temp file to config.yml. confirmClear=§7To §lCONFIRM§7 inventory clear, please repeat command\: §6{0} -confirmPayment=§7To §lCONFIRM§7 payment of §6{0}§7, please repeat command\: §6{1} connectedPlayers=§6Connected players§r connectionFailed=Failed to open connection. consoleName=Console @@ -189,7 +166,6 @@ createKitUnsupported=§4NBT item serialization has been enabled, but this server creatingConfigFromTemplate=Creating config from template\: {0} creatingEmptyConfig=Creating empty config\: {0} creative=creative -currency={0}{1} currentWorld=§6Current World\:§c {0} customtextCommandDescription=Allows you to create custom text commands. customtextCommandUsage=/ - Define in bukkit.yml @@ -313,16 +289,6 @@ dumpUrl=§6Created server dump\: §c{0} duplicatedUserdata=Duplicated userdata\: {0} and {1}. durability=§6This tool has §c{0}§6 uses left. east=E -ecoCommandDescription=Manages the server economy. -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=Gives the specified player the specified amount of money -ecoCommandUsage2=/ take -ecoCommandUsage2Description=Takes the specified amount of money from the specified player -ecoCommandUsage3=/ set -ecoCommandUsage3Description=Sets the specified player''s balance to the specified amount of money -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=Resets the specified player''s balance to the server''s starting balance editBookContents=§eYou may now edit the contents of this book. enabled=enabled enchantCommandDescription=Enchants the item the user is holding. @@ -540,9 +506,7 @@ infoCommandDescription=Shows information set by the server owner. infoCommandUsage=/ [chapter] [page] infoPages=§e ---- §6{2} §e--§6 Page §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Unknown chapter. -insufficientFunds=§4Insufficient funds available. invalidBanner=§4Invalid banner syntax. -invalidCharge=§4Invalid charge. invalidFireworkFormat=§4The option §c{0} §4is not a valid value for §c{1}§4. invalidHome=§4Home§c {0} §4doesn''t exist\! invalidHomeName=§4Invalid home name\! @@ -659,7 +623,6 @@ kitCommandUsage1Description=Lists all available kits kitCommandUsage2=/ [player] kitCommandUsage2Description=Gives the specified kit to you or another player if specified kitContains=§6Kit §c{0} §6contains\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4There are no valid kits. kitError2=§4That kit is improperly defined. Contact an administrator. @@ -739,7 +702,6 @@ mailTooLong=§4Mail message too long. Try to keep it below 1000 characters. markMailAsRead=§6To mark your mail as read, type§c /mail clear§6. matchingIPAddress=§6The following players previously logged in from that IP address\: maxHomes=§4You cannot set more than§c {0} §4homes. -maxMoney=§4This transaction would exceed the balance limit for this account. mayNotJail=§4You may not jail that person\! mayNotJailOffline=§4You may not jail offline players. meCommandDescription=Describes an action in the context of the player. @@ -748,7 +710,6 @@ meCommandUsage1=/ meCommandUsage1Description=Describes an action meSender=me meRecipient=me -minimumBalanceError=§4The minimum balance a user can have is {0}. minimumPayAmount=§cThe minimum amount you can pay is {0}. minute=minute minutes=minutes @@ -758,8 +719,6 @@ mobsAvailable=§6Mobs\:§r {0} mobSpawnError=§4Error while changing mob spawner. mobSpawnLimit=Mob quantity limited to server limit. mobSpawnTarget=§4Target block must be a mob spawner. -moneyRecievedFrom=§a{0}§6 has been received from§a {1}§6. -moneySentTo=§a{0} has been sent to {1}. month=month months=months moreCommandDescription=Fills the item stack in hand to specified amount, or to maximum size if none is specified. @@ -784,7 +743,6 @@ msgtoggleCommandDescription=Blocks receiving all private messages. msgtoggleCommandUsage=/ [player] [on|off] msgtoggleCommandUsage1=/ [player] msgtoggleCommandUsage1Description=Toggles fly for yourself or another player if specified -multipleCharges=§4You cannot apply more than one charge to this firework. multiplePotionEffects=§4You cannot apply more than one effect to this potion. muteCommandDescription=Mutes or unmutes a player. muteCommandUsage=/ [datediff] [reason] @@ -815,7 +773,6 @@ nearCommandUsage4=/ nearCommandUsage4Description=Lists all players within the given radius of the specified player nearbyPlayers=§6Players nearby\:§r {0} nearbyPlayersList={0}§f(§c{1}m§f) -negativeBalanceError=§4User is not allowed to have a negative balance. nickChanged=§6Nickname changed. nickCommandDescription=Change your nickname or that of another player. nickCommandUsage=/ [player] @@ -867,12 +824,10 @@ noPermToSpawnMob=§4You don''t have permission to spawn this mob. noPlacePermission=§4You do not have permission to place a block near that sign. noPotionEffectPerm=§4You do not have permission to apply potion effect §c{0} §4to this potion. noPowerTools=§6You have no power tools assigned. -notAcceptingPay=§4{0} §4is not accepting payment. notAllowedToLocal=§4You don''t have permission to speak in local chat. notAllowedToQuestion=§4You don''t have permission to ask a question. notAllowedToShout=§4You don''t have permission to shout. notEnoughExperience=§4You do not have enough experience. -notEnoughMoney=§4You do not have sufficient funds. notFlying=not flying nothingInHand=§4You have nothing in your hand. now=now @@ -888,28 +843,9 @@ onlyPlayers=§4Only in-game players can use §c{0}§4. onlyPlayerSkulls=§4You can only set the owner of player skulls (§c397\:3§4). onlySunStorm=§4/weather only supports sun/storm. openingDisposal=§6Opening disposal menu... -orderBalances=§6Ordering balances of§c {0} §6users, please wait... oversizedMute=§4You may not mute a player for this period of time. oversizedTempban=§4You may not ban a player for this period of time. passengerTeleportFail=§4You cannot be teleported while carrying passengers. -payCommandDescription=Pays another player from your balance. -payCommandUsage=/ -payCommandUsage1=/ -payCommandUsage1Description=Pays the specified player the given amount of money -payConfirmToggleOff=§6You will no longer be prompted to confirm payments. -payConfirmToggleOn=§6You will now be prompted to confirm payments. -payDisabledFor=§6Disabled accepting payments for §c{0}§6. -payEnabledFor=§6Enabled accepting payments for §c{0}§6. -payMustBePositive=§4Amount to pay must be positive. -payOffline=§4You cannot pay offline users. -payToggleOff=§6You are no longer accepting payments. -payToggleOn=§6You are now accepting payments. -payconfirmtoggleCommandDescription=Toggles whether you are prompted to confirm payments. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Toggles whether you are accepting payments. -paytoggleCommandUsage=/ [player] -paytoggleCommandUsage1=/ [player] -paytoggleCommandUsage1Description=Toggles if you, or another player if specified, are accepting payments pendingTeleportCancelled=§4Pending teleportation request cancelled. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -1077,8 +1013,6 @@ requestSent=§6Request sent to§c {0}§6. requestSentAlready=§4You have already sent {0}§4 a teleport request. requestTimedOut=§4Teleport request has timed out. requestTimedOutFrom=§4Teleport request from §c{0} §4has timed out. -resetBal=§6Balance has been reset to §c{0} §6for all online players. -resetBalAll=§6Balance has been reset to §c{0} §6for all players. rest=§6You feel well rested. restCommandDescription=Rests you or the given player. restCommandUsage=/ [player] @@ -1100,18 +1034,6 @@ seenCommandUsage1=/ seenCommandUsage1Description=Shows the logout time, ban, mute, and UUID information of the specified player seenOffline=§6Player§c {0} §6has been §4offline§6 since §c{1}§6. seenOnline=§6Player§c {0} §6has been §aonline§6 since §c{1}§6. -sellBulkPermission=§6You do not have permission to bulk sell. -sellCommandDescription=Sells the item currently in your hand. -sellCommandUsage=/ <||hand|inventory|blocks> [amount] -sellCommandUsage1=/ [amount] -sellCommandUsage1Description=Sells all (or the given amount, if specified) of the given item in your inventory -sellCommandUsage2=/ hand [amount] -sellCommandUsage2Description=Sells all (or the given amount, if specified) of the held item -sellCommandUsage3=/ all -sellCommandUsage3Description=Sells all possible items in your inventory -sellCommandUsage4=/ blocks [amount] -sellCommandUsage4Description=Sells all (or the given amount, if specified) of blocks in your inventory -sellHandPermission=§6You do not have permission to hand sell. serverFull=Server is full\! serverReloading=There''s a good chance you''re reloading your server right now. If that''s the case, why do you hate yourself? Expect no support from the EssentialsX team when using /reload. serverTotal=§6Server Total\:§c {0} @@ -1122,8 +1044,6 @@ serverUnsupportedDangerous=You are running a server fork that is known to be ext serverUnsupportedLimitedApi=You are running a server with limited API functionality. EssentialsX will still work, but certain features may be disabled. serverUnsupportedDumbPlugins=You are using plugins known to cause severe issues with EssentialsX and other plugins. serverUnsupportedMods=You are running a server that does not properly support Bukkit plugins. Bukkit plugins should not be used with Forge/Fabric mods\! For Forge\: Consider using ForgeEssentials, or SpongeForge + Nucleus. -setBal=§aYour balance was set to {0}. -setBalOthers=§aYou set {0}§a''s balance to {1}. setSpawner=§6Changed spawner type to§c {0}§6. sethomeCommandDescription=Set your home to your current location. sethomeCommandUsage=/ [[player\:]name] @@ -1149,12 +1069,6 @@ setwarpCommandDescription=Creates a new warp. setwarpCommandUsage=/ setwarpCommandUsage1=/ setwarpCommandUsage1Description=Sets the warp with the specified name to your location -setworthCommandDescription=Set the sell value of an item. -setworthCommandUsage=/ [itemname|id] -setworthCommandUsage1=/ -setworthCommandUsage1Description=Sets the worth of your held item to the given price -setworthCommandUsage2=/ -setworthCommandUsage2Description=Sets the worth of the specified item to the given price sheepMalformedColor=§4Malformed color. shoutDisabled=§6Shout mode §cdisabled§6. shoutDisabledFor=§6Shout mode §cdisabled §6for §c{0}§6. @@ -1244,8 +1158,6 @@ suicideCommandUsage=/ suicideMessage=§6Goodbye cruel world... suicideSuccess=§6Player §c{0} §6took their own life. survival=survival -takenFromAccount=§e{0}§a has been taken from your account. -takenFromOthersAccount=§e{0}§a taken from§e {1}§a account. New balance\:§e {2} teleportAAll=§6Teleport request sent to all players... teleportAll=§6Teleporting all players... teleportationCommencing=§6Teleportation commencing... @@ -1399,8 +1311,6 @@ tptoggleCommandDescription=Blocks all forms of teleportation. tptoggleCommandUsage=/ [player] [on|off] tptoggleCommandUsage1=/ [player] tptoggleCommandUsageDescription=Toggles if teleports are enabled for yourself or another player if specified -tradeSignEmpty=§4The trade sign has nothing available for you. -tradeSignEmptyOwner=§4There is nothing to collect from this trade sign. treeCommandDescription=Spawn a tree where you are looking. treeCommandUsage=/ treeCommandUsage1=/ @@ -1481,12 +1391,11 @@ versionDevLatest=§6You''re running the latest EssentialsX dev build\! versionError=§4Error while fetching EssentialsX version information\! Build information\: §c{0}§6. versionErrorPlayer=§6Error while checking EssentialsX version information\! versionFetching=§6Fetching version information... -versionOutputVaultMissing=§4Vault is not installed. Chat and permissions may not work. +versionOutputLuckPermsMissing=§4LuckPerms is not installed. Chat prefixes/suffixes and group features will not work. versionOutputFine=§6{0} version\: §a{1} versionOutputWarn=§6{0} version\: §c{1} versionOutputUnsupported=§d{0} §6version\: §d{1} versionOutputUnsupportedPlugins=§6You are running §dunsupported plugins§6\! -versionOutputEconLayer=§6Economy Layer\: §r{0} versionMismatch=§4Version mismatch\! Please update {0} to the same version. versionMismatchAll=§4Version mismatch\! Please update all Essentials jars to the same version. versionReleaseLatest=§6You''re running the latest stable version of EssentialsX\! @@ -1548,7 +1457,6 @@ whoisHunger=§6 - Hunger\:§r {0}/20 (+{1} saturation) whoisIPAddress=§6 - IP Address\:§r {0} whoisJail=§6 - Jail\:§r {0} whoisLocation=§6 - Location\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Money\:§r {0} whoisMuted=§6 - Muted\:§r {0} whoisMutedReason=§6 - Muted\:§r {0} §6Reason\: §c{1} whoisNick=§6 - Nick\:§r {0} @@ -1565,19 +1473,6 @@ worldCommandUsage1=/ worldCommandUsage1Description=Teleports to your corresponding location in the nether or overworld worldCommandUsage2=/ worldCommandUsage2Description=Teleports to your location in the given world -worth=§aStack of {0} worth §c{1}§a ({2} item(s) at {3} each) -worthCommandDescription=Calculates the worth of items in hand or as specified. -worthCommandUsage=/ <||hand|inventory|blocks> [-][amount] -worthCommandUsage1=/ [amount] -worthCommandUsage1Description=Checks the worth of all (or the given amount, if specified) of the given item in your inventory -worthCommandUsage2=/ hand [amount] -worthCommandUsage2Description=Checks the worth of all (or the given amount, if specified) of the held item -worthCommandUsage3=/ all -worthCommandUsage3Description=Checks the worth of all possible items in your inventory -worthCommandUsage4=/ blocks [amount] -worthCommandUsage4Description=Checks the worth of all (or the given amount, if specified) of blocks in your inventory -worthMeta=§aStack of {0} with metadata of {1} worth §c{2}§a ({3} item(s) at {4} each) -worthSet=§6Worth value set year=year years=years youAreHealed=§6You have been healed. diff --git a/Essentials/src/main/resources/messages_en_GB.properties b/Essentials/src/main/resources/messages_en_GB.properties index 8977945bf..08ad852ce 100644 --- a/Essentials/src/main/resources/messages_en_GB.properties +++ b/Essentials/src/main/resources/messages_en_GB.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} has been added to your account. -addedToOthersAccount=§a{0} added to {1}§a account. New balance\: {2} adventure=adventure afkCommandDescription=Marks you as away-from-keyboard. afkCommandUsage=/ [player/message...] @@ -47,20 +45,6 @@ backupFinished=§6Backup finished. backupStarted=§6Backup started. backupInProgress=§6An external backup script is currently in progress\! Halting plugin disable until finished. backUsageMsg=§6Returning to previous location. -balance=§aBalance\:§c {0} -balanceCommandDescription=States the current balance of a player. -balanceCommandUsage=/ [player] -balanceCommandUsage1=/ -balanceCommandUsage1Description=States your current balance -balanceCommandUsage2=/ -balanceCommandUsage2Description=Displays the balance of the specified player -balanceOther=§aBalance of {0}§a\:§c {1} -balanceTop=§6Top balances ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Gets the top balance values. -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] -balancetopCommandUsage1Description=Displays the first (or specified) page of the top balance values banCommandDescription=Bans a player. banCommandUsage=/ [reason] banCommandUsage1=/ [reason] @@ -161,16 +145,9 @@ consoleCannotUseCommand=This command cannot be used by Console. compassBearing=§6Bearing\: {0} ({1} degrees). compassCommandDescription=Describes your current bearing. compassCommandUsage=/ -condenseCommandDescription=Condenses items into a more compact blocks. -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Condenses all items in your inventory -condenseCommandUsage2=/ -condenseCommandUsage2Description=Condenses the specified item in your inventory configFileMoveError=Failed to move config.yml to backup location. configFileRenameError=Failed to rename temp file to config.yml. confirmClear=§7To §lCONFIRM§7 inventory clear, please repeat command\: §6{0} -confirmPayment=§7To §lCONFIRM§7 payment of §6{0}§7, please repeat command\: §6{1} connectedPlayers=§6Connected players§r connectionFailed=Failed to open connection. consoleName=Console @@ -189,7 +166,6 @@ createKitUnsupported=§4NBT item serialization has been enabled, but this server creatingConfigFromTemplate=Creating config from template\: {0} creatingEmptyConfig=Creating empty config\: {0} creative=creative -currency={0}{1} currentWorld=§6Current World\:§c {0} customtextCommandDescription=Allows you to create custom text commands. customtextCommandUsage=/ - Define in bukkit.yml @@ -313,16 +289,6 @@ dumpUrl=§6Created server dump\: §c{0} duplicatedUserdata=Duplicated userdata\: {0} and {1}. durability=§6This tool has §c{0}§6 uses left. east=E -ecoCommandDescription=Manages the server economy. -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=Gives the specified player the specified amount of money -ecoCommandUsage2=/ take -ecoCommandUsage2Description=Takes the specified amount of money from the specified player -ecoCommandUsage3=/ set -ecoCommandUsage3Description=Sets the specified player''s balance to the specified amount of money -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=Resets the specified player''s balance to the server''s starting balance editBookContents=§eYou may now edit the contents of this book. enabled=enabled enchantCommandDescription=Enchants the item the user is holding. @@ -540,9 +506,7 @@ infoCommandDescription=Shows information set by the server owner. infoCommandUsage=/ [chapter] [page] infoPages=§e ---- §6{2} §e--§6 Page §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Unknown chapter. -insufficientFunds=§4Insufficient funds available. invalidBanner=§4Invalid banner syntax. -invalidCharge=§4Invalid charge. invalidFireworkFormat=§4The option §c{0} §4is not a valid value for §c{1}§4. invalidHome=§4Home§c {0} §4doesn''t exist\! invalidHomeName=§4Invalid home name\! @@ -659,7 +623,6 @@ kitCommandUsage1Description=Lists all available kits kitCommandUsage2=/ [player] kitCommandUsage2Description=Gives the specified kit to you or another player if specified kitContains=§6Kit §c{0} §6contains\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4There are no valid kits. kitError2=§4That kit is improperly defined. Contact an administrator. @@ -739,7 +702,6 @@ mailTooLong=§4Mail message too long. Try to keep it below 1000 characters. markMailAsRead=§6To mark your mail as read, type§c /mail clear§6. matchingIPAddress=§6The following players previously logged in from that IP address\: maxHomes=§4You cannot set more than§c {0} §4homes. -maxMoney=§4This transaction would exceed the balance limit for this account. mayNotJail=§4You may not jail that person\! mayNotJailOffline=§4You may not jail offline players. meCommandDescription=Describes an action in the context of the player. @@ -748,7 +710,6 @@ meCommandUsage1=/ meCommandUsage1Description=Describes an action meSender=me meRecipient=me -minimumBalanceError=§4The minimum balance a user can have is {0}. minimumPayAmount=§cThe minimum amount you can pay is {0}. minute=minute minutes=minutes @@ -758,8 +719,6 @@ mobsAvailable=§6Mobs\:§r {0} mobSpawnError=§4Error while changing mob spawner. mobSpawnLimit=Mob quantity limited to server limit. mobSpawnTarget=§4Target block must be a mob spawner. -moneyRecievedFrom=§a{0}§6 has been received from§a {1}§6. -moneySentTo=§a{0} has been sent to {1}. month=month months=months moreCommandDescription=Fills the item stack in hand to specified amount, or to maximum size if none is specified. @@ -784,7 +743,6 @@ msgtoggleCommandDescription=Blocks receiving all private messages. msgtoggleCommandUsage=/ [player] [on|off] msgtoggleCommandUsage1=/ [player] msgtoggleCommandUsage1Description=Toggles fly for yourself or another player if specified -multipleCharges=§4You cannot apply more than one charge to this firework. multiplePotionEffects=§4You cannot apply more than one effect to this potion. muteCommandDescription=Mutes or unmutes a player. muteCommandUsage=/ [datediff] [reason] @@ -815,7 +773,6 @@ nearCommandUsage4=/ nearCommandUsage4Description=Lists all players within the given radius of the specified player nearbyPlayers=§6Players nearby\:§r {0} nearbyPlayersList={0}§f(§c{1}m§f) -negativeBalanceError=§4User is not allowed to have a negative balance. nickChanged=§6Nickname changed. nickCommandDescription=Change your nickname or that of another player. nickCommandUsage=/ [player] @@ -867,12 +824,10 @@ noPermToSpawnMob=§4You don''t have permission to spawn this mob. noPlacePermission=§4You do not have permission to place a block near that sign. noPotionEffectPerm=§4You do not have permission to apply potion effect §c{0} §4to this potion. noPowerTools=§6You have no power tools assigned. -notAcceptingPay=§4{0} §4is not accepting payment. notAllowedToLocal=§4You don''t have permission to speak in local chat. notAllowedToQuestion=§4You don''t have permission to ask a question. notAllowedToShout=§4You don''t have permission to shout. notEnoughExperience=§4You do not have enough experience. -notEnoughMoney=§4You do not have sufficient funds. notFlying=not flying nothingInHand=§4You have nothing in your hand. now=now @@ -888,28 +843,9 @@ onlyPlayers=§4Only in-game players can use §c{0}§4. onlyPlayerSkulls=§4You can only set the owner of player skulls (§c397\:3§4). onlySunStorm=§4/weather only supports sun/storm. openingDisposal=§6Opening disposal menu... -orderBalances=§6Ordering balances of§c {0} §6users, please wait... oversizedMute=§4You may not mute a player for this period of time. oversizedTempban=§4You may not ban a player for this period of time. passengerTeleportFail=§4You cannot be teleported while carrying passengers. -payCommandDescription=Pays another player from your balance. -payCommandUsage=/ -payCommandUsage1=/ -payCommandUsage1Description=Pays the specified player the given amount of money -payConfirmToggleOff=§6You will no longer be prompted to confirm payments. -payConfirmToggleOn=§6You will now be prompted to confirm payments. -payDisabledFor=§6Disabled accepting payments for §c{0}§6. -payEnabledFor=§6Enabled accepting payments for §c{0}§6. -payMustBePositive=§4Amount to pay must be positive. -payOffline=§4You cannot pay offline users. -payToggleOff=§6You are no longer accepting payments. -payToggleOn=§6You are now accepting payments. -payconfirmtoggleCommandDescription=Toggles whether you are prompted to confirm payments. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Toggles whether you are accepting payments. -paytoggleCommandUsage=/ [player] -paytoggleCommandUsage1=/ [player] -paytoggleCommandUsage1Description=Toggles if you, or another player if specified, are accepting payments pendingTeleportCancelled=§4Pending teleportation request cancelled. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -1077,8 +1013,6 @@ requestSent=§6Request sent to§c {0}§6. requestSentAlready=§4You have already sent {0}§4 a teleport request. requestTimedOut=§4Teleport request has timed out. requestTimedOutFrom=§4Teleport request from §c{0} §4has timed out. -resetBal=§6Balance has been reset to §c{0} §6for all online players. -resetBalAll=§6Balance has been reset to §c{0} §6for all players. rest=§6You feel well rested. restCommandDescription=Rests you or the given player. restCommandUsage=/ [player] @@ -1100,18 +1034,6 @@ seenCommandUsage1=/ seenCommandUsage1Description=Shows the logout time, ban, mute, and UUID information of the specified player seenOffline=§6Player§c {0} §6has been §4offline§6 since §c{1}§6. seenOnline=§6Player§c {0} §6has been §aonline§6 since §c{1}§6. -sellBulkPermission=§6You do not have permission to bulk sell. -sellCommandDescription=Sells the item currently in your hand. -sellCommandUsage=/ <||hand|inventory|blocks> [amount] -sellCommandUsage1=/ [amount] -sellCommandUsage1Description=Sells all (or the given amount, if specified) of the given item in your inventory -sellCommandUsage2=/ hand [amount] -sellCommandUsage2Description=Sells all (or the given amount, if specified) of the held item -sellCommandUsage3=/ all -sellCommandUsage3Description=Sells all possible items in your inventory -sellCommandUsage4=/ blocks [amount] -sellCommandUsage4Description=Sells all (or the given amount, if specified) of blocks in your inventory -sellHandPermission=§6You do not have permission to hand sell. serverFull=Server is full\! serverReloading=There''s a good chance you''re reloading your server right now. If that''s the case, why do you hate yourself? Expect no support from the EssentialsX team when using /reload. serverTotal=§6Server Total\:§c {0} @@ -1122,8 +1044,6 @@ serverUnsupportedDangerous=You are running a server fork that is known to be ext serverUnsupportedLimitedApi=You are running a server with limited API functionality. EssentialsX will still work, but certain features may be disabled. serverUnsupportedDumbPlugins=You are using plugins known to cause severe issues with EssentialsX and other plugins. serverUnsupportedMods=You are running a server that does not properly support Bukkit plugins. Bukkit plugins should not be used with Forge/Fabric mods\! For Forge\: Consider using ForgeEssentials, or SpongeForge + Nucleus. -setBal=§aYour balance was set to {0}. -setBalOthers=§aYou set {0}§a''s balance to {1}. setSpawner=§6Changed spawner type to§c {0}§6. sethomeCommandDescription=Set your home to your current location. sethomeCommandUsage=/ [[player\:]name] @@ -1149,12 +1069,6 @@ setwarpCommandDescription=Creates a new warp. setwarpCommandUsage=/ setwarpCommandUsage1=/ setwarpCommandUsage1Description=Sets the warp with the specified name to your location -setworthCommandDescription=Set the sell value of an item. -setworthCommandUsage=/ [itemname|id] -setworthCommandUsage1=/ -setworthCommandUsage1Description=Sets the worth of your held item to the given price -setworthCommandUsage2=/ -setworthCommandUsage2Description=Sets the worth of the specified item to the given price sheepMalformedColor=§4Malformed colour. shoutDisabled=§6Shout mode §cdisabled§6. shoutDisabledFor=§6Shout mode §cdisabled §6for §c{0}§6. @@ -1244,8 +1158,6 @@ suicideCommandUsage=/ suicideMessage=§6Goodbye cruel world... suicideSuccess=§6Player §c{0} §6took their own life. survival=survival -takenFromAccount=§e{0}§a has been taken from your account. -takenFromOthersAccount=§e{0}§a taken from§e {1}§a account. New balance\:§e {2} teleportAAll=§6Teleport request sent to all players... teleportAll=§6Teleporting all players... teleportationCommencing=§6Teleportation commencing... @@ -1399,8 +1311,6 @@ tptoggleCommandDescription=Blocks all forms of teleportation. tptoggleCommandUsage=/ [player] [on|off] tptoggleCommandUsage1=/ [player] tptoggleCommandUsageDescription=Toggles if teleports are enabled for yourself or another player if specified -tradeSignEmpty=§4The trade sign has nothing available for you. -tradeSignEmptyOwner=§4There is nothing to collect from this trade sign. treeCommandDescription=Spawn a tree where you are looking. treeCommandUsage=/ treeCommandUsage1=/ @@ -1481,12 +1391,10 @@ versionDevLatest=§6You''re running the latest EssentialsX dev build\! versionError=§4Error while fetching EssentialsX version information\! Build information\: §c{0}§6. versionErrorPlayer=§6Error while checking EssentialsX version information\! versionFetching=§6Fetching version information... -versionOutputVaultMissing=§4Vault is not installed. Chat and permissions may not work. versionOutputFine=§6{0} version\: §a{1} versionOutputWarn=§6{0} version\: §c{1} versionOutputUnsupported=§d{0} §6version\: §d{1} versionOutputUnsupportedPlugins=§6You are running §dunsupported plugins§6\! -versionOutputEconLayer=§6Economy Layer\: §r{0} versionMismatch=§4Version mismatch\! Please update {0} to the same version. versionMismatchAll=§4Version mismatch\! Please update all Essentials jars to the same version. versionReleaseLatest=§6You''re running the latest stable version of EssentialsX\! @@ -1548,7 +1456,6 @@ whoisHunger=§6 - Hunger\:§r {0}/20 (+{1} saturation) whoisIPAddress=§6 - IP Address\:§r {0} whoisJail=§6 - Jail\:§r {0} whoisLocation=§6 - Location\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Money\:§r {0} whoisMuted=§6 - Muted\:§r {0} whoisMutedReason=§6 - Muted\:§r {0} §6Reason\: §c{1} whoisNick=§6 - Nick\:§r {0} @@ -1565,19 +1472,6 @@ worldCommandUsage1=/ worldCommandUsage1Description=Teleports to your corresponding location in the nether or overworld worldCommandUsage2=/ worldCommandUsage2Description=Teleports to your location in the given world -worth=§aStack of {0} worth §c{1}§a ({2} item(s) at {3} each) -worthCommandDescription=Calculates the worth of items in hand or as specified. -worthCommandUsage=/ <||hand|inventory|blocks> [-][amount] -worthCommandUsage1=/ [amount] -worthCommandUsage1Description=Checks the worth of all (or the given amount, if specified) of the given item in your inventory -worthCommandUsage2=/ hand [amount] -worthCommandUsage2Description=Checks the worth of all (or the given amount, if specified) of the held item -worthCommandUsage3=/ all -worthCommandUsage3Description=Checks the worth of all possible items in your inventory -worthCommandUsage4=/ blocks [amount] -worthCommandUsage4Description=Checks the worth of all (or the given amount, if specified) of blocks in your inventory -worthMeta=§aStack of {0} with metadata of {1} worth §c{2}§a ({3} item(s) at {4} each) -worthSet=§6Worth value set year=year years=years youAreHealed=§6You have been healed. diff --git a/Essentials/src/main/resources/messages_es.properties b/Essentials/src/main/resources/messages_es.properties index 08b0df910..e0c515b31 100644 --- a/Essentials/src/main/resources/messages_es.properties +++ b/Essentials/src/main/resources/messages_es.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} han sido agregados a tu cuenta. -addedToOthersAccount=§a{0} han sidos agregados a la cuenta de {1}§a. Nuevo saldo\: {2} adventure=aventura afkCommandDescription=Te pone como ausente. afkCommandUsage=/ [jugador/mensaje...] @@ -47,20 +45,6 @@ backupFinished=Copia de seguridad completada. backupStarted=§6Copia de seguridad empezada. backupInProgress=§6La creación de una copia de seguridad externa está en progreso\! No se podrán desahibilitar plugins hasta que esta termine. backUsageMsg=§6Volviendo a la ubicación anterior. -balance=§aDinero\:§c {0} -balanceCommandDescription=Muestra el saldo actual de un jugador. -balanceCommandUsage=/ [jugador] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Comprueba tu saldo actual -balanceCommandUsage2=/ -balanceCommandUsage2Description=Muestra el saldo de un jugador especificado -balanceOther=§aDinero de {0} §a\:§c {1} -balanceTop=§6Ranking de economías ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Obtiene los valores más altos de dinero. -balancetopCommandUsage=/ [página] -balancetopCommandUsage1=/ [página] -balancetopCommandUsage1Description=Muestra la primera (o especificada) página de el top valores de saldo banCommandDescription=Banea a un jugador. banCommandUsage=/ [razón] banCommandUsage1=/ [razón] @@ -161,16 +145,9 @@ consoleCannotUseCommand=Este comando no puede usarse por Consola. compassBearing=§6Orientación\: {0} ({1} grados). compassCommandDescription=Describe tu rumbo actual. compassCommandUsage=/ -condenseCommandDescription=Condensa ítems en bloques más compactos. -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Condensa todos los items en tu inventario -condenseCommandUsage2=/ -condenseCommandUsage2Description=Condensa el item especificado en tu inventario configFileMoveError=Error al mover config.yml a la carpeta de la copia de seguridad. configFileRenameError=Error al renombrar archivo temp a config.yml. confirmClear=§7To §lCONFIRM§7 inventory clear, please repeat command\: §6{0} -confirmPayment=§7Para §lCONFIRMAR§7 el pago de §6{0}§7, repite el comando\: §6{1} connectedPlayers=§6Jugadores conectados§r connectionFailed=No se ha podido abrir la conexion. consoleName=Consola @@ -189,7 +166,6 @@ createKitUnsupported=§4La serialización de objetos NBT ha sido activada, pero creatingConfigFromTemplate=Creando configuración desde la plantilla\: {0} creatingEmptyConfig=Creando configuración vacía\: {0} creative=creativo -currency={0}{1} currentWorld=§7Mundo actual\: {0} customtextCommandDescription=Te permite crear comandos de texto personalizados. customtextCommandUsage=/ - Define en bukkit.yml @@ -313,16 +289,6 @@ dumpUrl=§6Se ha creado el volcado del servidor\: §c{0} duplicatedUserdata=Datos de usuario duplicados\: {0} y {1} durability=§7Esta herramienta tiene §c{0}§7 usos restantes. east=E -ecoCommandDescription=Gestiona la economía del servidor. -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=Da al jugador especificado la cantidad de dinero especificada -ecoCommandUsage2=/ take -ecoCommandUsage2Description=Toma la cantidad especificada de dinero del jugador especificado -ecoCommandUsage3=/ set -ecoCommandUsage3Description=Establece el saldo del jugador especificado a la cantidad de dinero especificada -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=Restablece el saldo del jugador especificado al saldo inicial del servidor editBookContents=§eAhora puedes editar los contenidos de este libro. enabled=activado enchantCommandDescription=Encanta el ítem que el usuario está sosteniendo. @@ -540,9 +506,7 @@ infoCommandDescription=Muestra información establecida por el dueño del servid infoCommandUsage=/ [capítulo] [página] infoPages=§e ---- §7{2} §e--§7 Página §4{0}§7/§4{1} §e---- infoUnknownChapter=§4Desconocido. -insufficientFunds=§4Te falta dinero. invalidBanner=§4Formato de banner invalido. -invalidCharge=§4Carga no válida. invalidFireworkFormat=§4La opción §c{0} §4no es un valor válido para §c{1}§4. invalidHome=§4¡El hogar§c {0} §4no existe\! invalidHomeName=§4¡Nombre de hogar inválido\! @@ -659,7 +623,6 @@ kitCommandUsage1Description=Lista de todos los kits disponibles kitCommandUsage2=/ [jugador] kitCommandUsage2Description=Entrega el kit especificado a ti o a otro jugador si se especifica kitContains=§6El kit §c{0} §6contiene\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§cNo hay ningún kit válido. kitError2=§4Este kit está mal creado. Por favor, contacta con un administrador. @@ -739,7 +702,6 @@ mailTooLong=§4Mensaje muy largo. Intenta menos de 1000 caracteres. markMailAsRead=§6Para marcar tu correo como leído, escribe§c /mail clear§6. matchingIPAddress=§6Los siguientes jugadores entraron previamente con la IP\: maxHomes=§4No puedes tener más de§c {0} §4hogares. -maxMoney=§4Esta transacción supera el límite del dinero para esta cuenta. mayNotJail=§cNo puedes encarcelar a esa persona. mayNotJailOffline=§4No puedes encarcelar a jugadores que no están conectados. meCommandDescription=Describe una acción en el contexto del jugador. @@ -748,7 +710,6 @@ meCommandUsage1=/ meCommandUsage1Description=Describe una acción meSender=yo meRecipient=mi -minimumBalanceError=§4El balance mínimo que un jugador puede tener es {0}. minimumPayAmount=§cThe minimum amount you can pay is {0}. minute=minuto minutes=minutos @@ -758,8 +719,6 @@ mobsAvailable=§6Mobs\:§r {0} mobSpawnError=Error al cambiar la localización para el nacimiento de los mobs. mobSpawnLimit=Cantidad de criaturas (mobs) limitadas por el servidor. mobSpawnTarget=El bloque seleccionado será el lugar donde van a aparecer los mobs. -moneyRecievedFrom=§a{0}§6 ha sido recibido de §a {1}§6. -moneySentTo=§a{0} ha sido enviado a {1} month=mes months=meses moreCommandDescription=Rellena el stack de items en tu mano con la cantidad especificada, o al máximo si ninguna cantidad es especificada. @@ -784,7 +743,6 @@ msgtoggleCommandDescription=Bloquea la recepción de mensajes privados. msgtoggleCommandUsage=/ [jugador] [on|off] msgtoggleCommandUsage1=/ [jugador] msgtoggleCommandUsage1Description=Alterna el vuelo de ti mismo o de otro jugador si se especifica -multipleCharges=§4Solo puedes aplicar una carga a este cohete. multiplePotionEffects=§4No puedes aplicarle más de un efecto a esta poción. muteCommandDescription=Silencia o deja de silenciar a un jugador. muteCommandUsage=/ [tiempo] [razón] @@ -815,7 +773,6 @@ nearCommandUsage4=/ nearCommandUsage4Description=Enumera a todos los jugadores cerca del jugador especificado dentro del radio dado nearbyPlayers=§6Jugadores cercanos\:§r {0} nearbyPlayersList={0}§f(§c{1}m§f) -negativeBalanceError=§4El jugador no tiene permitido tener dinero por debajo de 0$. nickChanged=§6Nick cambiado. nickCommandDescription=Cambia tu apodo o el de otro jugador. nickCommandUsage=/ [jugador] @@ -867,12 +824,10 @@ noPermToSpawnMob=§4No tienes permiso para generar esa criatura. noPlacePermission=§4No tienes permiso para colocar un bloque junto a eso. noPotionEffectPerm=§4No tienes permiso para aplicar el efecto§c {0} §4a esta poción. noPowerTools=§6No tienes ninguna herramienta eléctrica asignada. -notAcceptingPay=§4{0} §4no esta aceptando pagos. notAllowedToLocal=§4No tienes permiso para hablar en el chat local. notAllowedToQuestion=§4No tienes permiso para usar la pregunta. notAllowedToShout=§4No tienes permiso para gritar. notEnoughExperience=§4No tienes la experiencia necesaria. -notEnoughMoney=§4No tienes dinero suficiente. notFlying=no esta volando nothingInHand=§cNo tienes nada en tu mano. now=ahora @@ -888,28 +843,9 @@ onlyPlayers=§4Solo jugadores dentro del juego pueden usar §c{0}§4. onlyPlayerSkulls=§4Solo puedes indicar el propietario de las calaveras de jugadores (§c397\:3§4). onlySunStorm=§c/weather §4solo acepta los valores §csun §4o §cstorm §4(§6sol§4/§6tormenta§4). openingDisposal=§6Opening disposal menu... -orderBalances=Creando un ranking de {0} usuarios segun su saldo, espera... oversizedMute=§4No puedes silenciar a un jugador por este periodo de tiempo. oversizedTempban=§4No puedes banear por ese periodo de tiempo. passengerTeleportFail=§2♣§d§kii§a§lSkyblock§d§kii§2♣ No puedes teletransportarte mientras transportas pasajeros. -payCommandDescription=Paga a otro jugador con tu dinero. -payCommandUsage=/ -payCommandUsage1=/ -payCommandUsage1Description=Paga al jugador especificado la cantidad de dinero dada -payConfirmToggleOff=§6You will no longer be prompted to confirm payments. -payConfirmToggleOn=§6You will now be prompted to confirm payments. -payDisabledFor=§6Aceptación de pagos desactivado para §c{0}§6. -payEnabledFor=§6Aceptación de pagos activado para §c{0}§6. -payMustBePositive=§4La cantidad a pagar debe ser positiva. -payOffline=§4No puedes pagar a usuarios sin conexión. -payToggleOff=§6Has dejado de aceptar pagos. -payToggleOn=§6Ahora estas aceptando pagos. -payconfirmtoggleCommandDescription=Alterna si necesitas confirmar pagos. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Alterna si puedes aceptar pagos. -paytoggleCommandUsage=/ [jugador] -paytoggleCommandUsage1=/ [jugador] -paytoggleCommandUsage1Description=Activa o desactiva si tú, u otro jugador si se especifica, acepta pagos pendingTeleportCancelled=§4Petición de teletransporte cancelada. pingCommandDescription=¡PONG\! pingCommandUsage=/ @@ -1075,8 +1011,6 @@ requestSent=§6La petición ha sido enviada a§c {0}§6. requestSentAlready=§4Ya has enviado una peticion de teletransporte a {0}§4. requestTimedOut=§4El tiempo de la solicitud de teletransporte se ha agotado. requestTimedOutFrom=§4La petición de teletransporte de §c{0} §4ha caducado. -resetBal=§6Dinero reestablecido a §c{0} §6a todos los jugadores conectados. -resetBalAll=§6Dinero reestablecido a §c{0} §6a todos los jugadores. rest=§6Te sientes descansado. restCommandDescription=Te descansa o al jugador especificado. restCommandUsage=/ [jugador] @@ -1098,18 +1032,6 @@ seenCommandUsage1=/ seenCommandUsage1Description=Muestra la información sobre el tiempo desconectado, bans, silencios y UUID del jugador especificado seenOffline=§6El jugador§c {0} §6ha estado §4desconectado§6 desde §c{1}§6. seenOnline=§6El jugador§c {0} §6ha estado §aconectado§6 desde §c{1}§6. -sellBulkPermission=§6You do not have permission to bulk sell. -sellCommandDescription=Vende el item en tu mano. -sellCommandUsage=/ <||mano|inventario|bloques> [cantidad] -sellCommandUsage1=/ [cantidad] -sellCommandUsage1Description=Vende todo (o la cantidad dada, si se especifica) del objeto dado que haya en tu inventario -sellCommandUsage2=/ mano [cantidad] -sellCommandUsage2Description=Vende todo (o la cantidad dada, si se especifica) del objeto sostenido -sellCommandUsage3=/ todos -sellCommandUsage3Description=Vende todos los objetos posibles en tu inventario -sellCommandUsage4=/ bloques [cantidad] -sellCommandUsage4Description=Vende todos (o la cantidad dada, si se especifica) los bloques en tu inventario -sellHandPermission=§6You do not have permission to hand sell. serverFull=¡El servidor está lleno\! serverReloading=Hay una buena probabilidad de que estés recargando tu servidor en este momento. Si ese es el caso, ¿por qué te odias? No esperes soporte del equipo de EssentialsX al usar /reload. serverTotal=§6Total\:§c {0} @@ -1120,8 +1042,6 @@ serverUnsupportedDangerous=Está ejecutando un fork de servidor que se sabe que serverUnsupportedLimitedApi=Está ejecutando un servidor con una funcionalidad API limitada. EssentialsX seguirá funcionando, pero ciertas características pueden estar desactivadas. serverUnsupportedDumbPlugins=Estás usando plugins que se sabe que causan graves problemas con EssentialsX y otros plugins. serverUnsupportedMods=Estás ejecutando un servidor que no es compatible con los plugins de Bukkit. ¡No se deben utilizar con mods de Forge/Fabric\! Para Forge\: es recomendable usar ForgeEssentials o SpongeForge + Nucleus. -setBal=§aEconomía personal establecida en {0}. -setBalOthers=§aLa economia de {0}§a ha sido establecida a {1}. setSpawner=§Cambiado tipo de generador a§c {0}§6. sethomeCommandDescription=Establece tu hogar en tu posición actual. sethomeCommandUsage=/ [[jugador\:]nombre] @@ -1147,12 +1067,6 @@ setwarpCommandDescription=Crea un nuevo warp. setwarpCommandUsage=/ setwarpCommandUsage1=/ setwarpCommandUsage1Description=Establece el warp con el nombre especificado en tu ubicación -setworthCommandDescription=Establece el valor de venta de un item. -setworthCommandUsage=/ [item|id] -setworthCommandUsage1=/ -setworthCommandUsage1Description=Establece el valor del objeto sostenido al precio dado -setworthCommandUsage2=/ -setworthCommandUsage2Description=Establece el valor del objeto especificado al precio dado sheepMalformedColor=§4Color malformado. shoutDisabled=§6Modo gritar §cdesactivado§6. shoutDisabledFor=§6Modo gritar §cdesactivado §6para §c{0}§6. @@ -1242,8 +1156,6 @@ suicideCommandUsage=/ suicideMessage=§6Adiós mundo cruel... suicideSuccess=§6{0} §cse ha suicidado... survival=supervivencia -takenFromAccount=§e{0}§a se han tomado del saldo de tu cuenta. -takenFromOthersAccount=§a{0} se han tomado de la cuenta de {1}§a. §2Nuevo saldo\: {2} teleportAAll=§7Peticion de teletransporte enviada a todos los jugadores... teleportAll=§7Teletransportando a todos los jugadores... teleportationCommencing=§6Teletransportando... @@ -1397,8 +1309,6 @@ tptoggleCommandDescription=Bloquea todas las formas de teletransportación. tptoggleCommandUsage=/ [jugador] [on|off] tptoggleCommandUsage1=/ [jugador] tptoggleCommandUsageDescription=Activa o desactiva el teletransporte para ti u otro jugador si se especifica -tradeSignEmpty=Esta tienda no tiene nada disponible para ti. -tradeSignEmptyOwner=No hay nada que recojer de esta tienda. treeCommandDescription=Genera un árbol donde miras. treeCommandUsage=/ treeCommandUsage1=/ @@ -1479,12 +1389,10 @@ versionDevLatest=§6¡Estás ejecutando la última compilación de EssentialsX\! versionError=§4¡Error al obtener información de la versión de EssentialsX\! Info. de compilación\: §c{0}§6. versionErrorPlayer=§6¡Error al comprobar información de la versión de EssentialsX\! versionFetching=§6Obteniendo información de versión... -versionOutputVaultMissing=§4Vault no esta instalado. El chat y los permisos pueden no funcionar. versionOutputFine=§6{0} version\: §a{1} versionOutputWarn=§6{0} version\: §c{1} versionOutputUnsupported=§d{0} §6version\: §d{1} versionOutputUnsupportedPlugins=§6Estas ejecutando §dplugins no soportados§6\! -versionOutputEconLayer=§6Capa de economía\: §r{0} versionMismatch=La version no coincide\! Por favor actualiza {0} a la misma version. versionMismatchAll=La version no coincide\! Por favor actualiza todos los jars de Essentials a la misma version. versionReleaseLatest=§6¡Estás ejecutando la versión más estable de EssentialsX\! @@ -1546,7 +1454,6 @@ whoisHunger=§7 - Hambre\:§r {0}/20 (+{1} saturación) whoisIPAddress=§7 - Dirección IP\:§f {0} whoisJail=§7 - Cárcel\:§r {0} whoisLocation=§7 - Ubicación\:§f ({0}, {1}, {2}, {3}) -whoisMoney=§7 - Dinero\:§f {0} whoisMuted=§7 - Silenciado\:§f {0} whoisMutedReason=§6 - Silenciado\:§r {0} §6Motivo\: §c{1} whoisNick=§7 - Nick\:§f {0} @@ -1563,19 +1470,6 @@ worldCommandUsage1=/ worldCommandUsage1Description=Te teletransporta a tu ubicación actual en el nether o en el mundo normal worldCommandUsage2=/ worldCommandUsage2Description=Te teletransporta a tu ubicación en el mundo dado -worth=§7Pila de {0} con valor de §c{1}§7 ({2} objeto(s) a {3} cada uno) -worthCommandDescription=Calcula el valor de los items en la mano o especificados. -worthCommandUsage=/ <||hand|inventory|blocks> [-][cantidad] -worthCommandUsage1=/ [cantidad] -worthCommandUsage1Description=Comprueba el valor de todo (o la cantidad dada, si se especifica) del objeto dado en tu inventario -worthCommandUsage2=/ mano [cantidad] -worthCommandUsage2Description=Comprueba el valor de todo (o la cantidad dada, si se especifica) del objeto sostenido -worthCommandUsage3=/ todos -worthCommandUsage3Description=Comprueba el valor de todos los objetos posibles en tu inventario -worthCommandUsage4=/ bloques [cantidad] -worthCommandUsage4Description=Comprueba el valor de todos (o la cantidad dada, si se especifica) los bloques en tu inventario -worthMeta=§7Pila de {0} con metadata de {1} , con valor de §c{2}§7 ({3} objeto(s) a {4} cada uno) -worthSet=Establecer valor year=año years=años youAreHealed=§7Has sido curado. diff --git a/Essentials/src/main/resources/messages_et.properties b/Essentials/src/main/resources/messages_et.properties index 59897a4fa..6b154504a 100644 --- a/Essentials/src/main/resources/messages_et.properties +++ b/Essentials/src/main/resources/messages_et.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} on sinu kontole lisatud. -addedToOthersAccount=§a{0} on lisatud {1}§a kontole. Uus summa\: {2} adventure=seiklus afkCommandDescription=Märgib sind kui klaviatuurist eemal. afkCommandUsage=/ [mängija/sõnum...] @@ -47,20 +45,6 @@ backupFinished=§6Varukoopia on valmis. backupStarted=§6Varukoopia tegemine alustatud. backupInProgress=§6Väline varundusskript on hetkel töötamas\! Plugina keelamine on edasilükatud selle lõppemiseni. backUsageMsg=§6Naased eelmisesse asukohta. -balance=§aRahasumma\:§c {0} -balanceCommandDescription=Kuvab mängija hetkest rahaseisu. -balanceCommandUsage=/ [mängija] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Kuvab sinu hetkest rahaseisu -balanceCommandUsage2=/ -balanceCommandUsage2Description=Kuvab valitud mängija hetkest rahaseisu -balanceOther=§aMängija {0}§a rahasumma\:§c {1} -balanceTop=§6Top rikkaimad ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Hangib top rikkaimate rahaseisu. -balancetopCommandUsage=/ [lk] -balancetopCommandUsage1=/ [lk] -balancetopCommandUsage1Description=Kuvab esimest (või valitud) lehte top rikkaimate rahatabelis banCommandDescription=Blokeerib mängija. banCommandUsage=/ [põhjus] banCommandUsage1=/ [põhjus] @@ -161,16 +145,9 @@ consoleCannotUseCommand=Seda käsku ei saa kasutada konsool. compassBearing=§6Suund\: {0} ({1} kraadi). compassCommandDescription=Kirjeldab sinu asukohta kompassil. compassCommandUsage=/ -condenseCommandDescription=Pakib esemed kompaktsemateks plokkideks. -condenseCommandUsage=/ [ese] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Pakib kõik sinu seljakotis olevad esemed kokku -condenseCommandUsage2=/ -condenseCommandUsage2Description=Pakib valitud eseme sinu seljakotis kokku configFileMoveError=config.yml liigutamine varundusasukohta ebaõnnestus. configFileRenameError=Ajutise faili ümbernimetamine config.yml-ks ebaõnnestus. confirmClear=§7Et §lKINNITADA§7 seljakoti tühjendamist, palun korda käsklust\: §6{0} -confirmPayment=§7Et §lKINNITADA§7 §6{0}§7 makset, palun korda käsklust\: §6{1} connectedPlayers=§6Ühendatud mängijad§r connectionFailed=Ühenduse avamine ebaõnnestus. consoleName=Konsool @@ -189,7 +166,6 @@ createKitUnsupported=§4NBT esemete jadastamine on lubatud, kuid see server ei j creatingConfigFromTemplate=Seadistuse loomine mallist\: {0} creatingEmptyConfig=Loon tühja seadistust\: {0} creative=loominguline -currency={0}{1} currentWorld=§6Praegune maailm\:§c {0} customtextCommandDescription=Lubab luua kohandatud tekstipõhiseid käsklusi. customtextCommandUsage=/ - määra failis bukkit.yml @@ -275,16 +251,6 @@ downloadingGeoIp=Toimub GeoIP andmebaasi allalaadimine... see võib aega võtta duplicatedUserdata=Topelt kasutajaandmed\: {0} ja {1}. durability=§6Sellel esemel on §c{0}§6 kasutust järel. east=ida -ecoCommandDescription=Haldab serveri ökonoomiat. -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=Annab määratud mängijale valitud hulgal raha -ecoCommandUsage2=/ take -ecoCommandUsage2Description=Võtab määratud mängijalt valitud hulga raha -ecoCommandUsage3=/ set -ecoCommandUsage3Description=Määrab määratud mängija rahasummaks valitud hulga raha -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=Lähtestab määratud mängija rahasumma serveri algussummale editBookContents=§eSa võid nüüd muuta selle raamatu sisu. enabled=lubatud enchantCommandDescription=Loitsib käesoleva eseme. @@ -499,9 +465,7 @@ infoCommandDescription=Kuvab serveri omaniku määratud informatsiooni. infoCommandUsage=/ [peatükk] [leht] infoPages=§e ---- §6{2} §e--§6 Leht §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Tundmatu peatükk. -insufficientFunds=§4Rahasumma pole piisav. invalidBanner=§4Sobimatu plakatisüntaks. -invalidCharge=§4Vigane tasu. invalidFireworkFormat=§4Valik §c{0} §4ei ole sobiv väärtus §c{1}§4 jaoks. invalidHome=§4Kodu§c {0} §4pole määratud\! invalidHomeName=§4Sobimatu kodunimi\! @@ -617,7 +581,6 @@ kitCommandUsage1Description=Loetleb kõik saadaval olevad komplektid kitCommandUsage2=/ [mängija] kitCommandUsage2Description=Annab määratud komplekti sulle või teisele mängijale, kui on määratud kitContains=§6Abipakk §c{0} §6sisaldab\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Sobivaid abipakke ei leitud. kitError2=§4See abipakk on ebakorrektselt seadistatud. Kontakteeru administraatoriga. @@ -692,7 +655,6 @@ mailTooLong=§4Kiri on liiga pikk. Püüa see hoida alla 1000 tähemärgi. markMailAsRead=§6Kirjade loetuks märkimiseks kirjuta §c /mail clear§6. matchingIPAddress=§6Sellelt IP-aadressilt on eelnevalt sisse loginud järgnevad mängijad\: maxHomes=§4Sa ei saa määrata rohkem kui§c {0} §4kodu. -maxMoney=§4Antud tehing ületaks selle konto liimiti. mayNotJail=§4Sa ei tohi seda mängijat vangistada\! mayNotJailOffline=§4Sa ei tohi vangistada võrgust väljas olevaid mängijaid. meCommandDescription=Kirjeldab tegevust mängija kontekstis. @@ -701,7 +663,6 @@ meCommandUsage1=/ meCommandUsage1Description=Kirjeldab tegevust meSender=mina meRecipient=mina -minimumBalanceError=§4Miinimumsumma, mis saab kontol olla on {0}. minimumPayAmount=§cMiinimumsumma, mida saad maksta on {0}. minute=minut minutes=minutit @@ -711,8 +672,6 @@ mobsAvailable=§6Elukad\:§r {0} mobSpawnError=§4Elukatekitaja vahetamisel esines viga. mobSpawnLimit=Elukate hulk on piiratud serveri limiidile. mobSpawnTarget=§4Sihtplokk peab olema elukatekitaja. -moneyRecievedFrom=§6Mängija§a {1}§6 saatis sulle §a{0}§6. -moneySentTo=§aSaatsid mängijale {1} {0}. month=kuu months=kuud moreCommandDescription=Täidab käesoleva esemekuhja määratud suurusele või kui suurus pole määratud, maksimaalsele suurusele. @@ -737,7 +696,6 @@ msgtoggleCommandDescription=Blokeerib kõigi privaatsõnumite vastuvõttu. msgtoggleCommandUsage=/ [mängija] [on|off] msgtoggleCommandUsage1=/ [mängija] msgtoggleCommandUsage1Description=Lülitab enda või valikuliselt teise mängija lendamist -multipleCharges=§4Sa ei saa sellele ilutulestikule lisada rohkemat, kui üks laeng. multiplePotionEffects=§4Sa ei saa sellele võlujoogile lisada rohkemat, kui üks efekt. muteCommandDescription=Vaigistab mängija või lubab tal rääkida. muteCommandUsage=/ [kestus] [põhjus] @@ -768,7 +726,6 @@ nearCommandUsage4=/ nearCommandUsage4Description=Loetleb kõik mängijad, kes asuvad täpsustatud mängija antud raadiuses nearbyPlayers=§6Läheduses olevad mängijad\:§r {0} nearbyPlayersList={0}§f(§c{1}m§f) -negativeBalanceError=§4Kasutajal ei tohi olla negatiivne rahasumma. nickChanged=§6Hüüdnimi on muudetud. nickCommandDescription=Muuda enda või teise mängija hüüdnime. nickCommandUsage=/ [mängija] @@ -820,10 +777,8 @@ noPermToSpawnMob=§4Sul puudub luba selle eluka tekitamiseks. noPlacePermission=§4Sul puudub luba selle sildi juurde ploki asetamiseks. noPotionEffectPerm=§4Sul puudub luba sellele võlujoogile efekti §c{0} §4 rakendamiseks. noPowerTools=§6Sul puuduvad võimutööriistad. -notAcceptingPay=§4Mängija §4{0} §4ei võta makseid vastu. notAllowedToLocal=§4Sul puudub luba kohalikus vestluses rääkimiseks. notEnoughExperience=§4Sul pole piisavalt kogemuspunkte. -notEnoughMoney=§4Sul pole piisavalt raha. notFlying=ei lenda nothingInHand=§4Sa ei hoia midagi käes. now=nüüd @@ -839,28 +794,9 @@ onlyPlayers=§4Käsklust §c{0}§4 saab kasutada ainult mängusiseselt. onlyPlayerSkulls=§4Sa saad määrata ainult mängija peade (§c397\:3§4) omanikku. onlySunStorm=§4/weather toetab vaid valikuid sun ja storm. openingDisposal=§6Hävitusmenüü avamine... -orderBalances=§6Järjestan§c {0} §6mängija rahasummasid, palun oota... oversizedMute=§4Sa ei tohi mängijaid ajutiselt vaigistada nii pikaks ajaks. oversizedTempban=§4Sa ei tohi mängijaid ajutiselt blokeerida nii pikaks ajaks. passengerTeleportFail=§4Sind ei saa teleportida, kuni kannad kaasreisijaid. -payCommandDescription=Maksab teisele mängijale oma rahasummast. -payCommandUsage=/ -payCommandUsage1=/ -payCommandUsage1Description=Maksab määratud mängijale valitud hulgal raha -payConfirmToggleOff=§6Sinult ei küsita enam maksete kinnitusi. -payConfirmToggleOn=§6Sinult nüüd küsitakse maksete kinnitusi. -payDisabledFor=§6Mängijale§c {0}§6 on keelatud maksete vastuvõtmine. -payEnabledFor=§6Mängijale§c {0}§6 on lubatud maksete vastuvõtmine. -payMustBePositive=§4Makstav rahasumma peab olema positiivne. -payOffline=§4Võrgust väljas olevatele mängijatele ei saa maksta. -payToggleOff=§6Sa ei võta enam makseid vastu. -payToggleOn=§6Sa võtad nüüd makseid vastu. -payconfirmtoggleCommandDescription=Lülitab maksete kinnituse küsimise sisse/välja. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Lülitab maksete vastuvõtu sisse/välja. -paytoggleCommandUsage=/ [mängija] -paytoggleCommandUsage1=/ [mängija] -paytoggleCommandUsage1Description=Lülitab sinu, või teisel mängijal, kui on täpsustatud, maksete vastuvõtmise pendingTeleportCancelled=§4Ootel teleporteerumiskutse on hüljatud. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -1014,8 +950,6 @@ requestSent=§6Kutse saadetud mängijale§c {0}§6. requestSentAlready=§4Sa juba saatsid teleporteerumiskutse mängijale {0}. requestTimedOut=§4Teleporteerumiskutse aegus. requestTimedOutFrom=§4Teleporteerumiskutse mängijalt §c{0} §4on aegunud. -resetBal=§6Rahasumma on taastatud väärtuseks §c{0} §6kõikidel võrgus olevatel mängijatel. -resetBalAll=§6Rahasumma on taastatud väärtuseks §c{0} §6kõikidel mängijatel. rest=§6Tunned end puhanuna. restCommandDescription=Saadab sind või valitud mängijat puhkama. restCommandUsage=/ [mängija] @@ -1037,18 +971,6 @@ seenCommandUsage1=/ seenCommandUsage1Description=Näitab väljalogimise aega, keelu, vaigistamise ja UUID informatsiooni määratud mängija kohta seenOffline=§6Mängija§c {0} §6on olnud §4võrgust väljas§6 alates §c{1}§6. seenOnline=§6Mängija§c {0} §6on olnud §avõrgus§6 alates §c{1}§6. -sellBulkPermission=§6Sul puudub hulgimüügi luba. -sellCommandDescription=Müüb käes oleva eseme. -sellCommandUsage=/ <||hand|inventory|blocks> [kogus] -sellCommandUsage1=/ [kogus] -sellCommandUsage1Description=Müüb kõik(või antud koguses, kui on täpsustatud) antud eset sinu seljakotis -sellCommandUsage2=/ hand [kogus] -sellCommandUsage2Description=Müüb kõik(või antud koguses, kui on täpsustatud) käeshoitavat eset -sellCommandUsage3=/ all -sellCommandUsage3Description=Müüb kõik võimalikud asjad sinu seljakotist -sellCommandUsage4=/ blocks [kogus] -sellCommandUsage4Description=Müüb kõik(või antud koguses, kui on täpsustatud) antud plokki sinu seljakotis -sellHandPermission=§6Sul puudub käsimüügi luba. serverFull=Server on täis\! serverReloading=On suur tõenäosus, et laadid oma serverit hetkel uuesti. Kui see on tõsi, miks sa end vihkad? EssentialsX meeskond ei paku sulle tuge, kui kasutad käsklust /reload. serverTotal=§6Serveris kokku\:§c {0} @@ -1057,8 +979,6 @@ serverUnsupportedClass=Olekut määrav klass\: {0} serverUnsupportedCleanroom=Käitad serverit, mis ei toeta korralikult Bukkiti pluginaid, mis kasutavad sisemist Mojangi koodi. Kaalu oma serveri tarkvaraga sobiva Essentialsi alternatiivi kasutamist. serverUnsupportedLimitedApi=Käitad piiratud rakendusliidesega serverit. EssentialsX töötab siiski, aga mõned funktsioonid võivad olla keelatud. serverUnsupportedMods=Käitad serverit, mis ei toeta Bukkiti pluginaid korralikult. Bukkiti pluginaid ei peaks koos Forge''i/Fabricu modidega kasutama\! Kaalu Forge''i puhul ForgeEssentialsi või SpongeForge + Nucleuse kasutamist. -setBal=§aSinu rahasummaks on määratud\: {0}. -setBalOthers=§aMäärasid mängija {0}§a rahasummaks {1}. setSpawner=§6Muutsid elukatekitaja tüübiks §c {0}§6. sethomeCommandDescription=Määrab su koduks praeguse asukoha. sethomeCommandUsage=/ [[mängija\:]nimi] @@ -1084,11 +1004,6 @@ setwarpCommandDescription=Loob uue koolu. setwarpCommandUsage=/ setwarpCommandUsage1=/ setwarpCommandUsage1Description=Seadistab lõimu antud nimega sinu asukohta -setworthCommandDescription=Määra eseme müügihind. -setworthCommandUsage=/ [esemenimi|id] -setworthCommandUsage1=/ -setworthCommandUsage2=/ [esemenimi] -setworthCommandUsage2Description=Seadistab määratud esemele väärtuse antud hinnaga sheepMalformedColor=§4Moondunud värv. shoutDisabled=§6Hüüdmisrežiim §ckeelatud§6. shoutDisabledFor=§6Hüüdmisrežiim on §ckeelatud §6mängijal §c{0}§6. @@ -1170,8 +1085,6 @@ suicideCommandUsage=/ suicideMessage=§6Head aega, julm maailm... suicideSuccess=§6Mängija §c{0} §6võttis endalt elu. survival=ellujäämine -takenFromAccount=§aSinu kontolt on §e{0}§a maha võetud. -takenFromOthersAccount=§aMängija§e {1}§a kontolt on §e{0}§a maha võetud. Uus rahasumma\:§e {2} teleportAAll=§6Teleporteerumiskutse saadetud kõikidele mängijatele... teleportAll=§6Teleporteerin kõik mängijad... teleportationCommencing=§6Teleporteerumine algab... @@ -1316,8 +1229,6 @@ tptoggleCommandDescription=Blokeerib kõik teleporteerimise viisid. tptoggleCommandUsage=/ [mängija] [on|off] tptoggleCommandUsage1=/ [mängija] tptoggleCommandUsageDescription=Lülitab teleporteerumise kutsete vastuvõtmise sinule või teisele mängijale, kui on täpsustatud -tradeSignEmpty=§4Kauplemissildil pole sulle midagi pakkuda. -tradeSignEmptyOwner=§4Siit kauplemissildilt pole midagi korjata. treeCommandDescription=Tekitab vaadatavasse kohta puu. treeCommandUsage=/ treeCommandUsage1=/ @@ -1393,12 +1304,10 @@ versionDevLatest=§6Käitad viimatist EssentialsX arendusredaktsiooni\! versionError=§4EssentialsX''i versiooniinfo hankimisel esines viga\! Redaktsiooni info\: §c{0}§6. versionErrorPlayer=§6EssentialsX''i versiooniinfo kontrollimisel esines viga\! versionFetching=§6Versiooni info hankimine... -versionOutputVaultMissing=§4Vault ei ole paigaldatud. Vestlus ja õigused ei pruugi töötada. versionOutputFine=§6{0} versioon\: §a{1} versionOutputWarn=§6{0} versioon\: §c{1} versionOutputUnsupported=§d{0} §6versioon\: §d{1} versionOutputUnsupportedPlugins=§6Sa käitad §dmittetoetatud pluginaid§6\! -versionOutputEconLayer=§6Ökonoomiakiht\: §r{0} versionMismatch=§4Versioon ei kattu\! Palun uuenda {0} samale versioonile. versionMismatchAll=§4Versioon ei kattu\! Palun uuenda kõik Essentialsi jarid samale versioonile. versionReleaseLatest=§6Käitad viimatist EssentialsX''i stabiilset versiooni\! @@ -1460,7 +1369,6 @@ whoisHunger=§6 - Nälg\:§r {0}/20 (+{1} küllastus) whoisIPAddress=§6 - IP-aadress\:§r {0} whoisJail=§6 - Vangistatud\:§r {0} whoisLocation=§6 - Asukoht\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Rahasumma\:§r {0} whoisMuted=§6 - Vaigistatud\:§r {0} whoisMutedReason=§6 - Vaigistatud\:§r {0} §6Põhjus\: §c{1} whoisNick=§6 - Hüüdnimi\:§r {0} @@ -1477,19 +1385,6 @@ worldCommandUsage1=/ worldCommandUsage1Description=Teleporeerib teid vastavasse asukohta, kas põrgus või maailmas worldCommandUsage2=/ worldCommandUsage2Description=Teleporteerib teie asukohta antud maailmas -worth=§aEseme {0} kuhi on väärt §c{1}§a ({2} ese(t) hinnaga {3} tükk) -worthCommandDescription=Arvutab käes olevate või määratud esemete väärtuse. -worthCommandUsage=/ <||hand|inventory|blocks> [-][kogus] -worthCommandUsage1=/ [kogus] -worthCommandUsage1Description=Kontrollib kõigi(või antud koguses, kui on täpsustatud) antud eseme väärtust teie seljakotis -worthCommandUsage2=/ hand [kogus] -worthCommandUsage2Description=Kontrollib kõigi(või antud koguses, kui on täpsustatud) käes hoitava eseme väärtust teie seljakotis -worthCommandUsage3=/ all -worthCommandUsage3Description=Kontrollib kõikide võimalike esemete väärtust teie seljakotis -worthCommandUsage4=/ blocks [kogus] -worthCommandUsage4Description=Kontrollib kõigi(või antud koguses, kui on täpsustatud) antud plokkide väärtust teie seljakotis -worthMeta=§aEseme {0} kuhi metaandmetega {1} on väärt §c{2}§a ({3} ese(t) hinnaga {4} tükk) -worthSet=§6Eseme väärtus määratud year=aasta years=aastat youAreHealed=§6Sind on tervendatud. diff --git a/Essentials/src/main/resources/messages_eu.properties b/Essentials/src/main/resources/messages_eu.properties index e47eb89d4..d149cda8e 100644 --- a/Essentials/src/main/resources/messages_eu.properties +++ b/Essentials/src/main/resources/messages_eu.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} zure kontura gehitu dira. -addedToOthersAccount=§a{0} gehituak {1}§a-en kontura. Balantze berria\: {2} adventure=abentura afkCommandDescription=Teklatutik urrun zaudela esaten dute. afkCommandUsage=/ [jokalaria/mezua...] @@ -26,9 +24,6 @@ autoAfkKickReason=Byl jsi vyhozen za neaktivitu delší než {0} minut. backupFinished=§6Segurtasun kopia ondo burutu da. backupStarted=§6Segurtasun kopia burutzea hasi da. backUsageMsg=§6Aurreko kokalekura itzultzen. -balance=§aDirua\:§c {0} -balanceOther=§a{0}-(e)ren balantzea\:§c {1} -balanceTop=§6Zerbitzariko aberatsenak ({0}) banExempt=Ezin duzu jokalari hori zigortu. banExemptOffline=§5Jokalaria ez dago konektatuta, beraz, ezin duzu zigortu. banFormat=§cZerbitzarira sarrera galarazi zaizu\:§r{0} @@ -137,8 +132,6 @@ ignoreExempt=§4Ezin diozu jokalari honi ez entzunarena egin. illegalDate=Data formatu baliogabea. infoChapter=§6Aukeratu kapitulua\: infoUnknownChapter=§4Atal ezezaguna. -insufficientFunds=§4Ez daukazu nahikoa dirurik. -invalidCharge=§Karga baliogabea. invalidHome=§4Ez da §c{0}§4 etxea aurkitu\! invalidHomeName=§4Etxe izen baliogabea\! invalidMob=§4Munstro mota baliogabea. @@ -194,11 +187,9 @@ mobsAvailable=§6Munstroak\:§r {0} mobSpawnError=§4Ezin izan da mob sorgailua aldatu. mobSpawnLimit=Munstro kopurua zerbitzariak mugatua. mobSpawnTarget=§4Aukeratutako blokeak munstro-sorgailua izan behar du. -moneySentTo=§a{0} bidali dizkiozu {1} -(r)i. month=hilabete months=hilabeteak moreThanZero=§4Kantitea 0 baino handiagoa izan beharko da. -multipleCharges=§4Ezin diozu karga bat baino gehiago jarri suziri honi. multiplePotionEffects=§4Ezin diozu efektu bat baino gehiago jarri edabe honi. mutedPlayer=§c {0} §6 jokalaria isildua izan da. mutedPlayerFor={0} jokalaria ixildua {1}-rako. @@ -206,7 +197,6 @@ muteExempt=§4Ezin duzu jokalari hori isildu. muteExemptOffline=§5Jokalaria ez dago konektatuta, beraz, ezin duzu zigortu. muteNotify=§c{0} §6-(e)k §c{1}§6 isildu du. nearbyPlayers=§6Gertu dauden jokalariak\:§r {0} -negativeBalanceError=§4Ezin duzu diru zorrik izan. nickChanged=§6Ezizena aldatu duzu. nickDisplayName=§4Essentials-en ezarpenetan funtzio hau gaitu beharko duzu. nickInUse=§4Izen hori dagoeneko badu norbaitek. @@ -235,7 +225,6 @@ noPermissionSkull=§4Ez daukazu buru hori editatzeko baimenik. noPermToSpawnMob=§4Ez daukazu munstro hori sortzeko baimenik. noPlacePermission=§4Ez daukazu kartelaren ondoan blokerik jartzeko baimenik. notEnoughExperience=§4Ez daukazu nahikoa esperientziarik. -notEnoughMoney=§4Ez daukazu nahikoa dirurik. notFlying=ez da hegan ari nothingInHand=§4Ez daukazu ezer eskuan. now=orain @@ -366,7 +355,6 @@ whoisHealth=§6 - Osasuna\:§r {0} whoisIPAddress=§6 - IP helbidea\:§r {0} whoisJail=§6 - Kartzela\:§r {0} whoisLocation=§6 - Kokapena\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Dirua\:§r {0} whoisMuted=§6 - Mututua§r {0} whoisNick=§6 - Ezizena\:§r {0} whoisTop=§6 \=\=\=\=\=\= Honi buruz\:§c {0} §6\=\=\=\=\=\= diff --git a/Essentials/src/main/resources/messages_fi.properties b/Essentials/src/main/resources/messages_fi.properties index 27fc63e2a..59a20c4a5 100644 --- a/Essentials/src/main/resources/messages_fi.properties +++ b/Essentials/src/main/resources/messages_fi.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} on lisätty sinun tilillesi. -addedToOthersAccount=§a{0} lisätty pelaajan {1}§a tilille. Uusi rahatilanne\: {2} adventure=seikkailu afkCommandDescription=Merkitsee sinut "näppäimistöltä-poistuneeksi". afkCommandUsage=/ [pelaaja/viesti...] @@ -47,20 +45,6 @@ backupFinished=§6Varmuuskopiointi suoritettu. backupStarted=§6Varmuuskopiointi aloitettu. backupInProgress=§6Ulkoinen varmuuskopio-skripti on parhaillaan käynnissä\! Pysäytyslaajennus poistetaan käytöstä, kunnes se on valmis. backUsageMsg=§6Palataan edelliseen sijaintiin. -balance=§aRahatilanne\:§6 {0} -balanceCommandDescription=Ilmoittaa pelaajan nykyisen rahatilanteen. -balanceCommandUsage=/ [pelaaja] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Näyttää nykyisen rahamääräsi -balanceCommandUsage2=/ -balanceCommandUsage2Description=Näyttää määritetyn pelaajan rahatilanteen -balanceOther=§aPelaajan {0}§a saldo\:§c {1} -balanceTop=§6Top rahatilanteet ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Ilmoittaa suurimmat rahasaldot. -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] -balancetopCommandUsage1Description=Näyttää ensimmäisen (tai valitun) sivun top-rahatilannetiedoista banCommandDescription=Bannaa pelaajan. banCommandUsage=/ [reason] banCommandUsage1=/ [reason] @@ -159,16 +143,9 @@ commandNotLoaded=§4Komento {0} on väärin ladattu. compassBearing=§6Osoittaa\: {0} ({1} astetta). compassCommandDescription=Kuvailee nykyistä katsomiskulmaasi. compassCommandUsage=/ -condenseCommandDescription=Tiivistää esineet pienemmiksi kappaleiksi. -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Tyhjentää tavaraluottelosi -condenseCommandUsage2=/ -condenseCommandUsage2Description=Poistaa tietyn tavaran tavaraluettelostasi configFileMoveError=Virhe siirrettäessä tiedostoa config.yml varmuuskopio sijaintiin. configFileRenameError=Virhe nimettäessä tiedostoa temp tiedostoon config.yml confirmClear=§7§lVAHVISTAAKSESI§7 tavaraluettelon tyhjennyksen, suorita uudellen komento\: §6{0} -confirmPayment=§7§lVAHVISTAAKSESI§7 maksun §6{0}§7, suorita uudelleen komento\: §6{1} connectedPlayers=§6Liittyneet pelaajat§r connectionFailed=Virhe avattaessa yhteyttä. consoleName=Konsoli @@ -187,7 +164,6 @@ createKitUnsupported=§4NBT-tavaroiden sarjoitus on otettu käyttöön, mutta t creatingConfigFromTemplate=Luodaan config tiedostoa mallista\: {0} creatingEmptyConfig=Luodaan tyhjää config tiedostoa\: {0} creative=luova -currency={0}{1} currentWorld=§6Tämänhetkinen maailma\:§c {0} customtextCommandDescription=Sallii sinun luoda kustomoituja tekstikomentoja. customtextCommandUsage=/ - Määritä bukkit.yml-tiedostossa @@ -255,8 +231,6 @@ downloadingGeoIp=Ladataan GeoIP tietokantaa... tämä voi viedä hetken (maa\: 1 duplicatedUserdata=Kopioitu käyttäjän tiedot\: {0} ja {1} durability=§6Tällä työkalulla on §c{0}§6 käyttökertaa jäljellä. east=E -ecoCommandDescription=Hallitsee palvelimen rahatilanteita. -ecoCommandUsage=/ editBookContents=§eVoit nyt muokata tämän kirjan sisältöä. enabled=otettu käyttöön enchantCommandDescription=Lumoaa tavaran, jota käyttäjä pitää kädessään. @@ -407,9 +381,7 @@ infoCommandDescription=Näyttää tiedot, mitä palvelimen omistaja on asettanut infoCommandUsage=/ [chapter] [page] infoPages=§e ---- §6{2} §e--§6 Sivu §4{0}§6/§4{1} §e---- infoUnknownChapter=§4Tuntematon luku. -insufficientFunds=§4Käytettävissä ei ole riittävästi varoja. invalidBanner=§4Virheellinen bannerin syntaksi. -invalidCharge=§4Virheellinen maksu. invalidFireworkFormat=§4Vaihtoehdolla §c{0} §4ei ole kelvollista arvoa §c{1}§4. invalidHome=§4Kotia§c {0} §4ei ole olemassa\! invalidHomeName=§4Virheellinen kodin nimi\! @@ -502,7 +474,6 @@ kitCommandUsage=/ [kit] [player] kitCommandUsage1=/ kitCommandUsage2=/ [player] kitContains=§6Pakki §c{0} §6sisältää\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Ei ole kelvollisia pakkauksia. kitError2=§4Tuo paketti on väärin määritelty. Ota yhteys järjestelmänvalvojaan. @@ -553,7 +524,6 @@ mailTooLong=§4Viesti on liian pitkä. Yritä pitää se alle 1000 merkissä. markMailAsRead=§6Merkataksesi viestin luetuksi, kirjoita§c /mail clear§6. matchingIPAddress=§6Seuraavat pelaajat ovat aiemmin kirjautuneet sisään tästä IP-osoitteesta\: maxHomes=§4Et voi asettaa §c {0} §4kotia enempää. -maxMoney=§4Tämä toimenpide ylittää saldorajan tälle tilille. mayNotJail=§4Et voi laittaa tuota pelaajaa vankilaan\! mayNotJailOffline=§4Et voi vangita offline-pelaajia. meCommandDescription=Kuvailee toiminna pelaajan kontekstin yhteydessä. @@ -561,7 +531,6 @@ meCommandUsage=/ meCommandUsage1=/ meSender=minä meRecipient=minä -minimumBalanceError=§4Minimisaldo, joka käyttäjällä voi olla, on {0}. minimumPayAmount=§cVähimmäismäärä, jonka voit maksaa on {0}. minute=minuutti minutes=minuuttia @@ -571,8 +540,6 @@ mobsAvailable=§7Mobit\: {0} mobSpawnError=§4Virhe vaihdettaessa mob-luojan tyyppiä. mobSpawnLimit=Mobien määrä rajoitettu palvelimen maksimimäärään. mobSpawnTarget=§4Kohteen pitää olla spawner palikka. -moneyRecievedFrom=§a{0}§6 vastaanotettu pelaajalta§a {1}§6. -moneySentTo=§a{0} on lähetetty pelaajalle {1}. month=kuukausi months=kuukautta moreCommandDescription=Täyttää tavarapinon kädessäsi määritetyksi arvoksi, tai maksimikooksi, jos mitään ei ole määritetty. @@ -594,7 +561,6 @@ msgIgnore=§4Pelaajalla §c{0} §4on viestit poissa käytöstä. msgtoggleCommandDescription=Estää kaikki yksityisviestit. msgtoggleCommandUsage=/ [player] [on|off] msgtoggleCommandUsage1=/ [pelaaja] -multipleCharges=§4Tähän ilotulitteeseen ei voi ladata useampaa kuin yhtä panosta. multiplePotionEffects=§4Tähän juomaan ei voida soveltaa useampaa kuin yhtä efektiä. muteCommandDescription=Hiljentää tai poistaa pelaajan hiljennyksen. muteCommandUsage=/ [datediff] [reason] @@ -615,7 +581,6 @@ nearCommandUsage=/ [playername] [radius] nearCommandUsage1=/ nearCommandUsage3=/ nearbyPlayers=§6Lähellä olevat pelaajat\:§r {0} -negativeBalanceError=§4Käyttäjällä ei saa olla negatiivista saldoa. nickChanged=§6Lempinimi vaihdettu. nickCommandDescription=Vaihtaa sinun tai jonkun muun pelaajan lempinimen. nickCommandUsage=/ [player] @@ -660,9 +625,7 @@ noPermToSpawnMob=§4Sinulla ei ole lupaa luoda tätä mobia. noPlacePermission=§4Sinulla ei ole lupaa laittaa palikoita lähelle tuota kylttiä. noPotionEffectPerm=§4Sinulla ei ole lupaa soveltaa juomavaikutusta §c{0} §4tähän juomaan. noPowerTools=§6Sinulla ei ole määritetty voimatyökaluja. -notAcceptingPay=§4{0} §4ei hyväksy maksua. notEnoughExperience=§4Sinulla ei ole tarpeeksi kokemusta. -notEnoughMoney=§4Sinulla ei ole riittävästi rahaa. notFlying=ei lennä nothingInHand=§4Sinulla ei ole mitään kädessäsi. now=nyt @@ -676,26 +639,9 @@ onlyPlayers=§4Vain pelissä olevat pelaajat voivat käyttää komentoa §c{0}§ onlyPlayerSkulls=§4Voit asettaa vain pelaajakallon omistajan (§cminecraft\:player_head§4). onlySunStorm=§4/weather tukee vain komentoja sun/storm. openingDisposal=§6Avataan hävitysvalikko... -orderBalances=§6Järjestetään rahatilanteita§c {0} §6käyttäjälle, odota... oversizedMute=§4Et voi mykistää pelaajaa täksi ajaksi. oversizedTempban=§4Et voi bannata pelaajaa täksi ajaksi. passengerTeleportFail=§4Sinua ei voi teleportata kun sinulla on matkustajia. -payCommandDescription=Maksaa toiselle pelaajalle omista varoistasi. -payCommandUsage=/ -payCommandUsage1=/ -payConfirmToggleOff=§6Sinua ei enää kehoteta vahvistamaan maksuja. -payConfirmToggleOn=§6Sinua pyydetään nyt vahvistamaan maksut. -payDisabledFor=§6Poistit maksujen vastaanottamisen käytöstä pelaajalta §c{0}§6. -payEnabledFor=§6Otit maksujen vastaanottamisen käyttöön pelaajalle §c{0}§6. -payMustBePositive=§4Maksettavan määrän on oltava positiivinen. -payOffline=§4Et voi maksaa offline-käyttäjille. -payToggleOff=§6Et enää ota vastaan maksuja. -payToggleOn=§6Otat nyt vastaan maksuja. -payconfirmtoggleCommandDescription=Vaihtaa, pyydetäänkö sinua vahvistamaan maksut vai ei. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Vaihtaa, hyväksytkö maksuja vai et. -paytoggleCommandUsage=/ [pelaaja] -paytoggleCommandUsage1=/ [pelaaja] pendingTeleportCancelled=§4Odottava teleporttipyyntö peruttu. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -808,8 +754,6 @@ requestDeniedFrom=§c{0} §6hylkäsi teleporttipyyntösi. requestSent=§6Pyyntö lähetettiin pelaajalle§c {0}§6. requestSentAlready=§4Olet jo lähettänyt pelaajalle {0}§4 teleporttauspyynnön. requestTimedOut=§4Teleport-pyyntö on vanhentunut. -resetBal=§6Saldo palautettu arvoon §c{0} §6kaikille online-pelaajille. -resetBalAll=§6Saldo on palautettu arvoon §c{0} §6kaikille pelaajille. rest=§6Tunnet olosi levänneeksi. restCommandDescription=Asettaa sinut tai valitun pelaajan levänneeksi. restCommandUsage=/ [pelaaja] @@ -829,9 +773,6 @@ seenCommandUsage=/ seenCommandUsage1=/ seenOffline=§6Pelaaja§c {0} §6on ollut §4offlinena§6 ajan\: §c{1}§6. seenOnline=§6Pelaaja§c {0} §6on ollut §aonlinena§6 ajan §c{1}§6. -sellBulkPermission=§6Sinulla ei ole lupaa myydä montaa tavaraa kerralla. -sellCommandDescription=Myy tavaran, joka on tällä hetkellä kädessäsi. -sellHandPermission=§6Sinulla ei ole lupaa myydä kädestä. serverFull=Palvelin on täynnä\! serverReloading=On hyvin mahdollista, että lataat palvelinta uudelleen juuri nyt. Jos näin on, miksi vihaat itseäsi? Älä odota minkäänlaista tukea EssentialsX-tiimiltä, kun käytät /reload -komentoa. serverTotal=§6Palvelimen kokonaisrahamäärä\:§c {0} @@ -840,8 +781,6 @@ serverUnsupportedClass=Tilan määrittävä luokka\: {0} serverUnsupportedCleanroom=Käytössäsi on palvelin, joka ei tue oikein Bukkit lisäosia, jotka tukeutuvat sisäiseen Mojang koodiin. Harkitse Essentialsin korvaavan lisäosan käyttöä palvelimellasi. serverUnsupportedLimitedApi=Käytössäsi on palvelin, jolla on rajallinen API-toiminto. EssentialsX toimii edelleen, mutta tietyt ominaisuudet saattavat olla poissa käytöstä. serverUnsupportedMods=Käytössäsi on palvelin, joka ei tue oikein Bukkit-plugineita. Bukkit-plugineita ei tule käyttää Forge/Fabric-modien kanssa\! Forgen yhteydessä, harkitse ForgeEssentialsin tai SpongeForgen + Nucleuksen käyttöä. -setBal=§aRahatilanteesi on asetettu arvoon {0}. -setBalOthers=§aAsetit pelaajan {0}§a rahatilanteen arvoon {1}. setSpawner=§6Vaihdettiin spawnerin tyypiksi§c {0}§6. sethomeCommandDescription=Asettaa kodin nykyiseen sijaintiisi. sethomeCommandUsage=/ [[pelaaja\:]nimi] @@ -857,8 +796,6 @@ settprValue=§6Asetettiin satunnaisen teleporttauksen §c{0}§6 arvoon §c{1}§6 setwarpCommandDescription=Luo uuden warpin. setwarpCommandUsage=/ setwarpCommandUsage1=/ -setworthCommandDescription=Asettaa kohteen myyntiarvon. -setworthCommandUsage=/ [tavarannimi|id] sheepMalformedColor=§4Viallinen väri. shoutDisabled=§6Huutotila on §cpoistettu käytöstä§6. shoutDisabledFor=§6Huutotila §cpoistettu käytöstä §6pelaajalla §c{0}§6. @@ -925,8 +862,6 @@ suicideCommandUsage=/ suicideMessage=§6Hyvästi julma maailma... suicideSuccess=§c{0} §6riisti oman henkensä. survival=selviytyminen -takenFromAccount=§e{0}§a on veloitettu tililtäsi. -takenFromOthersAccount=§e{0}§a veloitettu pelaajan§e {1}§a tililtä. Uusi rahatilanne\:§e {2} teleportAAll=§6Teleporttaus-pyyntö lähetetty kaikille pelaajille... teleportAll=§6Teleportataan kaikki pelaajat... teleportationCommencing=§6Teleportataan... @@ -1034,8 +969,6 @@ tps=§6Tämänhetkinen TPS \= {0} tptoggleCommandDescription=Estää kaikentyyppisen teleporttaamisen. tptoggleCommandUsage=/ [player] [on|off] tptoggleCommandUsage1=/ [pelaaja] -tradeSignEmpty=§4Vaihtokyltillä ei ole mitään tarjolla sinulle. -tradeSignEmptyOwner=§4Ei ole mitään mitä kerätä tästä vaihtokyltistä. treeCommandDescription=Luo puun sijaintiin, mihin katsot. treeCommandUsage=/ treeCommandUsage1=/ @@ -1091,7 +1024,6 @@ vanishCommandDescription=Piilottaa sinut muilta pelaajilta. vanishCommandUsage=/ [player] [on|off] vanishCommandUsage1=/ [pelaaja] vanished=§6Olet nyt täysin näkymätön tavallisille käyttäjille ja piilotettu pelin sisäisistä komennoista. -versionOutputVaultMissing=§4Vault-pluginia ei ole asennettu. Keskustelu ja käyttöoikeudet eivät ehkä toimi. versionOutputFine=§6{0} versio\: §a{1} versionOutputWarn=§6{0} versio\: §c{1} versionOutputUnsupported=§d{0} §6versio\: §d{1} @@ -1147,7 +1079,6 @@ whoisHunger=§6 - Nälkä\:§r {0}/20 (+{1} kylläisyys) whoisIPAddress=§6 - IP osoite\:§r {0} whoisJail=§6 - Vangittu\:§r {0} whoisLocation=§6 - Sijainti\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Rahaa\:§r {0} whoisMuted=§6 - Mykistetty\:§r {0} whoisMutedReason=§6 - Mykistetty\:§r {0} §6Syy\: §c{1} whoisNick=§6 - Lempinimi\:§r {0} @@ -1163,11 +1094,6 @@ worldCommandUsage=/ [world] worldCommandUsage1=/ worldCommandUsage2=/ worldCommandUsage2Description=Teleporttaa sijaintiisi annetussa maailmassa -worth=§aPino tavaraa "{0}" on arvoltaan §c{1}§a ({2} tavara(a) \= {3}/kappale) -worthCommandDescription=Laskee kädessä olevan tai määritettyjen esineiden arvon. -worthCommandUsage=/ <||hand|inventory|blocks> [-][amount] -worthMeta=§6Pino tavaraa "{0}" metadatan kanssa {1} on arvoltaan §c{2}§a ({3} tavara(a) \= {4}/kappale) -worthSet=§6Arvo asetettu year=vuosi years=vuotta youAreHealed=§6Sinut on parannettu. diff --git a/Essentials/src/main/resources/messages_fil_PH.properties b/Essentials/src/main/resources/messages_fil_PH.properties index 642ea0289..eeb1c8218 100644 --- a/Essentials/src/main/resources/messages_fil_PH.properties +++ b/Essentials/src/main/resources/messages_fil_PH.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} ay nadagdag sa iyong account. -addedToOthersAccount=§a{0} ay nadagdag sa {1}§a account. Bagong pitaka\: {2} adventure=panglakbayan afkCommandDescription=Mamarkahan ka na nakaalis-mula-sa-keyboard. afkCommandUsage=/ [manlalaro/mensahe...] @@ -45,18 +43,6 @@ backupFinished=§6Natapos ang backup. backupStarted=§6Nagsimula ang backup. backupInProgress=§4Mayroon pang eksternal backup skript sa kasalukuyang unlad\! Titigilin ang pag-tigil ng plugin hanggang matapos ito. backUsageMsg=§6Bumabalik sa nakaraang locasyon. -balance=§aPitaka\:§c {0} -balanceCommandDescription=Sinasabi ang kasalukuyang pitaka ng manlalaro. -balanceCommandUsage=/ [manlalaro] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Sinasabi ang kasalukuyang pitaka -balanceCommandUsage2=/ -balanceOther=§aPitaka ni {0}§a\:§c {1} -balanceTop=§6Pinakamataas na pitaka ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Kinukuha ang halaga ng mga pinakamataas na pitaka. -balancetopCommandUsage=/ [pahina] -balancetopCommandUsage1=/ [pahina] banCommandDescription=Nagpapagbawal ng manlalaro. banCommandUsage=/ [dahilan] banCommandUsage1=/ [dahilan] @@ -138,14 +124,9 @@ commandNotLoaded=§4Hindi maayos ang pagka-load ng utos na {0}. compassBearing=§6Kinalalaman\: {0} ({1} digri). compassCommandDescription=Sinasabi ang iyong kasalakuyang kinalalaman. compassCommandUsage=/ -condenseCommandDescription=Pinapaikliin ang mga bagay sa mga mas masiksik na bloke. -condenseCommandUsage=/ [bagay] -condenseCommandUsage1=/ -condenseCommandUsage2=/ configFileMoveError=Nabigo ang paglipat ng config.yml na file sa backup na locasyon. configFileRenameError=Nabigo ang pagkabago ng pangalan ng temp file sa config.yml. confirmClear=§7Para §li-kumpirmahin§7 ang pagkabura ng imbentaryo, mangyaring gawin ang utos muli\: §6{0} -confirmPayment=§7Para §li-kumpirmahin§7 ang pagbabayad ng6{0}§7, mangyaring gawin ang utos muli\: §6{1} connectedPlayers=§6Kumonektadong manlalaro§r connectionFailed=Hindi makabukas ng koneksyon. consoleName=Console @@ -162,7 +143,6 @@ createKitSuccess=§6Ginawang Kit\: §f{0}\n§6Antala\: §f{1}\n§6Link\: §f{2}\ creatingConfigFromTemplate=Gumagawa ng config mula sa template\: {0} creatingEmptyConfig=Gumagawa ng walang lamang config\: {0} creative=kalikhaan -currency={0}{1} currentWorld=§6Kasalukuyang Mundo\:§c {0} customtextCommandDescription=Pinayagan kang gumawa ng pasadyang text na utos. customtextCommandUsage=/ - I-kahulugan sa bukkit.yml @@ -247,13 +227,6 @@ dumpErrorUpload=§4Error habang ina-upload ang §c{0}§4\: §c{1} duplicatedUserdata=Duplikadong manlalarong-datos\: {0} at {1}. durability=§6Pwede mo pa gamitin ito ng §c{0}§6 pang beses. east=E -ecoCommandDescription=Kino-kontrol ang ekonomiya na server. -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=Ibibigay yung manlalarong tinutukoy ng tinutukoy na halaga ng pera -ecoCommandUsage2=/ take -ecoCommandUsage3=/ set -ecoCommandUsage4=/ reset editBookContents=§ePwede mo na baguhin ang nilalaman ng itong libro. enabled=pinagana enchantCommandDescription=Minamalika ang bagay na kinakapit ng manlalaro. @@ -438,9 +411,7 @@ infoCommandDescription=Magpapakita ng impormasyon na itinakda ng nag-aari ng ser infoCommandUsage=/ [kabanata] [pahina] infoPages=§e ---- §6{2} §e--§6 Pahinang §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Di-malamang kabanata. -insufficientFunds=§4Imbalidong pera na pwedeng gamitin. invalidBanner=§4Imbalidong kodigo sa bandila. -invalidCharge=§4Imbalidong kodigo. invalidFireworkFormat=§4Ang opsyong §c{0} §4ay imbalidong halaga para sa§c{1}§4. invalidHome=§4Ang bahay nac {0} §4ay hindi umiiral\! invalidHomeName=§4Imbalidong pangalan ng bahay\! @@ -534,7 +505,6 @@ kitCommandUsage=/ [kit] [manlalaro] kitCommandUsage1=/ kitCommandUsage2=/ [manlalaro] kitContains=§6Ang kit na §c{0} §6ay naglalaman ng\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Walang mga balid na kits. kitError2=§4Hindi maayos ang pagkaliwanag ng kit an iyon. Mangyaring maghiling ng admin. @@ -594,7 +564,6 @@ mailTooLong=§4Masyadong mahaba ang mensahe. Subukang panatilihin mo ng mas maba markMailAsRead=§6Upang imarkahan ang iyong mail ng nabasa, mangyaring sulatin ang§c /mail clear§6. matchingIPAddress=§6Ito ang mga manlalaro na dating nag-login mula sa IP address na iyon\: maxHomes=§4Bawal ka magtakda ng mas higit sa§c {0} §4bahay. -maxMoney=§4Ilalagpas ng transaksyon na ito ang limitasyon ng pitaka para sa account na ito. mayNotJail=§4Bawal mo ikulong ang tao na iyon\! mayNotJailOffline=§4Bawal mo idala ang mga manlalaro na offline sa kulungan. meCommandDescription=Ilalarawan ang aksyon sa konteksto ng manlalaro. @@ -602,7 +571,6 @@ meCommandUsage=/ meCommandUsage1=/ meSender=ako meRecipient=ako -minimumBalanceError=§4Ang pinakamaliit na pitaka na pwede sa manlalaro ay {0}. minimumPayAmount=§cAng pinakamaliit na pitaka na pwede mong ibayad ay {0}. minute=minuto minutes=mga minuto @@ -612,8 +580,6 @@ mobsAvailable=§6Mobs\:§r {0} mobSpawnError=§4Error habang binabago ang mob spawner. mobSpawnLimit=Linimit ang halaga ng pagkaspawn ng mob sa limitasyon ng server. mobSpawnTarget=§4Ang tinutukoy na bloke ay dapat maging mob spawner. -moneyRecievedFrom=§a{0}§6 ay nakuha mula kay§a {1}§6. -moneySentTo=§a{0} ay nabigay kay {1}. month=buwan months=mga buwan moreCommandDescription=Ipupuno ang item stack sa kamay ng tinutukoy na halaga, o sa pinakataas na laki kung wala ang tinutukoy. @@ -645,7 +611,6 @@ nearCommandUsage1=/ nearCommandUsage3=/ nearbyPlayers=§6Manlalaro na malapit\:§r {0} nearbyPlayersList={0}§f(§c{1}m§f) -negativeBalanceError=§4Hindi pinapayagan ang manlalaro upang magkaroon ng negatibong pitaka. nickChanged=§6Binago ang Nickname. nickCommandDescription=Ibago ang iyong nickname o ang ng iba-pang manlalaro na iyon. nickCommandUsage=/ [manlalaro] @@ -663,11 +628,6 @@ now=ngayon nukeCommandUsage=/ [manlalaro] nukeCommandUsage1=/ [mga manlalaro...] passengerTeleportFail=§4Ikaw ay hindi maaaring malipat habang dumadala ka ng mga tao. -payCommandUsage=/ -payCommandUsage1=/ -payconfirmtoggleCommandUsage=/ -paytoggleCommandUsage=/ [manlalaro] -paytoggleCommandUsage1=/ [manlalaro] pingCommandDescription=Pong\! pingCommandUsage=/ playtimeCommandUsage=/ [manlalaro] @@ -713,7 +673,6 @@ setjailCommandUsage1=/ settprCommandUsage=/ [center|minrange|maxrange] [halaga] setwarpCommandUsage=/ setwarpCommandUsage1=/ -setworthCommandUsage=/ [pangalan-ng-bagay|id] showkitCommandUsage=/ showkitCommandUsage1=/ signFormatFail=§4[{0}] @@ -807,5 +766,4 @@ whoisGod=§6 - Diyos na kapangyarihan\:§r {0} workbenchCommandUsage=/ worldCommandUsage=/ [mundo] worldCommandUsage1=/ -worthCommandUsage=/ <||hand|inventory|blocks> [-][halaga] youAreHealed=§6Ginaling ka. diff --git a/Essentials/src/main/resources/messages_fr.properties b/Essentials/src/main/resources/messages_fr.properties index 5cd05edd2..326a01689 100644 --- a/Essentials/src/main/resources/messages_fr.properties +++ b/Essentials/src/main/resources/messages_fr.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} ont été ajoutés à votre compte. -addedToOthersAccount=§a{0} ajoutés au compte de {1}§a. Nouveau solde \: {2} adventure=aventure afkCommandDescription=Vous indique comme étant absent. afkCommandUsage=/ [joueur/message...] @@ -47,20 +45,6 @@ backupFinished=§6Sauvegarde terminée. backupStarted=§6Début de la sauvegarde. backupInProgress=§6Un script externe de sauvegarde est en cours d’exécution \! L''arrêt du plugin est suspendu jusque la fin de la procédure. backUsageMsg=§7Retour à votre emplacement précédent. -balance=§aSolde \:§c {0} -balanceCommandDescription=Indique le solde actuel d''un joueur. -balanceCommandUsage=/ [joueur] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Indique votre solde actuel -balanceCommandUsage2=/ -balanceCommandUsage2Description=Affiche le solde du joueur spécifié -balanceOther=§aSolde de {0}§a \:§c {1} -balanceTop=§6Les plus grandes fortunes ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Obtenir la liste des plus fortunés. -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] -balancetopCommandUsage1Description=Affiche la première page (ou une page spécifique) des valeurs des plus grosses fortunes banCommandDescription=Bannit un joueur. banCommandUsage=/ [raison] banCommandUsage1=/ [raison] @@ -160,16 +144,9 @@ commandNotLoaded=§cLa commande {0} a été mal chargée. compassBearing=§7Orientation\: {0} ({1} degrés). compassCommandDescription=Indique votre orientation actuelle. compassCommandUsage=/ -condenseCommandDescription=Compacte les objets en blocs. -condenseCommandUsage=/ [objet] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Condense tous les objets dans votre inventaire -condenseCommandUsage2=/ -condenseCommandUsage2Description=Condense l''objet spécifié dans votre inventaire configFileMoveError=Échec du déplacement de config.yml vers l''emplacement de sauvegarde. configFileRenameError=Impossible de renommer le fichier temporaire en config.yml. confirmClear=§7Pour §lCONFIRMER§7 l''effacement de l''inventaire, répétez la commande \: §6{0} -confirmPayment=§7Pour §lCONFIRMER§7 le paiement de §6{0}§7, répétez la commande \: §6{1} connectedPlayers=§6Joueurs connectés§r connectionFailed=Échec de la connexion. consoleName=Console @@ -188,7 +165,6 @@ createKitUnsupported=§4La sérialisation d''item NBT a été activée, mais ce creatingConfigFromTemplate=Création de la configuration à partir du modèle \: {0} creatingEmptyConfig=Création d''une configuration vierge \: {0} creative=créatif -currency={0}{1} currentWorld=§6Monde actuel \:§c {0} customtextCommandDescription=Vous permet de créer des commandes avec un texte personnalisé. customtextCommandUsage=/ - Défini dans le fichier bukkit.yml @@ -312,16 +288,6 @@ dumpUrl=§7Création d''un dump de serveur \: §c{0} duplicatedUserdata=Données utilisateurs dupliquées \: {0} et {1} durability=§6Cet outil a §c{0}§6 utilisation(s) restante(s). east=E -ecoCommandDescription=Gère l''économie du serveur. -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=Donne au joueur spécifié la somme d''argent spécifié -ecoCommandUsage2=/ take -ecoCommandUsage2Description=Retire la somme d''argent spécifié du joueur spécifié -ecoCommandUsage3=/ set -ecoCommandUsage3Description=Définit le solde du joueur spécifié au montant spécifié -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=Réinitialise le solde du joueur spécifié au solde de départ du serveur editBookContents=§eVous pouvez maintenant éditer le contenu de ce livre. enabled=activé enchantCommandDescription=Enchante l''objet que l''utilisateur tient en main. @@ -539,9 +505,7 @@ infoCommandDescription=Affiche les informations définies par le propriétaire d infoCommandUsage=/ [chapitre] [page] infoPages=§e ---- §6{2} §e--§6 Page §4{0}§6/§4{1} §e---- infoUnknownChapter=§4Chapitre inconnu. -insufficientFunds=§4Fonds insuffisants. invalidBanner=§4Syntaxe de bannière invalide. -invalidCharge=§4Charge invalide. invalidFireworkFormat=§4L''option §c{0} §4n''est pas une valeur valide pour §c{1}§4. invalidHome=La résidence {0} n''existe pas invalidHomeName=§4Nom de résidence invalide \! @@ -658,7 +622,6 @@ kitCommandUsage1Description=Liste tous les kits disponibles kitCommandUsage2=/ [joueur] kitCommandUsage2Description=Vous donne le kit spécifié ou le donne à un autre joueur si spécifié kitContains=§6Le kit §c{0} §6contient \: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§cIl n''y a pas de kits valides. kitError2=§4Ce kit est mal défini. Contactez un administrateur. @@ -738,7 +701,6 @@ mailTooLong=§4Votre courrier est trop long. Il doit contenir au maximum 1000 ca markMailAsRead=§6Pour marquer votre courrier comme lu, tapez§c /mail clear§6. matchingIPAddress=§6Les joueurs suivants se sont déjà connectés avec cette adresse IP \: maxHomes=Vous ne pouvez pas créer plus de {0} résidences. -maxMoney=§4Cette transaction dépasserait la limite du solde de ce compte. mayNotJail=§cVous ne pouvez pas emprisonner cette personne. mayNotJailOffline=§4Vous ne pouvez pas emprisonner les joueurs déconnectés. meCommandDescription=Décrit une action dans le contexte du joueur. @@ -747,7 +709,6 @@ meCommandUsage1=/ meCommandUsage1Description=Décrit une action meSender=moi meRecipient=moi -minimumBalanceError=§4Le solde minimum qu''un joueur peut avoir est {0}. minimumPayAmount=§cVous ne pouvez payer qu''un montant supérieur à {0}. minute=minute minutes=minutes @@ -757,8 +718,6 @@ mobsAvailable=§6Créatures \:§r {0} mobSpawnError=§4Erreur lors du changement du générateur de créatures. mobSpawnLimit=Quantité de créatures limitée au maximum du serveur. mobSpawnTarget=Le bloc cible doit être un générateur de créatures. -moneyRecievedFrom=§a{1} §6vous a envoyé§a {0}§6. -moneySentTo=§a{0} ont été envoyés à {1}. month=mois months=mois moreCommandDescription=Complète la pile de l''objet que vous tenez avec la quantité spécifiée, ou à la quantité maximale si non-spécifiée. @@ -783,7 +742,6 @@ msgtoggleCommandDescription=Bloque la réception de messages privés. msgtoggleCommandUsage=/ [joueur] [on|off] msgtoggleCommandUsage1=/ [joueur] msgtoggleCommandUsage1Description=Active/désactive le vol pour vous-même ou un autre joueur si spécifié -multipleCharges=§4Vous ne pouvez pas appliquer plus d''une charge à ce feu d''artifice. multiplePotionEffects=§4Vous ne pouvez pas appliquer plus d''un effet à cette potion. muteCommandDescription=Rend muet ou rend la voix à un joueur. muteCommandUsage=/ [durée] [raison] @@ -814,7 +772,6 @@ nearCommandUsage4=/ nearCommandUsage4Description=Liste tous les joueurs dans le rayon donné autour du joueur spécifié nearbyPlayers=§6Joueurs aux alentours \:§r {0} nearbyPlayersList={0}§f(§c{1}m§f) -negativeBalanceError=§4L''utilisateur n''est pas autorisé à avoir un solde négatif. nickChanged=§6Surnom changé. nickCommandDescription=Changer votre pseudo ou celui d''un autre joueur. nickCommandUsage=/ [joueur] @@ -866,12 +823,10 @@ noPermToSpawnMob=§4Vous n''avez pas la permission d''invoquer cette créature. noPlacePermission=§cVous n''avez pas la permission de placer un bloc près de cette pancarte. noPotionEffectPerm=§4Vous n''avez pas la permission d''appliquer l''effet §c{0} §4à cette potion. noPowerTools=§6Vous n''avez pas d''outil macro associé. -notAcceptingPay=§4{0} §4n''accepte pas le paiement. notAllowedToLocal=§4Vous ne pouvez pas parler dans le chat local car vous n''avez pas la permission. notAllowedToQuestion=§4Vous n''êtes pas autorisé à utiliser la question. notAllowedToShout=§4Vous n''êtes pas autorisé à crier. notEnoughExperience=§4Vous n''avez pas assez d''expérience. -notEnoughMoney=§4Vous n''avez pas les fonds nécessaires. notFlying=ne vole pas nothingInHand=§4Vous n''avez rien en main. now=maintenant @@ -887,28 +842,9 @@ onlyPlayers=§4Seul les joueurs en jeu peuvent utiliser §c{0}§4. onlyPlayerSkulls=§4Vous ne pouvez définir que le propriétaire des têtes de joueurs (§c397\:3§4). onlySunStorm=§4/weather n''accepte que les valeurs sun/storm (soleil/tempête). openingDisposal=§6Ouverture du menu de destruction... -orderBalances=§6Classement des soldes de§c {0} joueurs, veuillez patienter... oversizedMute=§4Vous ne pouvez pas réduire au silence un joueur pendant autant de temps. oversizedTempban=§4Vous ne pouvez pas bannir un joueur pendant autant de temps. passengerTeleportFail=§4Vous ne pouvez pas être téléporté lorsque vous transportez des passagers. -payCommandDescription=Payez un autre joueur avec votre argent. -payCommandUsage=/ -payCommandUsage1=/ -payCommandUsage1Description=Donne au joueur spécifié le montant d''argent spécifié -payConfirmToggleOff=§6Il ne vous sera plus demandé de confirmer les paiements. -payConfirmToggleOn=§6Il vous sera désormais demandé de confirmer les paiements. -payDisabledFor=§6L''acceptation des paiements a été désactivée pour §c{0}§6. -payEnabledFor=§6L''acceptation des paiements a été activée pour §c{0}§6. -payMustBePositive=§4La valeur doit être positive. -payOffline=§4Vous ne pouvez pas payer les joueurs hors ligne. -payToggleOff=§6Vous n''acceptez plus les paiements. -payToggleOn=§6Vous acceptez les paiements. -payconfirmtoggleCommandDescription=Active/désactive la confirmation pour les paiements. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Active/désactive l''acceptation des paiements. -paytoggleCommandUsage=/ [joueur] -paytoggleCommandUsage1=/ [joueur] -paytoggleCommandUsage1Description=Active/désactive si vous, ou un autre joueur si spécifié, acceptez les paiements pendingTeleportCancelled=§4Demande de téléportation annulée. pingCommandDescription=Pong \! pingCommandUsage=/ @@ -1074,8 +1010,6 @@ requestSent=§6Demande envoyée à§c {0}§6. requestSentAlready=§4Vous avez déjà envoyé une demande de téléportation à {0}§4. requestTimedOut=§4La demande de téléportation a expiré. requestTimedOutFrom=§4La demande de téléportation de §c{0} §4a expiré. -resetBal=§6Le solde a été réinitialisé à §c{0} §6pour tous les joueurs en ligne. -resetBalAll=§6Le solde a été réinitialisé à §c{0} §6pour tous les joueurs. rest=§6Vous vous sentez bien reposé(e). restCommandDescription=Vous soigne ou soigne le joueur spécifié. restCommandUsage=/ [joueur] @@ -1097,18 +1031,6 @@ seenCommandUsage1=/ seenCommandUsage1Description=Affiche les informations sur l''heure de déconnexion, les bannissements, les mute et l''UUID du joueur spécifié seenOffline=§6Le joueur§c {0} §6est §4hors-ligne§6 depuis §c{1}§6. seenOnline=§6Le joueur§c {0} §6est §4en ligne§6 depuis §c{1}§6. -sellBulkPermission=§6Vous n''avez pas la permission de vendre tout le contenu de votre inventaire. -sellCommandDescription=Vendre l''objet dans votre main. -sellCommandUsage=/ <||hand|inventory|blocks> [quantité] -sellCommandUsage1=/ [quantité] -sellCommandUsage1Description=Vend l''entièreté (ou le montant spécifié) de l''objet indiqué dans votre inventaire -sellCommandUsage2=/ hand [quantité] -sellCommandUsage2Description=Vend l''entièreté (ou le montant spécifié) de l''objet tenu en main -sellCommandUsage3=/ all -sellCommandUsage3Description=Vend tous les objets possibles dans votre inventaire -sellCommandUsage4=/ blocks [quantité] -sellCommandUsage4Description=Vend la totalité (ou la quantité spécifiée) de blocs dans votre inventaire -sellHandPermission=§6Vous n''avez pas la permission de vendre le contenu de votre main. serverFull=Le serveur est complet \! serverReloading=Il y a de bonnes chances que vous soyez entrain de recharger votre serveur en ce moment. Si c''est le cas, pourquoi vous détestez vous-même ? N''attendez aucun support de l''équipe EssentialsX en utilisant /reload. serverTotal=§6Total du serveur \: §c{0} @@ -1119,8 +1041,6 @@ serverUnsupportedDangerous=Vous utilisez un fork de serveur qui est connu pour serverUnsupportedLimitedApi=Vous exécutez un serveur avec des fonctionnalités API limitées. EssentialsX continuera de fonctionner, mais certaines fonctionnalités seront désactivées. serverUnsupportedDumbPlugins=Vous utilisez des plugins connus pour causer de graves problèmes avec EssentialsX et d''autres plugins. serverUnsupportedMods=Vous exécutez un serveur qui ne prend pas correctement en charge les plugins Bukkit. Les plugins Bukkit ne devraient pas être utilisés avec les mods Forge/Fabric \! Envisagez d''utiliser ForgeEssentials ou SpongeForge + Nucleus. -setBal=§aVotre solde a été modifié à {0}. -setBalOthers=§aVous avez modifià le solde de {0} à {1}. setSpawner=§6Le type de générateur a été changé en§c {0}§6. sethomeCommandDescription=Définit votre résidence à votre emplacement actuel. sethomeCommandUsage=/ [[joueur\:]nom] @@ -1146,12 +1066,6 @@ setwarpCommandDescription=Crée un nouveau point de téléportation. setwarpCommandUsage=/ setwarpCommandUsage1=/ setwarpCommandUsage1Description=Définit le warp avec le nom spécifié sur votre position actuelle -setworthCommandDescription=Définit la valeur de vente d''un objet. -setworthCommandUsage=/ [nom de l''item|id] -setworthCommandUsage1=/ -setworthCommandUsage1Description=Définit la valeur de l''objet tenu en main au prix spécifié -setworthCommandUsage2=/ -setworthCommandUsage2Description=Définit la valeur de l''objet spécifié au prix donné sheepMalformedColor=§4Couleur incorrecte. shoutDisabled=§6Mode cri §cdésactivé§6. shoutDisabledFor=§6Mode cri §cdésactivé §6pour §c{0}§6. @@ -1241,8 +1155,6 @@ suicideCommandUsage=/ suicideMessage=§6Adieu monde cruel... suicideSuccess=§7{0} s''est suicidé. survival=survie -takenFromAccount=Retrait de §e{0}§a de votre compte. -takenFromOthersAccount=Retrait de §e{0}§a du compte de §e {1}§a. Nouveau solde \: §e {2} teleportAAll=§6Demande de téléportation envoyée à tous les joueurs... teleportAll=§6Téléportation de tous les joueurs... teleportationCommencing=§7Début de la téléportation... @@ -1396,8 +1308,6 @@ tptoggleCommandDescription=Bloque toutes les formes de téléportation. tptoggleCommandUsage=/ [joueur] [on|off] tptoggleCommandUsage1=/ [joueur] tptoggleCommandUsageDescription=Active/désactive les téléportations pour vous ou pour un autre joueur si spécifié -tradeSignEmpty=Le panneau de vente n''a pas encore assez de stock. -tradeSignEmptyOwner=Il n''y a rien à collecter de cette pancarte d''échange commercial. treeCommandDescription=Fait apparaître un arbre où vous regardez. treeCommandUsage=/ treeCommandUsage1=/ @@ -1478,12 +1388,10 @@ versionDevLatest=§6Vous utilisez la dernière version de développement d''Esse versionError=§4Erreur lors de la récupération des informations sur la version d''EssentialsX \! Informations sur la build \: §c{0}§6. versionErrorPlayer=§6Erreur lors de la vérification des informations sur la version d''EssentialsX \! versionFetching=§6Récupération des informations de version... -versionOutputVaultMissing=§4Vault n''est pas installé. Le tchat et les permissions risquent de ne pas fonctionner. versionOutputFine=§6Version {0} \: §a{1} versionOutputWarn=§6Version {0} \: §c{1} versionOutputUnsupported=§6Version §d{0} \: §d{1} versionOutputUnsupportedPlugins=§6Vous utilisez des §dplugins non pris en charge§6 \! -versionOutputEconLayer=§6Économie \: §r{0} versionMismatch=Versions différentes \! Veuillez mettre {0} à la même version. versionMismatchAll=§4Versions différentes \! Veuillez mettre à jour tous les jars Essentials à la même version. versionReleaseLatest=§6Vous utilisez la dernière version stable d''EssentialsX \! @@ -1545,7 +1453,6 @@ whoisHunger=§6 - Faim \:§r {0} / 20 (+{1} saturation) whoisIPAddress=§6 - Adresse IP \:§r {0} whoisJail=§6 - Prison \:§r {0} whoisLocation=§6 - Position \:§f ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Argent \:§r {0} whoisMuted=§6 - Muet(s) \:§r {0} whoisMutedReason=§6 - Muet \:§r {0} §6Raison \: §c{1} whoisNick=§6 - Surnom \:§r {0} @@ -1562,19 +1469,6 @@ worldCommandUsage1=/ worldCommandUsage1Description=Vous téléporte dans le Nether ou dans l''End à l''emplacement correspondant à votre emplacement actuel worldCommandUsage2=/ worldCommandUsage2Description=Vous téléporte à votre position actuelle dans le monde donné -worth=§7Un stack de {0} vaut §c{1}§7 ({2} objet(s) à {3} chacun) -worthCommandDescription=Calcule la valeur des objets en main ou tel que spécifié. -worthCommandUsage=/ <||hand|inventory|blocks> [-][quantité] -worthCommandUsage1=/ [quantité] -worthCommandUsage1Description=Vérifie la valeur de tous (ou du montant donné, si spécifié) les objets donnés dans votre inventaire -worthCommandUsage2=/ hand [quantité] -worthCommandUsage2Description=Vérifie la valeur de tous (ou du montant donné, si spécifié) les objets tenus en main -worthCommandUsage3=/ all -worthCommandUsage3Description=Vérifie la valeur de tous les objets possibles dans votre inventaire -worthCommandUsage4=/ blocks [quantité] -worthCommandUsage4Description=Vérifie la valeur de tous (ou le montant donné, si spécifié) les blocs dans votre inventaire -worthMeta=§aUn stack de {0} de type {1} vaut §c{2}§a ({3} objet(s) à {4} chacun) -worthSet=§6Valeur définie year=année years=années youAreHealed=§6Vous avez été soigné(e). diff --git a/Essentials/src/main/resources/messages_he.properties b/Essentials/src/main/resources/messages_he.properties index 9db908e72..bcaf123a7 100644 --- a/Essentials/src/main/resources/messages_he.properties +++ b/Essentials/src/main/resources/messages_he.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5{0} §5{1} -addedToAccount=§a{0} נוסף לחשבון שלך. -addedToOthersAccount=§a{0} נוסף לחשבונו של {1}§a. מאזן חדש\: {2} adventure=הרפתקה afkCommandDescription=שם אותך כ-רחוק מהמקלדת. afkCommandUsage=[שחקן/הודעה...] @@ -47,20 +45,6 @@ backupFinished=§6 גיבוי הושלם. backupStarted=§6B הגיבוי התחיל. backupInProgress=§6סקריפט גיבוי חיצוני מתבצע כעת\! מה שגורם להשבתה של הפלאגין עד סיום. backUsageMsg=§6 חוזר למיקום הקודם. -balance=§a מאזנך\:§c {0} -balanceCommandDescription=מציג את היתרה של שחקן. -balanceCommandUsage=שחקן -balanceCommandUsage1=/ -balanceCommandUsage1Description=מציג את היתרה שלכם -balanceCommandUsage2=\\ -balanceCommandUsage2Description=מציג את היתרה של שחקן נבחר -balanceOther=§aיתרה של {0}§a\:§c {1} -balanceTop=§6 בעלי המאזן הגבוה ביותר\: ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=מציג את רשימת הכי עשירים. -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] -balancetopCommandUsage1Description=מציג את העמוד הראשון (או שצוין) של רשימת העשירים banCommandDescription=מרחיק שחקן. banCommandUsage=/ [reason] banCommandUsage1=/ [reason] @@ -161,16 +145,9 @@ consoleCannotUseCommand=הפקודה הזאת אינה מאופשרת לשימו compassBearing=§6נושא\: {0} ({1} מעלות). compassCommandDescription=מציג את הכיוון הנוכחי שלך. compassCommandUsage=/ -condenseCommandDescription=דוחס פריטים לבלוקים קומפקטיים יותר. -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ -condenseCommandUsage1Description=דוחס את כל הדברים באינבנטורי שלך -condenseCommandUsage2=\\ -condenseCommandUsage2Description=דוחס פריט מסויים בתוך האינבנטורי שלך configFileMoveError=נכשלה העברת config.yml למיקומי הגיבויים. configFileRenameError=נכשל שינוי השם של קבצי temp ל config.yml. confirmClear=§7בשביל §lלאשר§7 את ניקוי האינבנטורי שלך, בבקשה חיזרו על הפקודה §6{0} -confirmPayment=§7בשביל §lלאשר§7 העברת תשלום של §6{0}§7 בבקשה חיזרו על הפקודה §6{1} connectedPlayers=§6 התחברו שחקנים §r connectionFailed=נכשל פתיחת חיבור. consoleName=מסוף @@ -188,7 +165,6 @@ createKitSuccess=§6 ערכה שנוצרה\: §f{0}\n§דיליי\: §f{1}\n§6 creatingConfigFromTemplate=יוצר קונפינג מ template\: {0} creatingEmptyConfig=יוצר קונפינג ריק\: {0} creative=יצירתי -currency={0}{1} currentWorld=\n§6עולם נוכחי\:§c {0}\n customtextCommandDescription=מאפשר לכם ליצור פקודות טקסט מותאמות אישית. customtextCommandUsage=\\ - הגדר ב-bukkit.yml @@ -302,16 +278,6 @@ dumpUrl=§6נוצר dump שרת\: §c{0} duplicatedUserdata=נתוני שחקנים כפולים\: {0} ו{1}. durability=\n§6לחפץ זה יש §c{0}§6 שימושים שנותרו.\n east=מזרח -ecoCommandDescription=מנהל את מערכת הכלכלה בשרת. -ecoCommandUsage=\\ -ecoCommandUsage1=\\ give -ecoCommandUsage1Description=נותן לשחקן שצוין את סכום הכסף שצוין -ecoCommandUsage2=\\ take -ecoCommandUsage2Description=לוקח את סכום הכסף שצוין מהשחקן שצוין -ecoCommandUsage3=\\ set -ecoCommandUsage3Description=מגדיר את יתרת הבנק השחקן שצוין לסכום הכסף שצוין -ecoCommandUsage4=\\ reset -ecoCommandUsage4Description=מאפס את יתרת הבנק של השחקן שצוין ליתרת ההתחלה של השרת editBookContents=\n§eכעת אתה יכול לערוך את התוכן של ספר זה.\n enabled=הופעל enchantCommandDescription=מכשף פריט שהמשתמש מחזיק. @@ -483,8 +449,6 @@ infoAfterDeath=§6אתה נהרגת ב §e{0} §6במיקום §e{1}, {2}, {3}§ infoChapter=§6בחר פרק\: infoCommandUsage=\\ [chapter] [page] infoUnknownChapter=\n§4נתון לא ידוע.\n -insufficientFunds=\n§4אין מספיק כסף זמין.\n -invalidCharge=\n§4תשלום שגוי.\n invalidHome=\n§4בית§c {0} §4לא קיים\!\n invalidHomeName=השם של הבית לא תקין \! invalidMob=השם של המוב לא תקין \! @@ -554,7 +518,6 @@ kitCommandUsage1Description=מונה את כל הקיטים הזמינים kitCommandUsage2=/ [player] kitCommandUsage2Description=נותן את הקיט שניתן לך או לשחקן אחר אם פורט kitContains=§6קיט §c{0} §6מכיל\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=\n§4אין ערכות שנמצאו.\n kitError2=\n§4הערכה מוגדרת לא כראוי. צור קשר עם מנהל.\n @@ -660,7 +623,6 @@ noPlacePermission=\n§4אין לך הרשאות לבנות ליד שלט זה.\n noPotionEffectPerm=\n§4אין לך הרשאות להפעיל אפקט זה §c{0} §4לשיקוי זה.\n noPowerTools=\n§6אין לך כוחות רשומים.\n notEnoughExperience=\n§4אין לך מספיק רמות.\n -notEnoughMoney=\n§4אין לך מספיק כסף.\n notFlying=לא עף nothingInHand=\n§4אין לך כלום ביד.\n now=עכשיו @@ -673,13 +635,7 @@ onlyDayNight=/time תומך רק יום/לילה. onlyPlayers=\n§4רק שחקנים במשחק יכולים להשתמש ב §c{0}§4.\n onlyPlayerSkulls=\n§4אתה יכול רק להגדיר את הבעלים של הראש (§c397\:3§4).\n onlySunStorm=\n§4/מזג אוויר תומך רק שמש/סופה.\n -orderBalances=\n§6מסדר נתוני כסף של§c {0} §6שחקנים, אנא המתן...\n oversizedTempban=\n§4אינך יכול לאסור שחקן זה לזמן זה.\n -payCommandUsage=\\ -payCommandUsage1=\\ -payconfirmtoggleCommandUsage=/ -paytoggleCommandUsage=שחקן -paytoggleCommandUsage1=שחקן pendingTeleportCancelled=\n§4בקשה ממתינה בוטלה.\n pingCommandDescription=פונג\! pingCommandUsage=/ @@ -761,14 +717,8 @@ seenCommandUsage=\\ seenCommandUsage1=\\ seenOffline=\n§6השחקן§c {0} §6§4התנתק§6 מאז §c{1}§6.\n seenOnline=\n§6השחקן§c {0} §6§4התחבר§6 מאז §c{1}§6.\n -sellCommandUsage=\\ <||hand|inventory|blocks> [amount] -sellCommandUsage1=\\ [amount] -sellCommandUsage2=\\ hand [amount] -sellCommandUsage4=\\ blocks [amount] serverFull=השרת מלא\! serverTotal=\n§6שרת סך הכול\:§c {0}\n -setBal=\n§aהכסף שלך שונה ל {0}.\n -setBalOthers=\n§aשינית לשחקן {0}§a''s את כמות הכסף ל {1}.\n setSpawner=\n§6סוג המשגר שונה ל §c {0}§6.\n sethomeCommandUsage=\\ [[player\:]name] sethomeCommandUsage1=\\ @@ -779,9 +729,6 @@ settprCommandUsage=\\ [center|minrange|maxrange] [value] settprCommandUsage1=\\ center setwarpCommandUsage=/ setwarpCommandUsage1=/ -setworthCommandUsage=\\ [itemname|id] -setworthCommandUsage1=\\ -setworthCommandUsage2=\\ sheepMalformedColor=\n§4צבע פגום.\n shoutFormat=§6[הכרזה]§r {0} showkitCommandUsage=\\ @@ -917,9 +864,5 @@ workbenchCommandUsage=/ worldCommandUsage=\\ [world] worldCommandUsage1=/ worldCommandUsage2=\\ -worthCommandUsage=\\ <||hand|inventory|blocks> [-][amount] -worthCommandUsage1=\\ [amount] -worthCommandUsage2=\\ hand [amount] -worthCommandUsage4=\\ blocks [amount] year=שנה years=שנים diff --git a/Essentials/src/main/resources/messages_hi_IN.properties b/Essentials/src/main/resources/messages_hi_IN.properties index 47bb348c9..d9c46972d 100644 --- a/Essentials/src/main/resources/messages_hi_IN.properties +++ b/Essentials/src/main/resources/messages_hi_IN.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} आपके खाते में जोड़ दिया गया है। -addedToOthersAccount=§a{0} को {1}§a के खाते में जोड़ दिया गया है. नया बैलैंस\: {2} adventure=एडवेंचर afkCommandDescription=आपको Afk के रूप में चिह्नित करता है। afkCommandUsage=/ [खिलाड़ी/संदेश...] diff --git a/Essentials/src/main/resources/messages_hr.properties b/Essentials/src/main/resources/messages_hr.properties index 83f549110..1bc16b04b 100644 --- a/Essentials/src/main/resources/messages_hr.properties +++ b/Essentials/src/main/resources/messages_hr.properties @@ -2,8 +2,6 @@ #version: ${full.version} # Single quotes have to be doubled: '' # by: -addedToAccount=§a{0} je dodano na vaš račun. -addedToOthersAccount=§3{0} &7je dodano na račun &3{1}.&7 Novo stanje\: &3{2} adventure=avantura alertBroke=uništeno\: alertFormat=§3 [{0}] §3 {1} §3 {2} &7na\: &3{3} @@ -28,13 +26,6 @@ backupDisabled=§7Jedna vanjska sigurnosna kopija nije konfigurirana. backupFinished=§7Backup je zavrsen. backupStarted=§7Backup je zapoceo. backUsageMsg=§7Vracanje na prethodnu lokaciju. -balance=§aStanje na racunu\:§c {0} -balanceCommandUsage1=/ -balanceOther=§aStanje na racunu od {0}§a\:§c {1} -balanceTop=§6Top stanje na racunu ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] banCommandDescription=Zabranjuje pristup igraču. banCommandUsage=/ [reason] banCommandUsage1=/ [reason] @@ -82,7 +73,6 @@ commandFailed=Naredba {0} nije uspjela\: commandHelpFailedForPlugin=Pogreska pri dobivanju pomoći za plugin\: {0} commandNotLoaded=Komanda {0} je uspjesno ucitana. compassCommandUsage=/ -condenseCommandUsage1=/ configFileMoveError=Premjestiti config.yml na mjesto sigurnosne kopije nije uspjelo. configFileRenameError=Nije prava mjesavina varalica preminenovati u confiog.ym. connectedPlayers=Povezani igraci @@ -195,8 +185,6 @@ infoChapter=§6Odaberi poglavlje\: infoChapterPages=§e ---- §6{0} §e--§6 Stranica §c{1}§6 od §c{2} §e---- infoPages=§e ---- §6{2} §e--§6 Stranica §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Nepoznato poglavlje. -insufficientFunds=§4Nedovoljno sredstava. -invalidCharge=§4Pogresna primjena. invalidFireworkFormat=&7Izbor &3{0} &7nije valjan sa &3{1}&7. invalidHome=§4Home§c {0} §4ne postoji\! invalidHomeName=§4Krivo ime home-a\! @@ -271,11 +259,9 @@ mobsAvailable=&7Mobs\:&3 {0} mobSpawnError=&7Greska u promjenjivanju spawnera. mobSpawnLimit=&7Mob kolicina je ogranicena na ovom serveru. mobSpawnTarget=&7Moras gledati u spawner da ga pretvoris u drugi spawner. -moneySentTo=§a{0} je poslano do {1}. month=&7mjesec months=&7mjeseci moreThanZero=&7Quantities mora biti veci od 0. -multipleCharges=&7Nije moguce primjeniti vise naplacuje taj vatromet. multiplePotionEffects=&7Nije moguce primjeniti vise efekta ovaj napitak. mutedPlayer=&7Igrac &3{0} &7unmutan. mutedPlayerFor=&7Igrac&3 {0} &7je mutovan za &3{1}&7. @@ -284,7 +270,6 @@ muteExemptOffline=&7Nemozes mutati izvanmrezne igrace. muteNotify=&3{0} &7je mutovao igraca &3{1}&7. nearCommandUsage1=/ nearbyPlayers=&7Igraci u blizini\: &3{0} -negativeBalanceError=&7Igrac nesmije imati negativne novce. nickChanged=&7Ime je promjenjeno. nickDisplayName=&7Moras promjeniti displayname u Essentials config. nickInUse=&7Ovo ime vec postoji. @@ -315,7 +300,6 @@ noPlacePermission=&7Nemas dozvolu da postavis block blizu znaka. noPotionEffectPerm=§4Nemas dozvolu da pridodas efekt§c{0} §4ovom potionu. noPowerTools=&7Nemas dovoljnu moc da ovo napravis. notEnoughExperience=§4Nemaš dovoljno iskustva. -notEnoughMoney=§4Nemas dovoljno novca. notFlying=&7ne letis nothingInHand=§4Nemaš ništa u ruci. now=&7Sada @@ -326,9 +310,7 @@ onlyDayNight=/Time samo podržava dan/noć. onlyPlayers=§4Samo igrači u igri mogu koristiti §c{0}§4. onlyPlayerSkulls=Možeš postaviti samo igračevu lubanju (§c397\:3§4). onlySunStorm=§4/weather podržava samo sun/storm. -orderBalances=&7Ucitavamo stanja novaca &3{0} &figraca, molimo pricekajte... oversizedTempban=&7Nemozes banovati igraca na to vrijeme. -payconfirmtoggleCommandUsage=/ pendingTeleportCancelled=&7Ponistio si teleport zahtijev. pingCommandDescription=&3Strong-Pvperzzz &7<333\! pingCommandUsage=/ @@ -379,16 +361,12 @@ requestDenied=§6Teleport zahtjev se odbija. requestDeniedFrom=&3{0} &7je odbio vas teleportaciski zahtjev. requestSent=&7Zahtjev je poslan do &3{0}&7. requestTimedOut=&7Teleport zahtjev je istekao. -resetBal=&7Novac je reseritan na &3{0} &7svim online igracima. -resetBalAll=&7Novac je resetiran na &3{0} &7svim igracima. second=sekunda seconds=sekunde seenOffline=&7Igrac &3 {0} &7je &4izvanmreze&7 vec &3{1}&7. seenOnline=&7Igrac &3 {0} &7je &aonline &7vec &3{1}&7. serverFull=&7Server je pun\! serverTotal=&7Server ukupno\: &3{0} -setBal=&7Tvoj novac je postavljen na &3{0}. -setBalOthers=&7Stavio si &3{0} &7novce za &3{1}&7. setSpawner=§6Promijenjen spawner tip to§c {0}§6. similarWarpExist=§4Warp sa sličnim imenom već postoji. skullChanged=&7Glava se promjenila u &3{0}&7. @@ -480,15 +458,12 @@ whoisHunger=&7 - glad\: &3 {0}/20 (+{1} Zasicenje) whoisIPAddress=&7 - IP Adresa\: &3 {0} whoisJail=&7 - Zatvoren\: &3 {0} whoisLocation=&7 - Mjesto\: &3 ({0}, {1}, {2}, {3}) -whoisMoney=&7 - Novac\: &3 {0} whoisMuted=&7 - Mutovan\:&3 {0} whoisNick=&7 - Nick\: &3 {0} whoisOp=&7 - OP\:&3 {0} whoisTop=&7 \=\=\= &3Tko je\: {0} &7 \=\=\= workbenchCommandUsage=/ worldCommandUsage1=/ -worth=§aStack {0} vrijednosti §c{1}§a ({2} stavke u {3} svaki) -worthSet=§6Vrijednost je stavljena year=&7godina years=&7godine youAreHealed=§6Izlječen si. diff --git a/Essentials/src/main/resources/messages_hu.properties b/Essentials/src/main/resources/messages_hu.properties index 75cbeeb28..9fcb1a8e3 100644 --- a/Essentials/src/main/resources/messages_hu.properties +++ b/Essentials/src/main/resources/messages_hu.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} hozzáadva az egyenlegedhez. -addedToOthersAccount=§a{0} hozzáadva {1}§a egyenlegéhez. Új egyenlege\: {2} adventure=kaland afkCommandDescription=Beállítja, hogy távol vagy a géptől. afkCommandUsage=/ [játékos/üzenet...] @@ -47,20 +45,6 @@ backupFinished=§6A biztonsági mentés kész. backupStarted=§6A biztonsági mentés elkezdve. backupInProgress=§6Egy külső biztonsági mentési szkript jelenleg folyamatban van\! A leállító plugin letiltva, ameddig befejeződik. backUsageMsg=§6Visszatérés az előző helyre. -balance=§aEgyenleg\:§c {0} -balanceCommandDescription=A játékos aktuális egyenlegének állapota. -balanceCommandUsage=/ [játékos] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Leírja a jelenlegi egyenleged -balanceCommandUsage2=/ -balanceCommandUsage2Description=Megjeleníti a megadott játékos egyenlegét -balanceOther={0}§a egyenlege\:§c {1} -balanceTop=§6Legmagasabb egyenlegek ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Legmagasabb egyenlegek lekérdezése. -balancetopCommandUsage=/ [oldal] -balancetopCommandUsage1=/ [oldal] -balancetopCommandUsage1Description=Megjeleníti a legnagyobb egyenlegek első (vagy meghatározott) oldalát banCommandDescription=Kitilt egy játékost. banCommandUsage=/ [ok] banCommandUsage1=/ [ok] @@ -159,16 +143,9 @@ commandNotLoaded=§4A(z) {0} parancs nincs betöltve. compassBearing=§6Irány\: {0} ({1} fok). compassCommandDescription=Leírja az aktuális irányod. compassCommandUsage=/ -condenseCommandDescription=A tárgyakat kompaktabb blokkokká alakítja. -condenseCommandUsage=/ [tárgy] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Sűríti az eszköztáradban lévő összes tárgyat -condenseCommandUsage2=/ -condenseCommandUsage2Description=Sűríti az eszköztáradban lévő meghatározott tárgyat configFileMoveError=Nem sikerült áthelyezni a config.yml fájlt a mentési helyre. configFileRenameError=Nem sikerült átnevezni az ideiglenes fájlt a config.yml fájlra. confirmClear=§7Meg kell §lERŐSÍTENED§7 az eszköztárad törlését. A megerősítéshez írd be ismét ezt a parancsot\: §6{0} -confirmPayment=§7Meg kell §lERŐSÍTENED§7 a §6{0}§7 utalást. A megerősítéshez írd be ismét ezt a parancsot\: §6{1} connectedPlayers=§6Csatlakozott játékosok§r connectionFailed=Nem sikerült megnyitni a kapcsolatot. consoleName=Konzol @@ -187,7 +164,6 @@ createKitUnsupported=§4 Az NBT -elemek sorosítása engedélyezve van, de ez a creatingConfigFromTemplate=Konfig létrehozása sablonból\: {0} creatingEmptyConfig=Üres konfig létrehozása\: {0} creative=kreatív -currency={0}{1} currentWorld=§6Jelenlegi világ\:§c {0} customtextCommandDescription=Egyéni szöveges parancsok létrehozását teszi lehetővé. customtextCommandUsage=/ - Definiálja a bukkit.yml fájlban @@ -285,16 +261,6 @@ dumpUrl=§6Létrehozott szerver dump\: §c {0} duplicatedUserdata=Duplikált felhasználói adatok\: {0} és {1}. durability=§6Ez az eszköz még §c{0}§6 használatig bírja. east=K -ecoCommandDescription=A szervergazdaságot kezeli. -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=Megadja a meghatározott játékosnak a megadott összeget -ecoCommandUsage2=/ take -ecoCommandUsage2Description=Elveszi a meghatározott összeget a megadott játékostól -ecoCommandUsage3=/ set -ecoCommandUsage3Description=Beállítja a megadott játékos egyenlegét a megadott pénzösszegre -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=Visszaállítja a megadott játékos egyenlegét a szerver kezdő egyenlegére editBookContents=§6Most már szerkesztheted a könyv tartalmát. enabled=engedélyezve enchantCommandDescription=Elvarázsolja azt a tárgyat, amit a felhasználó tart. @@ -491,9 +457,7 @@ infoCommandDescription=Megmutatja a szerver tulajdonosa által beállított info infoCommandUsage=/ [fejezet] [oldal] infoPages=§e ---- §6{2} §e--§6 Oldal §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Ismeretlen fejezet. -insufficientFunds=§4Nem áll rendelkezésre elegendő összeg. invalidBanner=§4Érvénytelen zászló szintaxis. -invalidCharge=§4Érvénytelen díj. invalidFireworkFormat=§6Ez az opció\: §4{0} §6nem érvényes §4{1}§6-ra/-re. invalidHome=§4A(z)§c {0} §4otthon nem létezik\! invalidHomeName=§4Érvénytelen otthon név\! @@ -591,7 +555,6 @@ kitCommandUsage1=/ kitCommandUsage2=/ [játékos] kitCommandUsage2Description=Ad egy megadott kit-et neked vagy egy megadott játékosnak kitContains=§6A(z) §c{0} §6csomag tartalmaz\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Nincsenek elérhető csomagok. kitError2=§4Ez a csomag nem megfelelő. Lépj kapcsolatba egy adminisztrátorral. @@ -650,7 +613,6 @@ mailTooLong=§4A levél túl hosszú. Próbálj meg 1000 karakter alatt maradni. markMailAsRead=§6Hogy olvasottnak jelöld a leveled, írd be§c /mail clear§6. matchingIPAddress=§6Az alábbi játékosok csatlakoztak utoljára erről az IP címről\: maxHomes=§4Nem állíthatsz be több mint§c {0} §4otthont. -maxMoney=§4Ez a tranzakció meghaladja ennek a fióknak az egyenlegkorlátját. mayNotJail=§4Őt nem teheted börtönbe\! mayNotJailOffline=§4Nem börtönözhetsz be offline játékosokat. meCommandDescription=Leír egy tevékenységet a játékos összefüggésében. @@ -658,7 +620,6 @@ meCommandUsage=/ meCommandUsage1=/ meSender=én meRecipient=én -minimumBalanceError=A felhasználó minimális egyenlege {0} lehet. minimumPayAmount=§cA minimális összeg, amit fizethetsz, {0}. minute=perc minutes=perc @@ -668,8 +629,6 @@ mobsAvailable=§6Élőlények\:§r {0} mobSpawnError=§4Hiba az élőlényidéző megváltoztatása közben. mobSpawnLimit=A kiszolgálói limitre korlátozott élőlény mennyiség meghaladva. mobSpawnTarget=§4A célblokknak élőlényidőzőnek kell lennie. -moneyRecievedFrom=§a{0}§6-t kaptál§a {1}§6-tól/-től. -moneySentTo=§a{0}-t küldtél {1}§a-nak/nek. month=hónap months=hónap moreCommandDescription=Megtölti a kezedben lévő halmot egy megadott menyességre, vagy maximum nagyságra, ha nincs megadva mennyiség. @@ -692,7 +651,6 @@ msgIgnore=§c{0} §4az üzenetek letiltva. msgtoggleCommandDescription=Blokkolja az összes privát üzenet fogadását. msgtoggleCommandUsage=/ [játékos] [on|off] msgtoggleCommandUsage1=/ [játékos] -multipleCharges=§4Nem alkalmazhatsz több töltetet ennél a tűzijátéknál. multiplePotionEffects=§4Erre a bájitalra egynél több effekt nem alkalmazható. muteCommandDescription=A játékos lenémítása vagy a lenémításának megszüntetése. muteCommandUsage=/ [időtartam] [ok] @@ -713,7 +671,6 @@ nearCommandUsage=/ [játékosnév] [sugár] nearCommandUsage1=/ nearCommandUsage3=/ nearbyPlayers=§6Közeli játékosok\:§r {0} -negativeBalanceError=§4A felhasználó nem jogosult negatív egyenlegre. nickChanged=§6A becenév megváltoztatva. nickCommandDescription=Változtasd meg a becenevedet vagy egy másik játékos becenevét. nickCommandUsage=/ [játékos] @@ -758,9 +715,7 @@ noPermToSpawnMob=§4Nincs jogosultságod leidézni ezt az élőlényt. noPlacePermission=§4Nincs jogosultságod egy blokknak a tábla közelében elhelyezésére. noPotionEffectPerm=§4Nincs jogosultságod a főzet effekt alkalmazására §c{0} §4ennél a főzetnél. noPowerTools=§6Nincsenek power tools hozzárendeléseid. -notAcceptingPay=§4{0} §4nem fogad el fizetést. notEnoughExperience=§4Nincs elég tapasztalatod. -notEnoughMoney=§4Nincs elegendő pénzed. notFlying=nem repül nothingInHand=§4Nincs semmi a kezedben. now=most @@ -774,26 +729,9 @@ onlyPlayers=§4Csak játékon belül használható a(z) §c{0}§4 parancs. onlyPlayerSkulls=§4Csak játékos fejnek tudod beállítani a tulajdonosát (§c397\:3§4). onlySunStorm=§4A /weather csak a sun/storm-t támogatja. openingDisposal=§6Szemetes menü megnyitása... -orderBalances=§6Egyenlegek összegyüjtése§c {0} §6játékostól, kérlek, várj... oversizedMute=§4Nem némíthatsz le egy játékost erre az időtartamra. oversizedTempban=§4Nem tilthatsz ki egy játékost erre az időtartamra. passengerTeleportFail=§4Utasok szállítása közben nem lehet teleportálni. -payCommandDescription=Fizetsz egy másik játékosnak az egyenlegedből. -payCommandUsage=/ -payCommandUsage1=/ -payConfirmToggleOff=§6A továbbiakban nem kell megerősítened a fizetéseket. -payConfirmToggleOn=§6Mostantól meg kell erősítened a fizetéseket. -payDisabledFor=§6Fizetések elfogadása letiltva §c{0}§6-nak/nek. -payEnabledFor=§6Fizetések elfogadása engedélyezve §c{0}§6-nak/nek. -payMustBePositive=§4A fizetendő összegnek pozitívnak kell lennie. -payOffline=§4Nem fizethetsz offline felhasználóknak. -payToggleOff=§6Már nem fogadod el a fizetéseket. -payToggleOn=§6Most elfogadod a fizetéseket. -payconfirmtoggleCommandDescription=Változtasd meg, hogy kérjen-e megerősítést a fizetésekhez. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Változtasd meg, hogy el-e fogadod a fizetéseket. -paytoggleCommandUsage=/ [játékos] -paytoggleCommandUsage1=/ [játékos] pendingTeleportCancelled=§4Folyamatban lévő teleportálás megszakítva. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -907,8 +845,6 @@ requestDeniedFrom=§c{0} §6elutasította a kérésedet. requestSent=§6Kérés elküldve§c {0}§6-nak/nek. requestSentAlready={0}§4-nek/-nak már küldtél teleport kérést. requestTimedOut=§4A teleport kérés kifutott az időből. -resetBal=§6Egyenleg visszaállítva §a{0}-ra/-re §6minden online játékosnak. -resetBalAll=§6Egyenleg visszaállítva §a{0}§6-ra/-re az összes játékosnak. rest=§6Kipihentnek érzed magad. restCommandDescription=Egy másik játékos vagy magad pihentetése. restCommandUsage=/ [játékos] @@ -928,9 +864,6 @@ seenCommandUsage=/ seenCommandUsage1=/ seenOffline=§c{0} §4offline §6ennyi ideje\: §c{1}§6. seenOnline=§c{0} §aonline §6ennyi ideje\: §c{1}§6. -sellBulkPermission=§6Nincs engedélyed a tömeges értékesítésre. -sellCommandDescription=Eladja a kezedben lévő tárgyat. -sellHandPermission=§6Nincs engedélyed a kézből történő eladásra. serverFull=A szerver tele van\! serverReloading=Jó esély van rá, hogy most újratölti a szerverét. Ha ez a helyzet, miért utálod magad? Ne várjon támogatást az EssentialsX csapattól, ha használod a /reload parancsot. serverTotal=§6Szerver összesen\:§c {0} @@ -941,8 +874,6 @@ serverUnsupportedDangerous=Olyan szerver módosulatot futtatsz, amely köztudott serverUnsupportedLimitedApi=Korlátozott API-funkcionalitású szervert futtatsz. Az EssentialsX továbbra is működik, de bizonyos funkciók le vannak tiltva. serverUnsupportedDumbPlugins=Olyan pluginokat használ, amelyekről ismert, hogy súlyos problémákat okoznak az EssentialsX és más pluginok esetében. serverUnsupportedMods=Olyan szervert futtatsz, amely nem támogatja megfelelően a Bukkit beépülő modulokat. A Bukkit beépülő modulokat nem szabad Forge / Fabric modokkal használni\! Forge esetén\: Fontolja meg a ForgeEssentials vagy a SpongeForge + Nucleus használatát. -setBal=§aEgyenleged beállítva {0}-ra/-re. -setBalOthers=§aBeállítottad {0}§a egyenlegét {1}-ra/-re. setSpawner=§6Az élőlényidéző új típusa\:§c {0}. sethomeCommandDescription=Beállítja az otthonod erre a helyre. sethomeCommandUsage=/ [[játékos\:]név] @@ -958,8 +889,6 @@ settprValue=§6Véletlenszerű teleport beállítva §c{0}§6 §c{1}§6. setwarpCommandDescription=Létrehoz egy új warpot. setwarpCommandUsage=/ setwarpCommandUsage1=/ -setworthCommandDescription=Beállítja a tárgy eladási értékét. -setworthCommandUsage=/ [tárgynév|id] <ár> sheepMalformedColor=§4Hibás szín. shoutDisabled=§6Kiáltás mód §cletiltva§6. shoutDisabledFor=§6Kiáltás mód §cletiltva §c{0} §6számára. @@ -1026,8 +955,6 @@ suicideCommandUsage=/ suicideMessage=§6Viszlát kegyetlen világ... suicideSuccess=§6{0} §6feladta az életét. survival=túlélő -takenFromAccount=§e{0}§a levéve az egyenlegedről. -takenFromOthersAccount=§e{0}§a levéve§e {1}§a egyenlegéről. Új egyenleg\:§e {2} teleportAAll=§6A teleport kérés mindenkinek elküldve... teleportAll=§6Összes játékos teleportálása... teleportationCommencing=§6Teleportálás megkezdése... @@ -1136,8 +1063,6 @@ tps=§6Jelenlegi TPS \= {0} tptoggleCommandDescription=Blokkolja a teleportálás minden formáját. tptoggleCommandUsage=/ [játékos] [on|off] tptoggleCommandUsage1=/ [játékos] -tradeSignEmpty=§4A kereskedelmi tábla nem áll rendelkezésre számodra. -tradeSignEmptyOwner=§4Nincs mit gyűjteni ebből a kereskedelmi táblából. treeCommandDescription=Létrehoz egy fát oda, ahova nézel. treeCommandUsage=/ treeCommandUsage1=/ @@ -1203,7 +1128,6 @@ versionDevLatest=§6Futtatja a legújabb EssentialsX fejlesztői verziót\! versionError=§4Hiba az EssentialsX verzióinformációk beolvasása közben\! Építési információk\: §c{0} §6. versionErrorPlayer=§6Hiba az EssentialsX verzióinformációinak ellenőrzése közben\! versionFetching=Verzióinformációk lekérése... -versionOutputVaultMissing=§4A Vault nincs telepítve. A chat és a jogosultságok lehet nem működnek. versionOutputFine=§6{0} verzió\: §a{1} versionOutputWarn=§6{0} verzió\: §c{1} versionOutputUnsupported=§d{0} §6verzió\: §d{1} @@ -1262,7 +1186,6 @@ whoisHunger=§6 - Éhség\:§r {0}/20 (+{1} telítettség) whoisIPAddress=§6 - IP cím\:§r {0} whoisJail=§6 - Börtön\:§r {0} whoisLocation=§6 - Elhelyezkedés\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Pénz\:§r {0} whoisMuted=§6 - Lenémítva\:§r {0} whoisMutedReason=§6 - Lenémítva\:§r {0} §6Oka\: §c{1} whoisNick=§6 - Becenév\:§r {0} @@ -1276,11 +1199,6 @@ workbenchCommandUsage=/ worldCommandDescription=Váltás a világok között. worldCommandUsage=/ [világ] worldCommandUsage1=/ -worth=§aStackelés {0} érdemes §c{1}§a ({2} elem(ek) {3} minden) -worthCommandDescription=Kiszámítja a kézben lévő vagy a megadott tárgy értékét. -worthCommandUsage=/ <||hand|inventory|blocks> [-][mennyiség] -worthMeta=§aStackelés {0} az {1} értékű metaadatokkal §c{2}§a ({3} elem(ek) {4} minden) -worthSet=§6Ár beállítva. year=év years=év youAreHealed=§6Életed feltöltve. diff --git a/Essentials/src/main/resources/messages_it.properties b/Essentials/src/main/resources/messages_it.properties index f3750846d..5f909252f 100644 --- a/Essentials/src/main/resources/messages_it.properties +++ b/Essentials/src/main/resources/messages_it.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} sono stati aggiunti al tuo account. -addedToOthersAccount=§a{0} sono stati aggiunti all''account di {1}§a. Nuovo bilancio\: {2} adventure=avventura afkCommandDescription=Indica che sei lontano-dal-Pc. afkCommandUsage=/ [giocatore/messaggio...] @@ -47,20 +45,6 @@ backupFinished=Backup terminato. backupStarted=Backup iniziato backupInProgress=§6Uno script di backup esterno è attualmente in corso\! Il plugin di arresto disabilita fino al termine. backUsageMsg=§7Ritornato alla posizione precedente. -balance=§aSoldi\:§c {0} -balanceCommandDescription=Visualizza il saldo attuale di un giocatore. -balanceCommandUsage=/ [player] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Indica il tuo saldo attuale -balanceCommandUsage2=/ -balanceCommandUsage2Description=Visualizza il saldo del giocatore specificato -balanceOther=§aSoldi di {0}§a\:§c {1} -balanceTop=§6Migliori bilanci ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Ottiene i valori di bilancio più alti. -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] -balancetopCommandUsage1Description=Visualizza la prima pagina (o specificata) dei valori del saldo superiore banCommandDescription=Banna un giocatore. banCommandUsage=/ [reason] banCommandUsage1=/ [reason] @@ -160,16 +144,9 @@ commandNotLoaded=§4Il comando {0} non è stato caricato correttamente. compassBearing=§6Angolo\: {0} ({1} gradi). compassCommandDescription=Descrive la tua posizione attuale. compassCommandUsage=/ -condenseCommandDescription=Condensa gli oggetti in blocchi più compatti. -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Condensa tutti gli oggetti nel tuo inventario -condenseCommandUsage2=/ -condenseCommandUsage2Description=Condensa l''oggetto specificato nel tuo inventario configFileMoveError=Fallito nello spostare config.yml nella posizione del backup. configFileRenameError=Fallito nel rinominare il file temporaneo a config.yml. confirmClear=§7Per §lCONFERMARE§7 la cancellazione dell''inventario, ripeti il comando\: §6{0} -confirmPayment=§7Per §lCONFERMARE§7 il pagamento di §6{0}§7, ripeti il comando\: §6{1} connectedPlayers=§6Giocatori connessi§r connectionFailed=Connessione fallita. consoleName=Console @@ -188,7 +165,6 @@ createKitUnsupported=§4La serializzazione dell''oggetto Nbt è stata abilitata, creatingConfigFromTemplate=Creazione della configurazione dal template\: {0} creatingEmptyConfig=Creazione configurazione vuota\: {0} creative=creativa -currency={0}{1} currentWorld=§6Mondo Attuale\:§c {0} customtextCommandDescription=Consente di creare comandi di testo personalizzati. customtextCommandUsage=/ - Definisci in bukkit.yml @@ -312,16 +288,6 @@ dumpUrl=§6Creato server dump\: §c{0} duplicatedUserdata=Dati dell''utente duplicati\: {0} e {1} durability=§6Questo attrezzo ha §c{0}§6 utilizzi rimasti east=E -ecoCommandDescription=Gestisce l''economia dei server. -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=Dà al giocatore specificato la quantità di denaro specificata -ecoCommandUsage2=/ prendere -ecoCommandUsage2Description=Prende la quantità di denaro specificata dal giocatore specificato -ecoCommandUsage3=/ impostata -ecoCommandUsage3Description=Imposta il saldo del giocatore specificato alla quantità di denaro specificata -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=Ripristina il saldo del giocatore specificato al saldo iniziale del server editBookContents=§eOra puoi modificare i contenuti di questo libro. enabled=abilitato enchantCommandDescription=Incanta l''oggetto che l''utente sta tenendo. @@ -539,9 +505,7 @@ infoCommandDescription=Mostra le informazioni impostate dal proprietario del ser infoCommandUsage=/ [chapter] [page] infoPages=§e ---- §6{2} §e--§6 Pagina §4{0}§6/§4{1} §e---- infoUnknownChapter=§4Capitolo sconosciuto. -insufficientFunds=§4Fondi disponibili insufficienti. invalidBanner=§4Sintassi banner non valida. -invalidCharge=§cCosto non corretto. invalidFireworkFormat=§4L''opzione §c{0} §4non è un valore valido per §c{1}§4. invalidHome=La casa {0} non esiste\! invalidHomeName=§4Nome casa non valido\! @@ -658,7 +622,6 @@ kitCommandUsage1Description=Elenca tutti i kit disponibili kitCommandUsage2=/ [player] kitCommandUsage2Description=Dà il kit specificato a te o a un altro giocatore se specificato kitContains=§6Il Kit §c{0} §6contiene\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§cNon ci sono kit validi. kitError2=§4Quel kit non è definito correttamente. Contatta un amministratore. @@ -738,7 +701,6 @@ mailTooLong=§4Il messaggio è troppo lungo. Riprova senza superare i 1000 carat markMailAsRead=§6Per marcare la tua mail come letta, digita§c /mail clear§6. matchingIPAddress=§6I seguenti giocatori sono entrati con quell''indirizzo IP\: maxHomes=Non puoi impostare più di {0} case. -maxMoney=§4Questa transazione eccederebbe il limite massimo di soldi per questo account. mayNotJail=§cNon puoi imprigionare quel giocatore. mayNotJailOffline=§4Non puoi imprigionare un giocatore che è offline. meCommandDescription=Descrive un''azione nel contesto del giocatore. @@ -747,7 +709,6 @@ meCommandUsage1=/ meCommandUsage1Description=Descrive un''azione meSender=io meRecipient=io -minimumBalanceError=§4Il saldo minimo che un utente può avere è {0}. minimumPayAmount=§cL''importo minimo che puoi pagare è {0}. minute=minuto minutes=minuti @@ -757,8 +718,6 @@ mobsAvailable=§6Mostri\:§r {0} mobSpawnError=Errore durante il cambiamento del generatore di mob. mobSpawnLimit=Quantità Mob limitata dal server. mobSpawnTarget=Il blocco designato deve essere un generatore di mostri. -moneyRecievedFrom=§a{0}§6 sono stati ricevuti da§a {1}§6. -moneySentTo=§a{0} sono stati inviati a {1} month=mese months=mesi moreCommandDescription=Riempie la stack di oggetti in mano alla quantità specificata, o alla dimensione massima se nessuno è specificato. @@ -783,7 +742,6 @@ msgtoggleCommandDescription=Blocca la ricezione di tutti i messaggi privati. msgtoggleCommandUsage=/ [player] [power] msgtoggleCommandUsage1=/ [player] msgtoggleCommandUsage1Description=Attiva/Disattiva vola per te stesso o per un altro giocatore se specificato -multipleCharges=§4Non puoi applicare più di una carica a questo fuoco d''artificio. multiplePotionEffects=§4Non puoi applicare più di un effetto a questa pozione. muteCommandDescription=Muta o disattiva un giocatore. muteCommandUsage=/ [datediff] @@ -814,7 +772,6 @@ nearCommandUsage4=/ nearCommandUsage4Description=Elenca tutti i giocatori nel raggio indicato dal giocatore specificato nearbyPlayers=Giocatori nelle vicinanze\: {0} nearbyPlayersList={0}§f(§c{1}m§f) -negativeBalanceError=§4L''utente non ha il permesso di avere un bilancio negativo. nickChanged=§6Nickname modificato. nickCommandDescription=Cambia il tuo soprannome o quello di un altro giocatore. nickCommandUsage=/ [giocatore\:] @@ -866,12 +823,10 @@ noPermToSpawnMob=§4Non hai il permesso di generare questo mob. noPlacePermission=§4Non hai il permesso di piazzare un blocco accanto a questo cartello. noPotionEffectPerm=§4Non hai il permesso di applicare l''effetto §c{0} §4a questa pozione. noPowerTools=§6Non hai nessun power tool assegnato. -notAcceptingPay=§4{0} §4non accetta pagamenti. notAllowedToLocal=§4Non hai il permesso di parlare in chat locale. notAllowedToQuestion=§4Non hai il permesso di usare la domanda. notAllowedToShout=§4Non hai il permesso di gridare. notEnoughExperience=§4Non hai abbastanza esperienza. -notEnoughMoney=§4Non hai abbastanza soldi. notFlying=non volando nothingInHand=§4Non hai niente in mano. now=adesso @@ -887,28 +842,9 @@ onlyPlayers=§4Solo in gioco i giocatori possono usare §c{0}§4. onlyPlayerSkulls=§4Puoi solo impostare il propetario della testa (§c397\:3§4). onlySunStorm=/weather supporta solo sun/storm. openingDisposal=§6Opening disposal menu... -orderBalances=§6Ordinamento bilanci di§c {0} §6utenti, attendere prego... oversizedMute=§4Non puoi bannare giocatori per questo arco di tempo. oversizedTempban=§4Non puoi bannare giocatori per questo arco di tempo. passengerTeleportFail=§4Non puoi essere teletrasportato mentre trasporti passeggeri. -payCommandDescription=Paga un altro giocatore dal tuo saldo. -payCommandUsage=/ -payCommandUsage1=/ -payCommandUsage1Description=Paga il giocatore specificato la quantità data di denaro -payConfirmToggleOff=§6Non ti verrà più richiesto di confermare i pagamenti. -payConfirmToggleOn=§6Ora ti verrà richiesto di confermare i pagamenti. -payDisabledFor=§6Accettare pagamenti per §c{0}§6. -payEnabledFor=§6Accettare pagamenti per §c{0}§6. -payMustBePositive=§4L''importo da pagare deve essere positivo. -payOffline=§4Non puoi pagare utenti offline. -payToggleOff=§6Non accetti più pagamenti. -payToggleOn=§6Ora accetti pagamenti. -payconfirmtoggleCommandDescription=§6D''ora in poi ti verrà richiesto di confermare le cancellazioni dell''inventario. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Attiva o disattiva l''accettazione dei pagamenti. -paytoggleCommandUsage=/ [player] -paytoggleCommandUsage1=/ [player] -paytoggleCommandUsage1Description=Attiva/Disattiva se te, o un altro giocatore se specificato, accetti pagamenti pendingTeleportCancelled=§cRichiesta in sospeso di teletrasporto cancellata. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -1076,8 +1012,6 @@ requestSent=§6Richiesta inviata a§c {0}§6. requestSentAlready=§4Hai già inviato a {0}§4 una richiesta di teletrasporto. requestTimedOut=§4Richiesta di telestrasporto scaduta. requestTimedOutFrom=§4La richiesta di teletrasporto da §c{0} §4è scaduta. -resetBal=§6Il bilancio è stato resettato a §c{0} §6per tutti i giocatori in gioco. -resetBalAll=§6Il bilancio è stato resettato a §c{0} §6per tutti i giocatori. rest=§6Ti senti ben riposato. restCommandDescription=Riposa tu o il giocatore dato. restCommandUsage=/ [player] @@ -1099,18 +1033,6 @@ seenCommandUsage1=/ seenCommandUsage1Description=Mostra il tempo di uscita, il divieto, il muto, e le informazioni UUID del giocatore specificato seenOffline=§6Il giocatore§c {0} §6non è in §4gioco§6 da §c{1}§6. seenOnline=§6Il giocatore§c {0} §6è in §agioco§6 da §c{1}§6. -sellBulkPermission=§6Non hai il permesso di vendere in massa. -sellCommandDescription=Vende l''oggetto attualmente in mano. -sellCommandUsage=/ <||hand|inventory|blocks> [amount] -sellCommandUsage1=/ [amount] -sellCommandUsage1Description=Vende tutto (o l''importo dato, se specificato) dell''oggetto indicato nel tuo inventario -sellCommandUsage2=/ mano [amount] -sellCommandUsage2Description=Vende tutto (o l''importo dato, se specificato) dell''elemento detenuto -sellCommandUsage3=/ all -sellCommandUsage3Description=Vende tutti gli oggetti possibili nel tuo inventario -sellCommandUsage4=/ blocchi [amount] -sellCommandUsage4Description=Vende tutti (o l''importo dato, se specificato) di blocchi nel tuo inventario -sellHandPermission=§6Non hai il permesso di vendere individualmente. serverFull=Il server è pieno\! serverReloading=C''è una buona probabilità che stai ricaricando il tuo server in questo momento. Se questo è il caso, perché odi te stesso? Aspettati nessun supporto dal team di EssentialsX quando usi /reload. serverTotal=§6Totale Server\:§c {0} @@ -1121,8 +1043,6 @@ serverUnsupportedDangerous=Stai eseguendo un fork server che è noto per essere serverUnsupportedLimitedApi=Stai eseguendo un server con API limitate. EssentialsX funzionerà ancora, ma alcune funzionalità potrebbero essere disabilitate. serverUnsupportedDumbPlugins=Stai usando plugin noti per causare gravi problemi con EssentialsX e altri plugin. serverUnsupportedMods=Stai eseguendo un server che non supporta correttamente i plugin di Bukkit. I plugin Bukkit non devono essere usati con le mod Forge/Fabric\! Per Forge\: Considera di usare ForgeEssentials, o SpongeForge + Nucleo. -setBal=§aI tuoi soldi sono stati impostati a {0}. -setBalOthers=§aHai impostato i soldi di {0} a {1}. setSpawner=§6Cambiato il tipo di generatore di mostri a§c {0}§6. sethomeCommandDescription=Ritorna alla tua posizione corrente. sethomeCommandUsage=/ [giocatore\:]] @@ -1148,12 +1068,6 @@ setwarpCommandDescription=Crea un nuovo warp. setwarpCommandUsage=/ setwarpCommandUsage1=/ setwarpCommandUsage1Description=Imposta il warp con il nome specificato alla tua posizione -setworthCommandDescription=Imposta il valore di vendita di un oggetto. -setworthCommandUsage=/ [nomeoggetto id] -setworthCommandUsage1=/ -setworthCommandUsage1Description=Imposta il valore del tuo oggetto tenuto al prezzo dato -setworthCommandUsage2=/ -setworthCommandUsage2Description=Imposta il valore dell''elemento specificato al prezzo specificato sheepMalformedColor=§4Colore non valido. shoutDisabled=§6Modalità Shout §cattiva§6. shoutDisabledFor=§6Modalità Shout §cattiva §6per §c{0}§6. @@ -1243,8 +1157,6 @@ suicideCommandUsage=/ suicideMessage=§7Addio mondo crudele... suicideSuccess=§7{0} si è suicidato. survival=sopravvivenza -takenFromAccount=§e{0}§a sono stati prelevati dal tuo conto. -takenFromOthersAccount=§e{0}§a presi dal conto di§e {1}§a. Nuovo saldo\:§e {2} teleportAAll=§7Richiesta di teletrasporto inviata a tutti i giocatori... teleportAll=§7Sto teletrasportando tutti i giocatori... teleportationCommencing=§7Inizio teletrasporto... @@ -1398,8 +1310,6 @@ tptoggleCommandDescription=Blocca tutte le forme di teletrasporto. tptoggleCommandUsage=/ [player] [power] tptoggleCommandUsage1=/ [player] tptoggleCommandUsageDescription=Attiva/Disattiva se i teletrasporti sono abilitati per te o per un altro giocatore se specificato -tradeSignEmpty=§4Il cartello di baratto non dispone di merci da scambiare. -tradeSignEmptyOwner=§4Non c''è niente da raccogliere da questo cartello. treeCommandDescription=Genera un grande albero dove stai guardando. treeCommandUsage=/ treeCommandUsage1=/ @@ -1480,12 +1390,10 @@ versionDevLatest=§6Stai eseguendo l''ultima build di EssentialsX\! versionError=§4Errore durante il recupero delle informazioni sulla versione di EssentialsX\! Informazioni di generazione\: §c{0}§6. versionErrorPlayer=§6Errore durante il controllo delle informazioni sulla versione di EssentialsX\! versionFetching=Caricamento delle informazione sulla versione... -versionOutputVaultMissing=§4Vault non è installato. Chat e permessi potrebbero non funzionare. versionOutputFine=§6{0} versione\: §a{1} versionOutputWarn=§6{0} versione\: §c{1} versionOutputUnsupported=§d{0} §6versione\: §d{1} versionOutputUnsupportedPlugins=§6Stai utilizzando §dplugin non supportati§6\! -versionOutputEconLayer=§6Livello Economia\: §r{0} versionMismatch=§4Versione incorretta\! Aggiornare {0} alla stessa versione. versionMismatchAll=§4Versione incorretta\! Aggiornare tutti i jar Essentials alla stessa versione. versionReleaseLatest=§6Stai eseguendo l''ultima versione stabile di EssentialsX\! @@ -1547,7 +1455,6 @@ whoisHunger=§6 - Fame\:§r {0}/20 (+{1} saturazione) whoisIPAddress=§6 - Indirizzo IP\:§f {0} whoisJail=§6 - Imprigionato\:§f {0} whoisLocation=§6 - Posizione\:§f ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Denaro\:§f {0} whoisMuted=§6 - Mutato\:§f {0} whoisMutedReason=§6 - Mutato\:§r {0} §6Motivo\: §c{1} whoisNick=§6 - Nick\:§f {0} @@ -1564,19 +1471,6 @@ worldCommandUsage1=/ worldCommandUsage1Description=Teletrasporta nella tua posizione corrispondente nel nether o nel mondo esterno worldCommandUsage2=/ worldCommandUsage2Description=Teletrasporta nella tua posizione nel mondo dato -worth=§7Stack di {0} valore §c{1}§7 ({2} oggetto(i) a {3} l''uno) -worthCommandDescription=Calcola il valore degli oggetti in mano o come specificato. -worthCommandUsage=/ <||hand|inventory|blocks> [-][amount] -worthCommandUsage1=/ [amount] -worthCommandUsage1Description=Controlla il valore di tutti (o l''importo dato, se specificato) dell''elemento indicato nel tuo inventario -worthCommandUsage2=/ mano [amount] -worthCommandUsage2Description=Controlla il valore di tutti (o l''importo dato, se specificato) dell''elemento detenuto -worthCommandUsage3=/ all -worthCommandUsage3Description=Controlla il valore di tutti gli oggetti possibili nel tuo inventario -worthCommandUsage4=/ blocchi [amount] -worthCommandUsage4Description=Controlla il valore di tutti (o l''importo dato, se specificato) di blocchi nel tuo inventario -worthMeta=§7Stack di {0} con metadati di {1} valore §c{2}§7 ({3} oggetto(i) a {4} l''uno) -worthSet=Valore definito year=anno years=anni youAreHealed=§7Sei stato curato. diff --git a/Essentials/src/main/resources/messages_ja.properties b/Essentials/src/main/resources/messages_ja.properties index 020012a0f..d9598edc6 100644 --- a/Essentials/src/main/resources/messages_ja.properties +++ b/Essentials/src/main/resources/messages_ja.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} をあなたの所持金へ追加しました。 -addedToOthersAccount=§a {0} を {1} §a へ与えました。現在の所持金\: {2} adventure=アドベンチャー afkCommandDescription=キーボードから離れたユーザーとしてマークします。 afkCommandUsage=/ [player/message...] @@ -47,20 +45,6 @@ backupFinished=§6バックアップが終了しました。 backupStarted=§6バックアップを開始します。 backupInProgress=§6現在、外部バックアップスクリプトが進行中です。終了するまでプラグインの無効化を停止します。 backUsageMsg=§6前の場所に戻ります。 -balance=§a所持金\: §c{0} -balanceCommandDescription=プレイヤーの現在の所持金を設定します。 -balanceCommandUsage=/ [player] -balanceCommandUsage1=/ -balanceCommandUsage1Description=現在の残高を確認する -balanceCommandUsage2=/ -balanceCommandUsage2Description=指定したプレイヤーの残高を表示します -balanceOther={0}§aの所持金\: §c {1} -balanceTop=§6所持金ランキング ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=トップ残高値を取得します。 -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] -balancetopCommandUsage1Description=残高トップ値の最初または指定されたページを表示します banCommandDescription=プレーヤをBANします。 banCommandUsage=/ [reason] banCommandUsage1=/ [reason] @@ -159,16 +143,9 @@ commandNotLoaded=§4{0} は正しく読み込まれました。 compassBearing=§6方角\:{0} ({1}度) compassCommandDescription=現在の方角について説明します。 compassCommandUsage=/ -condenseCommandDescription=アイテムをよりコンパクトなブロックにまとめます。 -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ -condenseCommandUsage1Description=インベントリ内のすべてのアイテムを消去します。 -condenseCommandUsage2=/ -condenseCommandUsage2Description=インベントリ内の指定されたアイテムを圧縮します configFileMoveError=Config.ymlのバックアップフォルダへの移動が失敗しました。 configFileRenameError=一時ファイルのconfig.ymlへの名前変更をすることが出来ませんでした。 confirmClear=§7インベントリの削除を§l確認§7するために次のコマンドをもう一度実行して下さい。\: §6{0} -confirmPayment=§6{0}§7の支払いを§l確認§7するために次のコマンドをもう一度実行して下さい。\: §6{1} connectedPlayers=§6接続中のプレイヤー一覧§r connectionFailed=接続することができませんでした。 consoleName=§cコンソール @@ -187,7 +164,6 @@ createKitUnsupported=§4NBTアイテムシリアライズは有効になって creatingConfigFromTemplate=テンプレートからコンフィグファイルを生成しています\: {0} creatingEmptyConfig=空のコンフィグを生成しています\: {0} creative=クリエイティブ -currency={0}{1} currentWorld=§6今いるワールド:§c{0} customtextCommandDescription=カスタムテキストコマンドを作成できます。 customtextCommandUsage=/ - bukkit.ymlにて設定 @@ -286,16 +262,6 @@ dumpUrl=§6サーバーダンプを作成しました\: §c{0} duplicatedUserdata=重複したユーザーデータ\: {0} と {1} durability=§6このツールは §c{0}§6 を利用しています。 east=東 -ecoCommandDescription=サーバーの経済を管理します。 -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=指定したプレイヤーに一定量のアイテムを与えます -ecoCommandUsage2=/ take -ecoCommandUsage2Description=指定されたプレーヤーから指定された金額を引きます -ecoCommandUsage3=/ set -ecoCommandUsage3Description=指定したプレイヤーの残高を指定した金額に設定します。 -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=指定したプレイヤーの残高をサーバーの開始時の残高にリセットします editBookContents=§eあなたは、この本の内容を編集することが出来ます。 enabled=有効 enchantCommandDescription=持っているアイテムをエンチャントします。 @@ -513,9 +479,7 @@ infoCommandDescription=サーバーオーナーが設定した情報を表示し infoCommandUsage=/ [chapter] [page] infoPages=§e ---- §6{2} §e--§6 ページ §c{0}§6/§c{1} §e---- infoUnknownChapter=§4不明な章。 -insufficientFunds=§4利用可能な資金が不足しています。 invalidBanner=§4バナーの構文が不正です。 -invalidCharge=§4その金額で設定することは出来ません。 invalidFireworkFormat=§4この§c{0} §4オプションを§c{1}§4に設定することは出来ません。 invalidHome=§4ホーム§c {0} §4は存在しません\! invalidHomeName=§4無効なホーム名です。 @@ -632,7 +596,6 @@ kitCommandUsage1Description=利用可能なキットの一覧を表示します kitCommandUsage2=/ [player] kitCommandUsage2Description=指定されたキットを自分または他のプレイヤーに与えます kitContains=§6キット§c{0}§6を含んでいます。 -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4有効なキットがありません。 kitError2=§4このキットは正しく設定されていないため、有効ではありません。 @@ -710,7 +673,6 @@ mailTooLong=§4メールのメッセージが長すぎます。1000文字以下 markMailAsRead=§6あなた宛のメールを既読にするには, §c /mail clear§6を入力してください. matchingIPAddress=§6以下のプレイヤーはこのIPアドレスでログインしました。 maxHomes=§4§c {0} §4個以上ホームを設定することはできません。 -maxMoney=§4このアカウントの所持金は上限に達しています。 mayNotJail=§4そのユーザーは投獄することはできません。 mayNotJailOffline=§4オフラインのプレイヤーを投獄することはできません。 meCommandDescription=プレイヤーのコンテキストでアクションを説明します。 @@ -719,7 +681,6 @@ meCommandUsage1=/ meCommandUsage1Description=アクションを説明しています meSender=私 meRecipient=私 -minimumBalanceError=§4ユーザーが持つことができる最小残高は {0} です。 minimumPayAmount=§c支払える最低金額は{0}です。 minute=分 minutes=分 @@ -729,8 +690,6 @@ mobsAvailable=§6Mobs\:§r {0} mobSpawnError=§4Mobスポナーを変更するときにエラーが発生しました。 mobSpawnLimit=サーバーの制限に制限されたMobの数。 mobSpawnTarget=§4ターゲットブロックはMob Spawnerでなければなりません。 -moneyRecievedFrom=§a{0}§6を§a{1}§6から受け取りました。 -moneySentTo=§a{0} を {1} に送りました。 month=月 months=月 moreCommandDescription=アイテムスタックを指定された量に、または指定されていない場合は最大サイズまで埋めます。 @@ -755,7 +714,6 @@ msgtoggleCommandDescription=すべてのプライベートメッセージの受 msgtoggleCommandUsage=/ [player] [on|off] msgtoggleCommandUsage1=/ [player] msgtoggleCommandUsage1Description=指定されている場合、自分または他のプレイヤーのフライを切り替えます。 -multipleCharges=§4この花火に複数のチャージを適用することはできません。 multiplePotionEffects=§4このポーションに複数の効果を適用することはできません。 muteCommandDescription=プレイヤーをミュートまたはミュート解除します。 muteCommandUsage=/ [datediff] [reason] @@ -786,7 +744,6 @@ nearCommandUsage4=/ nearCommandUsage4Description=指定したプレイヤーの半径内のすべてのプレイヤーを一覧表示します nearbyPlayers=§6近くにいるプレイヤー\:§r {0} nearbyPlayersList={0}§f(§c{1}m§f) -negativeBalanceError=§4ユーザーはお金がマイナスになることは許可されていません. nickChanged=§6ニックネームが変更されました。 nickCommandDescription=ニックネームや他のプレイヤーのニックネームを変更します。 nickCommandUsage=/ [player] @@ -838,12 +795,10 @@ noPermToSpawnMob=§4このMobを召喚する権限がありません。 noPlacePermission=§4あなたは看板の近くにブロックを置く権限がありません。 noPotionEffectPerm=§c{0} §4のポーション効果を付与する権限がありません。 noPowerTools=§6このツールはパワーツールになっていません。\n -notAcceptingPay=§4{0} §4は支払いを受け付けていません。 notAllowedToLocal=§4AFKローカルチャットで会話する権限がありません。 notAllowedToQuestion=§4あなたは質問を使用する権限がありません。 notAllowedToShout=あなたは叫ぶ権限を持っていません notEnoughExperience=§4あなたは十分な経験値を持っていません。 -notEnoughMoney=§4あなたは十分なお金を持っていません. notFlying=飛んでいません。 nothingInHand=§4手に何も持っていません。 now=現在 @@ -859,28 +814,9 @@ onlyPlayers=§4ゲーム内のプレイヤーのみが §c{0} §4を使用でき onlyPlayerSkulls=§4プレイヤーの頭ブロックのみを設定することが出来ます。 onlySunStorm=§c/weather §4コマンドは §csun§4もしくは§cstorm§のみ選択出来ます。 openingDisposal=§6廃棄メニューを開いています... -orderBalances=§c {0} §6人のユーザーの残高を照会中です。処理には時間がかかることあります。 oversizedMute=§4この期間、プレイヤーをミュートすることはできません。 oversizedTempban=§4この期間で期限BANは出来ません。 passengerTeleportFail=§4乗客がいるためテレポートをすることはできません。 -payCommandDescription=自分の残高から他のプレイヤーにお金を支払います。 -payCommandUsage=/ -payCommandUsage1=/ -payCommandUsage1Description=指定されたプレイヤーに指定した金額を支払う -payConfirmToggleOff=§6支払いの確認が求められないようになりました。 -payConfirmToggleOn=§6支払いの確認が求められるようになりました。 -payDisabledFor=§6§c{0}§6 の支払いの受け付けを無効にしました。 -payEnabledFor=§6§c{0}§6 の支払いの受け付けを有効にしました。 -payMustBePositive=§4支払う金額は正の値である必要があります。 -payOffline=§4オフラインのユーザーに支払うことはできません。 -payToggleOff=§6支払いを受け付けないようにしました。 -payToggleOn=§6支払いを受け付けています。 -payconfirmtoggleCommandDescription=支払いの確認を求めるかどうかを切り替えます。 -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=支払いを受け付けるかどうかを切り替えます -paytoggleCommandUsage=/ [player] -paytoggleCommandUsage1=/ [player] -paytoggleCommandUsage1Description=支払いを受け付けるかどうかを切り替えます。または他のプレイヤーが指定した場合、支払いを受け付けるかどうかを切り替えます。 pendingTeleportCancelled=§4テレポート要求が§c拒否§rされました。 pingCommandDescription=Pong\! pingCommandUsage=/ @@ -1045,8 +981,6 @@ requestSent=§6要求を§c {0}§6に送信しました。 requestSentAlready=§4あなたはすでに {0} §4にテレポートリクエストを送っています\! requestTimedOut=§4テレポート要求はタイムアウト(時間切れ)です。 requestTimedOutFrom=§4§c{0} §4からのテレポートリクエストが時間切れになりました。 -resetBal=§6すべてのオンラインプレイヤーの所持金が§c{0} §6にリセットされました。 -resetBalAll=§6すべてのプレイヤーの所持金が§c{0} §6にリセットされました。 rest=§6よく休めたと思う。 restCommandDescription=あなたまたは指定したプレイヤーを休憩します。 restCommandUsage=/ [player] @@ -1068,18 +1002,6 @@ seenCommandUsage1=/ seenCommandUsage1Description=指定したプレーヤーのログアウト時間、禁止、ミュート、UUIDの情報を表示します seenOffline=§c {0} §6の §cオフライン§6 経過時間 §c{1} seenOnline=§c {0} §6の §bオンライン§6 経過時間 §c{1} -sellBulkPermission=§6権限が無いためまとめ売りができません。 -sellCommandDescription=手に持っているアイテムを販売します。 -sellCommandUsage=/ <||hand|inventory|blocks> [amount] -sellCommandUsage1=/ [amount] -sellCommandUsage1Description=インベントリにあるアイテムをすべて (指定された場合は指定された量) 売ります -sellCommandUsage2=/ hand [amount] -sellCommandUsage2Description=持っているアイテムの全て (または指定された量) を売ります -sellCommandUsage3=/ all -sellCommandUsage3Description=インベントリ内の売ることが可能な全てのアイテムを売ります -sellCommandUsage4=/ blocks [amount] -sellCommandUsage4Description=インベントリ内のブロックをすべて (または指定された場合は指定された量) 売ります -sellHandPermission=§6権限が無いため手に持っているアイテムを売れません。 serverFull=サーバーは満員です\! serverReloading=今、サーバーを再読み込みしている可能性が高いです。もしそうなら、なぜ自分を恨むのですか?再読み込みの際、EssentialsXチームからのサポートは期待できません。 serverTotal=§6サーバー内合計\:§c {0} @@ -1090,8 +1012,6 @@ serverUnsupportedDangerous=非常に危険でデータ消失につながるこ serverUnsupportedLimitedApi=API機能が制限されたサーバーを実行しています。EssentialsXは引き続き動作しますが、特定の機能が無効になっている可能性があります。 serverUnsupportedDumbPlugins=EssentialsXや他のプラグインで深刻な問題を引き起こすことが知られているプラグインを使用している。 serverUnsupportedMods=Bukkitプラグインを正しくサポートしていないサーバーを実行しています。Bukkitプラグインは Forge/Fabric のMODで使用しないでください\! Forgeの場合:ForgeEssentials または SpongeForge + Nucleus の使用を検討してください。 -setBal=§aあなたの所持金が {0} に設定されました。 -setBalOthers=§a{0}§c の所持金を {1} に設定しました。 setSpawner=§6スポナーのタイプを§c {0}§6に変更しました。 sethomeCommandDescription=現在の場所に家を設定します。 sethomeCommandUsage=/ [[player\:]name] @@ -1117,12 +1037,6 @@ setwarpCommandDescription=新規ワープを作成 setwarpCommandUsage=/ setwarpCommandUsage1=/ setwarpCommandUsage1Description=指定された名前のワープ位置を設定します -setworthCommandDescription=商品の売値を設定します。 -setworthCommandUsage=/ [itemname|id] -setworthCommandUsage1=/ -setworthCommandUsage1Description=持っているアイテムの価格を指定した価格に設定します -setworthCommandUsage2=/ -setworthCommandUsage2Description=指定されたアイテムの価格を指定した価格に設定します sheepMalformedColor=§4その色は正しくない形です。 shoutDisabled=§6シャウトモードを§c無効化§6しました。 shoutDisabledFor=§c{0} §6のシャウトモードを§c無効化§6しました。 @@ -1212,8 +1126,6 @@ suicideCommandUsage=/ suicideMessage=§6残酷な世界よ、さようなら。 suicideSuccess=§c{0} §6は自ら命を絶った。 survival=サバイバル -takenFromAccount=§aあなたの所持金から §e{0}§a 引かれました。 -takenFromOthersAccount=§e{0} §aが§e {1} §aアカウントから取られました。新しい残高\:§e {2} teleportAAll=§6すべてのプレイヤーにテレポート要求を送信しました。 teleportAll=§6すべてのプレーヤーをテレポートしています。 teleportationCommencing=§6テレポートします。 @@ -1365,8 +1277,6 @@ tptoggleCommandDescription=すべてのテレポートをブロックします tptoggleCommandUsage=/ [player] [on|off] tptoggleCommandUsage1=/ [player] tptoggleCommandUsageDescription=指定された場合、自分または他のプレイヤーのテレポートを有効にするかどうかを切り替えます -tradeSignEmpty=§4トレードサインには利用可能なものは何もありません。 -tradeSignEmptyOwner=§4このトレードサインから収集するものは何もありません。 treeCommandDescription=見ている場所に木をスポーンさせます。 treeCommandUsage=/ treeCommandUsage1=/ @@ -1445,12 +1355,10 @@ versionDevLatest=§6最新の EssentialsX ビルドを実行しています\! versionError=§4EssentialsXのバージョン情報を取得する際にエラーが発生しました。ビルド情報\:§c {0} §6. versionErrorPlayer=§6EssentialsXのバージョン情報のチェック中にエラーが発生しました。 versionFetching=§6バージョン情報を取得中... -versionOutputVaultMissing=§4Vaultはインストールされていません。チャットと権限が機能しない場合があります。 versionOutputFine=§6{0} バージョン\: §a{1} versionOutputWarn=§6{0} バージョン\: §c{1} versionOutputUnsupported=§d{0} §6バージョン\: §d{1} versionOutputUnsupportedPlugins=§6サポートされていないプラグインを実行しています§6! -versionOutputEconLayer=§6エコノミーレイヤー\: §r{0} versionMismatch=§4バージョンの不一致!{0} を同じバージョンに更新してください。 versionMismatchAll=§4バージョンの不一致!すべてのEssentials jarを同じバージョンに更新してください。 versionReleaseLatest=§6最新の安定版EssentialsXを実行しています。 @@ -1512,7 +1420,6 @@ whoisHunger=§6 - 満腹度\:§r {0}/20 (+{1} 隠し満腹度) whoisIPAddress=§6 - IPアドレス\:§r {0} whoisJail=§6 - 牢獄\:§r {0} whoisLocation=§6 - 座標\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - 所持金\:§r {0} whoisMuted=§6 - ミュート\:§r {0} whoisMutedReason=§6 - ミュート\:§r {0} §6理由\: §c{1} whoisNick=§6 - ニックネーム\:§r {0} @@ -1529,19 +1436,6 @@ worldCommandUsage1=/ worldCommandUsage1Description=ネザーまたはオーバーワールド内の対応する場所にテレポートします worldCommandUsage2=/ worldCommandUsage2Description=指定したワールド内の場所にテレポートします -worth=§aアイテム {0} は §c{1}§a の価格になります ( {2} 個のアイテムはそれぞれ {3} です) -worthCommandDescription=手持ちのアイテムの価値を計算します。 -worthCommandUsage=/ <||hand|inventory|blocks> [-][amount] -worthCommandUsage1=/ [amount] -worthCommandUsage1Description=インベントリ内のすべてのアイテム (または指定された量) の価値をチェックします -worthCommandUsage2=/ hand [amount] -worthCommandUsage2Description=手に持っているすべてのアイテム (または指定された量) の価値を確認する -worthCommandUsage3=/ all -worthCommandUsage3Description=インベントリにあるすべての可能なアイテムの価値をチェックします -worthCommandUsage4=/ blocks [amount] -worthCommandUsage4Description=インベントリ内のすべてのブロック (または指定された量) の価値をチェックします -worthMeta=§a{1} のメタデータが付いてるアイテム {0} は §c{2}§a の価格になります ( {3} 個のアイテムはそれぞれ {4} です) -worthSet=§6価値セット year=年 years=年 youAreHealed=§6体力と満腹状態を回復しました。 diff --git a/Essentials/src/main/resources/messages_ko.properties b/Essentials/src/main/resources/messages_ko.properties index 0daf9aec7..e27525408 100644 --- a/Essentials/src/main/resources/messages_ko.properties +++ b/Essentials/src/main/resources/messages_ko.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0}이(가) 당신의 계좌에 추가됐습니다. -addedToOthersAccount=§a{0}가 {1}§a님의 계정에 추가되었습니다. 새 잔고\: {2} adventure=모험 afkCommandDescription=자리비움 상태로 전환합니다. afkCommandUsage=/ [player/message...] @@ -47,20 +45,6 @@ backupFinished=§6백업이 완료되었습니다. backupStarted=§6백업을 시작합니다. backupInProgress=§6외부 백업 스크립트가 진행 중입니다\! 완료될 때까지 플러그인 비활성화를 중단합니다. backUsageMsg=§6이전 장소로 돌아가는중.. -balance=§6잔고\:§c {0} -balanceCommandDescription=플레이어의 현재 잔고를 보여줍니다. -balanceCommandUsage=/ [플레이어] -balanceCommandUsage1=/ -balanceCommandUsage1Description=현재 잔고를 표시합니다 -balanceCommandUsage2=/ <플레이어> -balanceCommandUsage2Description=해당 플레이어의 잔고를 보여줍니다 -balanceOther=§a{0}의 잔고§a\:§c {1} -balanceTop=§6잔고 순위 ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=잔고 순위를 봅니다. -balancetopCommandUsage=/ [페이지] -balancetopCommandUsage1=/ [페이지] -balancetopCommandUsage1Description=잔고 순위의 첫 페이지(또는 해당 페이지)를 보여줍니다. banCommandDescription=플레이어를 차단합니다. banCommandUsage=/ <플레이어> [사유] banCommandUsage1=/ <플레이어> [사유] @@ -161,16 +145,9 @@ consoleCannotUseCommand=이 명령어는 콘솔에서 사용할 수 없습니다 compassBearing=§6방위\: {0} ({1} 도). compassCommandDescription=현재 방위를 보여줍니다. compassCommandUsage=/ -condenseCommandDescription=아이템을 더 작은 블록으로 압축합니다. -condenseCommandUsage=/ [아이템] -condenseCommandUsage1=/ -condenseCommandUsage1Description=인벤토리의 모든 아이템을 압축합니다 -condenseCommandUsage2=/ <아이템> -condenseCommandUsage2Description=인벤토리의 해당 아이템을 압축합니다 configFileMoveError=config.yml를 백업 위치로 이동하지 못했습니다. configFileRenameError=임시 파일의 이름을 config.yml로 변경하지 못했습니다. confirmClear=§7정말로 인벤토리를 §l비우시겠습니까?§7 다음 명령어를 반복하세요\: §6{0} -confirmPayment=§7정말로 §6{0}§7 (을)를 §l지불§7하시겠습니까? 다음 명령어를 반복하세요\: §6{1} connectedPlayers=§6접속 중인 플레이어§r connectionFailed=연결에 실패하였습니다. consoleName=콘솔 @@ -189,7 +166,6 @@ createKitUnsupported=§4NBT 아이템 직렬화가 활성화 되었지만 이 creatingConfigFromTemplate=템플릿을 설정하여 만듭니다 \: {0} creatingEmptyConfig=빈 설정 파일을 생성중\: {0} creative=크리에이티브 -currency={0}{1} currentWorld=§6현재 월드\:§c {0} customtextCommandDescription=사용자 지정 명령어를 만듭니다. customtextCommandUsage=/ - bukkit.yml 에서 정의하세요 @@ -305,16 +281,6 @@ dumpUrl=§6서버 덤프를 생성했습니다\: §c{0} duplicatedUserdata=중복된 유저데이터 \: {0} 와/과 {1} durability=§6이 도구는 사용 가능 횟수가 s §c{0}§6번 남았습니다 east=E -ecoCommandDescription=서버 경제를 관리합니다. -ecoCommandUsage=/ -ecoCommandUsage1=/ give <플레이어> <수량> -ecoCommandUsage1Description=해당 플레이어에게 주어진 값만큼의 돈을 줍니다. -ecoCommandUsage2=/ take <플레이어> <수량> -ecoCommandUsage2Description=해당 플레이어에게서 주어진 값만큼의 돈을 뺍니다. -ecoCommandUsage3=/ set <플레이어> <수량> -ecoCommandUsage3Description=해당 플레이어의 잔고를 주어진 값으로 설정합니다. -ecoCommandUsage4=/ reset <플레이어> <수량> -ecoCommandUsage4Description=해당 플레이어의 잔고를 서버의 시작 잔고로 초기화합니다. editBookContents=§e이제 이 책의 내용을 수정할 수 있습니다. enabled=활성화 enchantCommandDescription=유저가 들고있는 아이템에 마법을 부여합니다. @@ -532,9 +498,7 @@ infoCommandDescription=서버 주인이 설정한 정보를 봅니다. infoCommandUsage=/ [챕터] [쪽] infoPages=§e ---- §6{2} §e--§6 페이지 §c{0}§6/§c{1} §e---- infoUnknownChapter=§4알 수 없는 챕터. -insufficientFunds=§4자금이 부족합니다. invalidBanner=§4배너 구문이 잘못되었습니다. -invalidCharge=§4잘못된 청구입니다. invalidFireworkFormat=§c{0} §4옵션은 §c{1} §4라는 값이 존재하지 않습니다. invalidHome=§c{0}§4 집이 존재하지않습니다\! invalidHomeName=§4집 이름이 맞지 않습니다\! @@ -651,7 +615,6 @@ kitCommandUsage1Description=모든 사용 가능한 키트를 봅니다 kitCommandUsage2=/ [player] kitCommandUsage2Description=그 키트를 자신이나 다른 플레이어에게 줍니다 kitContains=§6키트 §c{0} §6에는 다음이 포함됩니다\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§c올바른 킷이 없습니다. kitError2=§4킷 정의가 잘못되었습니다. 관리자에게 문의하세요. @@ -726,7 +689,6 @@ mailTooLong=§4메일 메시지가 너무 깁니다. 영어 기준 1000자 를 markMailAsRead=§6이 메일을 읽으셨다면, §c /mail clear §6명령어를 사용하여 삭제 해주세요. matchingIPAddress=§6해당 플레이어는 이전에 다음 IP 주소로부터 접속하였습니다\: maxHomes=§4집을 §c {0} §4개까지만 가질 수 있습니다. -maxMoney=§4 이 트랜잭션이 계정에 대한 균형 제한을 초과할 것 입니다. mayNotJail=§4이 플레이어는 감옥에 가둘 수 없습니다\! mayNotJailOffline=§4당신은 접속중이지 않은 플레이어를 감옥에 보낼 수 없습니다. meCommandDescription=플레이어의 현재 상황을 설명합니다. @@ -735,7 +697,6 @@ meCommandUsage1=/ meCommandUsage1Description=상황을 설명합니다 meSender=나 meRecipient=나 -minimumBalanceError=§4유저가 최소로 가질 수 있는 잔고는 {0} 입니다. minimumPayAmount=§c최소로 지불 할 수 있는 금액은 {0} 입니다. minute=분 minutes=분 @@ -745,8 +706,6 @@ mobsAvailable=§6몹\:§r {0} mobSpawnError=§4몹 스포너를 변경하는 중 오류가 발생했습니다. mobSpawnLimit=서버에서 수용 할 수 있는 몬스터의 개체 수를 초과하였습니다. mobSpawnTarget=지정된 블록은 무조건 몬스터 스포너이여야합니다. -moneyRecievedFrom=§a{0}§6(이)가 §a{1} §6에게서 입금되었습니다. -moneySentTo=§a{0}가 {1}에게 보내졌습니다. month=월(달) months=월(달) moreCommandDescription=들고있는 아이템의 스택을 해당하는 만큼 채우거나,지정되지 않을 경우 최대 크기로 설정합니다. @@ -771,7 +730,6 @@ msgtoggleCommandDescription=모든 귓속말을 받지 않습니다. msgtoggleCommandUsage=/ [닉네임] [on|off] msgtoggleCommandUsage1=/ [플레이어] msgtoggleCommandUsage1Description=해당되는 경우 자신 또는 다른 플레이어의 플라이를 설정 또는 해제합니다 -multipleCharges=§4이 폭죽에는 한개의 효과만 적용할 수 있습니다. multiplePotionEffects=§4한가지 포션에 하나의 효과만 적용할 수 있습니다. muteCommandDescription=플레이어를 채금합니다. muteCommandUsage=/ [datediff] [reason] @@ -802,7 +760,6 @@ nearCommandUsage4=/ nearCommandUsage4Description=선택된 플레이어 중심으로 주어진 반경 내의 모든 플레이어 목록을 나열합니다. nearbyPlayers=§6주변 플레이어\:§r {0} nearbyPlayersList={0}§f(§c{1}분§f) -negativeBalanceError=§4잔고가 음수가 되면 안됩니다. nickChanged=§6닉네임이 변경되었습니다. nickCommandDescription=본인이나 다른 플레이어의 닉네임을 바꿉니다. nickCommandUsage=/ [player] @@ -854,12 +811,10 @@ noPermToSpawnMob=§4이 몬스터를 소환할 권한이 없습니다. noPlacePermission=§4그 표지판 근처에 블럭을 놓을 수 있는 권한이 없습니다. noPotionEffectPerm=§4당신은 이 포션에 §c{0} §4 효과를 적용할 권한이 없습니다. noPowerTools=§6할당된 파워툴이 없습니다. -notAcceptingPay=§4{0} §4는 거래를 받지 않습니다. notAllowedToLocal=§4로컬 채팅에서 발언할 권한이 없습니다. notAllowedToQuestion=§4질문할 권한이 없습니다. notAllowedToShout=§4소리칠 권한이 없습니다. notEnoughExperience=§4경험치가 부족합니다. -notEnoughMoney=§4당신은 충분한 돈을 가지고있지 않습니다. notFlying=비행중이 아님 nothingInHand=§4손에 아무것도 없습니다. now=지금 @@ -874,26 +829,9 @@ onlyPlayers=§4버킷에서는 §c{0}§4 를 사용 할 수 없습니다. 게임 onlyPlayerSkulls=&4당신은 플레이어 머리의 소유자만 설정할 수 있습니다 (&c397\:3&4). onlySunStorm=§4/날씨는 맑음/흐림만 설정이 가능합니다. openingDisposal=§6폐기 메뉴 여는 중... -orderBalances=§c {0} §6유저들의 돈을 정리 하고 있습니다. 잠시만 기다려주세요... oversizedMute=§4이 기간으로는 플레이어를 채금할 수 없습니다. oversizedTempban=§4이 기간으로는 플레이어를 차단할 수 없습니다. passengerTeleportFail=§4동행자가 있을 때는 텔레포트 할 수 없습니다. -payCommandDescription=다른 사람에게 돈을 지불합니다. -payCommandUsage=/ <플레이어> <수량> -payCommandUsage1=/ <플레이어> <수량> -payConfirmToggleOff=§6이제 거래를 받을 때 확인 메시지가 표시되지 않습니다. -payConfirmToggleOn=§6이제 거래를 받을 때 확인 메시지가 표시됩니다. -payDisabledFor=§c{0} §6(은)는 거래를 받지 않습니다. -payEnabledFor=§c{0} §6(은)는 거래를 받습니다. -payMustBePositive=§4값은 양수여야 합니다. -payOffline=§4접속중이지 않은 플레이어에게 지불할 수 없습니다. -payToggleOff=§6이제 거래를 받지 않습니다. -payToggleOn=§6이제 거래를 받습니다. -payconfirmtoggleCommandDescription=결제를 받을 때 확인 메시지를 표시할지 정합니다. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=결제를 받을 지 정합니다. -paytoggleCommandUsage=/ [플레이어] -paytoggleCommandUsage1=/ [플레이어] pendingTeleportCancelled=§4순간이동 요청이 취소되었습니다. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -1043,8 +981,6 @@ requestSent=§c{0}§6님에게 텔레포트 요청을 보냅니다. requestSentAlready=§4이미 {0}§4 에게 텔레포트 요청을 보냈습니다. requestTimedOut=§4텔레포트 요청이 타임아웃 되었습니다. requestTimedOutFrom=§c{0} §4님으로부터 온 텔레포트 요청이 만료되었습니다. -resetBal=§6모든 온라인 플레이어의 잔고가 §a{0} §6(으)로 리셋되었습니다. -resetBalAll=§6모든 플레이어의 잔고가 §a{0} §6(으)로 리셋되었습니다. rest=§6잘 휴식한 듯한 느낌이 듭니다. restCommandDescription=플레이어를 휴식시킵니다. restCommandUsage=/ [플레이어] @@ -1065,18 +1001,6 @@ seenCommandUsage1=/ <플레이어> seenCommandUsage1Description=해당 플레이어의 로그아웃 시간, 차단 여부, 음소거 여부, UUID 정보를 보여줍니다 seenOffline=§6플레이어§c {0} §6이/가 §c{1}§6 전부터 §4오프라인§6상태였습니다. seenOnline=§6플레이어§c {0} §6이/가 §c{1}§6 전부터 §a온라인§6상태였습니다. -sellBulkPermission=§6여러개를 한꺼번에 판매할 수 있는 권한이 없습니다. -sellCommandDescription=손에 든 아이템을 판매합니다. -sellCommandUsage=/ <||hand|inventory|blocks> [amount] -sellCommandUsage1=/ <아이템> [수량] -sellCommandUsage1Description=당신의 인벤토리에서 해당 아이템을 전부(또는 지정한 경우, 지정한 수량만큼) 판매합니다 -sellCommandUsage2=/ hand [수량] -sellCommandUsage2Description=들고 있는 아이템을 전부(또는 지정한 경우, 지정한 수량만큼) 판매합니다 -sellCommandUsage3=/ all -sellCommandUsage3Description=당신의 인벤토리에서 팔 수 있는 아이템을 전부 판매합니다 -sellCommandUsage4=/ blocks [수량] -sellCommandUsage4Description=들고 있는 아이템을 전부(또는 지정한 경우, 지정한 수량만큼) 판매합니다 -sellHandPermission=§6손에 든 아이템을 팔 수 있는 권한이 없습니다. serverFull=서버가 꽉 찼습니다\! serverReloading=지금 서버를 리로드하고 있을 가능성이 높습니다. 만약 그렇다면, 왜 자신을 미워하는 거죠? /reload 를 사용하는 것은 EssentialsX 팀의 지원이 필요하지 않습니다. serverTotal=§6서버 총 합계\:§c {0} @@ -1086,8 +1010,6 @@ serverUnsupportedCleanroom=서버가 버킷 플러그인을 제대로 지원하 serverUnsupportedDangerous=현재 매우 위험하고 데이터 손실을 초래할 수 있는 포크 버킷을 사용중입니다. Paper 버킷과 같이 더욱 안정적인 서버 버킷을 사용하는 것을 강력히 권장합니다. serverUnsupportedLimitedApi=서버가 한정적인 API로 동작하고 있습니다. EssentialsX는 여전히 동작하겠지만, 일부 기능은 제한될 수 있습니다. serverUnsupportedMods=서버가 버킷 플러그인을 제대로 지원하지 않습니다. 버킷 플러그인은 Forge/Fabric 모드와 함께 사용되어선 안됩니다\! Forge의 경우\: ForgeEssentials, 혹은 SpongeForge + Nucleus 사용을 고려해보세요. -setBal=§a잔고가 {0}으로 설정되었습니다. -setBalOthers=§a{0}§a의 잔고를 {1}으로 설정합니다. setSpawner=§6스포너 타입을 §c{0}§6으로 변경합니다. sethomeCommandDescription=현재 위치로 집을 설정합니다. sethomeCommandUsage=/ [[player\:]닉네임] @@ -1110,11 +1032,6 @@ settprValue=§6무작위 텔레포트 §c{0} §6(을)를 §c{1} §6(으)로 설 setwarpCommandDescription=새 워프를 만듭니다. setwarpCommandUsage=/ <워프 이름> setwarpCommandUsage1=/ <워프 이름> -setworthCommandDescription=아이템의 판매 가격을 설정합니다. -setworthCommandUsage=/ [itemname|id] <가격> -setworthCommandUsage1=/ <가격> -setworthCommandUsage1Description=손에 들고 있는 아이템의 가격을 입력한 값으로 지정합니다. -setworthCommandUsage2=/ sheepMalformedColor=§4잘못된 색상입니다. shoutDisabled=§6외치기 모드 §c비활성화§6됨. shoutDisabledFor=§c{0} §6의 외치기 모드를 §c비활성화§6했습니다. @@ -1198,8 +1115,6 @@ suicideCommandUsage=/ suicideMessage=§6잘 있거라, 잔혹한 세상아... suicideSuccess=§6{0}§6님이 자살했습니다. survival=서바이벌 -takenFromAccount=§e{0} §a만큼 지불했습니다. -takenFromOthersAccount=§e{1}§a 의 지갑에서 §e{0} §a가 빠져나갔습니다. 새 잔고\:§e {2} teleportAAll=§6모든 플레이어에게 텔레포트 요청을 보냈습니다... teleportAll=§6모든 플레이어를 텔레포트 하는중.. teleportationCommencing=§6텔레포트 중... @@ -1339,8 +1254,6 @@ tps=§6현재 TPS \= {0} tptoggleCommandDescription=모든 형태의 텔레포트를 차단합니다. tptoggleCommandUsage=/ [닉네임] [on|off] tptoggleCommandUsage1=/ [플레이어] -tradeSignEmpty=해당된 표지판은 충분한 공급을 하지 못합니다. -tradeSignEmptyOwner=§4거래 표지로부터 아무것도 획득할 수 없었습니다. treeCommandDescription=바라보고 있는 곳에 나무를 소환합니다. treeCommandUsage=/ treeCommandUsage1=/ @@ -1412,7 +1325,6 @@ versionDevLatest=§6최신 버전의 EssentialsX 개발 빌드를 사용하고 versionError=§4EssentialsX 버전 정보를 가져오는데 오류가 발생했습니다\! 빌드 정보\: §c{0}§6. versionErrorPlayer=§6EssentialsX 버전 정보를 확인하는데 오류가 발생했습니다\! versionFetching=§6버전 정보를 가져오는중... -versionOutputVaultMissing=§4Vault 이(가) 설치되어 있지 않습니다. 대화 및 권한 설정이 작동하지 않을 수 있습니다. versionOutputFine=§6{0} 버전\: §a{1} versionOutputWarn=§6{0} 버전\: §c{1} versionOutputUnsupported=§d{0} §6버전\: §d{1} @@ -1477,7 +1389,6 @@ whoisHunger=§6 - 배고픔\:§r {0}/20 (+{1} 추가 체력) whoisIPAddress=§6 - 아이피\:§r {0} whoisJail=§6 - 감옥\:§r {0} whoisLocation=§6 - 위치\: §r({0}, {1}, {2}, {3}) -whoisMoney=§9 - 잔액\: {0} whoisMuted=§6 - 채팅 금지\:§r {0} whoisMutedReason=§6 - 대화 금지\:§r {0} §6사유\: §c{1} whoisNick=§6 - 닉네임\:§r {0} @@ -1494,19 +1405,6 @@ worldCommandUsage1=/ worldCommandUsage1Description=당신의 위치에 상응하는 네더 또는 오버월드로 텔레포트합니다. worldCommandUsage2=/ <세계> worldCommandUsage2Description=주어진 월드의 위치로 이동합니다. -worth=§a{0} {2}개의 가격은 §c{1}§a 입니다. (아이템 1개의 가격은 {3} 입니다.) -worthCommandDescription=들고있는 아이템 또는 해당 아이템의 가치를 계산합니다. -worthCommandUsage=/ <<아이템>||hand|inventory|blocks> [-][수량] -worthCommandUsage1=/ <아이템> [수량] -worthCommandUsage1Description=보관함에서 해당 아이템을 전부(또는 지정한 경우, 지정된 수량만큼) 의 양을 확인합니다 -worthCommandUsage2=/ hand [수량] -worthCommandUsage2Description=들고 있는 아이템을 모든 블록(또는 지정한 경우, 지정한 수량만큼) 의 양을 확인합니다 -worthCommandUsage3=/ all -worthCommandUsage3Description=보관함에 있는 모든 아이템의 양을 확인합니다 -worthCommandUsage4=/ blocks [수량] -worthCommandUsage4Description=보관함에 있는 모든 블록(또는 지정한 경우, 지정된 수량만큼) 의 양을 확인합니다 -worthMeta=§7겹쳐진 {0}\:{1} 는 §c{2}의 가치가 있씁니다.§7 (아이템 {3}는 각 {4} 만큼의 가치) -worthSet=가치 및 값 설정 year=년(년도) years=년 youAreHealed=§7당신은 치료되었습니다. diff --git a/Essentials/src/main/resources/messages_lol_US.properties b/Essentials/src/main/resources/messages_lol_US.properties index e9449fa62..1e2cf6719 100644 --- a/Essentials/src/main/resources/messages_lol_US.properties +++ b/Essentials/src/main/resources/messages_lol_US.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} haz been addd 2 ur akownt. -addedToOthersAccount=§a{0} addd 2 {1}§a akownt. New balace\: {2} adventure=advenchur afkCommandDescription=Markz u as away-frum-keybord. afkCommandUsage=/ [playr/mesage...] @@ -47,20 +45,6 @@ backupFinished=§6Bakup Finishd. backupStarted=§6Bakup Startd. backupInProgress=§6An External Bakup Script Iz Currently In Progres\! Haltin Plugin Disable Til Finishd. backUsageMsg=§6Returnin 2 Previous Locashun. -balance=§aBalance\:§c {0} -balanceCommandDescription=Statez Teh Current Balance Ov Playr. -balanceCommandUsage=/ [player] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Statez Ur Current Balance -balanceCommandUsage2=/ -balanceCommandUsage2Description=Displays Teh Balance Ov Teh Specifid Playr -balanceOther=§aBalance ov {0}§a\:§c {1} -balanceTop=§6Top balancez ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Gets Teh Top Balance Valuez. -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] -balancetopCommandUsage1Description=Displays Teh Furst (Or Specifid) Paeg Ov Teh Top Balance Valuez banCommandDescription=Banz Playr. banCommandUsage=/ [reason] banCommandUsage1=/ [reason] @@ -159,16 +143,9 @@ commandNotLoaded=§4comman {0} oH HI r EMPROPErle loadd. compassBearing=§6beerin\: {0} ({1} deegrez). compassCommandDescription=Oh hi deescribez ur currnt beerin. compassCommandUsage=/ -condenseCommandDescription=Condensez itemz ento moar compact blokz. -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Condensez al Itemz in ur enVentory -condenseCommandUsage2=/ -condenseCommandUsage2Description=CondeNSez teh specifid item in ur enVENTORY configFileMoveError=FaILd to move Config.yml to bakup locasHUN. configFileRenameError=faild To renAMe teMp fil to config.ymL. confirmClear=§7tO §lCONFIRM§7 enventory cleer pleez rEPEET Command §6{0} -confirmPayment=§7ot §lCONFIRM§7 pAYMnt fOR §6{0}§7, pLEez repeet comman plz\: §6{1} connectedPlayers=§6connectd playerZ plz§r connectionFailed=faILD to opin conneCshun?? consoleName=consol @@ -187,7 +164,6 @@ createKitUnsupported=§4nbt item SERIALIZASHUN HAZ biN INAbled bUt thiz servr r creatingConfigFromTemplate=oh hi creetin config fRum template {0} creatingEmptyConfig=creetin empty config\: {0} creative=creetif -currency={0}{1} currentWorld=§6curRNt world\:§c {0} customtextCommandDescription=alowz u to creete custom teXT Commandz. customtextCommandUsage=/ - deeFine in BUKKIT.yml @@ -285,16 +261,6 @@ dumpUrl=§6creeTD SErvr dump\: §c{0} duplicatedUserdata=duplicatd userdata\: {0} an {1}. durability=§6thiz tol hAZ §c{0}§6 usez lEAftis. east=e -ecoCommandDescription=managez teh servr economy?? -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=gIVez TEH SPecifid playr teh sPECIFid imount for moneyz -ecoCommandUsage2=/ take -ecoCommandUsage2Description=takez teh Specifid IMOUnT For moneys FRUM teh speCIFId playr -ecoCommandUsage3=/ set -ecoCommandUsage3Description=setz teh speciFID PLAYERz balens to TEH SPECIFid imounT For moneyS -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=resetz teh specifid playerZ bAlens to teh serverz startin BALENS K? editBookContents=§eu can now edit teH CONtenTZ For thiz bok enabled=inabld enchantCommandDescription=inchantz TEH ITEM Teh usr r HOLdin. @@ -512,9 +478,7 @@ infoCommandDescription=showz enFormashun seted by teh servr ownR., infoCommandUsage=/ [chapter] [page] infoPages=§e ---- §6{2} §e--§6 pGe §c{0}§6\!§c{1} §e---- infoUnknownChapter=§4unknowN CHAPtR., -insufficientFunds=§4u iz pr an doNt haz inoo Moneys invalidBanner=§4envAlid baNnr syntaKS, -invalidCharge=§4envalid charge; invalidFireworkFormat=§4teh opshun §c{0} §4r noT Valid value fr §c{1}§4. invalidHome=§4Home§c {0} §4doesnt exist\!? invalidHomeName=§4envalid home nemE\!\!\!\!\!\!\!\!\!\!\!\!\!\!\!\!\!\!\! @@ -631,7 +595,6 @@ kitCommandUsage1Description=printin al kit listz on uR scrin kitCommandUsage2=/ [player] kitCommandUsage2Description=givez teh specifid kit TO U or anotHR plaYr if spECIfid kitContains=§6Kit §c{0} §6cOntainz\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4ther Iz no valid kitz kitError2=§4that kIT r emproperle deefind?? contacT An administRAtr @@ -709,7 +672,6 @@ mailTooLong=§4mail mesagE TO long?? trY to kep IT below 1000 CHARacTerZ markMailAsRead=§6TO maRk ur MaIL az reeD Type§c /mail clear§6. matchingIPAddress=§6teh folowIn playerZ PREViousle loggd in fruM that IP addres\: maxHomes=§4u cannot seted moar THAn§c {0} §4homez. -maxMoney=§4THIZ TRANSACSHuN wouLd excd teh balens Limit fr thiz aCcount?? mayNotJail=§4u can not jail that person\! mayNotJailOffline=§4u can not jail offlinE playerZ. meCommandDescription=deescribez an acshun in teH CONText for teh playr. @@ -718,7 +680,6 @@ meCommandUsage1=/ meCommandUsage1Description=deescrIBEZ aN Acshun meSender=me meRecipient=me -minimumBalanceError=§4teh minimum BALENS Usr can haz r {0}. minimumPayAmount=§cteh minimuM Imount u can pai r {0}. minute=minute minutes=miNuTez @@ -728,8 +689,6 @@ mobsAvailable=§6mobz\:§r {0} mobSpawnError=§4errr wil changin mob spornr. mobSpawnLimit=mob kwantitie lIMitd TO SERVR limit. mobSpawnTarget=§4target BLok mus be mob spornr. -moneyRecievedFrom=§a{0}§6 haz BIN receivd frum§a {1}§6. -moneySentTo=§a{0} haz bin sended to {1}. month=monTH months=monthz moreCommandDescription=fIlZ TEh item stak in hAN TO SPECifid imount or to maximum size if none r specifid. @@ -768,7 +727,6 @@ nearCommandUsage4=/ nearCommandUsage4Description=liStz al playErz within teh gived radiuz foR Teh specifid playr nearbyPlayers=§6plAYERZ neerby\:§r {0} nearbyPlayersList={0}§f(§c{1}m§f) -negativeBalanceError=§4usr r nOT ALowd to haz Negatif balens?? k? nickChanged=§6nikname changD nickCommandDescription=change ur niKname or that for anOTHr playr?? nickCommandUsage=/ [player] @@ -816,14 +774,7 @@ noPendingRequest=§4u dO NOT haz penDIN REKwest noPerm=§4u do not haz teH §c{0}§4 permishun nukeCommandUsage=/ [player] nukeCommandUsage1=/ [players...] -orderBalances=§6orderin balanCEZ for§c {0} §6userS pleez waiT\!\!\!\!\!\!\!\!\!\!\!\!\!\!\! passengerTeleportFail=§4U cant b teleportd wiz da passeger onboard. -payCommandDescription=payz anothr playr frUm ur balEns?? -payCommandUsage=/ -payCommandUsage1=/ -payconfirmtoggleCommandUsage=/ -paytoggleCommandUsage=/ [player] -paytoggleCommandUsage1=/ [player] pingCommandUsage=/ playtimeCommandUsage=/ [player] playtimeCommandUsage1=/ @@ -857,21 +808,12 @@ removeCommandUsage2=/ [world] repairCommandUsage=/ [hand|all] repairCommandUsage1=/ repairCommandUsage2=/ all -resetBal=§6Balens haz bin reseted to §c{0} §6fr al online plaYErz?? -resetBalAll=§6oH hi balens haz BIN RESeted TO §c{0} §6oh hi fr al PLAyERZ??\!\!???\! restCommandUsage=/ [player] restCommandUsage1=/ [player] rtoggleCommandUsage=/ [player] [on|off] rulesCommandUsage=/ [chapter] [page] seenCommandUsage=/ seenCommandUsage1=/ -sellCommandUsage=/ <||hand|inventory|blocks> [amount] -sellCommandUsage1=/ [amount] -sellCommandUsage2=/ hand [amount] -sellCommandUsage3=/ all -sellCommandUsage4=/ blocks [amount] -setBal=§aoh hi Ur baleNS were seTED to {0}. -setBalOthers=§au seted {0}§a''z balens tO k? {1}. sethomeCommandUsage=/ [[player\:]name] sethomeCommandUsage1=/ sethomeCommandUsage2=/ \: @@ -883,9 +825,6 @@ settprCommandUsage2=/ minrange settprCommandUsage3=/ maxrange setwarpCommandUsage=/ setwarpCommandUsage1=/ -setworthCommandUsage=/ [itemname|id] -setworthCommandUsage1=/ -setworthCommandUsage2=/ showkitCommandUsage=/ showkitCommandUsage1=/ editsignCommandUsage=/ [line number] [text] @@ -911,7 +850,6 @@ stonecutterCommandUsage=/ sudoCommandUsage=/ sudoCommandUsage1=/ [args] suicideCommandUsage=/ -takenFromOthersAccount=§e{0}§a TakeD frum §e {1}§a Account?? nEw balens\:§e {2} tempbanCommandUsage=/ [reason] tempbanCommandUsage1=/ [reason] tempbanipCommandUsage=/ [reason] @@ -972,7 +910,6 @@ unlinkCommandUsage=/ unlinkCommandUsage1=/ vanishCommandUsage=/ [player] [on|off] vanishCommandUsage1=/ [player] -versionOutputEconLayer=§6econOmy layr\: §r{0} warpCommandUsage1=/ [page] warpinfoCommandUsage=/ warpinfoCommandUsage1=/ @@ -981,8 +918,4 @@ whoisCommandUsage=/ whoisCommandUsage1=/ workbenchCommandUsage=/ worldCommandUsage1=/ -worthCommandUsage1=/ [amount] -worthCommandUsage2=/ hand [amount] -worthCommandUsage3=/ all -worthCommandUsage4=/ blocks [amount] youAreHealed=§6u haz bin heeald? diff --git a/Essentials/src/main/resources/messages_lt.properties b/Essentials/src/main/resources/messages_lt.properties index 850a2b386..e6c0bc0a0 100644 --- a/Essentials/src/main/resources/messages_lt.properties +++ b/Essentials/src/main/resources/messages_lt.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} buvo pridėta į jūsų sąskaitą. -addedToOthersAccount=§a{0} buvo pridėta į {1}§a sąskaitą. Naujas balansas\: {2} adventure=nuotykių afkCommandDescription=Pažymi jus kaip pasišalinus. afkCommandUsage=/ [player/message...] @@ -47,20 +45,6 @@ backupFinished=§6Backup finished. backupStarted=§6Backup started. backupInProgress=§6Išorinis atsarginės kopijos skriptas yra šiuo metu progrese\! Stabdomas pluginas kol bus baigta. backUsageMsg=§6Grįžtama į ankstesnę vietą. -balance=§aBalansas\:§c {0} -balanceCommandDescription=Nurodo dabartinį žaidėjo balansą. -balanceCommandUsage=/ [player] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Nurodo jūsų dabartinį balansą -balanceCommandUsage2=/ -balanceCommandUsage2Description=Parodo nurodyto žaidėjo balansą -balanceOther=§a{0} balansas\:§c {1} -balanceTop=§6Top balansai ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Gauna top balanso vertes. -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] -balancetopCommandUsage1Description=Rodomas pirmas (arba nurodytas) aukščiausių balanso verčių puslapis banCommandDescription=Užblokuoja žaidėją. banCommandUsage=/ [reason] banCommandUsage1=/ [reason] @@ -158,16 +142,9 @@ commandNotLoaded=§4Command {0} is improperly loaded. compassBearing=§6Azimutas\: {0} ({1} laipsnių). compassCommandDescription=Parodo į kurią pusę jūs šiuo metu žiūrite. compassCommandUsage=/ -condenseCommandDescription=Sutraukia daiktus į kompaktiškesnius blokus. -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Paverčia visus daiktus į blokus jūsų inventoriuje -condenseCommandUsage2=/ -condenseCommandUsage2Description=Paverčia specifinį daiktą į bloką jūsų inventoriuje configFileMoveError=Failed to move config.yml to backup location. configFileRenameError=Nepavyko pervadinti laikino failo į config.yml. confirmClear=§7To §lCONFIRM§7 inventory clear, please repeat command\: §6{0} -confirmPayment=§7To §lCONFIRM§7 payment of §6{0}§7, please repeat command\: §6{1} connectedPlayers=§6Prisijungę žaidėjai§r connectionFailed=Failed to open connection. consoleName=Konsolė @@ -186,7 +163,6 @@ createKitUnsupported=§4NBT elementų serializavimas buvo įjungtas, tačiau ši creatingConfigFromTemplate=Creating config from template\: {0} creatingEmptyConfig=Kuriama tuscia konfiguracija\: {0} creative=kūrybinis -currency={0}{1} currentWorld=§6Dabartinis pasaulis\:§c {0} customtextCommandDescription=Leidžia kurti pasirinktines teksto komandas. customtextCommandUsage=/ - Nustatyti per bukkit.yml @@ -283,16 +259,6 @@ dumpUrl=§6Sukurta serverio suvestinė\: §c{0} duplicatedUserdata=Duplicated userdata\: {0} and {1}. durability=§6This tool has §c{0}§6 uses left east=E -ecoCommandDescription=Tvarko serverio ekonomiką. -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=Duoda nurodytam žaidėjui nurodytą skaičių pinigų -ecoCommandUsage2=/ take -ecoCommandUsage2Description=Paima nurodytą pinigų sumą iš nurodyto žaidėjo -ecoCommandUsage3=/ set -ecoCommandUsage3Description=Nustato nurodyto žaidėjo balansą į nurodytą pinigų sumą -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=Atstato nurodyto žaidėjo balansą į pradinį serverio balansą editBookContents=§eTu dabar gali redaguoti šios knygos turinį. enabled=įjungtas enchantCommandDescription=Užkerėja žaidėjo laikomą daiktą. @@ -508,9 +474,7 @@ infoCommandDescription=Rodo informacija nustatyta serverio savininko. infoCommandUsage=/ [chapter] [page] infoPages=§e ---- §6{2} §e--§6 Puslapis §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Unknown chapter. -insufficientFunds=§4Insufficient funds available. invalidBanner=§4Invalid banner syntax. -invalidCharge=§4Invalid charge. invalidFireworkFormat=§4Pasirinkimas §c{0} §4nėra galimas §c{1}§4. invalidHome=§4Namas§c {0} §4neegzistuoja\! invalidHomeName=§4Neteisingas namo pavadinimas\! @@ -626,7 +590,6 @@ kitCommandUsage1Description=Parodo visus galimus daiktų rinkinius kitCommandUsage2=/ [player] kitCommandUsage2Description=Suteikia nurodytą rinkinį jums arba nurodytam žaidėjui jeigu nurodyta kitContains=§6Kit §c{0} §6contains\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Nėra nei vieno rinkinio. kitError2=§4Šis rinkinys neegzistuoja. Susisiekite su administracija. @@ -703,7 +666,6 @@ mailTooLong=§4Pašto žinutė per ilga. Stenkitės neviršyti 1000 simbolių. markMailAsRead=§6Norint pažymėti laiškus skaitytais, rašykite§c /mail clear§6. matchingIPAddress=§6Šie žaidėjai anksčiau prisijungti iš šio IP adreso\: maxHomes=§4Tu negali nustatyti daugiau nei§c {0} §4namus. -maxMoney=Cant translate mayNotJail=§4Tu negali įkalinti šį žmogų\! mayNotJailOffline=§4Tu negali pasodinti į kalėjimą neprisijungusių žaidėjų. meCommandDescription=Apibūdina veiksmą žaidėjo kontekste. @@ -712,7 +674,6 @@ meCommandUsage1=/ meCommandUsage1Description=Paaiškina veiksmą meSender=aš meRecipient=aš -minimumBalanceError=§4Minimalus likutis, kurį gali turėti vartotojas, yra {0}. minimumPayAmount=§cThe minimum amount you can pay is {0}. minute=minutė minutes=minutės @@ -722,8 +683,6 @@ mobsAvailable=§6Gyvūnai\:§r {0} mobSpawnError=§4Klaida keičiant gyvūnų spawneri. mobSpawnLimit=Mob quantity limited to server limit. mobSpawnTarget=§4Privalai žiūrėti į gyvūnų spawneri. -moneyRecievedFrom=§a{0}§6 buvo gauta iš §a {1}§6. -moneySentTo=§aNusiuntei{0} žaidėjui\: {1}. month=mėnesis months=mėnesiai moreCommandDescription=Pripildo turimą daiktų krūvą iki nurodyto kiekio arba iki didžiausio dydžio, jei nenurodyta. @@ -748,7 +707,6 @@ msgtoggleCommandDescription=Blokuoja visų privačių pranešimų gavimą. msgtoggleCommandUsage=/ [player] [on|off] msgtoggleCommandUsage1=/ [player] msgtoggleCommandUsage1Description=Įjungia skraidymo režimą jums arba kitam žaidėjui jeigu nurodyta -multipleCharges=§4You cannot apply more than one charge to this firework. multiplePotionEffects=§4You cannot apply more than one effect to this potion. muteCommandDescription=Užtildo arba atitildo žaidėją. muteCommandUsage=/ [datediff] [reason] @@ -778,7 +736,6 @@ nearCommandUsage3Description=Nurodo visus žaidėjus esančius netoli nurodyto nearCommandUsage4=/ nearCommandUsage4Description=Nurodo visus žaidėjus esančius nurodyto atstumo specifinio žaidėjo nearbyPlayers=§6Žaidėjai netoliese\:§r {0} -negativeBalanceError=§4Vartotojas negali turėti neigiamo balanso. nickChanged=§6Slapyvardis pakeistas. nickCommandDescription=Pakeiskite savo arba kito žaidėjo slapyvardį. nickCommandUsage=/ [player] @@ -830,9 +787,7 @@ noPermToSpawnMob=§4You don''t have permission to spawn this mob. noPlacePermission=§4Tu neturi teisių padėti blokus šalia lentelės. noPotionEffectPerm=§4You do not have permission to apply potion effect §c{0} §4to this potion. noPowerTools=§6You have no power tools assigned. -notAcceptingPay=§4{0} §4is not accepting payment. notEnoughExperience=§4Tu turi per mažai patirties. -notEnoughMoney=§4Tu neturi pakankamai lesu. notFlying=neskrendi nothingInHand=Tu nieko neturi savo rankose. now=dabar @@ -848,28 +803,9 @@ onlyPlayers=§4Turite būti žaidime, jeigu norite naudoti §c{0}§4. onlyPlayerSkulls=§4Savininką galite nustatyti tik ant žaidėjo kaukolės (§c397\:3§4). onlySunStorm=§4Naudojimas\: /weather §2sun/storm. openingDisposal=§6Opening disposal menu... -orderBalances=§6Ordering balances of§c {0} §6users, please wait... oversizedMute=§4Jūs negalite užtildyti žaidėjo šiam laiko periodui. oversizedTempban=§4Tu negali užblokuoti žaidėjo laikinai. passengerTeleportFail=§4Jūs negalite būti teleportuojamas kol nešiojate keleivių. -payCommandDescription=Sumoka kitam žaidėjui iš jūsų balanso. -payCommandUsage=/ -payCommandUsage1=/ -payCommandUsage1Description=Sumoka nurodytam žaidėjui nurodytą kiekį pinigų -payConfirmToggleOff=§6You will no longer be prompted to confirm payments. -payConfirmToggleOn=§6You will now be prompted to confirm payments. -payDisabledFor=§6Išjungėte mokėjimų priemimą žaidėjui §c{0}§6. -payEnabledFor=§6Įjungėte mokėjimų priemimą žaidėjui §c{0}§6. -payMustBePositive=§4Amount to pay must be positive. -payOffline=§4Jūs negalite sumokėti atsijungusiems žaidėjams. -payToggleOff=§6You are no longer accepting payments. -payToggleOn=§6You are now accepting payments. -payconfirmtoggleCommandDescription=Nustato ar jūsų bus prašoma patvirtinti mokėjimus. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Nustato, ar priimate mokėjimus. -paytoggleCommandUsage=/ [player] -paytoggleCommandUsage1=/ [player] -paytoggleCommandUsage1Description=Nustato, ar jūs arba kitas žaidėjas, jei nurodyta, priima mokėjimus pendingTeleportCancelled=§4Teleportacija buvo atšaukta. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -1028,8 +964,6 @@ requestSent=§6Prašymas nusiųstas§c {0}§6. requestSentAlready=§4You have already sent {0}§4 a teleport request. requestTimedOut=§4Teleportacijos prašymas anuliuotas. requestTimedOutFrom=§4Teleportavimo užklausa iš §c{0} §4 baigėsi. -resetBal=§6Balansas buvo nustatytas į §c{0} §6visiems prisijungusiems žaidėjams. -resetBalAll=§6Balansas buvo nustatytas į §c{0} §6visiems žaidėjams. rest=§6Jūs jaučiatės gerai pailsėję. restCommandDescription=Pailsi jus arba nurodytą žaidėją. restCommandUsage=/ [player] @@ -1051,18 +985,6 @@ seenCommandUsage1=/ seenCommandUsage1Description=Rodo paskutinio atsijungimo laiką, užblokavimo, užtildymo ir UUID informacija nurodyto žaidėjo seenOffline=§c{0} §6yra §4atsijungęs§6 nuo §c{1}§6. seenOnline=§c{0} §6yra §aprisijungęs§6 nuo §c{1}§6. -sellBulkPermission=§6You do not have permission to bulk sell. -sellCommandDescription=Parduoda daiktą kurį šiuo metu laikote. -sellCommandUsage=/ <||hand|inventory|blocks> [amount] -sellCommandUsage1=/ [amount] -sellCommandUsage1Description=Parduoda visą (arba nurodytą kiekį, jei nurodyta) jūsų inventoriuje esančio daikto -sellCommandUsage2=/ hand [amount] -sellCommandUsage2Description=Parduoda visą (arba nurodytą sumą, jei nurodyta) laikomo daikto -sellCommandUsage3=/ all -sellCommandUsage3Description=Parduoda visas įmanomas prekes iš jūsų inventoriaus -sellCommandUsage4=/ blocks [amount] -sellCommandUsage4Description=Parduoda visus (arba nurodytą kiekį, jei nurodyta) blokus jūsų inventoriuje -sellHandPermission=§6You do not have permission to hand sell. serverFull=Serveris yra pilnas\! serverReloading=Didelė tikimybė, kad dabar perkraunate serverį. Jei taip, kodėl nekenčiate savęs? Naudodami /reload nesitikėkite EssentialsX komandos palaikymo. serverTotal=§6Serverį iš viso\:§c {0} @@ -1071,8 +993,6 @@ serverUnsupportedClass=Būseną lemianti klasė\: {0} serverUnsupportedCleanroom=Naudojate serverį, kuris tinkamai nepalaiko Bukkit įskiepių, besiremiančių Mojang vidiniu kodu. Apsvarstykite galimybę naudoti Essentials"serverio programinės įrangos pakaitalą. serverUnsupportedLimitedApi=Naudojate serverį su ribotomis API funkcijomis. EssentialsX vis tiek veiks, tačiau tam tikros funkcijos gali būti išjungtos. serverUnsupportedMods=Naudojate serverį, kuris tinkamai nepalaiko Bukkit įskiepių. Bukkit įskiepiai neturėtų būti naudojami su Forge/Fabric modifikacijomis\! Forge naudotojams\: apsvarstykite galimybę naudoti ForgeEssentials arba SpongeForge + Nucleus. -setBal=§aTavo balansas buvo nustatytas\: {0}. -setBalOthers=§aTu nustatei {0}§a''s balansą į {1}. setSpawner=§6Spawnerio tipas buvo pakeistas į§c {0}§6. sethomeCommandDescription=Nustato namus jūsų esamoje pozicijoje. sethomeCommandUsage=/ [[player\:]name] @@ -1098,12 +1018,6 @@ setwarpCommandDescription=Sukuria naują teleportacijos tašką. setwarpCommandUsage=/ setwarpCommandUsage1=/ setwarpCommandUsage1Description=Nustato teleportacijos tašką su duotu pavadinimu į jūsų poziciją -setworthCommandDescription=Nustatykite prekės pardavimo kainą. -setworthCommandUsage=/ [itemname|id] -setworthCommandUsage1=/ -setworthCommandUsage1Description=Nustato jūsų laikomo daikto vertę pagal nurodytą kainą -setworthCommandUsage2=/ -setworthCommandUsage2Description=Nustato nurodytos prekės vertę pagal nurodytą kainą sheepMalformedColor=§4Malformed color. shoutDisabled=§6Šaukimo režimas §cišjungtas§6. shoutDisabledFor=§6Šaukimo režimas §cišjungtas §6žaidėjui §c{0}§6. @@ -1193,8 +1107,6 @@ suicideCommandUsage=/ suicideMessage=§6Viso žiaurus pasauli... suicideSuccess=§6{0} §6took their own life. survival=išlikimas -takenFromAccount=§e{0}§a buvo atimta iš jūsų sąskaitos. -takenFromOthersAccount=§e{0}§a atimta iš§e {1}§a sąskaitos. Naujas balansas\:§e {2} teleportAAll=§6Teleportacijos prašymas nusiųstas visiems... teleportAll=§6Teleportuojami visi žaidėjai... teleportationCommencing=§6Prasideda teleportacija... @@ -1346,8 +1258,6 @@ tptoggleCommandDescription=Užblokuoja visas teleportacijos formas. tptoggleCommandUsage=/ [player] [on|off] tptoggleCommandUsage1=/ [player] tptoggleCommandUsageDescription=Perjungia, ar teleportai įjungti jums arba kitam žaidėjui, jei nurodyta -tradeSignEmpty=§4The trade sign has nothing available for you. -tradeSignEmptyOwner=§4There is nothing to collect from this trade sign. treeCommandDescription=Sukurkite medį ten, kur žiūrite. treeCommandUsage=/ treeCommandUsage1=/ @@ -1423,12 +1333,10 @@ versionDevLatest=§6Jūs naudojate naujausią EssentialsX programinę versiją\! versionError=§4Įvyko klaida tikrinant EssentialsX versijos informaciją\! Įskiepio buildo informacija\: §c{0}§6. versionErrorPlayer=§6Įvyko klaida tikrinant EssentialsX versijos informaciją\! versionFetching=§6Gaunama versijos informacija... -versionOutputVaultMissing=§4Vault nėra įdiegtas. Pokalbiai ir leidimai gali neveikti. versionOutputFine=§6{0} versija\: §a{1} versionOutputWarn=§6{0} versija\: §c{1} versionOutputUnsupported=§d{0} §6versija\: §d{1} versionOutputUnsupportedPlugins=§6Jūs naudojate §dnepalaikomus įskiepius§6\! -versionOutputEconLayer=§6Ekonomikos sluoksnis\: §r{0} versionMismatch=§4Version mismatch\! Please update {0} to the same version. versionMismatchAll=§4Version mismatch\! Please update all Essentials jars to the same version. versionReleaseLatest=§6Jūs naudojate naujausią stabilią EssentialsX versiją\! @@ -1490,7 +1398,6 @@ whoisHunger=§6 - Hunger\:§r {0}/20 (+{1} saturation) whoisIPAddress=§6 - IP Adresas\:§r {0} whoisJail=§6 - Kalėjimas\:§r {0} whoisLocation=§6 - Vieta\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Balansas\:§r {0} whoisMuted=§6 - Užtildytas\:§r {0} whoisMutedReason=§6 - Užtildytas\:§r {0} §6Priežastis\: §c{1} whoisNick=§6 - Slapyvardis\: §r {0} @@ -1507,19 +1414,6 @@ worldCommandUsage1=/ worldCommandUsage1Description=Teleportuoja į atitinkamą vietą neteryje arba pabaigos pasaulyje worldCommandUsage2=/ worldCommandUsage2Description=Teleportuoja į jūsų buvimo vietą nurodytame pasaulyje -worth=§aStack of {0} worth §c{1}§a ({2} item(s) at {3} each) -worthCommandDescription=Apskaičiuoja daiktų vertę rankoje arba kaip nurodyta. -worthCommandUsage=/ <||hand|inventory|blocks> [-][amount] -worthCommandUsage1=/ [amount] -worthCommandUsage1Description=Patikrina, kiek vertas visas (arba nurodytas kiekis, jei nurodyta) jūsų inventoriuje esančio daikto -worthCommandUsage2=/ hand [amount] -worthCommandUsage2Description=Patikrina, kiek vertas visas (arba nurodytas kiekis, jei nurodyta) jūsų rankose esančio daikto -worthCommandUsage3=/ all -worthCommandUsage3Description=Patikrina visų galimų inventoriaus daiktų vertę -worthCommandUsage4=/ blocks [amount] -worthCommandUsage4Description=Patikrina visų (arba nurodyto kiekio, jei nurodyta) jūsų inventoriuje esančių blokų vertę -worthMeta=§aStack of {0} with metadata of {1} worth §c{2}§a ({3} item(s) at {4} each) -worthSet=§6Worth value set year=metai years=metus youAreHealed=§6Tu buvai pagydytas. diff --git a/Essentials/src/main/resources/messages_lv_LV.properties b/Essentials/src/main/resources/messages_lv_LV.properties index 96bb1f33a..1b40c7ee8 100644 --- a/Essentials/src/main/resources/messages_lv_LV.properties +++ b/Essentials/src/main/resources/messages_lv_LV.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} tika pievienots jūsu kontam. -addedToOthersAccount=§a{0} tika pievienots {1}§a kontam. Jauna bilance\: {2} adventure=piedzīvojumu afkCommandDescription=Atzīmē jūs kā atgājušu no tastatūras. afkCommandUsage=/ [spēlētājs/ziņojums..] @@ -47,20 +45,6 @@ backupFinished=§6Rezerves kopija ir pabeigta. backupStarted=§6Rezerves kopēšana ir sākusies. backupInProgress=§6Pašlaik ir progresā ārējais rezerves skripts\! Spraudņa apturēšana ir atspējota līdz process ir pabeigts. backUsageMsg=§6Atgriešanās iepriekšējā vietā. -balance=§aBilance\:§c {0} -balanceCommandDescription=Parāda pašreizējo spēlētāja bilanci. -balanceCommandUsage=/ [player] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Parāda jūsu pašreizējo bilanci -balanceCommandUsage2=/ -balanceCommandUsage2Description=Parāda norādīta spēlētāja bilanci -balanceOther=§a{0} bilance§a\:§c {1} -balanceTop=§6Bagātākie spēlētāji ({0}) -balanceTopLine={0}, {1}, {2} -balancetopCommandDescription=Parāda bagātākos spēlētājus. -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] -balancetopCommandUsage1Description=Parāda pirmo (vai norādīto) lapu bagātāko spēlētāju sarakstā banCommandDescription=Nobano spēlētāju. banCommandUsage=/ [reason] banCommandUsage1=/ [reason] @@ -157,16 +141,9 @@ commandNotLoaded=§4Komanda {0} nav pareizi ielādēta. compassBearing=§6Azimuts\: {0} ({1} grādi). compassCommandDescription=Apraksta jūsu pašreizējo atrašanās vietu. compassCommandUsage=/ -condenseCommandDescription=Saspiež priekšmetus kompaktos blokos. -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Saspiež visus priekšmetus jūsu inventārī -condenseCommandUsage2=/ -condenseCommandUsage2Description=Saspiež norādīto priekšmetu jūsu inventārī configFileMoveError=Neizdevās pārvietot config.yml uz rezerves vietu. configFileRenameError=Neizdevās pārdēvēt pagaidu failu config.yml. confirmClear=§7Lai §lAPSTIPRINĀT§7 inventāra tīrīšanu, lūdzu atkārtojiet komandu\: §6{0} -confirmPayment=§7Lai §lAPSTIPRINĀT§7 maksājumu §6{0}§7, lūdzu atkārtojiet komandu\: §6{1} connectedPlayers=§6Spēlētāji tiešsaistē§r connectionFailed=Neizdevās atvērt savienojumu. consoleName=Konsole @@ -185,7 +162,6 @@ createKitUnsupported=§4NBT priekšmetu serializācija ir iespējota, bet šis s creatingConfigFromTemplate=Veido konfigurāciju no šablona\: {0} creatingEmptyConfig=Veido tukšu konfigurācijas failu\: {0} creative=radošais -currency={0}{1} currentWorld=§6Pašreizējā pasaule\:§c {0} customtextCommandDescription=Ļauj jums izveidot savas teksta komandas. customtextCommandUsage=/ - Definējiet iekš bukkit.yml @@ -243,8 +219,6 @@ downloadingGeoIp=Lejupielādē GeoIP datubāzi... tas var aizņemt kādu laiku ( duplicatedUserdata=Dublēti lietotāja dati\: {0} un {1}. durability=§6Šim rīkam ir atlikuši §c{0}§6 lietojumi. east=A -ecoCommandDescription=Pārvalda servera ekonomiku. -ecoCommandUsage=/ editBookContents=§eTagad tu vari rediģēt šīs grāmatas saturu. enabled=iespējots enchantCommandDescription=Apbur objektu, kuru tur lietotājs. @@ -395,9 +369,7 @@ infoCommandDescription=Parāda servera īpašnieka iestatīto informāciju. infoCommandUsage=/ [chapter] [page] infoPages=§e ---- §6{2} §e--§6 Lappuse §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Nezināma nodaļa. -insufficientFunds=§4Nepietiekami līdzekļi. invalidBanner=§4Nederīga karogu sintakse. -invalidCharge=§4Nederīgs lādiņš. invalidFireworkFormat=§4Opcijai §c{0} §4nav derīga vērtība §c{1}§4. invalidHome=§4Māja§c {0} §4neeksistē\! invalidHomeName=§4Nederīgs mājas nosaukums\! @@ -489,7 +461,6 @@ kitCommandDescription=Iegūst norādīto komplektu vai aplūko visus pieejamos k kitCommandUsage=/ [kit] [player] kitCommandUsage1=/ kitContains=§6Komplekts §c{0} §6satur\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Šeit nav derīgo komplektu. kitError2=§4Šis komplekts ir nepareizi definēts. Sazinieties ar administratoru. @@ -535,7 +506,6 @@ mailTooLong=§4Vēstule pārāk gara. Centies turēt to zem 1000 rakstzīmēm. markMailAsRead=§6Lai atzīmēt savu pastu kā izlasītu, raksti§c /mail clear§6. matchingIPAddress=§6Šie spēlētāji iepriekš gāja iekšā serverī no šīs IP adreses\: maxHomes=§4Tu nevari iestatīt vairāk par§c {0} §4mājām. -maxMoney=§4Šis darījums pārsniegs šī konta bilances limitu. mayNotJail=§4Tu nevari ielikt cietumā šo cilvēku\! mayNotJailOffline=§4Tu nevari ielikt cietumā spēlētājus, kuri ir bezsaistē. meCommandDescription=Raksturo darbību spēlētāja kontekstā. @@ -543,7 +513,6 @@ meCommandUsage=/ meCommandUsage1=/ meSender=es meRecipient=es -minimumBalanceError=§4Lietotāja minimālais iespējamais atlikums ir {0}. minimumPayAmount=§cMinimālā summa, ko tu vari maksāt ir {0}. minute=minūte minutes=minūtēm @@ -553,8 +522,6 @@ mobsAvailable=§6Mobi\:§r {0} mobSpawnError=§4Kļūda, mainot mobu radītāju. mobSpawnLimit=Mobu daudzums ir ierobežots līdz servera ierobežojumam. mobSpawnTarget=§4Mērķa blokam jābūt mobu radītājam. -moneyRecievedFrom=§a{0}§6 saņemti no§a {1}§6. -moneySentTo=§a{0} tika nosūtīti uz {1}. month=mēnesis months=mēneši moreCommandDescription=Piepilda priekšmetu kaudzi līdz noteiktai summai vai līdz maksimālajam izmēram, ja tāds nav norādīts. @@ -576,7 +543,6 @@ msgIgnore=§c{0} §4ir atslēgtas ziņas. msgtoggleCommandDescription=Bloķē visu privāto ziņojumu saņemšanu. msgtoggleCommandUsage=/ [player] [on|off] msgtoggleCommandUsage1=/ [player] -multipleCharges=§4Tu nevari pielietot vairāk par vienu lādiņu šim salūtam. multiplePotionEffects=§4Tu nevari pielietot vairāk par vienu efektu šai dzirai. muteCommandDescription=Uzstāda vai noņem spēlētāja runātspējas. muteCommandUsage=/ [datediff] [reason] @@ -597,7 +563,6 @@ nearCommandUsage=/ [playername] [radius] nearCommandUsage1=/ nearCommandUsage3=/ nearbyPlayers=§6Spēlētāji tuvumā\:§r {0} -negativeBalanceError=§4Lietotājam nav atļauta negatīva bilance. nickChanged=§6Segvārds mainīts. nickCommandDescription=Mainiet savu vai cita spēlētāja segvārdu. nickCommandUsage=/ [player] @@ -642,9 +607,7 @@ noPermToSpawnMob=§4Tev nav tiesību, lai radīt to mobu. noPlacePermission=§4Tev nav tiesību, lai likt bloku blakus tai zīmei. noPotionEffectPerm=§4Tev nav tiesību, lai pielietot dziras efektu §c{0} §4šai dzirai. noPowerTools=§6Tev nav piešķirts neviens spēka instruments. -notAcceptingPay=§4{0} §4nepieņem maksājumus. notEnoughExperience=§4Tev nav pietiekami daudz pieredzes. -notEnoughMoney=§4Tev nav pietiekamu līdzekļu. notFlying=nelido nothingInHand=§4Tev nav nekā rokās. now=tagad @@ -658,25 +621,9 @@ onlyPlayers=§4Tikai iekšspēles spēlētāji var izmantot §c{0}§4. onlyPlayerSkulls=§4Tu vari iestatīt īpašnieku tikai spēlētāju galvaskausiem (§c397\:3§4). onlySunStorm=§4/weather atbalsta tikai Sauli/vētru. openingDisposal=§6Atver likvidēšanas izvēlni... -orderBalances=§6Pasūta bilances no§c {0} §6lietotājiem, lūdzu uzgaidiet... oversizedMute=§4Tu nevari izraidīt spēlētāju uz šo laika periodu. oversizedTempban=§4Tu nevari izraidīt spēlētāju uz šo laika periodu. passengerTeleportFail=§4Tu nevari teleportēties, kamēr tev ir pasažieri. -payCommandDescription=Samaksā citam spēlētājam no sava konta. -payCommandUsage=/ -payCommandUsage1=/ -payConfirmToggleOff=§6Tev vairs netiks piedāvāts apstiprināt maksājumus. -payConfirmToggleOn=§6Tagad tev tiks piedāvāts apstiprināt maksājumus. -payDisabledFor=§6Atspējota maksājumu pieņemšana §c{0}§6. -payEnabledFor=§6Iespējota maksājumu pieņemšana §c{0}§6. -payMustBePositive=§4Maksājuma summai jābūt pozitīvai. -payToggleOff=§6Tu vairs nepieņem maksājumus. -payToggleOn=§6Tagad tu pieņem maksājumus. -payconfirmtoggleCommandDescription=Pārslēdz, vai tiek prasīts apstiprināt maksājumus. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Pārslēdz, vai jūs pieņemat maksājumus. -paytoggleCommandUsage=/ [player] -paytoggleCommandUsage1=/ [player] pendingTeleportCancelled=§4Gaidāmais teleportācijas pieprasījums atcelts. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -789,8 +736,6 @@ requestDeniedFrom=§c{0} §6noliedza tavu teleportācijas pieprasījumu. requestSent=§6Pieprasījums nosūtīts §c {0}§6. requestSentAlready=§4Tu jau esi nosūtījies {0}§4 teleportācijas pieprasījumu. requestTimedOut=§4Teleportācijas pieprasījuma termiņš ir beidzies. -resetBal=§6Bilance ir atiestatīta uz §c{0} §6visiem tiešsaistē esošajiem spēlētājiem. -resetBalAll=§6Bilance ir atiestatīta uz §c{0} §6visiem spēlētājiem. rest=§6Tu jūties labi atpūties. restCommandDescription=Atpūtina jūs vai doto spēlētāju. restCommandUsage=/ [player] @@ -810,16 +755,11 @@ seenCommandUsage=/ seenCommandUsage1=/ seenOffline=§6Spēlētājs§c {0} §6bija §4bezsaistē§6 kopš §c{1}§6. seenOnline=§6Spēlētājs§c {0} §6bija §atiešsaistē§6 kopš §c{1}§6. -sellBulkPermission=§6Tev nav tiesību vairumtirdzniecībai. -sellCommandDescription=Pārdod jūsu rokā esošo priekšmetu. -sellHandPermission=§6Tev nav tiesību, lai pārdod rokā esošos priekšmetus. serverFull=Serveris ir pilns\! serverReloading=Pastāv lielas izredzes, ka jūs restartējat serveri. Ja tas tā ir, kāpēc jūs ienīstat sevi? Negaidiet palīdzību no EssentialsX komandas izmantojot /reload. serverTotal=§6Serverī Kopā\:§c {0} serverUnsupported=Tu izmanto neatbalstītu servera versiju\! serverUnsupportedLimitedApi=Jūs izmantojat serveri ar ierobežotu API funkcionalitāti. EssentialsX joprojām darbosies, taču dažas funkcijas var būt atspējotas. -setBal=§aTava bilance tika iestatīta uz {0}. -setBalOthers=§aTu iestatīji {0}§a''a bilanci uz {1}. setSpawner=§6Nomainīja radītāja tipu uz§c {0}§6. sethomeCommandDescription=Iestatiet savu māju pašreizējā atrašanās vietā. sethomeCommandUsage=/ [player\:][name] @@ -835,8 +775,6 @@ settprValue=§6Iestatiet nejaušu teleportēšanas centru §c{0}§6 līdz §c{1} setwarpCommandDescription=Izveido jaunu warpu. setwarpCommandUsage=/ setwarpCommandUsage1=/ -setworthCommandDescription=Iestatiet priekšmeta pārdošanas vērtību. -setworthCommandUsage=/ [itemname|id] sheepMalformedColor=§4Kroplīga krāsa. shoutFormat=§6[Shout]§r {0} editsignCommandClear=§6Zīme notīrīta. @@ -894,8 +832,6 @@ suicideCommandUsage=/ suicideMessage=§6Ardievu nežēlīgā pasaule... suicideSuccess=§6Spēlētājs §c{0} §6atņēma sev dzīvību. survival=izdzīvošanas -takenFromAccount=§e{0}§a tika noņemti no tava konta. -takenFromOthersAccount=§e{0}§a tika noņemti no§e {1}§a konta. Jauna bilance\:§e {2} teleportAAll=§6Teleportācijas pieprasījums nosūtīts visiem spēlētājiem... teleportAll=§6Teleportē visus spēlētājus... teleportationCommencing=§6Teleportācija sākas... @@ -1002,8 +938,6 @@ tps=§6Pašreizējais TPS \= {0} tptoggleCommandDescription=Bloķē visa veida teleportāciju. tptoggleCommandUsage=/ [player] [on|off] tptoggleCommandUsage1=/ [player] -tradeSignEmpty=§4Tirdzniecības zīmei nav nekā pieejama tev. -tradeSignEmptyOwner=§4Šai tirdzniecības zīmei nav nekā, ko tu varētu savākt. treeCommandDescription=Spawno koku tur, kur skatāties. treeCommandUsage=/ treeCommandUsage1=/ @@ -1059,7 +993,6 @@ vanishCommandDescription=Paslēp sevi no citiem spēlētājiem. vanishCommandUsage=/ [player] [on|off] vanishCommandUsage1=/ [player] vanished=§6Tu tagad esi pilnīgi neredzams parastajiem lietotājiem, un paslēpts no iekšspēles komandām. -versionOutputVaultMissing=§4Vault nav instalēts. Čats un atļaujas var nestrādāt. versionOutputFine=§6{0} versija\: §a{1} versionOutputWarn=§6{0} versija\: §c{1} versionOutputUnsupported=§d{0} §6versija\: §d{1} @@ -1111,7 +1044,6 @@ whoisHunger=§6 - Izsalkums\:§r {0}/20 (+{1} piesātinājums) whoisIPAddress=§6 - IP Adrese\:§r {0} whoisJail=§6 - Cietums\:§r {0} whoisLocation=§6 - Atrašanās vieta\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Nauda\:§r {0} whoisMuted=§6 - Apklusināts\:§r {0} whoisMutedReason=§6 - Apklusināts\:§r {0} §6Iemesls\: §c{1} whoisNick=§6 - Segvārds\:§r {0} @@ -1125,11 +1057,6 @@ workbenchCommandUsage=/ worldCommandDescription=Pārslēdzieties starp pasaulēm. worldCommandUsage=/ [world] worldCommandUsage1=/ -worth=§aKaudze {0} vērta §c{1}§a ({2} priekšmets(i) {3} par katru) -worthCommandDescription=Aprēķina rokā vai atbilstoši norādīto priekšmetu vērtību. -worthCommandUsage=/ <||hand|inventory|blocks> [-][amount] -worthMeta=§aKaudze {0} ar metadata {1} vērta §c{2}§a ({3} priekšmets(i) {4} par katru) -worthSet=§6Vērtība iestatīta year=gads years=gadi youAreHealed=§6Tevi izārstēja. diff --git a/Essentials/src/main/resources/messages_nl.properties b/Essentials/src/main/resources/messages_nl.properties index 6d6e71806..bc6056638 100644 --- a/Essentials/src/main/resources/messages_nl.properties +++ b/Essentials/src/main/resources/messages_nl.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} is gestort op uw rekening. -addedToOthersAccount=§a{0} is toegevoegd aan {1}§a''s rekening. Nieuw saldo\: {2} adventure=avontuur afkCommandDescription=Markeert je als weg-van-toetsenbord. afkCommandUsage=/ [speler/bericht...] @@ -47,20 +45,6 @@ backupFinished=Backup voltooid. backupStarted=Backup gestart. backupInProgress=§6Een extern backup script wordt uitgevoerd\! Plugin wordt pas stopgezet als dit klaar is. backUsageMsg=§7Naar Uw vorige locatie aan het gaan. -balance=§7Saldo\: {0} -balanceCommandDescription=Laat het huidige saldo van een speler zien. -balanceCommandUsage=/ [speler] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Toont je huidige saldo -balanceCommandUsage2=/ -balanceCommandUsage2Description=Toont het saldo van een specifieke speler -balanceOther=§aSaldo van {0}§a\:§c {1} -balanceTop=§7 Top saldo ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Haalt de beste saldowaarden op. -balancetopCommandUsage=/ [pagina] -balancetopCommandUsage1=/ [pagina] -balancetopCommandUsage1Description=De eerste (of gespecificeerde) pagina van de waarden van de bovenste balans banCommandDescription=Verbant een speler. banCommandUsage=/ [reden] banCommandUsage1=/ [reden] @@ -161,16 +145,9 @@ consoleCannotUseCommand=Deze opdracht kan niet worden gebruikt vanuit de console compassBearing=§6Richting\: {0} ({1} graden). compassCommandDescription=Beschrijft je huidige richting. compassCommandUsage=/ -condenseCommandDescription=Perst items samen in meer compacte blokken. -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Condenseert alle items in je inventaris -condenseCommandUsage2=/ -condenseCommandUsage2Description=Condenseert het opgegeven item in je inventaris configFileMoveError=Het verplaatsen van config.yml naar de backup locatie is mislukt. configFileRenameError=Fout bij het hernoemen van de tijdelijke map naar config.yml confirmClear=§7Om het leeghalen van je intventaris te §lBEVESTIGEN§7, herhaal de command\: §6{0} -confirmPayment=§7Om de betaling van §6{0}§7 te §lBEVESTIGEN§7, herhaal de command\: §6{1} connectedPlayers=§6Spelers online§r connectionFailed=Fout bij het verbinden. consoleName=Console @@ -189,7 +166,6 @@ createKitUnsupported=§4NBT item serialisatie is ingeschakeld, maar deze server creatingConfigFromTemplate=Bezig met aanmaken van een config vanaf sjabloon\: {0} creatingEmptyConfig=Bezig met het aanmaken van een lege configuratie\: {0} creative=creatief -currency={0}{1} currentWorld=Huidige Wereld\: {0} customtextCommandDescription=Maakt het mogelijk om aangepaste tekstopdrachten te maken. customtextCommandUsage=/ - Definieer in bukkit.yml @@ -295,12 +271,6 @@ dumpUrl=§6Server dump aangemaakt\: §c{0} duplicatedUserdata=Dubbele gebruikersdata\: {0} en {1}. durability=§7Dit gereedschap kan nog §c{0}§7 gebruikt worden. east=O -ecoCommandDescription=Beheert de servereconomie. -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=Geeft de gegeven speler het gegeven bedrag geld -ecoCommandUsage2=/ take -ecoCommandUsage2Description=Neemt het gegeven bedrag geld van de gegeven speler editBookContents=§eU kunt nu de inhoud van dit boek aanpassen. enabled=ingeschakeld enchantCommandDescription=Betovert het item dat de gebruiker vasthoudt. @@ -504,9 +474,7 @@ infoCommandDescription=Toont informatie die is ingesteld door de eigenaar van de infoCommandUsage=/ [hoofdstuk] [pagina] infoPages=§e ---- §6{2} §e--§6 Pagina §4{0}§6/§4{1} §e---- infoUnknownChapter=§4Onbekend hoofdstuk. -insufficientFunds=§4Saldo niet toereikend. invalidBanner=§4Ongeldige banner syntax. -invalidCharge=§cOngeldige prijs. invalidFireworkFormat=§4De optie §c{0} §4is geen geldige waarde §c{1}§4.\n invalidHome=Home {0} Bestaat niet. invalidHomeName=§4Ongeldige huisnaam\! @@ -603,7 +571,6 @@ kitCommandUsage=/ [kit] [speler] kitCommandUsage1=/ kitCommandUsage2=/ [speler] kitContains=§6Kit §c{0} §6bevat\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Er zijn geen geldige kits. kitError2=§4Die kit is niet goed ingesteld. Neem contact op met een administrator. @@ -660,7 +627,6 @@ mailTooLong=§4Mail bericht te lang. Probeer om het onder 1000 tekens te houden. markMailAsRead=§6Om je mail te markeren als gelezen, typ§c /mail clear§6.\n matchingIPAddress=§6De volgende spelers logden eerder in op dat IP adres\: maxHomes=§4U kunt niet meer dan§c {0}§4 huizen zetten. -maxMoney=§4Deze transactie overschrijdt het balans van dit account. mayNotJail=§cU mag die speler niet in de gevangenis zetten. mayNotJailOffline=§4Je mag geen spelers in de gevangenis zetten wanneer zij offline zijn. meCommandDescription=Beschrijf een actie in de context van de speler. @@ -669,7 +635,6 @@ meCommandUsage1=/ meCommandUsage1Description=Beschrijf een actie meSender=ik meRecipient=ik -minimumBalanceError=§4Het minimale saldo dat een gebruiker kan hebben is {0}. minimumPayAmount=§cDe minimaal betaal hoeveelheld moet {0} zijn. minute=minuut minutes=minuten @@ -679,8 +644,6 @@ mobsAvailable=§6Mobs\:§r {0} mobSpawnError=§4Fout bij het veranderen van de mob spawner. mobSpawnLimit=De hoeveelheid mobs zijn gelimiteerd door de server limiet. mobSpawnTarget=§4Doelblok moet een mob spawner zijn. -moneyRecievedFrom=§a{0}§6 is ontvangen van§a {1}§6. -moneySentTo=§a{0} is verzonden naar {1}. month=maand months=maanden moreCommandDescription=Vult de voorwerpstapel in je hand aan tot het opgegeven aantal, of naar maximale hoeveelheid als er geen is opgegeven. @@ -703,7 +666,6 @@ msgtoggleCommandDescription=Blokkeert alle privéberichten. msgtoggleCommandUsage=/ [speler] [on|off] msgtoggleCommandUsage1=/ [speler] msgtoggleCommandUsage1Description=Schakelt vliegen aan of uit voor jezelf of een andere speler indien opgegeven -multipleCharges=§4U kunt niet meer dan één lading aan dit vuurwerk toevoegen. multiplePotionEffects=§4U kunt niet meer dan één effect aan dit toverdrankje toevoegen. muteCommandDescription=Dempt een speler of heft het dempen op. muteCommandUsage=/ [datediff] [reden] @@ -725,7 +687,6 @@ nearCommandUsage1=/ nearCommandUsage3=/ nearbyPlayers=§6Spelers dichtbij\:§r {0} nearbyPlayersList={0}§f(§c{1}m§f) -negativeBalanceError=Het is voor deze gebruiker niet toegestaan om een negatief saldo te hebben. nickChanged=Bijnaam veranderd. nickCommandDescription=Verander je bijnaam of die van een andere speler. nickCommandUsage=/ [speler] @@ -773,10 +734,8 @@ noPermToSpawnMob=§4U heeft geen toestemming om deze mob te spawnen. noPlacePermission=§4U heeft geen toestemming om een blok naast dat bord te plaatsen. noPotionEffectPerm=§4U heeft geen toestemming om het §c{0} §4effect aan deze toverdrank toe te voegen. noPowerTools=§6U heeft geen powertools toegewezen. -notAcceptingPay=§4{0} §4accepteert geen betalingen. notAllowedToLocal=§4U heeft geen toestemming om te spreken in de lokale chat. notEnoughExperience=§4U heeft niet genoeg experience. -notEnoughMoney=§4U heeft niet genoeg geld. notFlying=Niet aan het vliegen. nothingInHand=§4U heeft niets in uw hand. now=nu @@ -790,26 +749,9 @@ onlyPlayers=&4Alleen ingame spelers kunnen &c{0}&4 gebruiken. onlyPlayerSkulls=&4Je kan alleen de Eigenaar van een hoofd Zetten\! onlySunStorm=§4/weather ondersteunt alleen sun/storm. openingDisposal=§6Opening disposal menu... -orderBalances=§6Saldo''s bestellen van§c {0} §6gebruikers, een moment geduld alstublieft... oversizedMute=§4Je mag geen spelers dempen voor deze tijdsduur. oversizedTempban=§4U kunt een speler niet verbannen voor deze lange period van tijd. passengerTeleportFail=§4Je kunt niet geteleporteerd worden tijdens het vervoeren van passagiers. -payCommandDescription=Betaalt een andere speler van jouw saldo. -payCommandUsage=/ -payCommandUsage1=/ -payConfirmToggleOff=§6Je zal niet meer worden gevraagd om betalingen te bevestigen. -payConfirmToggleOn=§6Je zal worden gevraagd om betalingen te bevestigen. -payDisabledFor=§6Betalingen accepteren uitgeschakeld voor §c{0}§6. -payEnabledFor=§6Betalingen accepteren ingeschakeld voor §c{0}§6. -payMustBePositive=§4De aantal wat je wilt betalen moet positief zijn. -payOffline=§4Je kunt geen offline gebruikers betalen. -payToggleOff=§6Je accepteert niet langer betalingen. -payToggleOn=§6Je accepteert betalen weer. -payconfirmtoggleCommandDescription=Schakelt of je wordt gevraagd om betalingen te bevestigen. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Schakelt of je betalingen accepteert. -paytoggleCommandUsage=/ [speler] -paytoggleCommandUsage1=/ [speler] pendingTeleportCancelled=§4Afwachtende teleportatie afgelast. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -927,8 +869,6 @@ requestDeniedFrom=§c{0} §6heeft jouw teleporteeraanvraag geweigerd. requestSent=§7Aanvraag verstuurd naar {0}§7. requestSentAlready=§4Je hebt {0}§4 al een teleport verzoek gestuurd. requestTimedOut=§cTeleportatie verzoek is verlopen. -resetBal=§6Balans is gereset naar §c{0} §6voor alle online spelers. -resetBalAll=§6Saldo is gereset naar §c{0} §6voor alle spelers. rest=§6Je voelt je uitgerust. restCommandDescription=Rust jou of de gegeven speler uit. restCommandUsage=/ [speler] @@ -948,9 +888,6 @@ seenCommandUsage=/ seenCommandUsage1=/ seenOffline=§6Speler§c {0} §6is §4offline§6 sinds §c{1}§6. seenOnline=§6Speler§c {0} §6is §aonline§6 sinds §c{1}§6. -sellBulkPermission=§6You do not have permission to bulk sell. -sellCommandDescription=Verkoopt het voorwerp in je hand. -sellHandPermission=§6You do not have permission to hand sell. serverFull=Server is vol. serverReloading=Er is een grote kans dat je je server herlaadt. Als dat zo is, waarom haat je jezelf? Verwacht geen ondersteuning van het EssentialsX-team als je /reload gebruikt. serverTotal=§6Server Totaal\:§c {0} @@ -960,8 +897,6 @@ serverUnsupportedCleanroom=Je draait een server die Bukkit-plugins die vertrouwe serverUnsupportedDangerous=Je gebruikt een server implementatie waarvan bekend is dat deze extreem gevaarlijk is en tot dataverlies kan leiden. Het wordt sterk aangeraden om over te schakelen naar een stabielere en goed presterende serversoftware, zoals Paper of Tuinity. serverUnsupportedLimitedApi=Je gebruikt een server met beperkte API-functionaliteit. EssentialsX werkt nog steeds, maar sommige functies zijn mogelijk uitgeschakeld. serverUnsupportedMods=Je gebruikt een server die Bukkit plugins niet goed ondersteunt. Bukkit plugins mogen niet worden gebruikt met Forge/Fabric mods\! Voor Forge\: Overweeg om ForgeEssentials, of SpongeForge + Nucleus te gebruiken. -setBal=§aUw saldo is ingesteld op {0}. -setBalOthers=§aU heeft het saldo van {0} §aingesteld op {1}. setSpawner=§6Veranderde oproeper type naar§c {0}§6. sethomeCommandDescription=Stelt je thuisadres in als je huidige locatie. sethomeCommandUsage=/ [[speler\:]naam] @@ -977,8 +912,6 @@ settprValue=§6Willekeurige teleportatie §c{0}§6 ingesteld als §c{1}§6. setwarpCommandDescription=Maak een nieuwe warp. setwarpCommandUsage=/ setwarpCommandUsage1=/ -setworthCommandDescription=Stel de verkoopwaarde van een item in. -setworthCommandUsage=/ [itemnaam|id] sheepMalformedColor=§4Verkeerde kleur. shoutDisabled=§6Shout-modus §cuitgeschakeld§6. shoutDisabledFor=§6Shout-modus §cuitgeschakeld §6voor §c{0}. @@ -1045,8 +978,6 @@ suicideCommandUsage=/ suicideMessage=§6Vaarwel wrede wereld... suicideSuccess=§6{0} §6pleegde zelfmoord. survival=overleving -takenFromAccount=§e{0}§a is van uw rekening afgehaald. -takenFromOthersAccount=§e{0}§a is van§e {1}§a''s rekening gehaald. Nieuw saldo\:§e {2} teleportAAll=§6Teleportatie verzoek verzonden naar alle spelers... teleportAll=§6Bezig met teleporteren van alle spelers... teleportationCommencing=§6an het beginnen met teleporteren... @@ -1169,8 +1100,6 @@ tps=§6Huidige TPS \= {0} tptoggleCommandDescription=Blokkeert alle vormen van teleportatie. tptoggleCommandUsage=/ [speler] [on|off] tptoggleCommandUsage1=/ [speler] -tradeSignEmpty=§4Dit handelsbord heeft niets beschikbaar voor u. -tradeSignEmptyOwner=§4Er is niets te innen bij dit handelsbord. treeCommandDescription=Creëer een boom waar je kijkt. treeCommandUsage=/ treeCommandUsage1=/ @@ -1239,12 +1168,10 @@ versionDevLatest=§6Je gebruikt de laatste EssentialsX-devbuild\! versionError=§4Fout bij het ophalen van EssentialsX-versie-informatie\! Buildinformatie\: §c{0}§6. versionErrorPlayer=§6Fout bij het ophalen van EssentialsX-versie-informatie\! versionFetching=§6Versie-informatie ophalen... -versionOutputVaultMissing=§4Vault is niet geïnstalleerd. Sommige chat- en permissiefuncties werken niet. versionOutputFine=§6{0} versie\: §a{1} versionOutputWarn=§6{0} versie\: §c{1} versionOutputUnsupported=§d{0} §6versie\: §d{1} versionOutputUnsupportedPlugins=§6Er draaien §dniet-ondersteunde plugins§6\! -versionOutputEconLayer=§6Economie Laag\: §r{0} versionMismatch=Verkeerde versie\! Update {0} naar dezelfde versie. versionMismatchAll=Verkeerde versie\! Update alle Essentials jars naar dezelfde versie. versionReleaseLatest=§6Je gebruikt de laatste stabiele versie van EssentialsX\! @@ -1301,7 +1228,6 @@ whoisHunger=§6 - Honger\:§r {0}/20 (+{1} Verzadiging) whoisIPAddress=§6 - IP Adres\:§f {0} whoisJail=§6 - Gevangenis\:§f {0} whoisLocation=§6 - Locatie\:§f ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Geld\:§f {0} whoisMuted=§6 - Gedempt\:§f {0} whoisMutedReason=§6 - Gedempt\:§r {0} §6Reden\: §c{1} whoisNick=§6 - Bijnaam\:§f {0} @@ -1315,11 +1241,6 @@ workbenchCommandUsage=/ worldCommandDescription=Wissel tussen werelden. worldCommandUsage=/ [wereld] worldCommandUsage1=/ -worth=§aStapel {0} met waarde §c{1}§a ({2} voorwerp(en) voor {3} per stuk) -worthCommandDescription=Berekent de waarde van voorwerpen in hand of als opgegeven. -worthCommandUsage=/ <||hand|inventory|blocks> [-][totaal] -worthMeta=§aStapel {0} met een metadata van {1} met waarde §c{2}§a ({3} voorwerp(en) voor {4} per stuk) -worthSet=§6Waarde ingesteld year=jaar years=jaren youAreHealed=§6Je bent genezen. diff --git a/Essentials/src/main/resources/messages_no.properties b/Essentials/src/main/resources/messages_no.properties index d822a97ac..f6f9123ee 100644 --- a/Essentials/src/main/resources/messages_no.properties +++ b/Essentials/src/main/resources/messages_no.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} har blitt satt inn på kontoen din. -addedToOthersAccount=§a{0} har blitt lagt til {1}§a konto. Ny saldo\: {2} adventure=eventyr afkCommandDescription=Markerer deg som "borte fra tastaturet". afkCommandUsage=/ [spiller/melding...] @@ -47,20 +45,6 @@ backupFinished=§6Sikkerhetskopiering fullført. backupStarted=§6Sikkerhetskopiering startet. backupInProgress=§6Et eksternt backupskript pågår for øyeblikket\! Stopper deaktivering av utvidelsen til det er ferdig. backUsageMsg=§6Returnerer til forrige plassering. -balance=§aDin saldo\:§c {0} -balanceCommandDescription=Oppgir gjeldende saldo for en spiller. -balanceCommandUsage=/ [spiller] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Viser din nåværende saldo -balanceCommandUsage2=/ -balanceCommandUsage2Description=Viser saldoen til den angitte spilleren -balanceOther=§aSaldoen til {0}§a\:§c {1} -balanceTop=§6Høyeste saldoer ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Henter de høyeste saldoverdiene. -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] -balancetopCommandUsage1Description=Viser den første (eller spesifiserte) siden av toppbalanseverdier banCommandDescription=Utestenger en spiller. banCommandUsage=/ [grunn] banCommandUsage1=/ [grunn] @@ -158,16 +142,9 @@ commandNotLoaded=§4Kommandoen {0} er ikke riktig lastet inn. compassBearing=§6Peiling\: {0} ({1} grader). compassCommandDescription=Beskriver din gjeldende retningssans. compassCommandUsage=/ -condenseCommandDescription=Kondenserer gjenstander til mer kompakte blokker. -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Kondenserer alle gjenstander i inventaret ditt -condenseCommandUsage2=/ -condenseCommandUsage2Description=Kondenserer det angitte elementet i inventaret ditt configFileMoveError=Kunne ikke flytte config.yml til sikkerhetskopiplassering. configFileRenameError=Kunne ikke endre navnet på midlertidig fil config.yml. confirmClear=§7For å §lBEKREFTE§7 at inventaret tømmes, vennligst gjenta kommandoen\: §6{0} -confirmPayment=§7For å §lBEKREFTE§7 betalingen av §6{0}§7, vennligst gjenta kommandoen\: §6{1} connectedPlayers=§6Tilkoblede spillere§r connectionFailed=Kunne ikke åpne forbindelsen. consoleName=Konsoll @@ -185,7 +162,6 @@ createKitSuccess=§6Opprettet Sett\: §f{0}\n§6Forsinkelse\: §f{1}\n§6Kobling creatingConfigFromTemplate=Oppretter konfigurasjon fra mal\: {0} creatingEmptyConfig=Oppretter tom konfigurasjon\: {0} creative=kreativ -currency={0}{1} currentWorld=§6Nåværende verden\:§c {0} customtextCommandDescription=Lar deg opprette egendefinerte tekstkommandoer. customtextCommandUsage=/ - Definer i bukkit.yml @@ -280,16 +256,6 @@ dumpUrl=§6Opprettet serverutskrift\: §c{0} duplicatedUserdata=Duplisert brukerdata\: {0} og {1}. durability=§6Dette verktøyet har §c{0}§6 bruk igjen. east=Ø -ecoCommandDescription=Administrerer serverøkonomien. -ecoCommandUsage=/ -ecoCommandUsage1=/ gi -ecoCommandUsage1Description=Gir den valgte spilleren det valgte beløpet -ecoCommandUsage2=/ ta -ecoCommandUsage2Description=Tar det angitte beløpet fra den angitte spilleren -ecoCommandUsage3=/ sett inn -ecoCommandUsage3Description=Angir den angitte spillers saldo til det angitte beløpet -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=Tilbakestiller den angitte spillers balanse til serverens startbalanse editBookContents=§eDu kan nå redigere innholdet i denne boken. enabled=aktivert enchantCommandDescription=Fortryller gjenstanden brukeren holder. @@ -481,9 +447,7 @@ infoCommandDescription=Viser informasjon satt av servereieren. infoCommandUsage=/ [kapittel] [side] infoPages=§e ---- §6{2} §e--§6 Side §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Ukjent kapittel. -insufficientFunds=§4Du har ikke råd. invalidBanner=§4Ugyldig bannersyntaks. -invalidCharge=§4Ugyldig kostnad. invalidFireworkFormat=§4Alternativet §c{0} §4er ikke en gyldig verdi for §c{1}§4. invalidHome=§4Hjem§c {0} §4finnes ikke\! invalidHomeName=§4Ugyldig hjem-navn\! @@ -588,7 +552,6 @@ kitCommandUsage1Description=Viser alle tilgjengelige sett kitCommandUsage2=/ [spiller] kitCommandUsage2Description=Gir det angitte settet til deg eller en annen spiller hvis angitt kitContains=§6Sett §c{0} §6inneholder\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Det er ingen gyldige sett. kitError2=§4Det settet er feil definert. Kontakt en administrator. @@ -653,7 +616,6 @@ mailTooLong=§4Meldingen er for lang. Prøv å holde den under 1000 tegn. markMailAsRead=§6For å merke meldingene dine som lest, skriv§c /mail clear§6. matchingIPAddress=§6Følgende spillere har tidligere logget inn fra den IP-adressen\: maxHomes=§4Du kan ikke lage flere enn§c {0} §4hjem. -maxMoney=§4Denne transaksjonen vil overskride saldobegrensningen for denne kontoen. mayNotJail=§4Du kan ikke fengsle den personen\! mayNotJailOffline=§4Du kan ikke fengsle offline spillere. meCommandDescription=Beskriver en handling i spillerens kontekst. @@ -662,7 +624,6 @@ meCommandUsage1=/ meCommandUsage1Description=Beskriver en handling meSender=meg meRecipient=meg -minimumBalanceError=§4Minste saldo en bruker kan ha er {0}. minimumPayAmount=§cMinimumsbeløpet du kan betale er {0}. minute=minutt minutes=minutter @@ -672,8 +633,6 @@ mobsAvailable=§6Skapninger\:§r {0} mobSpawnError=§4Feil under endring av monsterfremkaller. mobSpawnLimit=Skapningsmengde begrenset til servergrense. mobSpawnTarget=§4Målblokk må være en monsterfremkaller. -moneyRecievedFrom=§a{0}§6 er mottatt fra§a {1}§6. -moneySentTo=§a{0} har blitt sendt til {1}. month=måned months=måneder moreCommandDescription=Fyller genstandsbunken i hånden til spesifisert mengde, eller til maksimal størrelse hvis ingen er spesifisert. @@ -696,7 +655,6 @@ msgtoggleCommandDescription=Blokkerer mottak av alle private meldinger. msgtoggleCommandUsage=/ [spiller] [on|off] msgtoggleCommandUsage1=/ [spiller] msgtoggleCommandUsage1Description=Veksler fly for deg selv eller en annen spiller hvis angitt -multipleCharges=§4Du kan ikke legge til mer enn en ladning på dette fyrverkeriet. multiplePotionEffects=§4Du kan ikke legge til mer enn en effekt på denne eliksiren. muteCommandDescription=Demper eller slutter å dempe en spiller. muteCommandUsage=/ [datoforskjell] [grunn] @@ -722,7 +680,6 @@ nearCommandUsage3=/ nearCommandUsage3Description=Viser alle spillere innenfor standard radius i nærheten av den angitte spilleren nearCommandUsage4Description=Viser alle spillere innenfor den angitte radiusen til den angitte spilleren nearbyPlayers=§6Spillere i nærheten\:§r {0} -negativeBalanceError=§4Bruker er ikke tillatt å ha en negativ saldo. nickChanged=§6Kallenavnet endret. nickCommandDescription=Endre kallenavnet ditt eller til en annen spiller. nickCommandUsage=/ [spiller] @@ -771,9 +728,7 @@ noPermToSpawnMob=§4Du har ikke tillatelse til å fremkalle denne skapningen. noPlacePermission=§4Du har ikke tillatelse til å plassere en blokk nær dette skiltet. noPotionEffectPerm=§4Du har ikke tillatelse til å legge til bryggeffekten §c{0} §4på denne eliksiren. noPowerTools=§6Du har ikke tildelt noen styrkeverktøy. -notAcceptingPay=§4{0} §4aksepterer ikke betalingen. notEnoughExperience=§4Du har ikke nok erfaring. -notEnoughMoney=§4Du har ikke råd. notFlying=flyr ikke nothingInHand=§4Du har ikke noe i hånden din. now=nå @@ -788,28 +743,9 @@ onlyPlayers=§4Bare påloggede spillere kan bruke §c{0}§4. onlyPlayerSkulls=§4Du kan bare angi eieren av spiller-hodeskaller (§c397\:3§4). onlySunStorm=§4/weather støtter bare sun/storm. openingDisposal=§6Åpner kastemeny... -orderBalances=§6Forespør saldoen til§c {0} §6brukere, vennligst vent... oversizedMute=§4Du kan ikke dempe en spiller for øyeblikket. oversizedTempban=§4Du kan ikke utestenge en spiller for øyeblikket. passengerTeleportFail=§4Du kan ikke teleporteres mens du bærer passasjerer. -payCommandDescription=Betaler en annen spiller fra saldoen din. -payCommandUsage=/ -payCommandUsage1=/ -payCommandUsage1Description=Sender den angitte spilleren den angitte mengden penger -payConfirmToggleOff=§6Du vil ikke lenger bli bedt om å bekrefte betalinger. -payConfirmToggleOn=§6Du vil nå bli bedt om å bekrefte utbetalinger. -payDisabledFor=§6Deaktiverte aksepterer betaling for §c{0}§6. -payEnabledFor=§6Aktiverte aksepterer betaling for §c{0}§6. -payMustBePositive=§4Betalingsbeløpet må være positivt. -payOffline=§4Du kan ikke betale til spillere som er offline. -payToggleOff=§6Du godtar ikke lenger betalinger. -payToggleOn=§6Du godtar nå betalinger. -payconfirmtoggleCommandDescription=Veksler om du blir bedt om å bekrefte betalinger. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Veksler om du godtar betalinger. -paytoggleCommandUsage=/ [spiller] -paytoggleCommandUsage1=/ [spiller] -paytoggleCommandUsage1Description=Aktiverer eller deaktiverer hvis du, eller en annen spiller hvis angitt, godtar betalinger pendingTeleportCancelled=§4Ventende teleporteringsforespørsel kansellert. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -942,8 +878,6 @@ requestDeniedFrom=§c{0} §6avslo teleporteringsforespørselen din. requestSent=§6Forespørsel sendt til§c {0}§6. requestSentAlready=§4Du har allerede sendt {0}§4 en teleporteringsforespørsel. requestTimedOut=§4Teleporteringsforespørselen har utløpt. -resetBal=§6Saldo har blitt tilbakestilt til §c{0} §6for alle påloggede spillere. -resetBalAll=§6Saldo har blitt tilbakestilt til §c{0} §6for alle spillere. rest=§6Du føler deg vel uthvilt. restCommandDescription=Uthviler deg eller den angitte spilleren. restCommandUsage=/ [spiller] @@ -963,9 +897,6 @@ seenCommandUsage=/ seenCommandUsage1=/ seenOffline=§6Spiller§c {0} §6har vært §4offline§6 siden §c{1}§6. seenOnline=§6Spiller§c {0} §6har vært §4online§6 siden §c{1}§6. -sellBulkPermission=§6Du har ikke tillatelse til salg i bulk. -sellCommandDescription=Selger gjenstanden som er i hånden din. -sellHandPermission=§6Du har ikke tillatelse til å selge fra hånen. serverFull=Serveren er full\! serverReloading=Det er en god sjanse for at du laster inn serveren din på nytt akkurat nå. Hvis det er tilfelle, hvorfor hater du deg selv? Ikke forvent noe støtte fra EssentialsX-teamet når du bruker /reload. serverTotal=§6Server Totalt\:§c {0} @@ -974,8 +905,6 @@ serverUnsupportedClass=Statusbestemmende klasse\: {0} serverUnsupportedCleanroom=Du kjører en server som ikke støtter Bukkit-utvidelser som er avhengig av intern Mojang-kode. Vurder å bruke en Essentials erstatning for serverprogramvaren. serverUnsupportedLimitedApi=Du kjører en server med begrenset API-funksjonalitet. EssentialsX vil fortsatt fungere, men visse funksjoner kan være deaktivert. serverUnsupportedMods=Du kjører en server som ikke støtter Bukkit-utvidelser riktig. Bukkit-utvidelser skal ikke brukes med Forge/Fabric modder\! For Forge\: Vurder å bruke ForgeEssentials, eller SpongeForge + Nucleus. -setBal=§aSaldoen din ble satt til {0}. -setBalOthers=§aDu satte {0}§a sin saldo til {1}. setSpawner=§6Endret fremkaller-type til§c {0}§6. sethomeCommandDescription=Sett hjemmet ditt til din nåværende posisjon. sethomeCommandUsage=/ [[spiller\:]navn] @@ -991,8 +920,6 @@ settprValue=§6Angi tilfeldig teleportering §c{0}§6 til §c{1}§6. setwarpCommandDescription=Oppretter en ny warp. setwarpCommandUsage=/ setwarpCommandUsage1=/ -setworthCommandDescription=Angi salgsverdien til en gjenstand. -setworthCommandUsage=/ [gjenstandsnavn|id] sheepMalformedColor=§4Misdannet farge. shoutDisabled=§6Ropemodus §cdeaktivert§6. shoutDisabledFor=§6Ropemodus §cdeaktivert §6for §c{0}§6. @@ -1059,8 +986,6 @@ suicideCommandUsage=/ suicideMessage=§6Farvel grusomme verden... suicideSuccess=§6Spiller §c{0} §6tok sitt eget liv. survival=overlevelse -takenFromAccount=§e{0}§a har blitt tatt fra kontoen din. -takenFromOthersAccount=§e{0}§a tatt fra§e {1}§a konto. Ny saldo\:§e {2} teleportAAll=§6Teleporteringsforespørsel sendt til alle spillere... teleportAll=§6Teleporterer alle spillere... teleportationCommencing=§6Teleportering påbegynnes... @@ -1169,8 +1094,6 @@ tps=§6Nåværende TPS \= {0} tptoggleCommandDescription=Blokkerer alle former for teleportering. tptoggleCommandUsage=/ [spiller] [on|off] tptoggleCommandUsage1=/ [spiller] -tradeSignEmpty=§4Handelsskiltet har ingenting tilgjengelig for deg. -tradeSignEmptyOwner=§4Det er ingenting å hente fra dette handelsskiltet. treeCommandDescription=Fremkall et tre der du ser. treeCommandUsage=/ treeCommandUsage1=/ @@ -1236,7 +1159,6 @@ versionDevLatest=§6Du kjører den nyeste EssentialsX utviklerversjonen\! versionError=§4Feil under henting av EssentialsX versjonsinformasjon\! Bygg-informasjon\: §c{0}§6. versionErrorPlayer=§6Feil under sjekking av EssentialsX versjonsinformasjon\! versionFetching=§6Henter versjonsinformasjon... -versionOutputVaultMissing=§4Vault er ikke installert. Chat og tillatelser fungerer kanskje ikke. versionOutputFine=§6{0} versjon\: §a{1} versionOutputWarn=§6{0} versjon\: §c{1} versionOutputUnsupported=§d{0} §6versjon\: §d{1} @@ -1295,7 +1217,6 @@ whoisHunger=§6 - Sult\:§r {0}/20 (+{1} metning) whoisIPAddress=§6 - IP-adresse\:§r {0} whoisJail=§6 - Fengsel\:§r {0} whoisLocation=§6 - Posisjon\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Penger\:§r {0} whoisMuted=§6 - Dempet\:§r {0} whoisMutedReason=§6 - Dempet\:§r {0} §6Årsak\: §c{1} whoisNick=§6 - Kallenavn\:§r {0} @@ -1309,11 +1230,6 @@ workbenchCommandUsage=/ worldCommandDescription=Bytt mellom verdener. worldCommandUsage=/ [verden] worldCommandUsage1=/ -worth=§aStack av {0} verdt §c{1}§a ({2} gjenstand(er) på {3} hver) -worthCommandDescription=Beregner verdien av gjenstandene i hånden eller som spesifisert. -worthCommandUsage=/ <||hand|inventory|blocks> [-][beløp] -worthMeta=§aStack av {0} med metadata av {1} verdt §c{2}§a ({3} gjenstand(er) på {4} hver) -worthSet=§6Verdt verdi satt year=år years=år youAreHealed=§6Du har blitt helbredet. diff --git a/Essentials/src/main/resources/messages_pl.properties b/Essentials/src/main/resources/messages_pl.properties index 703aaa7cf..0d112bb83 100644 --- a/Essentials/src/main/resources/messages_pl.properties +++ b/Essentials/src/main/resources/messages_pl.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} zostało dodane do twojego konta. -addedToOthersAccount=§a{0} zostało dodane do konta {1}§. Nowy stan konta\: {2}. adventure=Przygoda afkCommandDescription=Oznacza cię jako nieobecnego. afkCommandUsage=/ [gracz/wiadomość…] @@ -47,20 +45,6 @@ backupFinished=§7Kopia zapasowa zakończona. backupStarted=§7Kopia zapasowa rozpoczęta. backupInProgress=§6Zewnętrzny skrypt kopii zapasowej jest w toku\! Zatrzymanie wtyczki do czasu zakończenia. backUsageMsg=§7Powrót do poprzedniego miejsca. -balance=§aStan konta\:§c {0} -balanceCommandDescription=Wyświetla bieżące saldo gracza. -balanceCommandUsage=/ [gracz] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Obecny stan twojego konta -balanceCommandUsage2=/ -balanceCommandUsage2Description=Podaje stan konta danego gracza -balanceOther=§aStan konta gracza §7{0} §awynosi\:§c {1} -balanceTop=§7Najbogatsi gracze ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Wyświetla listę najwyższych sald. -balancetopCommandUsage=/ [strona] -balancetopCommandUsage1=/ [strona] -balancetopCommandUsage1Description=Wyświetla pierwszą (lub określoną) stronę wartości górnego salda banCommandDescription=Blokuje gracza. banCommandUsage=/ [powód] banCommandUsage1=/ [powód] @@ -161,16 +145,9 @@ consoleCannotUseCommand=To polecenie nie może być wykonywane przez konsolę. compassBearing=§6Namiar\: {0} ({1} stopni). compassCommandDescription=Opisuje twój aktualny namiar. compassCommandUsage=/ -condenseCommandDescription=Przemienia przedmioty w zwarte bloki. -condenseCommandUsage=/ [przedmiot] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Przemienia wszystkie przedmioty w twoim ekwipunku w bloki -condenseCommandUsage2=/ -condenseCommandUsage2Description=Przemienia określony przedmiot z twojego ekwipunku w bloki configFileMoveError=Nie udało sie przenieść config.yml do lokalizacji kopi zapasowej. configFileRenameError=Nie udało sie zmienić nazwy tymczasowego pliku na config.yml confirmClear=§7Aby §lPOTWIERDZIƧ7 wyczyszczenie ekwipunku, wpisz ponownie §6{0} -confirmPayment=§7Aby §lPOTWIERDZIƧ7 płatność §6{0}§7, wpisz ponownie\: §6{1} connectedPlayers=§7Aktywni gracze§r connectionFailed=Błąd podczas otwierania połączenia. consoleName=Konsola @@ -189,7 +166,6 @@ createKitUnsupported=§4Serializacja NBT przedmiotów została włączona, ale t creatingConfigFromTemplate=Tworzenie konfiguracji z szablonu\: {0} creatingEmptyConfig=Stworzono pusty plik konfiguracyjny\: {0} creative=Kreatywny -currency={0}{1} currentWorld=§7Bieżący świat\:§c {0} customtextCommandDescription=Pozwala na tworzenie własnych poleceń tekstowych. customtextCommandUsage=/ - Zdefiniuj w bukkit.yml @@ -313,16 +289,6 @@ dumpUrl=§6Stworzono zrzut serwera\: §c{0} duplicatedUserdata=Kopiowanie danych użytkownika\: {0} i {1}. durability=§6Temu narzędziu pozostało §c{0}§6 użyć east=E -ecoCommandDescription=Zarządza gospodarką serwera. -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=Daje określonemu graczowi określoną ilość pieniędzy -ecoCommandUsage2=/ take -ecoCommandUsage2Description=Zabiera określoną ilość pieniędzy od określonego gracza -ecoCommandUsage3=/ set -ecoCommandUsage3Description=Ustawia saldo określonego gracza na określoną ilość pieniędzy -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=Resetuje saldo określonego gracza do początkowego salda serwera editBookContents=§eNie możesz teraz edytować tej książki. enabled=włączone enchantCommandDescription=Zaklina dzierżony przez gracza przedmiot. @@ -540,9 +506,7 @@ infoCommandDescription=Pokazuje informacje ustawione przez właściciela serwera infoCommandUsage=/ [rozdział] [strona] infoPages=§e ---- §7{2} §e--§7 Strona §c{0}§7/§c{1} §e---- infoUnknownChapter=§4Nieznany rozdział. -insufficientFunds=§4Nie posiadasz wystarczających środków. invalidBanner=§4Nieprawidłowa składnia banneru. -invalidCharge=§4Nieprawidłowa opłata. invalidFireworkFormat=§6Opcja §4{0} §6nie jest prawidłową wartością dla §4{1}§6. invalidHome=§4Dom§c {0} §4nie istnieje. invalidHomeName=§4Niepoprawna nazwa domu. @@ -659,7 +623,6 @@ kitCommandUsage1Description=Pokazuje spis wszystkich dostępnych zestawów kitCommandUsage2=/ [gracz] kitCommandUsage2Description=Daje określony zestaw Tobie lub innemu graczowi kitContains=§6Zestaw §c{0} §6zawiera\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Nie ma prawidłowych zestawów. kitError2=§4Ten zestaw jest źle skonfigurowany. Skontaktuj się z administratorem\! @@ -739,7 +702,6 @@ mailTooLong=§4Wiadomość mail jest zbyt długa. Postaraj się utrzymać ją po markMailAsRead=§6Aby oznaczyć swoją pocztę jako przeczytaną, wpisz§c /mail clear§6. matchingIPAddress=§7Gracz wcześniej był zalogowany z tego adresu IP\: maxHomes=§4Nie możesz ustawic więcej niż§c {0} §4domow. -maxMoney=§4Ta transakcja przekroczyłaby limit salda dla tego konta mayNotJail=§4Nie możesz wtrącić do więzienia tej osoby. mayNotJailOffline=§4Nie możesz więzić graczy będących offline. meCommandDescription=Opisuje akcję w kontekście gracza. @@ -748,7 +710,6 @@ meCommandUsage1=/ meCommandUsage1Description=Opisuje zdarzenie meSender=ja meRecipient=ja -minimumBalanceError=§4Minimalne saldo jakie może mieć użytkownik to {0}. minimumPayAmount=§cMinimalna kwota, jaką możesz zapłacić, to {0}. minute=minuta minutes=min @@ -758,8 +719,6 @@ mobsAvailable=§7Moby\: {0} mobSpawnError=§4Błąd podczas zmiany spawnera. mobSpawnLimit=Ilość mobów ograniczona do limitu serwera. mobSpawnTarget=§4Blok musi być spawnerem. -moneyRecievedFrom=§6Odebrano §a{0}§6 od gracza§a {1}§6. -moneySentTo=§a{0} zostało wysłane do {1} month=miesiąc months=mies. moreCommandDescription=Wypełnia stack przedmiotów w dłoni do określonej ilości lub do maksymalnego rozmiaru, jeśli nie jest określony. @@ -784,7 +743,6 @@ msgtoggleCommandDescription=Blokuje otrzymywanie wszystkich wiadomości prywatny msgtoggleCommandUsage=/ [gracz] [on|off] msgtoggleCommandUsage1=/ [gracz] msgtoggleCommandUsage1Description=Włącza latanie dla siebie albo innego gracza -multipleCharges=§4Nie możesz ustawic więcej niż jeden ładunek dla tej fajerwerki. multiplePotionEffects=§4Nie możesz ustawic więcej niż jeden efekt dla tej mikstury. muteCommandDescription=Wycisza lub cofa wyciszenie gracza. muteCommandUsage=/ [długość] [powód] @@ -815,7 +773,6 @@ nearCommandUsage4=/ nearCommandUsage4Description=Wyświetla listę wszystkich graczy w danym promieniu od określonego gracza nearbyPlayers=§7Gracze w pobliżu\:§r {0} nearbyPlayersList={0}§f(§c{1}m§f) -negativeBalanceError=§4Gracz nie może mieć ujemnego stanu konta. nickChanged=§6Zmieniono pseudonim gracza. nickCommandDescription=Zmień swój pseudonim lub pseudonim innego gracza. nickCommandUsage=/ [gracz] @@ -867,12 +824,10 @@ noPermToSpawnMob=§4Nie masz uprawnień do tworzenia tego moba.. noPlacePermission=§4Nie masz uprawnień do stawiania bloku koło tego znaku.. noPotionEffectPerm=§4Nie masz uprawnień by dodać efekt §c{0} §4tej miksturze. noPowerTools=§7Nie masz przypisanego żadnego power tool. -notAcceptingPay=§4{0} §4nie przyjmuje wpłat. notAllowedToLocal=§4Nie masz uprawnień do pisania na lokalnym czacie. notAllowedToQuestion=§4Nie masz uprawnień do zadawania pytań. notAllowedToShout=§4Nie masz uprawnień do krzyczenia. notEnoughExperience=§4Nie masz wystarczająco dużo doswiadczenia. -notEnoughMoney=§4Nie masz tyle pieniędzy. notFlying=nie lata nothingInHand=§4Nie masz nic w ręku.. now=teraz @@ -888,28 +843,9 @@ onlyPlayers=§4Tylko gracze będący w grze mogą użyć {0}. onlyPlayerSkulls=§4Możesz tylko zmieniać właściciela głowy gracza (397\:3). onlySunStorm=§4/weather obsługuje tylko sun/storm. openingDisposal=§6Otwieranie menu kosza… -orderBalances=Pobieram fundusze {0} graczy, proszę czekać… oversizedMute=§4Nie możesz wyciszyć gracza na czas, który wyznaczyłeś. oversizedTempban=§4Nie możesz teraz zbanować tego gracza. passengerTeleportFail=§4Nie możesz się teleportować, kiedy kogoś nosisz. -payCommandDescription=Wypłaca innemu graczowi z Twojego konta. -payCommandUsage=/ -payCommandUsage1=/ -payCommandUsage1Description=Płaci podanemu graczowi określoną ilość pieniędzy -payConfirmToggleOff=§6Nie będziesz już proszony o potwierdzenie płatności. -payConfirmToggleOn=§6Będziesz poproszony o potwierdzenie płatności. -payDisabledFor=§7Wyłączono akceptowanie płatności dla §c{0}§7. -payEnabledFor=§7Włączono akceptowanie płatności dla §c{0}§7. -payMustBePositive=§4Wartość wpłaty musi być dodatnia. -payOffline=§4Nie możesz płacić użytkownikom offline. -payToggleOff=§6Od tej chwili nie przyjmujesz wpłat. -payToggleOn=§6Od tej chwili przyjmujesz wpłaty. -payconfirmtoggleCommandDescription=Przełącza, czy trzeba potwierdzić płatności. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Ustala, czy przyjmujesz wpłaty. -paytoggleCommandUsage=/ [gracz] -paytoggleCommandUsage1=/ [gracz] -paytoggleCommandUsage1Description=Przełącza, czy akceptujesz płatności ty lub ewentualny podany gracz pendingTeleportCancelled=§4Oczekujące zapytanie teleportacji odrzucone. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -1075,8 +1011,6 @@ requestSent=§7Twoja prośba o teleportacje została wyslana do§c {0}§7. requestSentAlready=§4Wysłałeś już prośbę o teleportacje do {0}§4. requestTimedOut=§7Prośba o teleportację wygasła. requestTimedOutFrom=§4Przedawniła się prośba o teleportację od gracza §c{0}. -resetBal=§6Saldo zostało zresetowane na §a{0} §6dla wszystkich graczy będących online. -resetBalAll=§6Saldo zostało zresetowane na §a{0} §6dla wszystkich graczy. rest=&7Czujesz się dobrze wypoczęty. restCommandDescription=Zrelaksuj siebie lub danego gracza. restCommandUsage=/ [gracz] @@ -1098,18 +1032,6 @@ seenCommandUsage1=/ seenCommandUsage1Description=Pokazuje czas wylogowania, bana, wyciszenia i informacje UUID określonego gracza seenOffline=§6Gracz§c {0} §6jest §4offline§6 od {1}. seenOnline=§6Gracz§c {0} §6jest §aonline§6 od {1}. -sellBulkPermission=§6Nie posiadasz uprawnień na sprzedaż wszystkich przedmiotów. -sellCommandDescription=Sprzedaje przedmiot w Twojej ręce. -sellCommandUsage=/ <||hand|inventory|blocks> [liczba] -sellCommandUsage1=/ [liczba] -sellCommandUsage1Description=Sprzedaje całość (lub podaną liczbę) danych itemów w twoim ekwipunku -sellCommandUsage2=/ hand [liczba] -sellCommandUsage2Description=Sprzedaje całość (lub podaną liczbę) trzymanych itemów -sellCommandUsage3=/ all -sellCommandUsage3Description=Sprzedaje wszystkie możliwe przedmioty w twoim ekwipunku -sellCommandUsage4=/ blocks [liczba] -sellCommandUsage4Description=Sprzedaje wszystkie (lub podaną liczbę) bloków w twoim ekwipunku -sellHandPermission=§6Nie posiadasz uprawnień na sprzedaż przedmiotów trzymanych w ręku. serverFull=Serwer jest pełen graczy, spróbuj pozniej. serverReloading=Istnieje duża szansa, że właśnie teraz przeładowujesz serwer. Jeśli tak jest, dlaczego siebie nienawidzisz? Nie oczekuj wsparcia ze strony zespołu EssentialsX podczas korzystania z komendy /reload. serverTotal=§7Podsumowanie serwera\:§c {0} @@ -1120,8 +1042,6 @@ serverUnsupportedDangerous=Używasz forka serwera, o którym wiadomo, że jest n serverUnsupportedLimitedApi=Używasz serwera o ograniczonej funkcjonalności API. EssentialsX nadal działa, ale niektóre funkcje mogą być wyłączone. serverUnsupportedDumbPlugins=Używasz wtyczek powodujących poważne problemy z EssentialsX i innymi wtyczkami. serverUnsupportedMods=Używasz serwera, który nie obsługuje poprawnie wtyczek Bukkit. Wtyczki Bukkit nie powinny być używane z modyfikacjami Forge\! Rozważ użycie ForgeEssentials lub SpongeForge z Nucleus. -setBal=§aTwój stan konta ustawiono na {0}. -setBalOthers=§aUstawiłeś saldo {0}§a na {1}. setSpawner=§6Zmieniono typ spawnera na§c {0} sethomeCommandDescription=Ustaw swój dom w bieżącym miejscu. sethomeCommandUsage=/ [[gracz\:]nazwa] @@ -1147,12 +1067,6 @@ setwarpCommandDescription=Tworzy nowy punkt teleportacyjny. setwarpCommandUsage=/ setwarpCommandUsage1=/ setwarpCommandUsage1Description=Ustawia warp o określonej nazwie na twoją lokalizację -setworthCommandDescription=Ustaw wartość sprzedaży produktu. -setworthCommandUsage=/ [nazwa itemu|id] -setworthCommandUsage1=/ -setworthCommandUsage1Description=Ustawia wartość trzymanego przedmiotu na podaną cenę -setworthCommandUsage2=/ -setworthCommandUsage2Description=Ustawia wartość określonego przedmiotu na podaną cenę sheepMalformedColor=§4Niewłaściwa barwa. shoutDisabled=§6Tryb gromki §cwyłączony§6. shoutDisabledFor=§6Tryb gromki §cwyłączony §6dla gracza §c{0}§6. @@ -1242,8 +1156,6 @@ suicideCommandUsage=/ suicideMessage=§7Żegnaj okrutny świecie. suicideSuccess=§c{0} dokonał zamachu na swoje życie survival=Przetrwanie -takenFromAccount=§e{0}§a zostało pobrane z twojego konta. -takenFromOthersAccount=§e{0}§a zostało pobrane z konta gracza §e {1}§a. Nowy stan konta\:§e {2} teleportAAll=§7Wysłano prośbę o teleportację wszystkim graczom… teleportAll=§7Teleportowano wszystkich graczy. teleportationCommencing=§7Teleport rozgrzewa się… @@ -1397,8 +1309,6 @@ tptoggleCommandDescription=Blokuje wszystkie formy teleportacji. tptoggleCommandUsage=/ [gracz] [on|off] tptoggleCommandUsage1=/ [gracz] tptoggleCommandUsageDescription=Przełącza możliwość teleportacji dla Ciebie lub innego gracza -tradeSignEmpty=§4Tabliczka handlowa nie jest dla Ciebie dostępna. -tradeSignEmptyOwner=§4Nie ma nic do pobrania z tej tabliczki. treeCommandDescription=Posadzi drzewo w miejscu, gdzie patrzysz. treeCommandUsage=/ treeCommandUsage1=/ @@ -1479,12 +1389,10 @@ versionDevLatest=§6Używasz najnowszej wersji rozwojowej EssentialsX\! versionError=§4Wystąpił błąd podczas pobierania informacji o wersji EssentialsX\! Informacje o kompilacji\: §c{0}§6. versionErrorPlayer=§6Wystąpił błąd podczas sprawdzania informacji o wersji EssentialsX\! versionFetching=§7Pobieranie informacji o wersji… -versionOutputVaultMissing=§4Plugin Vault nie jest zainstalowany. Chat i uprawnienia mogą nie działać. versionOutputFine=§6{0} wersja\: §a{1} versionOutputWarn=§6{0} wersja\: §c{1} versionOutputUnsupported=§d{0} §6wersja\: §d{1} versionOutputUnsupportedPlugins=§6Używasz §dniewspieranych wtyczek§6\! -versionOutputEconLayer=§7Warstwa ekonomiczna\: §r{0} versionMismatch=§4Niepoprawna wersja\! Proszę zaktualizować {0} do tej samej wersji co inne pliki. versionMismatchAll=§4Niepoprawna wersja\! Proszę zaktualizować wszystkie pliki Essentials do tej samej wersji. versionReleaseLatest=§6Używasz najnowszej stabilnej wersji EssentialsX\! @@ -1546,7 +1454,6 @@ whoisHunger=§6 - Głód\:§r {0}/20 (+{1} saturacji) whoisIPAddress=§7 - Adres IP\:§r {0}. whoisJail=§7 - W więzieniu\:§r {0}. whoisLocation=§7 - Lokalizacja\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§7 - Pieniądze\:§r {0}. whoisMuted=§7 - Wyciszony\:§r {0} whoisMutedReason=§6 - Wyciszony\:§r {0} §6Powód\: §c{1} whoisNick=§7 - Nick\:§r {0} @@ -1563,19 +1470,6 @@ worldCommandUsage1=/ worldCommandUsage1Description=Teleportuje się do Twojej odpowiedniej lokalizacji w netherze lub zwykłym świecie worldCommandUsage2=/ <świat> worldCommandUsage2Description=Teleportuje się do Twojej lokalizacji w danym świecie -worth=§aStos przedmiotu {0} jest wart §c{1}§a ({2} przedmiot(y/-ów) każdy po {3}) -worthCommandDescription=Oblicza wartość elementów znajdujących się w rękach lub w sposób określony. -worthCommandUsage=/ <||hand|inventory|blocks> [-][liczba] -worthCommandUsage1=/ [liczba] -worthCommandUsage1Description=Sprawdza wartość wszystkich (lub podanej liczby) danego itemu w twoim ekwipunku -worthCommandUsage2=/ hand [liczba] -worthCommandUsage2Description=Sprawdza wartość wszystkich (lub danej liczby, jeśli określona) trzymanych itemów -worthCommandUsage3=/ all -worthCommandUsage3Description=Sprawdza wartość wszystkich możliwych itemów w twoim ekwipunku -worthCommandUsage4=/ blocks [liczba] -worthCommandUsage4Description=Sprawdza wartość wszystkich (lub podaną liczbę, jeśli określona) bloków w twoim ekwipunku -worthMeta=§aStack {0} z metadata {1} jest warty §c{2}§a ({3} przedmiot(y) po {4} każdy) -worthSet=§7Cena przedmiotu została ustawiona. year=rok years=lat youAreHealed=§7Zostałeś uleczony. diff --git a/Essentials/src/main/resources/messages_pt.properties b/Essentials/src/main/resources/messages_pt.properties index 0257345d0..51ee2663f 100644 --- a/Essentials/src/main/resources/messages_pt.properties +++ b/Essentials/src/main/resources/messages_pt.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} foram adicionados à tua conta. -addedToOthersAccount=§a{0} foram adicionados à conta de {1}§a. Dinheiro atual\: {2} adventure=aventura afkCommandDescription=Marca-te como AFK. afkCommandUsage=/ [jogador/mensagem...] @@ -47,20 +45,6 @@ backupFinished=§6Cópia de segurança terminada. backupStarted=§6Cópia de segurança iniciada. backupInProgress=§6Um script de uma cópia de segurança externa está em progresso\! A desativação dos plugins será suspensa até a cópia estar terminada. backUsageMsg=§6A voltar ao local anterior. -balance=§aDinheiro\:§c {0} -balanceCommandDescription=Indica a quantidade de dinheiro de um jogador. -balanceCommandUsage=/ [jogador] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Indica o saldo atual -balanceCommandUsage2=/ -balanceCommandUsage2Description=Indica o saldo de um jogador -balanceOther=§aDinheiro de {0}§a\:§c {1} -balanceTop=§6Mais ricos ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Mostra uma lista dos jogadores mais ricos do servidor. -balancetopCommandUsage=/ [página] -balancetopCommandUsage1=/ [página] -balancetopCommandUsage1Description=Indica uma página da lista dos jogadores mais ricos banCommandDescription=Bane um jogador. banCommandUsage=/ [motivo] banCommandUsage1=/ [motivo] @@ -159,16 +143,9 @@ commandNotLoaded=§4O comando {0} está carregado incorretamente. compassBearing=§6A apontar para\: {0} ({1} graus). compassCommandDescription=Indica a direção cardeal para qual estás a olhar. compassCommandUsage=/ -condenseCommandDescription=Condensa os itens em blocos compactos. -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Junta todos os itens no teu inventário -condenseCommandUsage2=/ -condenseCommandUsage2Description=Junta um item no teu inventário configFileMoveError=Ocorreu um erro ao mover o ficheiro config.yml para o local da cópia de segurança. configFileRenameError=Ocorreu um erro ao renomear o ficheiro temporário para config.yml. confirmClear=§7Para §lCONFIRMAR§7 a destruição de itens do inventário, rescreve o comando\: §6{0} -confirmPayment=§7Para §lCONFIRMAR§7 o pagamento de §6{0}§7, rescreve o comando\: §6{1} connectedPlayers=§6Jogadores online§r connectionFailed=Erro de ligação. consoleName=Consola @@ -187,7 +164,6 @@ createKitUnsupported=§4A serialização NBT foi ativada, mas como o servidor n creatingConfigFromTemplate=A criar uma configuração baseada no modelo\: {0} creatingEmptyConfig=A criar uma configuração vazia\: {0} creative=criativo -currency={0}{1} currentWorld=§6Mundo atual\:§c {0} customtextCommandDescription=Permite criar comandos de texto personalizados. customtextCommandUsage=/ - Definido no bukkit.yml @@ -307,16 +283,6 @@ dumpUrl=§6Descarregamento do servidor concluído\: §c{0} duplicatedUserdata=Dados de utilizador duplicados\: {0} e {1}. durability=§6Esta ferramenta ainda pode ser usada mais §c{0}§6 vezes east=E -ecoCommandDescription=Gere a economia do servidor. -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=Dá uma quantidade especificada de dinheiro a um jogador -ecoCommandUsage2=/ take -ecoCommandUsage2Description=Remove uma quantidade especificada de dinheiro de um jogador -ecoCommandUsage3=/ set -ecoCommandUsage3Description=Define o saldo de um jogador para uma quantidade especificada -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=Repõe o saldo de um jogador para o saldo inicial editBookContents=§eAgora podes editar o conteúdo deste livro. enabled=ativado enchantCommandDescription=Encanta o item que o jogador está a segurar. @@ -531,9 +497,7 @@ infoCommandDescription=Mostra as informações definidas pelo proprietário do s infoCommandUsage=/ [capítulo] [página] infoPages=§e ---- §6{2} §e--§6 Página §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Capítulo desconhecido. -insufficientFunds=§4Não tens dinheiro suficiente. invalidBanner=§4A sintaxe do estandarte é inválida. -invalidCharge=§4O argumento é inválido. invalidFireworkFormat=§4A opção §c{0} §4não é um valor válido para §c{1}§4. invalidHome=§4A casa§c {0} §4não existe\! invalidHomeName=§4O nome da casa é inválido\! @@ -641,7 +605,6 @@ kitCommandUsage1Description=Dispõe todos os kits disponíveis kitCommandUsage2=/ [jogador] kitCommandUsage2Description=Dá um kit a um jogador kitContains=§6O kit §c{0} §6contém\: -kitCost=§7§o({0})§r kitDelay=§m{0}§r kitError=§4Não ha kits válidos. kitError2=§4Este kit não existe ou foi configurado incorretamente. @@ -714,7 +677,6 @@ mailTooLong=§4A mensagem de e-mail é demasiado longa. Usa menos de 1000 carác markMailAsRead=§6Para marcares os teus e-mails como lidos, usa§c /mail clear§6. matchingIPAddress=§6Estes jogadores entraram com este endereço de IP\: maxHomes=§4Não podes definir mais de§c {0} §4casas. -maxMoney=§4Esta transação iria exceder o limite de dinheiro desta conta. mayNotJail=§4Não podes prender essa pessoa\! mayNotJailOffline=§4Não podes prender jogadores offline. meCommandDescription=Descreve uma ação no contexto do jogador. @@ -723,7 +685,6 @@ meCommandUsage1=/ meCommandUsage1Description=Descreve uma ação meSender=eu meRecipient=eu -minimumBalanceError=§4O dinheiro mínimo que um jogador pode ter é {0}. minimumPayAmount=§cA quantidade mínima que um jogador pode pagar é {0}. minute=minuto minutes=minutos @@ -733,8 +694,6 @@ mobsAvailable=§6Criaturas\:§r {0} mobSpawnError=§4Ocorreu um erro ao mudar de gerador. mobSpawnLimit=A quantidade de criaturas está limitada pelo servidor. mobSpawnTarget=§4O bloco alvo tem de ser um gerador. -moneyRecievedFrom=§a{0}§6 foi recebido de§a {1}§6. -moneySentTo=§a{0} foi enviado para {1}. month=mês months=meses moreCommandDescription=Preenche os itens em pilha que tens em mão com a quantidade especificada. Caso não seja, será preenchido até obter o tamanho máximo de itens empilhados. @@ -758,7 +717,6 @@ msgtoggleCommandDescription=Bloqueia a receção de todas as mensagens privadas. msgtoggleCommandUsage=/ [jogador] [on|off] msgtoggleCommandUsage1=/ [jogador] msgtoggleCommandUsage1Description=Alterna o modo de voo de um jogador -multipleCharges=§4Não podes aplicar mais do que uma carga a este fogo-de-artifício. multiplePotionEffects=§4Não podes aplicar mais do que um efeito a esta poção. muteCommandDescription=Silencia um jogador. muteCommandUsage=/ [datadiff] [motivo] @@ -788,7 +746,6 @@ nearCommandUsage4=/ nearCommandUsage4Description=Dispõe uma lista de todos os jogadores numa dada área à volta de um jogador nearbyPlayers=§6Jogadores perto\:§r {0} nearbyPlayersList={0}§f(§c{1}m§f) -negativeBalanceError=§4Este jogador não tem permissões para ter dinheiro negativo. nickChanged=§6A alcunha foi alterada. nickCommandDescription=Muda a alcunha de um jogador. nickCommandUsage=/ [jogador] @@ -840,12 +797,10 @@ noPermToSpawnMob=§4Não tens permissões para gerar esta criatura. noPlacePermission=§4Não tens permissões para colocar um bloco perto desta tabuleta. noPotionEffectPerm=§4Não tens permissões para aplicar §c{0} §4 a esta opção. noPowerTools=§6Não tens nenhuma ferramenta de poder atribuída. -notAcceptingPay=§4{0} §4não está a aceitar pagamentos. notAllowedToLocal=§4Não tens permissões para falar no chat local. notAllowedToQuestion=§4Não tens permissões. notAllowedToShout=§4Não tens permissões para falar no chat geral. notEnoughExperience=§4Não tens experiência suficiente. -notEnoughMoney=§4Não tens dinheiro suficiente. notFlying=não voar nothingInHand=§4Não tens nada na tua mão. now=agora @@ -861,27 +816,9 @@ onlyPlayers=§4Só os jogadores online podem usar §c{0}§4. onlyPlayerSkulls=§4Só podes definir o proprietário das cabeças de jogadores (§c397\:3§4). onlySunStorm=§4Só podes usar "sun" ou "storm" no comando "/time". openingDisposal=§6A abrir o menu... -orderBalances=§6A ordenar o dinheiro de §c {0} §6jogadores, aguarda... oversizedMute=§4Não é possível silenciar um jogador por este período de tempo. oversizedTempban=§4Não é possível banir um jogador por este período de tempo. passengerTeleportFail=§4Não é possível seres teletransportado enquanto carregas passageiros. -payCommandDescription=Paga a outro jogador com o teu dinheiro. -payCommandUsage=/ -payCommandUsage1=/ -payCommandUsage1Description=Paga um valor especificado a um jogador -payConfirmToggleOff=§6A confirmação de pagamentos foi desativada. -payConfirmToggleOn=§6A confirmação de pagamentos foi ativada. -payDisabledFor=§6A aceitação de pagamentos foi desativado para §c{0}§6. -payEnabledFor=§6A aceitação de pagamentos foi ativado para §c{0}§6. -payMustBePositive=§4A quantidade a pagar tem de ser positiva. -payOffline=§4Não é possível pagar a jogadores offline. -payToggleOff=§6Não estás a aceitar pagamentos. -payToggleOn=§6§6Estás a aceitar pagamentos. -payconfirmtoggleCommandDescription=Alterna a confirmação de pagamentos. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Alterna a aceitação de pagamentos. -paytoggleCommandUsage=/ [jogador] -paytoggleCommandUsage1=/ [jogador] pendingTeleportCancelled=§4O pedido de teletransporte foi cancelado. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -1025,8 +962,6 @@ requestDeniedFrom=§c{0} §6recusou o pedido de teletransporte. requestSent=§6O pedido enviado para§c {0}§6. requestSentAlready=§4Já enviaste um pedido de teletransporte a {0}§4. requestTimedOut=§4O tempo limite do pedido de teletransporte foi atingido. -resetBal=§6O dinheiro de todos os jogadores online foram repostos para §a{0}§6. -resetBalAll=§6O dinheiro de todos os jogadores foram repostos para §a{0}§6. rest=§6Sentes-te como novo. restCommandDescription=Põe um jogador a dormir. restCommandUsage=/ [jogador] @@ -1046,11 +981,6 @@ seenCommandUsage=/ seenCommandUsage1=/ seenOffline=§6§c {0} §6está §4offline§6 desde §c{1}§6. seenOnline=§6§c {0} §6está §aonline§6 desde §c{1}§6. -sellBulkPermission=§6Não tens permissões para vender desta maneira. -sellCommandDescription=Vende o item que tens em mão. -sellCommandUsage3=/ all -sellCommandUsage4=/ blocks [quantidade] -sellHandPermission=§6Não tens permissões para vender à mão. serverFull=O servidor está cheio\! serverReloading=Atenção\: Há uma possibilidade do servidor estar agora a recarregar. Não haverá suporte por parte da equipa do EssentialsX quando o comando /reload é executado. serverTotal=§6Capacidade\:§c {0} @@ -1059,8 +989,6 @@ serverUnsupportedClass=Estado de classe determinada\: {0} serverUnsupportedCleanroom=Estás a executar um servidor incompatível com os plugins do Bukkit e está dependente do código interno da Mojang. É recomendada a alteração para um substituto do Essentials para o software deste servidor. serverUnsupportedLimitedApi=Estás a executar um servidor com a funcionalidade API limitada. O EssentialsX continuará a funcionar, mas algumas funcionalidades estarão desativadas. serverUnsupportedMods=Estás a executar um servidor incompatível com os plugins do Bukkit. Estes plugins não podem ser executados com os mods do Forge ou do Fabric\! Para o Forge, recomendamos o ForgeEssentials ou o SpongeForge + Nucleus. -setBal=§aO teu dinheiro foi definido para {0}. -setBalOthers=§aO dinheiro atual de {0} foi alterado para {1}. setSpawner=§6O gerador foi alterado para§c {0}. sethomeCommandDescription=Define a localização da casa para a posição atual. sethomeCommandUsage=/ [[jogador\:]nome] @@ -1080,9 +1008,6 @@ settprValue=§6Teletransporte aleatório de §c{0}§6 definido para §c{1}§6. setwarpCommandDescription=Cria um novo wrap. setwarpCommandUsage=/ setwarpCommandUsage1=/ -setworthCommandDescription=Define o valor de venda de um item. -setworthCommandUsage=/ [item|id] -setworthCommandUsage1=/ sheepMalformedColor=§4A cor não está especificada corretamente. shoutDisabled=§6O chat geral foi §cdesativado§6. shoutDisabledFor=§6O chat geral foi §cdesativado §6para §c{0}§6. @@ -1158,8 +1083,6 @@ suicideCommandUsage=/ suicideMessage=§6Adeus, mundo cruel... suicideSuccess=§6{0} §6morreu. survival=sobrevivência -takenFromAccount=§e{0}§a foram removidos da tua conta. -takenFromOthersAccount=§eForam removidos {0}§a da conta de {1}§a. Dinheiro atual\:§e {2} teleportAAll=§6O pedido de teletransporte foi enviado para todos os jogadores... teleportAll=§6A teletransportar todos os jogadores... teleportationCommencing=§6A teletransportar... @@ -1279,8 +1202,6 @@ tps=§6TPS atual \= {0} tptoggleCommandDescription=Bloqueia todos os métodos de teletransporte. tptoggleCommandUsage=/ [jogador] [on|off] tptoggleCommandUsage1=/ [jogador] -tradeSignEmpty=§4A tabuleta de troca não tem nada disponível para ti. -tradeSignEmptyOwner=§4Não há nada por recolher nesta tabuleta de troca. treeCommandDescription=Gera uma árvore para onde estás a olhar. treeCommandUsage=/ treeCommandUsage1=/ @@ -1352,12 +1273,10 @@ versionDevLatest=§6Estás a executar a compilação de desenvolvedor mais recen versionError=§4Ocorreu um erro ao verificar a versão do EssentialsX\! Informação da compilação\: §c{0}§6. versionErrorPlayer=§6Ocorreu um erro ao verificar a versão do EssentialsX\! versionFetching=§6A verificar informações da versão... -versionOutputVaultMissing=§4O Vault não está instalado. As permissões e o chat podem não funcionar corretamente. versionOutputFine=§6{0} versão\: §a{1} versionOutputWarn=§6{0} versão\: §c{1} versionOutputUnsupported=§d{0} §6versão\: §d{1} versionOutputUnsupportedPlugins=§6Estás a executar §dplugins incompatíveis§6\! -versionOutputEconLayer=§6Nível de economia\: §r{0} versionMismatch=§4A versão não é compatível\! Atualiza o {0} para a mesma versão. versionMismatchAll=§4A versão não é compatível\! Atualiza todos os ficheiros .jar do Essentials para a mesma versão. versionReleaseLatest=§6Estás a executar a versão mais recente do EssentialsX\! @@ -1417,7 +1336,6 @@ whoisHunger=§6 - Fome\:§r {0}/20 (+{1} saturação) whoisIPAddress=§6 - Endereço IP\:§r {0} whoisJail=§6 - Na prisão\:§r {0} whoisLocation=§6 - Localização\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Dinheiro\:§r {0} whoisMuted=§6 - Silenciado\:§r {0} whoisMutedReason=§6 - Silenciado\:§r {0} §6Motivo\: §c{1} whoisNick=§6 - Com alcunha\:§r {0} @@ -1433,14 +1351,6 @@ worldCommandUsage=/ [mundo] worldCommandUsage1=/ worldCommandUsage2=/ worldCommandUsage2Description=Teletransporta-te para a tua localização num mundo especificado -worth=§aConjunto de {0} que vale §c{1}§a ({2} item(s) a {3} cada) -worthCommandDescription=Calcula o valor do item que tens em mão ou um especificado. -worthCommandUsage=/ <||hand|inventory|blocks> [-][quantidade] -worthCommandUsage3=/ all -worthCommandUsage3Description=Determina o valor dos itens que tens no inventário -worthCommandUsage4=/ blocks [quantidade] -worthMeta=§aConjunto de {0} com os metadados de {1} que vale §c{2}§a ({3} item(s) a {4} cada) -worthSet=§6Valor definido year=ano years=anos youAreHealed=§6Foste curado. diff --git a/Essentials/src/main/resources/messages_pt_BR.properties b/Essentials/src/main/resources/messages_pt_BR.properties index aad829a4a..ea3ef0c7c 100644 --- a/Essentials/src/main/resources/messages_pt_BR.properties +++ b/Essentials/src/main/resources/messages_pt_BR.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} adicionado à sua conta. -addedToOthersAccount=§a{0} adicionado à conta de {1}§a. Novo saldo\: {2} adventure=aventura afkCommandDescription=Marca você como AFK. afkCommandUsage=/ [jogador/mensagem...] @@ -47,20 +45,6 @@ backupFinished=§6Backup finalizado. backupStarted=§6Backup iniciado. backupInProgress=§6Um script externo de backup está em progresso\! Suspendendo a desativação de plugins até o backup ser finalizado. backUsageMsg=§6Voltando ao local anterior. -balance=§aSaldo\:§c {0} -balanceCommandDescription=Indica o saldo de um jogador. -balanceCommandUsage=/ [jogador] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Indica seu saldo atual -balanceCommandUsage2=/ -balanceCommandUsage2Description=Exibe o saldo do jogador especificado -balanceOther=§aSaldo de {0}§a\:§c {1} -balanceTop=§6Mais ricos ({0}) -balanceTopLine={0}, {1}, {2} -balancetopCommandDescription=Lista os mais ricos do servidor. -balancetopCommandUsage=/ [página] -balancetopCommandUsage1=/ [página] -balancetopCommandUsage1Description=Exibe a primeira página (ou a página especificada) dos maiores saldos banCommandDescription=Bane um jogador. banCommandUsage=/ [motivo] banCommandUsage1=/ [motivo] @@ -161,16 +145,9 @@ consoleCannotUseCommand=Este comando não pode ser usado no Console. compassBearing=§6Apontando para\: {0} ({1} graus). compassCommandDescription=Indica a direção cardeal para qual você está olhando. compassCommandUsage=/ -condenseCommandDescription=Condensa itens em blocos compactos. -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Comprime todos os itens do seu inventário -condenseCommandUsage2=/ -condenseCommandUsage2Description=Comprime o item especificado no seu inventário configFileMoveError=Falha ao mover a config.yml para o local do backup. configFileRenameError=Falha ao renomear o arquivo temporário para config.yml. confirmClear=§7Para §lCONFIRMAR§7 a limpeza de inventário, repita o comando\: §6{0} -confirmPayment=§7Para §lCONFIRMAR§7 o pagamento de §6{0}§7, repita o comando\: §6{1} connectedPlayers=§6Jogadores conectados§r connectionFailed=Falha ao conectar-se. consoleName=Console @@ -189,7 +166,6 @@ createKitUnsupported=§4A serialização de itens NBT foi habilitada, mas este s creatingConfigFromTemplate=Criando configuração baseada no modelo\: {0} creatingEmptyConfig=Criando configuração vazia\: {0} creative=criativo -currency={0}{1} currentWorld=§6Mundo atual\:§c {0} customtextCommandDescription=Permite que você crie comandos com texto personalizado. customtextCommandUsage=/ - Defina em bukkit.yml @@ -313,16 +289,6 @@ dumpUrl=§6Dump do servidor criado\: §c{0} duplicatedUserdata=Duplicata de dados de usuário\: {0} e {1}. durability=§6Esta ferramenta tem §c{0}§6 usos restantes. east=L -ecoCommandDescription=Gerencia a economia do servidor. -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=Dá ao jogador indicado uma quantia de dinheiro -ecoCommandUsage2=/ take -ecoCommandUsage2Description=Tira uma quantia de dinheiro do jogador especificado -ecoCommandUsage3=/ set -ecoCommandUsage3Description=Define o saldo do jogador especificado para a quantia especificada de dinheiro -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=Redefine o saldo do jogador especificado para o saldo inicial do servidor editBookContents=§eAgora você pode editar o conteúdo deste livro. enabled=ativado enchantCommandDescription=Encanta o item que o usuário está segurando. @@ -540,9 +506,7 @@ infoCommandDescription=Mostra informações definidas pelo proprietário do serv infoCommandUsage=/ [capítulo] [página] infoPages=§e ---- §6{2} §e--§6 Página §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Capítulo desconhecido. -insufficientFunds=§4Dinheiro insuficiente. invalidBanner=§4Sintaxe de banner inválida. -invalidCharge=§4Argumento inválido. invalidFireworkFormat=§4A opção §c{0} §4não é válida para §c{1}§4. invalidHome=§4A casa§c {0} §4não existe\! invalidHomeName=§4Nome de casa inválido\! @@ -659,7 +623,6 @@ kitCommandUsage1Description=Lista todos os kits disponíveis kitCommandUsage2=/ [jogador] kitCommandUsage2Description=Dá o determinado conjunto de itens para você ou outro jogador quando especificado kitContains=§6Conjunto de itens §c{0} §6contém\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Não há conjunto de itens válidos. kitError2=§4Esse conjunto de itens não existe ou foi definido impropriamente. Contate um administrador. @@ -739,7 +702,6 @@ mailTooLong=§4Mensagem de email muito longa. Use menos de 1000 caracteres. markMailAsRead=§6Para marcar seus e-mails como lidos, digite§c /mail clear§6. matchingIPAddress=§6Os seguintes jogadores já logaram com esse endereco de IP anteriormente\: maxHomes=§4Você não pode definir mais de§c {0} §4casas. -maxMoney=§4Esta transação iria exceder o limite de saldo para esta conta. mayNotJail=§4Você não pode prender essa pessoa\! mayNotJailOffline=§4Você não pode prender jogadores desconectados. meCommandDescription=Descreve uma ação no contexto do jogador. @@ -748,7 +710,6 @@ meCommandUsage1=/ meCommandUsage1Description=Descreve uma ação meSender=eu meRecipient=eu -minimumBalanceError=§4O saldo mínimo que um usuário pode ter é {0}. minimumPayAmount=§cO valor mínimo que você pode pagar é {0}. minute=minuto minutes=minutos @@ -758,8 +719,6 @@ mobsAvailable=§6Mobs\:§r {0} mobSpawnError=§4Erro ao alterar gerador de criaturas. mobSpawnLimit=Quantidade de mobs aumentada até ao limite do servidor. mobSpawnTarget=§4O bloco alvo deve ser um gerador de criaturas. -moneyRecievedFrom=§aVocê recebeu {0} de {1}. -moneySentTo=§aVocê enviou {0} para {1}. month=mês months=meses moreCommandDescription=Preenche a pilha de itens na mão para a quantidade especificada, ou para o tamanho máximo se nenhum for especificado. @@ -784,7 +743,6 @@ msgtoggleCommandDescription=Bloqueia o recebimento de mensagens privadas. msgtoggleCommandUsage=/ [jogador] [on|off] msgtoggleCommandUsage1=/ [jogador] msgtoggleCommandUsage1Description=Alterna o voo para você ou para outro jogador, se especificado -multipleCharges=§4Você não pode aplicar mais de um comando para esse fogo de artifício. multiplePotionEffects=§4Você não pode aplicar mais de um efeito para essa poção. muteCommandDescription=Silencia ou não um jogador. muteCommandUsage=/ [datediff] [razão] @@ -815,7 +773,6 @@ nearCommandUsage4=/ nearCommandUsage4Description=Lista todos os jogadores ao redor de um jogador específico usando raio dado nearbyPlayers=§6Jogadores por perto\:§r {0} nearbyPlayersList={0}§f(§c{1}m§f) -negativeBalanceError=§4Usuário não tem permissão para ter um saldo negativo. nickChanged=§6Apelido alterado. nickCommandDescription=Mude seu apelido ou de outro jogador. nickCommandUsage=/ [jogador] @@ -867,12 +824,10 @@ noPermToSpawnMob=§4Você não tem permissão para spawnar esse mob. noPlacePermission=§4Você não tem permissão para colocar um bloco perto dessa placa. noPotionEffectPerm=§4Você não tem permissão para aplicar o efeito §c{0} §4para essa poção. noPowerTools=§6Você não tem nenhuma ferramenta de poder atribuida. -notAcceptingPay=§4{0} §4não está aceitando pagamento. notAllowedToLocal=§4Você não tem permissão para falar no chat local. notAllowedToQuestion=§4Você não tem permissão para a usar pergunta. notAllowedToShout=§4Você não tem permissão para gritar. notEnoughExperience=§4Você não tem experiência suficiente. -notEnoughMoney=§4Você não tem dinheiro suficiente. notFlying=não está voando nothingInHand=§4Você não tem nada em sua mão. now=agora @@ -888,28 +843,9 @@ onlyPlayers=§4Apenas jogadores dentro jogo podem usar §c{0}§4. onlyPlayerSkulls=§4Você só pode definir o proprietário de cabeças de jogador (§c397\:3§4). onlySunStorm=§4/weather suporta apenas sun/storm. openingDisposal=§6Abrindo o menu de eliminação... -orderBalances=§6Organizando saldos de§c {0} §6usuários, aguarde... oversizedMute=§4Você não poderá silenciar um jogador por esse período de tempo. oversizedTempban=§4Você não pode banir um jogador por esse período de tempo. passengerTeleportFail=§4Você não pode ser teleportado enquanto carrega passageiros. -payCommandDescription=Paga outro jogador do seu saldo. -payCommandUsage=/ -payCommandUsage1=/ -payCommandUsage1Description=Paga o jogador indicado a quantia de dinheiro -payConfirmToggleOff=§6Confirmação de pagamento desativada. -payConfirmToggleOn=§6Você agora será solicitado para confirmar pagamentos. -payDisabledFor=§6Aceite de pagamentos desativado para §c{0}§6. -payEnabledFor=§6Aceite de pagamentos ativado para §c{0}§6. -payMustBePositive=§4O valor a ser pago deve ser positivo. -payOffline=§4Você não pode pagar usuários off-line. -payToggleOff=§6Você não está mais aceitando pagamentos. -payToggleOn=§6Você agora está aceitando pagamentos. -payconfirmtoggleCommandDescription=Alterna se é solicitado para confirmar pagamentos. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Alterna se você está aceitando pagamentos. -paytoggleCommandUsage=/ [jogador] -paytoggleCommandUsage1=/ [jogador] -paytoggleCommandUsage1Description=Ativa/Desativa Se você ou outro jogador, Se especificado, esta aceitando pagamentos pendingTeleportCancelled=§4Pedido de teletransporte cancelado. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -1077,8 +1013,6 @@ requestSent=§6Pedido enviado para§c {0}§6. requestSentAlready=§4You have already sent {0}§4 a teleport request. requestTimedOut=§4Tempo limite do pedido de teletransporte se esgotou. requestTimedOutFrom=§4Pedido de teleporte de §c{0} §4expirou. -resetBal=§6Saldos de todos os jogadores online resetados para §a{0}§6. -resetBalAll=§6Saldos de todos os jogadores resetados para §a{0}§6. rest=§6Você se sente bem descansado. restCommandDescription=Restaura você ou o jogador alvo. restCommandUsage=/ [jogador] @@ -1100,18 +1034,6 @@ seenCommandUsage1=/ seenCommandUsage1Description=Mostra o tempo de saída, banimento, silenciamento e as informações de UUID do jogador especificado seenOffline=§6Jogador§c {0} §6está §4offline§6 desde §c{1}§6. seenOnline=§6Jogador§c {0} §6está §aonline§6 desde §c{1}§6. -sellBulkPermission=§6You do not have permission to bulk sell. -sellCommandDescription=Vende o item na sua mão. -sellCommandUsage=/ <||mao|inventario|blocos> [quantidade] -sellCommandUsage1=/ [quantidade] -sellCommandUsage1Description=Vende tudo (ou o valor dado, se especificado) do item determinado no seu inventário -sellCommandUsage2=/ hand [quantidade] -sellCommandUsage2Description=Vende tudo (ou o valor dado, se especificado) do item em sua mão -sellCommandUsage3=/ all -sellCommandUsage3Description=Vende todos os itens possíveis em seu inventário -sellCommandUsage4=/ blocks [quantidade] -sellCommandUsage4Description=Vende todos (ou o valor dado, se especificado) de blocos em seu inventário -sellHandPermission=§6You do not have permission to hand sell. serverFull=Servidor cheio\! serverReloading=Há uma boa chance do seu server estar recarregando agora. Se é esse o caso, por que você se odeia? Não espere nenhum suporte da equipe EssentialsX ao usar /reload. serverTotal=§6Total do Servidor\:§c {0} @@ -1122,8 +1044,6 @@ serverUnsupportedDangerous=Você está rodando uma fork de um servidor conhecida serverUnsupportedLimitedApi=Você está executando um servidor com uma funcionalidade de API limitada. O EssentialsX ainda funcionará, mas certos recursos podem ser desativados. serverUnsupportedDumbPlugins=Você está usando plugins conhecidos por causar problemas graves com o EssentialsX e outros plugins. serverUnsupportedMods=Você está rodando um servidor que não suporta plugins Bukkit de forma adequada. Plugins bukkit não devem ser usados com mods Forge/Fabric\! Para Forge\: Considere utilizar ForgeEssentials, ou SpongeForge + Nucleus. -setBal=§aSeu saldo foi definido para {0}. -setBalOthers=§aVocê configurou o seu balanço atual de {0}§a para {1}. setSpawner=§6Spawner alterado para§c {0}. sethomeCommandDescription=Defina sua casa para sua localização atual. sethomeCommandUsage=/ [[player\:]name] @@ -1149,12 +1069,6 @@ setwarpCommandDescription=Cria um novo warp. setwarpCommandUsage=/ setwarpCommandUsage1=/ setwarpCommandUsage1Description=Define o warp com o nome especificado para sua localização -setworthCommandDescription=Defina o valor de venda de um item. -setworthCommandUsage=/ [itemname|id] -setworthCommandUsage1=/ -setworthCommandUsage1Description=Define o valor do item mantido para o preço determinado -setworthCommandUsage2=/ -setworthCommandUsage2Description=Define o valor do item especificado para o preço determinado sheepMalformedColor=§4Cor mal especificada. shoutDisabled=§6Modo grito §cdesativado§6. shoutDisabledFor=§6Modo grito §cdesativado §6para §c{0}§6. @@ -1244,8 +1158,6 @@ suicideCommandUsage=/ suicideMessage=§6Adeus mundo cruel... suicideSuccess=§6{0} §6se matou. survival=sobrevivência -takenFromAccount=§e{0}§a foi removido da sua conta. -takenFromOthersAccount=§e{0}§a removido de§e {1}§a conta. Novo saldo\:§e {2} teleportAAll=§6Pedido de teletransporte enviado a todos os jogadores... teleportAll=§6Teleportando todos os jogadores... teleportationCommencing=§6Teleportando... @@ -1399,8 +1311,6 @@ tptoggleCommandDescription=Bloqueia todas as formas de teletransporte. tptoggleCommandUsage=/ [jogador] [on|off] tptoggleCommandUsage1=/ [jogador] tptoggleCommandUsageDescription=Alterna se teletransporte estiver habilitado para você mesmo ou para outro jogador, se for especificado -tradeSignEmpty=§4A placa de troca não tem nada disponível para você -tradeSignEmptyOwner=§4Não há nada para coletar dessa placa de troca. treeCommandDescription=Invoque uma árvore onde você está olhando. treeCommandUsage=/ treeCommandUsage1=/ @@ -1481,12 +1391,10 @@ versionDevLatest=§6Você está utilizando a versão mais recente do EssentialsX versionError=§4Erro ao obter as informações da versão do EssentialsX\! Informações da versão\: §c{0}§6. versionErrorPlayer=§6Erro ao verificar as informações da versão do EssentialsX\! versionFetching=§6Buscando informações da versão... -versionOutputVaultMissing=§4O Vault não está instalado. Chat e permissões podem não funcionar. versionOutputFine=§6{0} versão\: §a{1} versionOutputWarn=§6{0} versão\: §c{1} versionOutputUnsupported=§d{0} §6versão\: §d{1} versionOutputUnsupportedPlugins=§6Você está executando §dplugins não suportados§6\! -versionOutputEconLayer=§6Camada de Economia\: §r{0} versionMismatch=§4Versao não correspondente\! Por favor atualize o {0} para a mesma versão. versionMismatchAll=§4Versão não correspondente\! Por favor atualize todos os jars do Essentials para a mesma versão. versionReleaseLatest=§6Você está executando a última versão estável do EssentialsX\! @@ -1548,7 +1456,6 @@ whoisHunger=§6 - Fome\:§r {0}/20 (+{1} saturação) whoisIPAddress=§6 - Endereço IP\:§r {0} whoisJail=§6 - Prisão\:§r {0} whoisLocation=§6 - Localização\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Dinheiro\:§r {0} whoisMuted=§6 - Silenciado\:§r {0} whoisMutedReason=§6 - Silenciado\:§r {0} §6Motivo\: §c{1} whoisNick=§6 - Apelido\:§r {0} @@ -1565,19 +1472,6 @@ worldCommandUsage1=/ worldCommandUsage1Description=Teletransporta para a sua localização correspondente no Nether ou no Mundo Normal worldCommandUsage2=/ worldCommandUsage2Description=Teletransporta para a sua localização no mundo informado -worth=§aPack de {0} vale §c{1}§a ({2} a {3} cada) -worthCommandDescription=Calcula o valor de itens na mão ou conforme especificado. -worthCommandUsage=/ <||hand|inventory|blocks> [-][amount] -worthCommandUsage1=/ [quantidade] -worthCommandUsage1Description=Verifica o valor de todos (ou o valor dado, se especificado) do item determinado no seu inventário -worthCommandUsage2=/ hand [quantidade] -worthCommandUsage2Description=Verifica o valor de todos (ou o valor dado, se especificado) do item mantido -worthCommandUsage3=/ all -worthCommandUsage3Description=Verifica o valor de todos os itens possíveis em seu inventário -worthCommandUsage4=/ blocks [quantidade] -worthCommandUsage4Description=Verifica o valor de todos (ou o valor dado, se especificado) dos blocos em seu inventário -worthMeta=§aPack de {0} com metadata de {1} vale §c{2}§a ({3} a {4} cada) -worthSet=§6Valor definido year=ano years=anos youAreHealed=§6Você foi curado. diff --git a/Essentials/src/main/resources/messages_ro.properties b/Essentials/src/main/resources/messages_ro.properties index 3baad87e4..98170a9ea 100644 --- a/Essentials/src/main/resources/messages_ro.properties +++ b/Essentials/src/main/resources/messages_ro.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} au fost adaugati in contul tau. -addedToOthersAccount=§a{0} au fost adaugati in contul lui {1}§a. Balanta noua\: {2} adventure=aventură afkCommandDescription=Te marcheaza ca si plecat de la tastatura. afkCommandUsage=/ [jucator/mesaj...] @@ -46,19 +44,6 @@ backupFinished=§6Backup terminat. backupStarted=§6Backup început. backupInProgress=Un script extern de backup este in curs de desfasurare\! Nu se poate dezactiva plugin-ul pana se sfarseste. backUsageMsg=§6întoarcerea la locul anterior. -balance=§aBalanţă\:§c {0} -balanceCommandDescription=Indica soldul curent al unui jucator. -balanceCommandUsage=/ [player] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Indica soldul tau curent -balanceCommandUsage2Description=Afiseaza soldul jucatorului specificat -balanceOther=§aBalanţa lui {0} §a\:§c {1} -balanceTop=§6Topul balanţelor ({0}) -balanceTopLine={0}, {1}, {2} -balancetopCommandDescription=Obtine valorile soldului maxim. -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] -balancetopCommandUsage1Description=Afişează prima (sau specificat) pagină a valorilor soldului de top banCommandDescription=Banează un membru. banCommandUsage=/ [motiv] banCommandUsage1=/ [motiv] @@ -150,11 +135,9 @@ commandHelpLineUsage={0} - {1} commandNotLoaded=§4Comanda {0} este partial incarcata. compassBearing=§6Directie\: {0} ({1} grade). compassCommandUsage=/ -condenseCommandUsage1=/ configFileMoveError=Eroare mutând fișierul config.yml in locația Backup. configFileRenameError=Eroare redenumind fișierul config.yml. confirmClear=§7To §lCONFIRM§7 inventory clear, please repeat command\: §6{0} -confirmPayment=§7To §lCONFIRM§7 payment of §6{0}§7, please repeat command\: §6{1} connectedPlayers=§6Jucători conectați\: §r connectionFailed=Deschiderea conexiunii a eșuat. consoleName=Consolă @@ -173,7 +156,6 @@ createKitUnsupported=NBT item serialization has been enabled, but this server is creatingConfigFromTemplate=Se creaza configuratie de la sablonul\: {0} creatingEmptyConfig=Se creaza o configuratie goala\: {0} creative=creativ -currency={0}{1} currentWorld=§6Lumea actuala\:§c {0} customtextCommandDescription=Permite sa creați comenzi text personalizate. customtextCommandUsage=/ - Adaugă in bubuit.yml @@ -273,8 +255,6 @@ dumpUrl=Created server dump\: {0} duplicatedUserdata=Informatiile jucatorilor duplicate\: {0} and {1}. durability=§6Aceasta unealta are §c{0}§6 utilizari ramase east=E -ecoCommandDescription=Gestioneaza economia de pe server. -ecoCommandUsage=/ editBookContents=§eAcum poti modifica continutul acestei carti. enabled=activat enchantCommandDescription=Enchanteaza elementul pe care il tine in mana utilizatorul. @@ -410,9 +390,7 @@ infoChapter=§6Selectați Capitolul\: infoChapterPages=§e---§6 {0} §e--§6 Pagina §c {1} §6 de §c {2} §e--- infoPages=§e ---- §6{2} §e--§6 Pagina §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Capitol necunoscut. -insufficientFunds=§4Fonduri insuficiente. invalidBanner=§4Invalid banner syntax. -invalidCharge=§4Incarcare invalida. invalidFireworkFormat=§4The option §c{0} §4is not a valid value for §c{1}§4. invalidHome=§4Casa§c {0} §4nu exista\! invalidHomeName=§4Numele casei este invalida\! @@ -485,7 +463,6 @@ kill=§6Ai ucis (pe)§c {0} §6. killExempt=§4You cannot kill §c{0}§4. kitCommandUsage1=/ kitContains=§6Kit §c{0} §6contains\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Nu sunt kituri valide. kitError2=§4Acest kit este nedefinit. Contactati un operator. @@ -536,7 +513,6 @@ mailTooLong=§4Mail message too long. Try to keep it below 1000 characters. markMailAsRead=§6To mark your mail as read, type§c /mail clear§6. matchingIPAddress=§6Jucatori s-au logat anterior de pe aceste IP-uri\: maxHomes=§4Nu poti seta mai mult de§c {0} §4case. -maxMoney=§4Aceasta tranzactie ar depasi suma din acest cont. mayNotJail=§4Nu poti incarcera acest jucator\! mayNotJailOffline=§4Nu poti incarcera jucatorii inactivi. meCommandDescription=Descrie o actiune in contextul jucatorului. @@ -544,7 +520,6 @@ meCommandUsage=/ meCommandUsage1=/ meSender=eu meRecipient=eu -minimumBalanceError=The minimum balance a user can have is {0}. minimumPayAmount=§cThe minimum amount you can pay is {0}. minute=minut minutes=minute @@ -554,8 +529,6 @@ mobsAvailable=§6Mobi\:§r {0} mobSpawnError=§4Eroare in schimbarea mob generator. mobSpawnLimit=Cantitatea de mobi a fost limitata la limita serverului. mobSpawnTarget=§4Blocul tinta trebuie sa fie un generator. -moneyRecievedFrom=§a{0} au fost primiti de la {1}. -moneySentTo=§a{0} au fost trimisi catre {1}. month=luna months=luni moreCommandDescription=Completeaza item stack-ul din mana la o valoare specificata, sau la o dimensiune maxima daca nu este specificata. @@ -576,7 +549,6 @@ msgIgnore=§c{0} §4has messages disabled. msgtoggleCommandDescription=Blocheaza primirea tuturor mesajelor private. msgtoggleCommandUsage=/ [player] [on|off] msgtoggleCommandUsage1=/ [player] -multipleCharges=§4Nu poti aplica mai mult de o incarcare pe racheta. multiplePotionEffects=§4Nu poti aplica mai mult de un efect pe potiune. muteCommandDescription=Amuteste sau dezamuteste un jucator. muteCommandUsage=/ [datediff] [reason] @@ -595,7 +567,6 @@ nearCommandDescription=Arata jucatorii din apropierea ta sau a altui jucator. nearCommandUsage=/ [playername] [radius] nearCommandUsage1=/ nearbyPlayers=§6Jucatori in apropiere\:§r {0} -negativeBalanceError=§4Jucatorul nu are permisiunea sa aiba o balanta negativa. nickChanged=§6Nume schimbat. nickCommandDescription=Schimba porecla ta sau a altui jucator. nickCommandUsage=/ [player] @@ -639,9 +610,7 @@ noPermToSpawnMob=§4Nu ai permisiunea sa generezi acest mob. noPlacePermission=§4Nu ai permisiunea sa plasezi un bloc in apropierea acestui semn. noPotionEffectPerm=§4Nu ai permisiunea sa aplici efectul§c{0} §4pe aceasta potiune. noPowerTools=§6Nu ai nicio putere pe acest obiect. -notAcceptingPay=§4{0} §4is not accepting payment. notEnoughExperience=§4Nu ai destula experienta. -notEnoughMoney=§4Nu ai destule fonduri. notFlying=nu zbori nothingInHand=§4Nu ai nimic in mana. now=acum @@ -655,25 +624,9 @@ onlyPlayers=§4Only in-game players can use §c{0}§4. onlyPlayerSkulls=§4You can only set the owner of player skulls (§c397\:3§4). onlySunStorm=§4/weather suporta doar sun/storm. openingDisposal=§6Opening disposal menu... -orderBalances=§6Se ordoneaza balantele a§c {0} §6jucatori, te rog asteapta... oversizedMute=Nu poti amuti un jucator pentru o asa perioada de timp. oversizedTempban=§4Nu poti interzice un jucator pentru asa o perioada de timp. passengerTeleportFail=Nu poti fi teleportat in timp ce cari pasageri. -payCommandDescription=Plateste un alt jucator din balanta ta. -payCommandUsage=/ -payCommandUsage1=/ -payConfirmToggleOff=§6You will no longer be prompted to confirm payments. -payConfirmToggleOn=§6You will now be prompted to confirm payments. -payDisabledFor=Disabled accepting payments for {0}. -payEnabledFor=Enabled accepting payments for {0}. -payMustBePositive=§4Amount to pay must be positive. -payOffline=You cannot pay offline users. -payToggleOff=§6You are no longer accepting payments. -payToggleOn=§6You are now accepting payments. -payconfirmtoggleCommandDescription=Activeaza daca vi se solicita sa confirmati platile. -payconfirmtoggleCommandUsage=/ -paytoggleCommandUsage=/ [player] -paytoggleCommandUsage1=/ [player] pendingTeleportCancelled=§4Cererea de teleportare a fost refuzata. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -770,8 +723,6 @@ requestSent=§6Cerere a fost trimisa catre§c {0}§6. requestSentAlready=§4You have already sent {0}§4 a teleport request. requestTimedOut=§4Timpul de acceptare s-a terminat. requestTimedOutFrom=Teleport request from {0} has timed out. -resetBal=§6Balance has been reset to §c{0} §6for all online players. -resetBalAll=§6Balance has been reset to §c{0} §6for all players. rest=You feel well rested. restCommandUsage=/ [player] restCommandUsage1=/ [player] @@ -784,13 +735,9 @@ seconds=secunde seenAccounts=§6Player has also been known as\:§c {0} seenOffline=§6Player§c {0} §6has been §4offline§6 since §c{1}§6. seenOnline=§6Player§c {0} §6has been §aonline§6 since §c{1}§6. -sellBulkPermission=§6You do not have permission to bulk sell. -sellHandPermission=§6You do not have permission to hand sell. serverFull=Serverul este plin\! serverTotal=§6Total server\:§c {0} serverUnsupported=Se executa o versiune de server neacceptata\! -setBal=§aBalanta ta a fost setata la {0}. -setBalOthers=§aA-ti setat balanta lui {0} §a la {1}. setSpawner=§6Changed spawner type to§c {0}§6. sethomeCommandUsage1=/ sethomeCommandUsage2=/ \: @@ -846,8 +793,6 @@ suicideCommandUsage=/ suicideMessage=§6La revedere lume cruda... suicideSuccess=§6{0} §6si-a luat viata. survival=supravietuire -takenFromAccount=§a{0} au fost luati de pe contul tau. -takenFromOthersAccount=§a{0} au fost luati de pe contul lui {1}§a. Balanta noua\: {2}. teleportAAll=§6Cererea de teleportare a fost trimisa catre toti jucatorii... teleportAll=§6Teleporteaza toti jucatorii... teleportationCommencing=§6Teleportarea urmeaza... @@ -914,8 +859,6 @@ tprSuccess=Teleporting to a random location... tps=§6TPSul curent \= {0} tptoggleCommandUsage=/ [player] [on|off] tptoggleCommandUsage1=/ [player] -tradeSignEmpty=§4Semnul pentru negociere nu are nimic pentru tine. -tradeSignEmptyOwner=§4Nu este nimic de colectat de la acest semn. treeFailure=§4Generarea copacului a esuat. Incearca pe pamand sau iarba. treeSpawned=§6Copac generat. true=§aadevarat§r @@ -969,12 +912,10 @@ versionDevLatest=You''re running the latest EssentialsX dev build\! versionError=Error while fetching EssentialsX version information\! Build information\: {0}. versionErrorPlayer=Error while checking EssentialsX version information\! versionFetching=Fetching version information... -versionOutputVaultMissing=§4Vault nu este instalat. Chatul si permisiune s-ar putea sa nu fie functionale. versionOutputFine={0} versiune\: {1} versionOutputWarn=§6{0} versiune\: §c{1} versionOutputUnsupported=§d{0} §6versiune\: §d{1} versionOutputUnsupportedPlugins=§6Rulezi §dpluginuri nesuportate§6\! -versionOutputEconLayer=Economy Layer\: {0} versionMismatch=§4Versiunea nu se potriveste\! Fa update {0} la aceasi versiune. versionMismatchAll=§4Versiunea nu se potriveste\! Fa uptate la acceasi versiune. versionReleaseLatest=You''re running the latest stable version of EssentialsX\! @@ -1021,7 +962,6 @@ whoisHunger=§6 - Foame\: §r {0} / 20 (+ saturaţie {1}) whoisIPAddress=§6 - Aresa IP\:§r {0} whoisJail=§6 - Inchisi\:§r {0} whoisLocation=§6 - Locatia\: §r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Bani\:§r {0} whoisMuted=§6 - Vorbit interzis\:§r {0} whoisMutedReason=- Muted\: {0} Reason\: {1} whoisNick=§6 - Nume\:§r {0} @@ -1032,9 +972,6 @@ whoisTop=§6 \=\=\= Cine este\:§c {0} §6 \=\=\= whoisUuid=§6 - UUID\:§r {0} workbenchCommandUsage=/ worldCommandUsage1=/ -worth=§aUn stac de {0} valoreaza §c{1}§a ({2} obiect(e) la {3} fiecare) -worthMeta=§aUn stac de {0} cu metadata de {1} valoreaza §c{2}§a ({3} obiect(e) la {4} fiecare) -worthSet=§6Valoarea ''valorii'' setata year=an years=ani youAreHealed=§6Ai fost vindecat. diff --git a/Essentials/src/main/resources/messages_ru.properties b/Essentials/src/main/resources/messages_ru.properties index ec22dd716..3c596941e 100644 --- a/Essentials/src/main/resources/messages_ru.properties +++ b/Essentials/src/main/resources/messages_ru.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} было зачислено на ваш счет. -addedToOthersAccount=§a{0} зачислено на счет {1}§a. Текущий баланс\: {2} adventure=приключенческий afkCommandDescription=Отмечает вас как отошедшего. afkCommandUsage=/ [игрок] [сообщение] @@ -47,20 +45,6 @@ backupFinished=§6Резервное копирование завершено. backupStarted=§6Резервное копирование начато. backupInProgress=§6Выполняется скрипт внешнего резервного копирования\! Отключение плагина недоступно до завершения процесса. backUsageMsg=§6Возвращение на прежнюю локацию. -balance=§aБаланс\:§c {0} -balanceCommandDescription=Отображает текущий баланс игрока. -balanceCommandUsage=/ [игрок] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Отображает ваш текущий баланс -balanceCommandUsage2=/ <игрок> -balanceCommandUsage2Description=Отображает баланс указанного игрока -balanceOther=§aБаланс {0}§a\:§c {1} -balanceTop=§6Топ богачей ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Выводит топ богачей. -balancetopCommandUsage=/ [страница] -balancetopCommandUsage1=/ [страница] -balancetopCommandUsage1Description=Отображает первую (или указанную) страницу топа богачей banCommandDescription=Банит игрока. banCommandUsage=/ <игрок> [причина] banCommandUsage1=/ <игрок> [причина] @@ -161,16 +145,9 @@ consoleCannotUseCommand=Эту команду нельзя использова compassBearing=§6Азимут\: {0} ({1} градусов). compassCommandDescription=Описывает вашу текущую локацию. compassCommandUsage=/ -condenseCommandDescription=Сжимает предметы в блоки. -condenseCommandUsage=/ [предмет] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Сжимает все предметы в вашем инвентаре -condenseCommandUsage2=/ <предмет> -condenseCommandUsage2Description=Сжимает указанные предметы в вашем инвентаре configFileMoveError=Не удалось переместить config.yml в резервную копию. configFileRenameError=Не удалось переименовать временный файл в config.yml. confirmClear=§7Для §lПОДТВЕРЖДЕНИЯ§7 очистки инвентаря, пожалуйста, повторите команду\: §6{0} -confirmPayment=§7Для §lПОДТВЕРЖДЕНИЯ§7 перевода суммы §6{0}§7, пожалуйста, повторите команду\: §6{1} connectedPlayers=§6Игроков онлайн§r connectionFailed=Не удалось открыть подключение. consoleName=Консоль @@ -189,7 +166,6 @@ createKitUnsupported=§4Сериализация NBT предметов вклю creatingConfigFromTemplate=Создается файл конфигурации из шаблона\: {0} creatingEmptyConfig=Создается пустой конфигурационный файл\: {0} creative=творческий -currency={0}{1} currentWorld=§6Текущий мир\:§c {0} customtextCommandDescription=Позволяет создавать собственные текстовые команды. customtextCommandUsage=/ - Укажите в commands.yml @@ -313,16 +289,6 @@ dumpUrl=§6Создан дамп сервера\: §c{0} duplicatedUserdata=Дублированные файлы пользователей\: {0} и {1}. durability=§6У этого предмета ещё §c{0}§6 использований. east=В -ecoCommandDescription=Управляет экономикой сервера. -ecoCommandUsage=/ <игрок> [сумма] -ecoCommandUsage1=/ give <игрок> <сумма> -ecoCommandUsage1Description=Выдает указанному игроку указанную сумму денег -ecoCommandUsage2=/ take <игрок> <сумма> -ecoCommandUsage2Description=Забирает указанную сумму денег у указанного игрока -ecoCommandUsage3=/ set <игрок> <сумма> -ecoCommandUsage3Description=Устанавливает баланс указанного игрока на указанную сумму -ecoCommandUsage4=/ reset <игрок> -ecoCommandUsage4Description=Сбрасывает баланс указанного игрока на начальный баланс сервера editBookContents=§eТеперь вы можете редактировать содержание этой книги. enabled=включен enchantCommandDescription=Зачаровывает предмет в руке. @@ -540,9 +506,7 @@ infoCommandDescription=Показывает информацию, установ infoCommandUsage=/ [глава] [страница] infoPages=§e --- §6{2} §e--§6 Страница §c{0}§6/§c{1} §e--- infoUnknownChapter=§4Неизвестная глава. -insufficientFunds=§4Недостаточно средств. invalidBanner=§4Неверный синтаксис баннера. -invalidCharge=§4Неправильный ценник. invalidFireworkFormat=§4Опция §c{0} §4имеет неверное значение для §c{1}§4. invalidHome=§4Дома§c {0} §4не существует\! invalidHomeName=§4Неправильное название дома\! @@ -659,7 +623,6 @@ kitCommandUsage1Description=Перечисляет все доступные н kitCommandUsage2=/ <набор> [игрок] kitCommandUsage2Description=Выдает указанный набор вам или другому игроку, если указан kitContains=§6Набор §c{0} §6содержит\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Нет наборов, которые могут быть выданы. kitError2=§4Этот набор неправильно настроен. Свяжитесь с администрацией. @@ -739,7 +702,6 @@ mailTooLong=§4Письмо слишком длинное. Попробуйте markMailAsRead=§6Чтобы отметить почту прочитанной, введите§c /mail clear§6. matchingIPAddress=§6Игроки, которые были замечены с этим IP-адресом\: maxHomes=§4Вы не можете создать более§c {0} §4дома(ов). -maxMoney=§4Этот перевод превысит денежный лимит этого аккаунта. mayNotJail=§4Вы не можете отправить этого игрока в тюрьму\! mayNotJailOffline=§4Вы не можете садить в тюрьму офлайн игроков. meCommandDescription=Описывает действие от лица игрока. @@ -748,7 +710,6 @@ meCommandUsage1=/ <описание> meCommandUsage1Description=Описывает действие meSender=я meRecipient=я -minimumBalanceError=§4Минимально возможный баланс пользователя - {0}. minimumPayAmount=§cМинимальная сумма перевода {0}. minute=минута minutes=минут @@ -758,8 +719,6 @@ mobsAvailable=§6Мобы\:§r {0} mobSpawnError=§4Произошла ошибка при изменении рассадника мобов. mobSpawnLimit=Количество мобов ограничено настройками сервера. mobSpawnTarget=§4Вы должны смотреть на рассадник мобов. -moneyRecievedFrom=§a{0}§6 получено от игрока§a {1}§6. -moneySentTo=§a{0} отправлено игроку {1}. month=месяц months=месяцев moreCommandDescription=Заполняет стак предметов в руке до указанного количества или до максимального, если ничего не указано. @@ -784,7 +743,6 @@ msgtoggleCommandDescription=Блокирует получение приватн msgtoggleCommandUsage=/ [игрок] [on|off] msgtoggleCommandUsage1=/ [игрок] msgtoggleCommandUsage1Description=Переключает полет для вас или другого игрока, если указан -multipleCharges=§4Вы не можете применить больше одного заряда для фейерверка. multiplePotionEffects=§4Вы не можете применить более одного эффекта для зелья. muteCommandDescription=Устанавливает или снимает заглушение с игрока. muteCommandUsage=/ <игрок> [длительность] [причина] @@ -815,7 +773,6 @@ nearCommandUsage4=/ <игрок> <радиус> nearCommandUsage4Description=Перечисляет всех игроков в пределах заданного радиуса от указанного игрока nearbyPlayers=§6Окружающие игроки\:§r {0} nearbyPlayersList={0}§f(§c{1}м§f) -negativeBalanceError=§4Игрок не имеет прав на отрицательный баланс. nickChanged=§6Никнейм изменен. nickCommandDescription=Изменяет ваш никнейм или никнейм другого игрока. nickCommandUsage=/ [игрок] <никнейм|off> @@ -867,12 +824,10 @@ noPermToSpawnMob=§4У вас нет прав для призыва этого noPlacePermission=§4У вас нет прав ставить блоки возле этой таблички. noPotionEffectPerm=§4У вас нет прав для применения эффекта §c{0} §4на это зелье. noPowerTools=§6У вас нет командных инструментов. -notAcceptingPay=§4{0} §4не принимает платежи. notAllowedToLocal=§4У вас нет прав на общение в локальном чате. notAllowedToQuestion=§4У вас нет прав на использование вопроса. notAllowedToShout=§4У вас нет прав на возглас. notEnoughExperience=§4У вас недостаточно опыта. -notEnoughMoney=§4У вас недостаточно средств. notFlying=не летает nothingInHand=§4В вашей руке ничего нет. now=сейчас @@ -888,28 +843,9 @@ onlyPlayers=§4Только в игре можно использовать §c{ onlyPlayerSkulls=§4Вы можете указать владельца только головы игрока (§c397\:3§4). onlySunStorm=§4/weather поддерживает только sun/storm. openingDisposal=§6Открытие окна утилизации... -orderBalances=§6Подсчет баланса§c {0} §6игроков, подождите немного... oversizedMute=§4Вы не можете заглушить игрока на такой срок. oversizedTempban=§4Вы не можете забанить игрока на такой срок. passengerTeleportFail=§4Вы не можете телепортироваться во время перевозки пассажиров. -payCommandDescription=Платит игроку из вашего баланса. -payCommandUsage=/ <игрок> <сумма> -payCommandUsage1=/ <игрок> <сумма> -payCommandUsage1Description=Переводит указанному игроку заданную сумму денег -payConfirmToggleOff=§6Вы больше не будете получать запросы на подтверждение платежей. -payConfirmToggleOn=§6Теперь Вам будет предлагать подтвердить платежи. -payDisabledFor=§c{0}§6 больше не может принимать платежи. -payEnabledFor=§c{0}§6 теперь может принимать платежи. -payMustBePositive=§4Сумма перевода должна быть положительной. -payOffline=§4Вы не можете передавать деньги офлайн игрокам. -payToggleOff=§6Вы больше не принимаете платежи. -payToggleOn=§6Теперь вы принимаете платежи. -payconfirmtoggleCommandDescription=Переключает подтверждение денежных переводов. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Переключает прием или отклонение платежей. -paytoggleCommandUsage=/ [игрок] -paytoggleCommandUsage1=/ [игрок] -paytoggleCommandUsage1Description=Переключает, принимаете ли вы платежи, или другой игрок если указан pendingTeleportCancelled=§4Запрос на телепортацию отменен. pingCommandDescription=Понг\! pingCommandUsage=/ @@ -1077,8 +1013,6 @@ requestSent=§6Запрос отправлен игроку§c {0}§6. requestSentAlready=§4Вы уже отправили игроку {0}§4 запрос на телепортацию. requestTimedOut=§4Время запроса на телепортацию вышло. requestTimedOutFrom=§4Запрос на телепортацию от §c{0} §4истек. -resetBal=§6Баланс был сброшен на §a{0} §6для всех онлайн игроков. -resetBalAll=§6Баланс был сброшен на §a{0} §6для всех игроков. rest=§6Вы чувствуете себя отдохнувшим. restCommandDescription=Оправляет вас или указанного игрока. restCommandUsage=/ [игрок] @@ -1100,18 +1034,6 @@ seenCommandUsage1=/ <игрок> seenCommandUsage1Description=Отображает время выхода, бан, заглушение и UUID указанного игрока seenOffline=§6Игрок§c {0} §4офлайн§6 в течение §c{1}§6. seenOnline=§6Игрок§c {0} §aонлайн§6 в течение §c{1}§6. -sellBulkPermission=§6У вас нет прав продавать несколько предметов сразу. -sellCommandDescription=Продает предмет из вашей руки. -sellCommandUsage=/ <<имя предмета>||hand|inventory|blocks> [кол-во] -sellCommandUsage1=/ <имя предмета> [кол-во] -sellCommandUsage1Description=Продает все (или указанное количество) предметы указанного типа из вашего инвентаря -sellCommandUsage2=/ hand [кол-во] -sellCommandUsage2Description=Продает все (или указанное количество) удерживаемые в руке предметы -sellCommandUsage3=/ all -sellCommandUsage3Description=Продаёт все возможные предметы в вашем инвентаре -sellCommandUsage4=/ blocks [кол-во] -sellCommandUsage4Description=Продает все (или указанное количество) блоки в вашем инвентаре -sellHandPermission=§6У вас нет прав на продажу предмета из руки. serverFull=Сервер заполнен\! serverReloading=Похоже, что вы решили перезагрузить свой сервер используя /reload. Неужели вы настолько ненавидите себя? Не ожидайте поддержки от команды EssentialsX при использовании /reload. serverTotal=§6Всего\:§c {0} @@ -1122,8 +1044,6 @@ serverUnsupportedDangerous=Вы используете форк сервера, serverUnsupportedLimitedApi=Вы используете сервер с ограниченным функционалом API. EssentialsX все еще будет работать, но некоторые функции могут быть отключены. serverUnsupportedDumbPlugins=Вы используете плагины, известные за приченение серьезных проблем в работе EssentialsX и других плагинов. serverUnsupportedMods=Вы используете сервер, который не поддерживает плагины Bukkit должным образом. Плагины Bukkit не должны быть использованы в связке с модами Forge/Fabric\! Для Forge - рассмотрите возможность использования ForgeEssentials или SpongeForge + Nucleus. -setBal=§aВаш баланс установлен на {0}. -setBalOthers=§aВы установили баланс {0}§a на {1}. setSpawner=§6Tип рассадника мобов изменен на§c {0}§6. sethomeCommandDescription=Устанавливает точку дома на вашей текущей локации. sethomeCommandUsage=/ [[<игрок>\:]<название>] @@ -1149,12 +1069,6 @@ setwarpCommandDescription=Создает новый варп. setwarpCommandUsage=/ <варп> setwarpCommandUsage1=/ <варп> setwarpCommandUsage1Description=Устанавливает варп с указанным названием на вашем месте -setworthCommandDescription=Устанавливает стоимость продажи предмета. -setworthCommandUsage=/ [предмет/id] <цена> -setworthCommandUsage1=/ <цена> -setworthCommandUsage1Description=Устанавливает стоимость удерживаемого в руке предмета на заданную -setworthCommandUsage2=/ <имя предмета> <цена> -setworthCommandUsage2Description=Устанавливает стоимость указанного предмета на заданную sheepMalformedColor=§4Неверный цвет. shoutDisabled=§6Режим возгласа §cотключен§6. shoutDisabledFor=§6Режим возгласа §cотключен §6для §c{0}§6. @@ -1244,8 +1158,6 @@ suicideCommandUsage=/ suicideMessage=§6Прощай жестокий мир... suicideSuccess=§6Игрок §c{0} §6покончил жизнь самоубийством. survival=выживание -takenFromAccount=§e{0}§a было снято с вашего аккаунта. -takenFromOthersAccount=§e{0}§a снято с аккаунта §e {1}§a. Текущий баланс\:§e {2} teleportAAll=§6Запрос на телепортацию отправлен всем игрокам... teleportAll=§6Телепортирование всех игроков... teleportationCommencing=§6Телепортация начинается... @@ -1399,8 +1311,6 @@ tptoggleCommandDescription=Блокирует все виды телепорта tptoggleCommandUsage=/ [игрок] [on|off] tptoggleCommandUsage1=/ [игрок] tptoggleCommandUsageDescription=Переключает телепорты у вас, или другого игрока, если указан -tradeSignEmpty=§4В торговой табличке нет ничего доступного Вам. -tradeSignEmptyOwner=§4В торговой табличке нет ничего для сбора. treeCommandDescription=Создает дерево на месте вашего взгляда. treeCommandUsage=/ treeCommandUsage1=/ @@ -1481,12 +1391,10 @@ versionDevLatest=§6Вы используете последнюю сборку versionError=§4Ошибка при получении информации о версии EssentialsX\! Информация о сборке\: §c{0}§6. versionErrorPlayer=§6Ошибка при проверке информации о версии EssentialsX\! versionFetching=§6Получение информации о версии... -versionOutputVaultMissing=§4Плагин Vault не установлен. Чат и права могут не работать. versionOutputFine=§6{0} версия\: §a{1} versionOutputWarn=§6{0} версия\: §c{1} versionOutputUnsupported=§d{0} §6версия\: §d{1} versionOutputUnsupportedPlugins=§6У вас работают §dнеподдерживаемые плагины§6\! -versionOutputEconLayer=§6Слой экономики\: §r{0} versionMismatch=§4Версии не совпадают\! Обновите {0} до актуальной версии. versionMismatchAll=§4Версии не совпадают\! Обновите все компоненты Essentials до актуальной версии. versionReleaseLatest=§6Вы используете последнюю стабильную версию EssentialsX\! @@ -1548,7 +1456,6 @@ whoisHunger=§6 - Голод\:§r {0}/20 (+{1} насыщение) whoisIPAddress=§6 - IP-адрес\:§r {0} whoisJail=§6 - В тюрьме\:§r {0} whoisLocation=§6 - Местоположение\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Деньги\:§r {0} whoisMuted=§6 - Заглушен\:§r {0} whoisMutedReason=§6 - Заглушен\:§r {0} §6Причина\: §c{1} whoisNick=§6 - Никнейм\:§r {0} @@ -1565,19 +1472,6 @@ worldCommandUsage1=/ worldCommandUsage1Description=Телепортирует вас на соответствующие координаты в Незере или Верхнем мире worldCommandUsage2=/ <мир> worldCommandUsage2Description=Телепортирует на ваши координаты в указанном мире -worth=§aСтоимость стака {0} составляет §c{1}§a ({2} предметов по {3} каждый) -worthCommandDescription=Вычисляет стоимость указанного предмета или предмета в руке. -worthCommandUsage=/ <<предмет|id>|hand|inventory|blocks> [-][кол-во] -worthCommandUsage1=/ <имя предмета> [кол-во] -worthCommandUsage1Description=Проверяет стоимость всего (или заданного количества) определённого предмета из вашего инвентаря -worthCommandUsage2=/ hand [кол-во] -worthCommandUsage2Description=Проверяет стоимость всех (или заданного количества) предметов в вашей руке -worthCommandUsage3=/ all -worthCommandUsage3Description=Проверяет стоимость всех возможных предметов в вашем инвентаре -worthCommandUsage4=/ blocks [кол-во] -worthCommandUsage4Description=Проверяет стоимость всех (или заданного количества) блоков из вашего инвентаря -worthMeta=§aСтоимость стака {0} с метаданными {1} составляет §c{2}§a ({3} предметов по {4} каждый) -worthSet=§6Цена установлена year=год years=лет youAreHealed=§6Вы были вылечены. diff --git a/Essentials/src/main/resources/messages_si_LK.properties b/Essentials/src/main/resources/messages_si_LK.properties index 21af41827..c1a7651b3 100644 --- a/Essentials/src/main/resources/messages_si_LK.properties +++ b/Essentials/src/main/resources/messages_si_LK.properties @@ -9,9 +9,6 @@ anvilCommandUsage=/ backCommandUsage=/ [player] backCommandUsage1=/ backupCommandUsage=/ -balanceCommandUsage=/ [player] -balanceCommandUsage1=/ -balanceTopLine={0}. {1}, {2} banCommandUsage=/ [reason] banCommandUsage1=/ [reason] beezookaCommandUsage=/ @@ -26,10 +23,8 @@ clearinventoryCommandUsage=/ [player|*] [item[\:]|*|**] [amount] clearinventoryCommandUsage1=/ clearinventoryconfirmtoggleCommandUsage=/ compassCommandUsage=/ -condenseCommandUsage1=/ coordsKeyword={0}, {1}, {2} createKitSeparator=§m----------------------- -currency={0}{1} deljailCommandUsage=/ deljailCommandUsage1=/ delkitCommandUsage=/ @@ -74,9 +69,6 @@ loomCommandUsage=/ msgtoggleCommandUsage1=/ [player] nearCommandUsage1=/ nukeCommandUsage=/ [player] -payconfirmtoggleCommandUsage=/ -paytoggleCommandUsage=/ [player] -paytoggleCommandUsage1=/ [player] pingCommandUsage=/ playtimeCommandUsage=/ [player] playtimeCommandUsage1=/ diff --git a/Essentials/src/main/resources/messages_sk.properties b/Essentials/src/main/resources/messages_sk.properties index 59deba919..e69fab11a 100644 --- a/Essentials/src/main/resources/messages_sk.properties +++ b/Essentials/src/main/resources/messages_sk.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} bolo pridané na tvoj účet. -addedToOthersAccount=§a{0} bolo pridaných na účet {1}§a. Nový zostatok\: {2} adventure=dobrodružstvo afkCommandDescription=Označí ťa ako AFK (mimo klávesnice). afkCommandUsage=/ [hráč/správa...] @@ -47,20 +45,6 @@ backupFinished=§6Zálohovanie skončilo. backupStarted=§6Zálohovanie sa spustilo. backupInProgress=§6Práve beží externý zálohovací skript\! Vypnutie pluginu čaká na dokončenie. backUsageMsg=§6Vraciaš sa na predošlú polohu. -balance=§aZostatok\:§c {0} -balanceCommandDescription=Zobrazí aktuálny stav účtu hráča. -balanceCommandUsage=/ [hráč] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Tvoj aktuálny zostatok -balanceCommandUsage2=/ -balanceCommandUsage2Description=Zobrazí zostatok daného hráča -balanceOther=§aZostatok hráča {0}§a\:§c {1} -balanceTop=§6Najväčšie účty ({0}) -balanceTopLine={0}, {1}, {2} -balancetopCommandDescription=Zobrazí hodnoty najväčších účtov. -balancetopCommandUsage=/ [strana] -balancetopCommandUsage1=/ [strana] -balancetopCommandUsage1Description=Zobrazí prvú (alebo zadanú) stranu najvyšších zostatkov banCommandDescription=Udelí hráčovi ban. banCommandUsage=/ [dôvod] banCommandUsage1=/ [dôvod] @@ -161,16 +145,9 @@ consoleCannotUseCommand=Tento príkaz nemôže použiť Konzola. compassBearing=§6Kurz\: {0} ({1} stupňov). compassCommandDescription=Vypíše tvoj aktuálny azimut. compassCommandUsage=/ -condenseCommandDescription=Spojí predmety do kompaktnejších blokov. -condenseCommandUsage=/ [predmet] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Zhustí všetky predmety v tvojom inventári -condenseCommandUsage2=/ -condenseCommandUsage2Description=Zhustí zadaný predmet v tvojom inventári configFileMoveError=Nepodarilo sa premiestniť config.yml do zálohy. configFileRenameError=Nepodarilo sa premenovať dočasný súbor na config.yml. confirmClear=§7Pre §lPOTVRDENIE§7 vyprázdnenia inventára zopakuj príkaz\: §6{0} -confirmPayment=§7Pre §lPOTVRDENIE§7 platby §6{0}§7 zopakuj príkaz\: §6{1} connectedPlayers=§6Pripojení hráči§r connectionFailed=Otvorenie pripojenia zlyhalo. consoleName=Konzola @@ -189,7 +166,6 @@ createKitUnsupported=§4Serializácia predmetov podľa NBT je zapnutá, ale tent creatingConfigFromTemplate=Vytvára sa konfigurácia podľa šablóny\: {0} creatingEmptyConfig=Vytvára sa prázdna konfigurácia\: {0} creative=tvorivý -currency={0}{1} currentWorld=§6Aktuálny svet\:§c {0} customtextCommandDescription=Umožňuje ti vytvoriť vlastné textové príkazy. customtextCommandUsage=/ - definuj v súbore bukkit.yml @@ -313,16 +289,6 @@ dumpUrl=§6Serverový výpis vytvorený\: §c{0} duplicatedUserdata=Duplikované používateľské dáta\: {0} a {1}. durability=§6Tomuto nástroju zostáva ešte §c{0}§6 použití. east=V -ecoCommandDescription=Spravuje ekonomiku servera. -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=Dá určenému hráčovi určené množstvo peňazí -ecoCommandUsage2=/ take -ecoCommandUsage2Description=Vezme určené množstvo peňazí od určeného hráča -ecoCommandUsage3=/ set -ecoCommandUsage3Description=Nastaví zostatok určeného hráča na určenú sumu peňazí -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=Resetuje zostatok určeného hráča na počiatočný zostatok servera editBookContents=§eTeraz môžeš upravovať obsah tejto knihy. enabled=zapnuté enchantCommandDescription=Očaruje predmet v ruke hráča. @@ -540,9 +506,7 @@ infoCommandDescription=Zobrazí informácie nastavené vlastníkom servera. infoCommandUsage=/ [kapitola] [strana] infoPages=§e ---- §6{2} §e--§6 Strana §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Neznáma kapitola. -insufficientFunds=§4Nedostatok prostriedkov. invalidBanner=§4Neplatná definícia zástavy. -invalidCharge=§4Neplatný poplatok. invalidFireworkFormat=§4Možnosť §c{0} §4nie je platná hodnota pre §c{1}§4. invalidHome=§4Domov§c {0} §4neexistuje\! invalidHomeName=§4Neplatný názov domova\! @@ -659,7 +623,6 @@ kitCommandUsage1Description=Zobrazí všetky dostupne kity kitCommandUsage2=/ [hráč] kitCommandUsage2Description=Dá určený kit tebe alebo inému hráčovi, ak je špecifikovaný kitContains=§6Kit §c{0} §6obsahuje\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Neexistujú žiadne platné kity. kitError2=§4Tento kit je nesprávne nadefinovaný. Kontaktuj správcu. @@ -739,7 +702,6 @@ mailTooLong=§4Tvoja správa je príliš dlhá, môže mať najviac 1000 znakov. markMailAsRead=§6Pre vymazanie správ použi§c /mail clear§6. matchingIPAddress=§6Z tejto IP adresy sa v minulosti pripojili nasledujúci hráči\: maxHomes=§4Nemôžeš si nastaviť viac než§c {0} §4domovov. -maxMoney=§4Táto transakcia by prekročila limit tohto účtu. mayNotJail=§4Tohto hráča nemôžeš uväzniť\! mayNotJailOffline=§4Nemôžeš uväzniť offline hráča. meCommandDescription=Popisuje, čo zadávateľ robí. @@ -748,7 +710,6 @@ meCommandUsage1=/ meCommandUsage1Description=Popisuje akciu meSender=ja meRecipient=ja -minimumBalanceError=§4Najnižší možný stav účtu je {0}. minimumPayAmount=§cNajnižšia možná suma je {0}. minute=minúta minutes=minút @@ -758,8 +719,6 @@ mobsAvailable=§6Tvory\:§r {0} mobSpawnError=§4Chyba pri zmene spawnera. mobSpawnLimit=Počet tvorov je obmedzený na limit servera. mobSpawnTarget=§4Cieľová kocka musí byť spawner. -moneyRecievedFrom=§6Dostal si §a{0}§6 od hráča §a{1}§6. -moneySentTo=§aOdoslal si {0} hráčovi {1}. month=mesiac months=mesiacov moreCommandDescription=Vyplní držaný stack na stanovené množstvo alebo na maximum, ak množstvo nie je uvedené. @@ -784,7 +743,6 @@ msgtoggleCommandDescription=Zablokuje prijímanie všetkých súkromných správ msgtoggleCommandUsage=/ [hráč] [on|off] msgtoggleCommandUsage1=/ [hráč] msgtoggleCommandUsage1Description=Prepína lietanie pre seba alebo iného hráča, ak je špecifikovaný -multipleCharges=§4Na tento ohňostroj nemôžeš použiť viac než jeden náboj. multiplePotionEffects=§4Nemôžeš použiť viac než jeden efekt na tento elixír. muteCommandDescription=Umlčí hráča, alebo mu povolí písať. muteCommandUsage=/ [trvanie] [dôvod] @@ -815,7 +773,6 @@ nearCommandUsage4=/ nearCommandUsage4Description=Zobrazí všetkých hráčov v rámci daného okruhu zadaného hráča nearbyPlayers=§6Hráči v okolí\:§r {0} nearbyPlayersList={0}§f(§c{1}m§f) -negativeBalanceError=§4Hráč nemôže mať negatívny zostatok. nickChanged=§6Prezývka zmenená. nickCommandDescription=Zmeň svoju prezývku alebo prezývku iného hráča. nickCommandUsage=/ [hráč] @@ -867,12 +824,10 @@ noPermToSpawnMob=§4Nemáš oprávnenie na vyvolanie tohto tvora. noPlacePermission=§4Nemáš oprávnenie na ukladanie kociek v okolí tejto ceduľky. noPotionEffectPerm=§4Nemáš oprávnenie na použitie účinku §c{0} §4na tento elixír. noPowerTools=§6Nemáš priradené žiadne rýchlonástroje. -notAcceptingPay=§4{0} §4neprijíma platby. notAllowedToLocal=§4Nemáš oprávnenie na písanie do lokálneho chatu. notAllowedToQuestion=§4Nemáš oprávnenie písať otázky. notAllowedToShout=§4Nemáš oprávnenie písať zvolania. notEnoughExperience=§4Nemáš dostatok skúseností. -notEnoughMoney=§4Nemáš dostatok prostriedkov. notFlying=nelieta nothingInHand=§4Nemáš v ruke nič. now=teraz @@ -888,28 +843,9 @@ onlyPlayers=§4Len hráči v hre môžu používať §c{0}§4. onlyPlayerSkulls=§4Vlastníka môžeš nastaviť len hráčskym lebkám. onlySunStorm=§4/weather prijíma len hodnoty sun/storm. openingDisposal=§6Otvára sa odpadkový kôš... -orderBalances=§6Zoraďujem účty §c{0}§6 hráčov, prosím čakaj... oversizedMute=§4Nemôžeš umlčať hráča na takúto dobu. oversizedTempban=§4Nemôžeš dať ban hráčovi na takúto dobu. passengerTeleportFail=§4Nemôžeš sa teleportovať keď nesieš pasažierov. -payCommandDescription=Prevedie inému hráčovi peniaze z tvojho účtu. -payCommandUsage=/ -payCommandUsage1=/ -payCommandUsage1Description=Zaplatí určenému hráčovi danú sumu peňazí -payConfirmToggleOff=§6Odteraz nebude vyžadované potvrdenie platieb. -payConfirmToggleOn=§6Odteraz bude vyžadované potvrdenie platieb. -payDisabledFor=§6Prijímanie platieb vypnuté pre §c{0}§6. -payEnabledFor=§6Prijímanie platieb zapnuté pre §c{0}§6. -payMustBePositive=§4Suma na zaplatenie musí byť kladné číslo. -payOffline=§4Nemôžeš zadať platbu offline hráčovi. -payToggleOff=§6Odteraz neprijímaš platby. -payToggleOn=§6Odteraz prijímaš platby. -payconfirmtoggleCommandDescription=Zapína/vypína nutnosť potvrdenia platieb. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Zapína/vypína prijímanie platieb. -paytoggleCommandUsage=/ [hráč] -paytoggleCommandUsage1=/ [hráč] -paytoggleCommandUsage1Description=Prepína, či ty alebo iný hráč (ak je zadaný), prijímate platby pendingTeleportCancelled=§4Čakajúca žiadosť o teleport bola zrušená. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -1077,8 +1013,6 @@ requestSent=§6Žiadosť odoslaná hráčovi§c {0}§6. requestSentAlready=§4Hráčovi §c{0}§4 si už odoslal žiadosť o teleport. requestTimedOut=§4Žiadosť o teleport vypršala. requestTimedOutFrom=§4Žiadosť o teleport od §c{0} §4vypršala. -resetBal=§6Stav účtu bol obnovený na §c{0} §6pre všetkých online hráčov. -resetBalAll=§6Stav účtu bol obnovený na §c{0} §6pre všetkých hráčov. rest=§6Cítiš sa odpočinutý. restCommandDescription=Umožní odpočinúť tebe alebo danému hráčovi. restCommandUsage=/ [hráč] @@ -1100,18 +1034,6 @@ seenCommandUsage1=/ seenCommandUsage1Description=Zobrazí čas odhlásenia, ban, umlčanie a informácie o UUID zadaného hráča seenOffline=§6Hráč§c {0} §6je §4offline§6 už §c{1}§6. seenOnline=§6Hráč§c {0} §6je §aonline§6 už §c{1}§6. -sellBulkPermission=§6Nemáš oprávnenie na hromadný predaj. -sellCommandDescription=Predá držaný predmet. -sellCommandUsage=/ <||hand|inventory|blocks> [množstvo] -sellCommandUsage1=/ [množstvo] -sellCommandUsage1Description=Predá všetky (alebo dane množstvo, ak je špecifikované) dané predmety v tvojom inventári -sellCommandUsage2=/ hand [množstvo] -sellCommandUsage2Description=Predá všetky (alebo dane množstvo, ak je špecifikované) držané predmety -sellCommandUsage3=/ all -sellCommandUsage3Description=Predá všetky možné predmety v tvojom inventári -sellCommandUsage4=/ blocks [množstvo] -sellCommandUsage4Description=Predá všetky (alebo dané množstvo, ak je špecifikované) kocky v tvojom inventári -sellHandPermission=§6Nemáš oprávnenie na predaj z ruky. serverFull=Server je plný\! serverReloading=Podľa všetkého práve znova načítaš svoj server s pluginmi. Prečo si takto ubližuješ? Pri používaní /reload nečakaj žiadnu podporu od tímu EssentialsX. serverTotal=§6Server celkom\:§c {0} @@ -1122,8 +1044,6 @@ serverUnsupportedDangerous=Tvoj server beží na forku, ktorý je známy ako neb serverUnsupportedLimitedApi=Tvoj server má obmedzenú činnosť API. EssentialsX bude fungovať, ale niektoré funkcie môžu byť nedostupné. serverUnsupportedDumbPlugins=Používaš pluginy, o ktorých je známe, že spôsobujú vážne problémy s EssentialsX a ďalšími pluginmi. serverUnsupportedMods=Tvoj server nemá plnú podporu pre Bukkit pluginy. Bukkit pluginy by nemali byť používané s Forge/Fabric módmi. V prípade Forge zváž možnosť použitia ForgeEssentials alebo SpongeForge + Nucleus. -setBal=§aTvoj stav účtu bol nastavený na {0}. -setBalOthers=§aStav účtu hráča {0}§a si nastavil na {1}. setSpawner=§6Typ spawnera bol zmenený na§c {0}§6. sethomeCommandDescription=Nastaví tvoj domov na aktuálnu polohu. sethomeCommandUsage=/ [[hráč\:]názov] @@ -1149,12 +1069,6 @@ setwarpCommandDescription=Vytvorí nový warp. setwarpCommandUsage=/ setwarpCommandUsage1=/ setwarpCommandUsage1Description=Nastaví warp so zadaným názvom na mieste kde stojíš -setworthCommandDescription=Nastaví predajnú cenu predmetu. -setworthCommandUsage=/ [predmet|id] -setworthCommandUsage1=/ -setworthCommandUsage1Description=Nastaví hodnotu držaného predmetu na danú cenu -setworthCommandUsage2=/ -setworthCommandUsage2Description=Nastaví hodnotu špecifikovaného predmetu na danú cenu sheepMalformedColor=§4Nesprávne definovaná farba. shoutDisabled=§6Režim zvolania §cvypnutý§6. shoutDisabledFor=§6Režim zvolania §cvypnutý§6 pre hráča §c{0}§6. @@ -1244,8 +1158,6 @@ suicideCommandUsage=/ suicideMessage=§6Zbohom, krutý svet... suicideSuccess=§6Hráč §c{0} §6si siahol na život. survival=hra o prežitie -takenFromAccount=§e{0}§a bolo odobraných z tvojho účtu. -takenFromOthersAccount=§e{0}§a bolo odobraných z účtu hráča §e{1}§a. Nový zostatok\: §e{2} teleportAAll=§6Žiadosť o teleport odoslaná všetkým hráčom... teleportAll=§6Teleportujú sa všetci hráči... teleportationCommencing=§6Teleport začína... @@ -1399,8 +1311,6 @@ tptoggleCommandDescription=Zablokuje všetky druhy teleportu. tptoggleCommandUsage=/ [hráč] [on|off] tptoggleCommandUsage1=/ [hráč] tptoggleCommandUsageDescription=Zapína/vypína teleport pre teba alebo iného hráča, ak je špecifikovaný -tradeSignEmpty=§4Táto ceduľka pre teba nemá nič dostupné. -tradeSignEmptyOwner=§4Z tejto ceduľky nie je čo zobrať. treeCommandDescription=Zasaď strom tam, kam sa pozeráš. treeCommandUsage=/ treeCommandUsage1=/ @@ -1481,12 +1391,10 @@ versionDevLatest=§6Používaš aktuálnu vývojovú zostavu EssentialsX\! versionError=§4Pri získavaní informácií o verzii EssentialsX nastala chyba. Informácie o zostave\: §c{0}§6. versionErrorPlayer=§6Pri kontrolovaní informácií o verzii EssentialsX nastala chyba\! versionFetching=§6Získavanie informácií o verzii... -versionOutputVaultMissing=§4Vault nie je nainštalovaný. Oprávnenia a chat nemusia fungovať. versionOutputFine=§6Verzia {0}\: §a{1} versionOutputWarn=§6Verzia {0}\: §c{1} versionOutputUnsupported=§6Verzia §d{0}\: §d{1} versionOutputUnsupportedPlugins=§6Používaš §dnepodporované pluginy§6\! -versionOutputEconLayer=§6Ekonomická vrstva\: §r{0} versionMismatch=§4Nezhoda vo verzii\! Aktualizuj {0} na rovnakú verziu. versionMismatchAll=§4Nezhoda vo verzii\! Aktualizuj všetky Essentials jar súbory na rovnakú verziu. versionReleaseLatest=§6Používaš najnovšiu stabilnú verziu EssentialsX\! @@ -1548,7 +1456,6 @@ whoisHunger=§6 - Hlad\:§r {0}/20 (+{1} sýtosť) whoisIPAddress=§6 - IP Adresa\:§r {0} whoisJail=§6 - Väzenie\:§r {0} whoisLocation=§6 - Poloha\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Peniaze\:§r {0} whoisMuted=§6 - Umlčaný\:§r {0} whoisMutedReason=§6 - Umlčaný\:§r {0} §6Dôvod\: §c{1} whoisNick=§6 - Prezývka\:§r {0} @@ -1565,19 +1472,6 @@ worldCommandUsage1=/ worldCommandUsage1Description=Teleportuje ťa na zodpovedajúce miesto v netheru alebo overworldu worldCommandUsage2=/ worldCommandUsage2Description=Teleportuje ťa na tvoje miesto v danom svete -worth=§aStack {0} má hodnotu §c{1}§a ({2} predmetov po {3} za kus) -worthCommandDescription=Vypočíta hodnotu predmetov v ruke alebo podľa zadania. -worthCommandUsage=/ <||hand|inventory|blocks> [-][počet] -worthCommandUsage1=/ [množstvo] -worthCommandUsage1Description=Skontroluje hodnotu všetkého (alebo daného množstva, ak je špecifikované) daného predmetu v tvojom inventári -worthCommandUsage2=/ hand [množstvo] -worthCommandUsage2Description=Skontroluje hodnotu držaného predmetu (alebo daného množstva, ak je špecifikované) -worthCommandUsage3=/ all -worthCommandUsage3Description=Skontroluje hodnotu všetkých možných predmetov v tvojom inventári -worthCommandUsage4=/ blocks [množstvo] -worthCommandUsage4Description=Skontroluje hodnotu všetkých (alebo daného množstva, ak je špecifikované) kociek v tvojom inventári -worthMeta=§aStack {0} s metadátami {1} má hodnotu §c{2}§a ({3} predmetov po {4} za kus) -worthSet=§6Cena nastavená year=rok years=rokov youAreHealed=§6Tvoje zdravie bolo obnovené. diff --git a/Essentials/src/main/resources/messages_sr.properties b/Essentials/src/main/resources/messages_sr.properties index 1f915b444..7dfe8076e 100644 --- a/Essentials/src/main/resources/messages_sr.properties +++ b/Essentials/src/main/resources/messages_sr.properties @@ -2,8 +2,6 @@ #version: ${full.version} # Single quotes have to be doubled: '' # by: -addedToAccount=§a{0} je dodato na vaš nalog . -addedToOthersAccount=§a{0} dodati {1}§a računa. Novi balans\: {2} adventure=avantura alertBroke=Slomio je\: alertFormat=§3 [{0}] §r {1} §6 {2} na\: {3} diff --git a/Essentials/src/main/resources/messages_sr_CS.properties b/Essentials/src/main/resources/messages_sr_CS.properties index e3e1614c0..088e74b36 100644 --- a/Essentials/src/main/resources/messages_sr_CS.properties +++ b/Essentials/src/main/resources/messages_sr_CS.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} je dodato na vas racun. -addedToOthersAccount=§a{0} je dodato na racun igraca {1}§a. Novo stanje\: {2} adventure=avantura afkCommandDescription=Obeležava vas kao da ste daleko od tastature. afkCommandUsage=/ [igrač/poruka] @@ -46,19 +44,6 @@ backupFinished=§6Backup zavrsen. backupStarted=§6Backup poceo. backupInProgress=§6Spoljna rezervna kopija je trenutno u procesu\! Zaustavljanje deaktivacije plugina dok se ne završi. backUsageMsg=§6Vracanje na prethodnu lokaciju. -balance=§aNovac\:§c {0} -balanceCommandDescription=Navodi trenutan iznos novca igrača. -balanceCommandUsage=/ [player] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Prikazuje vase trenutno novcano stanje -balanceCommandUsage2Description=Prikazuje trenutno novcano stanje specificaranog igraca -balanceOther=§aNovac igraca {0}§a\:§c {1} -balanceTop=§6Top stanja ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Navodi najvišu vrednost salda. -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] -balancetopCommandUsage1Description=Prikazuje prvu (ili izabranu) stranicu vrha vrednosti salda banCommandDescription=Banuje igrača. banCommandUsage=/ [reason] banCommandUsage1=/ [reason] @@ -149,11 +134,9 @@ commandHelpFailedForPlugin=Greska pri trazenju pomoci o dodatku\: {0} commandHelpLineUsage={0} §6- {1} commandNotLoaded=§4Komanda {0} nepravilno ucitana. compassCommandUsage=/ -condenseCommandUsage1=/ configFileMoveError=Neuspelo premestanje config.yml na lokaciju za backup. configFileRenameError=Neuspelo preimenovanje privremenog fajla u config.yml. confirmClear=§7Da §lPOTVRDITE§7 čišćenje inventara, molimo vas ponovite komandu\: §6{0} -confirmPayment=§7Da §lPOTVRDITE§7 uplatu od §6{0}§7, molimo vas ponovite komandu\: §6{1} connectedPlayers=§6Povezani igraci§r connectionFailed=Ne moguce uspostaviti vezu. consoleName=Konzola @@ -168,7 +151,6 @@ createKitUnsupported=§4Serijalizacija NBT predmeta je aktivirana, ali server ne creatingConfigFromTemplate=Stvaranje konfiguracije iz sablona\: {0} creatingEmptyConfig=Stvaranje prazne konfiguracije\: {0} creative=kreativnost -currency={0}{1} currentWorld=§6Trenutni svetovi\:§c {0} day=dan days=dana @@ -347,9 +329,7 @@ infoChapter=§6Izaberite poglavlje\: infoChapterPages=§e ---- §6{0} §e--§6 Strana §c{1}§6 od §c{2} §e---- infoPages=§e ---- §6{2} §e--§6 Strana §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Nepostojece poglavlje. -insufficientFunds=§4Nedovoljno raspolozivih sredstava. invalidBanner=§4Nevažeći syntax bannera. -invalidCharge=Jedno polje nije validno. invalidFireworkFormat=§4Opcija §c{0} §4nije validna za §c{1}§4. invalidHome=§4Kuca§c {0} §4ne postoji\! invalidHomeName=§4Netacan naziv kuce\! @@ -404,7 +384,6 @@ kill=§6Ubijen§c {0}§6. killExempt=§4Ne mozete ubiti §c{0}§4. kitCommandUsage1=/ kitContains=§6Kit §c{0} §6sadrži\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Nema vazecih kitova. kitError2=§4Taj kit je nepravilno definisan. Kontaktirajte administratora. @@ -453,7 +432,6 @@ mailTooLong=§4Mail poruka predugacka. Potrudite se da bude manja od 1000 karakt markMailAsRead=§6Da stavite da ste procitali poruku, kucajte§c /mail clear§6. matchingIPAddress=§6Sledeci igraci su pre ulazili na taj nalog sa te IP adrese\: maxHomes=§4Ne mozete postaviti vise od§c {0} §4kuce. -maxMoney=§4Razmena bi prekoracila trenutno stanje limita za ovaj nalog. mayNotJail=§4Ne mozete zatvoriti tog igraca\! mayNotJailOffline=§Ne mozes zatvoriti offline igrace. minimumPayAmount=§cMinimalni iznos uplate je {0}. @@ -465,7 +443,6 @@ mobsAvailable=§6Stvorenja\:§r {0} mobSpawnError=§4Greska prilikom promene mob spawnera. mobSpawnLimit=Kolicina moba je prekoracila ogranicenje servera. mobSpawnTarget=§4Block u koji gledate mora biti mob spawner. -moneySentTo=§a{0} je poslato igracu {1}. month=mesec months=meseca moreThanZero=§4Kolicina mora biti veca od 0. @@ -476,7 +453,6 @@ msgEnabledFor=§6Primanje poruka §cuključeno §6za §c{0}§6. msgFormat=§6[§c{0}§6 -> §c{1}§6] §r{2} msgIgnore=§c{0} §4je isključio primanje poruka. msgtoggleCommandUsage1=/ [player] -multipleCharges=§4Ne mozes primeniti vise od jednog punjena na ovaj vatromet. multiplePotionEffects=§4Ne mozes primeniti vise od jednog efekta na ovaj naptiak. mutedPlayer=§6Igrac§c {0} §6ucutkan. mutedPlayerFor=§6Igrac§c {0} §6ucutkan na§c {1}§6. @@ -487,7 +463,6 @@ muteNotify=§c{0} §6je ucutkao igraca §c{1}§6. muteNotifyFor=§c{0} §6je ućutkao igrača §c{1}§6 za§c {2}§6. nearCommandUsage1=/ nearbyPlayers=§6Igraci u blizini\:§r {0} -negativeBalanceError=§4Igracu nije dozvoljeno da ima negativno stanje. nickChanged=§6Nadimak promenjen. nickDisplayName=§4Morate ukljuciti change-displayname u Essentials konfiguraciji. nickInUse=§4Taj nick vec neko koristi. @@ -526,9 +501,7 @@ noPermToSpawnMob=§4Nemate dozvolu za stvaranje tog stvorenja. noPlacePermission=§4Nemate dozvolu za postavljanje bloka blizu tog znaka. noPotionEffectPerm=§4Nemate dozvolu za dodavanje efekta §c{0} §4tom napitku. noPowerTools=§6Nemate dodeljenih super alatki. -notAcceptingPay=§4{0} §4je prihvata uplate. notEnoughExperience=§4Nemate dozovoljno iskustva. -notEnoughMoney=§4Nemate dovoljno novca. notFlying=ne leti nothingInHand=§4Nemate nista u ruci. now=sada @@ -541,16 +514,7 @@ onlyPlayers=§4Samo u igri mozete koristiti §c{0}§4. onlyPlayerSkulls=§4Mozes postaviti samo vlasnika glave igraca (§c397\:3§4). onlySunStorm=§4/weather podrzava samo sun/storm. openingDisposal=§6Otvaranje kante za smeće... -orderBalances=§6Sortiranje stanja od§c {0} §6igraca, molimo vas sacekajte... oversizedTempban=§4Ne mozes banovati igraca za ovaj taj period vremena. -payConfirmToggleOff=§6Više vas nećemo pitati za potvrdu uplata. -payConfirmToggleOn=§6Od sada ćemo vas pitati za potvrdu uplata. -payMustBePositive=§4Iznos uplate mora biti pozitivan. -payToggleOff=§6Više ne primate uplate. -payToggleOn=§6Od sada prihvatate uplate. -payconfirmtoggleCommandUsage=/ -paytoggleCommandUsage=/ [player] -paytoggleCommandUsage1=/ [player] pendingTeleportCancelled=§4Zahtev za teleport otkazan. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -632,8 +596,6 @@ requestDeniedFrom=§c{0} §6je odbio vas zahtev za teleport. requestSent=§6Zahtev poslat igracu§c {0}§6. requestSentAlready=§4Već ste poslali {0}§4 zahtev za teleport. requestTimedOut=§4Zahtev za teleport je istekao. -resetBal=§6Stanje resetovano na §c{0} §6za sve online igrace. -resetBalAll=§6Stanje resetovano na §c{0} §6za sve igrace. restCommandUsage=/ [player] restCommandUsage1=/ [player] returnPlayerToJailError=§4Greska prilikiom pokusavanja vracanja igraca §c {0} §4tuzatvor\: §c{1}§4\! @@ -643,13 +605,9 @@ seconds=sekunde seenAccounts=§6Igrac je takodje poznat kao\:§c {0} seenOffline=§6Igrac§c {0} §6je §4offline§6 vec §c{1}§6. seenOnline=§6Igrac§c {0} §6je §aonline§6 vec §c{1}§6. -sellBulkPermission=§6Nemate dozvolu za prodaju na veliko. -sellHandPermission=§6Nemate dozvolu za prodaju iz ruke. serverFull=Server je pun\! serverTotal=§6Ekonomija servera\:§c {0} serverUnsupported=Koristite verziju servera za koju ne nudimo podršku\! -setBal=§aVase stanje je stavljeno na {0}. -setBalOthers=§aPostavili ste stanje igraca {0}§a na {1}. setSpawner=§6Promenjen tip spawnera na§c {0}§6. sheepMalformedColor=§4Losa boja. shoutFormat=§6[Vikanje]§r {0} @@ -733,8 +691,6 @@ tprCommandUsage=/ tprCommandUsage1=/ tps=§6Trenutni TPS \= {0} tptoggleCommandUsage1=/ [player] -tradeSignEmpty=§4Znak za razmenu nema nista dostupno za tebe. -tradeSignEmptyOwner=§4Nema nicega da se pokupi sa ovog znaka za razmenu. treeFailure=§4Stvaranje drveta neuspelo. Pokusajte na travi. treeSpawned=§6Stvoreno drvo. true=§aomogucen§r @@ -771,12 +727,10 @@ usingTempFolderForTesting=Koriscenje privremenog direktorijuma radi testiranja\: vanish=§6Vanish za {0}§6\: {1} vanishCommandUsage1=/ [player] vanished=§6 Postao si ne vidljiv za igrace i sakriven za komande. -versionOutputVaultMissing=§4Vault nije instaliran. Chat i permisije možda neće raditi. versionOutputFine=§6{0} verzija\: §a{1} versionOutputWarn=§6{0} verzija\: §c{1} versionOutputUnsupported=§d{0} §verzija\: §d{1} versionOutputUnsupportedPlugins=§6Koristite plugine za koje ne nudimo §dpodršku§6\! -versionOutputEconLayer=§6Sloj Ekonomije\: §r{0} versionMismatch=§4Verzija se ne slaze\! Molimo vas azurirajte {0} na istu verziju. versionMismatchAll=§4Verzija se ne slaze\! Molimo vas azurirajte sve Essentials jar dokumente na iste verzije. voiceSilenced=§6Ti si upravo mutiran\! @@ -809,7 +763,6 @@ whoisHunger=§6 - Glad\:§r {0}/20 (+{1} zasicenosti) whoisIPAddress=§6 - IP Adresa\:§r {0} whoisJail=§6 - Zatvor\:§r {0} whoisLocation=§6 - Lokacija\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Novac\:§r {0} whoisMuted=§6 - Mute\:§r {0} whoisNick=§6 - Ime\:§r {0} whoisOp=§6 - Administrator\:§r {0} @@ -819,9 +772,6 @@ whoisTop=§6 \=\=\=\=\=\= KoJe\:§c {0} §6\=\=\=\=\=\= whoisUuid=§6 - UUID\:§r {0} workbenchCommandUsage=/ worldCommandUsage1=/ -worth=§aGomila {0} vredi §c{1}§a ({2} predmet(a) za {3} po svakom) -worthMeta=§aGomila {0} sa metadatom od {1} kosta §c{2}§a ({3} predmet(a) {4} po svakom) -worthSet=§6Vrednost podesenja year=godina years=godine youAreHealed=§6Izleceni ste. diff --git a/Essentials/src/main/resources/messages_sv.properties b/Essentials/src/main/resources/messages_sv.properties index 9857e9a4e..dd2a32173 100644 --- a/Essentials/src/main/resources/messages_sv.properties +++ b/Essentials/src/main/resources/messages_sv.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} har blivit tillagt på ditt konto. -addedToOthersAccount=§a{0} har blivit tillagt på {1}§a konto. Ny balans\: {2} adventure=äventyr afkCommandDescription=Markerar dig som borta. afkCommandUsage=/ [spelare/meddelande...] @@ -47,20 +45,6 @@ backupFinished=Backup klar backupStarted=Backup startad backupInProgress=§6Ett externt säkerhetskopieringsskript pågår för närvarande\! Avaktivera plugin tills det är klart. backUsageMsg=§7Tar dig tillbaka till din föregående position. -balance=§7Balans\: {0} -balanceCommandDescription=Visar en spelares saldo. -balanceCommandUsage=/ [spelare] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Visar ditt nuvarande saldo -balanceCommandUsage2=/ -balanceCommandUsage2Description=Visar en vald spelares saldo -balanceOther=§aKonto balans för {0} §aär §c{1} -balanceTop=§7Topp balans ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Hämtar de högsta saldovärdena. -balancetopCommandUsage=/ [sida] -balancetopCommandUsage1=/ [sida] -balancetopCommandUsage1Description=Visar den första (eller angivna) sidan av saldotopplistan banCommandDescription=Bannar en spelare. banCommandUsage=/ [anledning] banCommandUsage1=/ [anledning] @@ -160,16 +144,9 @@ commandNotLoaded=§cKommando {0} är felaktigt laddat. compassBearing=§6Riktning\: {0} ({1} grader). compassCommandDescription=Beskriver ditt nuvarande lager. compassCommandUsage=/ -condenseCommandDescription=Konsenderar objekt i ett mer kompakt block. -condenseCommandUsage=/ [föremål] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Foga ihop alla föremål i ditt förråd -condenseCommandUsage2=/ -condenseCommandUsage2Description=Foga ihop alla av det angivna föremålet i ditt förråd configFileMoveError=Kunde inte flytta config.yml till backup-platsen. configFileRenameError=Kunde inte byta namn på temp-filen till config.yml confirmClear=§7To §lCONFIRM§7 inventory clear, please repeat command\: §6{0} -confirmPayment=§7To §lCONFIRM§7 payment of §6{0}§7, please repeat command\: §6{1} connectedPlayers=§7Anslutna spelare§r connectionFailed=Kunde inte öppna anslutning. consoleName=Konsol @@ -188,7 +165,6 @@ createKitUnsupported=§cOBS-objektserialisering har aktiverats, men den här ser creatingConfigFromTemplate=Skapar konfiguration från mallen\: {0} creatingEmptyConfig=Skapar tom konfiguration\: {0} creative=kreativ -currency={0}{1} currentWorld=Nuvarande värld\: {0} customtextCommandDescription=Låter dig skapa egna text kommandon. customtextCommandUsage=/ - Definiera i bukkit.yml @@ -281,16 +257,6 @@ downloadingGeoIp=Laddar ner GeoIP-databasen... det här kan ta en stund (land\: duplicatedUserdata=Dublicerad användardata\: {0} och {1} durability=§7Det här verktyget har §c{0}§7 användningar kvar east=E -ecoCommandDescription=Hanterar serverns ekonomi. -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=Ger den valda spelaren den angivna mängden pengar -ecoCommandUsage2=/ take -ecoCommandUsage2Description=Tar den angivna mängden pengar från den valda spelaren -ecoCommandUsage3=/ set -ecoCommandUsage3Description=Ställer in den valda spelarens saldo till den angivna mängden pengar -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=Återställer den valda spelarens saldo till serverns inställda start-saldo editBookContents=§eDu kan nu ändra innehållet i denna bok. enabled=aktiverad enchantCommandDescription=Förtrollor saken spelaren håller. @@ -497,9 +463,7 @@ infoCommandDescription=Visar information skriven av serverägaren. infoCommandUsage=/ [kapitel] [sida] infoPages=§e ---- §6{2} §e--§6 Sida §4{0}§6/§4{1} §e---- infoUnknownChapter=§4Okänt kapitel. -insufficientFunds=§4Du har inte råd med detta. invalidBanner=§4Invalid banner syntax. -invalidCharge=§cOgiltig laddning. invalidFireworkFormat=§4Värdet §c{0} §4är inte ett korrekt värde för §c{1}§4. invalidHome=Hemmet {0} finns inte invalidHomeName=§4Ogiltigt hemnamn @@ -611,7 +575,6 @@ kitCommandUsage1Description=Ger en lista med alla tillgängliga uppsättningar kitCommandUsage2=/ [spelare] kitCommandUsage2Description=Ger den angivna uppsättningen till dig eller en vald spelare kitContains=§6Kit §c{0} §6contains\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§cDet finns inga giltiga kit. kitError2=§4Det där kittet är inte korrekt konfigurerat. Kontakta en administratör. @@ -681,7 +644,6 @@ mailTooLong=§4Mail message too long. Try to keep it below 1000 characters. markMailAsRead=§6För att markera dina meddelanden som lästa, skriv /mail clear. matchingIPAddress=§6Följande spelare har tidigare loggat in från den IP adressen\: maxHomes=Du kan inte ha fler än {0} hem. -maxMoney=Den här transaktionen är för hög för den här användaren mayNotJail=§cDu får inte sätta den personen i fängelse mayNotJailOffline=§4Du kan inte fängsla spelare som inte är online. meCommandDescription=Beskriver en handling med avseende på spelaren. @@ -690,7 +652,6 @@ meCommandUsage1=/ meCommandUsage1Description=Beskriver en handling meSender=mig meRecipient=mig -minimumBalanceError=§4Minsta saldo en användare kan ha är {0}. minimumPayAmount=§cThe minimum amount you can pay is {0}. minute=minut minutes=minuter @@ -700,8 +661,6 @@ mobsAvailable=§6Monster\:§r {0} mobSpawnError=Fel när mob-spawnaren försökte att ändras. mobSpawnLimit=Mängden mobs begränsad till serverns maxgräns mobSpawnTarget=Målblocket måste vara en mob-spawnare. -moneyRecievedFrom=§a{0}§6 har tagits emot från {1}§6. -moneySentTo=§a{0} har skickats till {1} month=månad months=månader moreCommandDescription=Fyller objektet stapel i hand till angivet belopp, eller till maximal storlek om ingen är angiven. @@ -722,7 +681,6 @@ msgFormat=§6[§c{0}§6 -> §c{1}§6] §r{2} msgIgnore=§c{0} §4has messages disabled. msgtoggleCommandUsage=/ [spelare] [on|off] msgtoggleCommandUsage1=/ [spelare] -multipleCharges=§4Du kan inte lägga till mer än en laddning till denna fyrverkeripjäs. multiplePotionEffects=§4Du kan inte lägga till mer än en effekt till denna brygd. muteCommandDescription=Tystar eller slutar tysta en spelare. muteCommandUsage=/ [tidslängd] [anledning] @@ -747,7 +705,6 @@ nearCommandUsage2=/ nearCommandUsage3=/ nearCommandUsage4=/ nearbyPlayers=Spelare i närheten\: {0} -negativeBalanceError=Användaren är inte tillåten att ha en negativ balans. nickChanged=Smeknamn ändrat. nickCommandDescription=Ändra ditt eller en vald spelares smeknamn. nickCommandUsage=/ [spelare] @@ -798,12 +755,10 @@ noPermToSpawnMob=§cDu har inte tillåtelse att spawna den här moben. noPlacePermission=§cDu har inte tillåtelse att placera ett block nära den skylten. noPotionEffectPerm=§4Du har inte tillåtelse att lägga till brygd-effekten §c{0} §4till denna brygden. noPowerTools=Du har inga power-tools tilldelade. -notAcceptingPay=§4{0} §4is not accepting payment. notAllowedToLocal=§4Du har inte behörighet att använda den lokala chatten. notAllowedToQuestion=§4Du har inte behörighet att fråga. notAllowedToShout=§4Du har inte behörighet att ropa. notEnoughExperience=Du har inte nog med erfarenhet. -notEnoughMoney=Du har inte tillräckligt med pengar. notFlying=flyger inte nothingInHand=§cDu har inget i din hand. now=nu @@ -819,25 +774,8 @@ onlyPlayers=§4Bara spelare kan använda §c{0}§4. onlyPlayerSkulls=§4Du kan bara ange ägaren för skallar av spelare (§c397\:3§4). onlySunStorm=/weather stöder bara sun(sol) eller storm(storm). openingDisposal=§6Opening disposal menu... -orderBalances=Beställer balanser av {0} användare, vänligen vänta... oversizedMute=§4Du kan inte tysta en spelare under så lång tid. oversizedTempban=§4Du kan inte banna en spelare just vid denna tidpunkt. -payCommandDescription=Betalar en annan spelare från ditt saldo. -payCommandUsage=/ -payCommandUsage1=/ -payCommandUsage1Description=Betalar den valda spelaren den angivna summan pengar -payConfirmToggleOff=§6You will no longer be prompted to confirm payments. -payConfirmToggleOn=§6You will now be prompted to confirm payments. -payMustBePositive=§4Amount to pay must be positive. -payOffline=§4Du kan inte betala spelare som inte är online. -payToggleOff=§6You are no longer accepting payments. -payToggleOn=§6You are now accepting payments. -payconfirmtoggleCommandDescription=Växlar mellan om du vill bli ombedd att bekräfta betalningar eller ej. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Växlar mellan om du tar emot betalningar eller ej. -paytoggleCommandUsage=/ [spelare] -paytoggleCommandUsage1=/ [spelare] -paytoggleCommandUsage1Description=Växlar mellan om du eller en vald spelare tar emot betalningar eller ej pendingTeleportCancelled=§cAvvaktande teleporteringsbegäran är avbruten. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -959,8 +897,6 @@ requestDeniedFrom=§7{0} nekade din teleportations-förfrågan. requestSent=§7Förfrågan skickad till {0}§7. requestSentAlready=§4You have already sent {0}§4 a teleport request. requestTimedOut=§cTeleportations-förfrågan har gått ut -resetBal=§6Balance has been reset to §c{0} §6for all online players. -resetBalAll=§6Balance has been reset to §c{0} §6for all players. rest=§6Du känner dig utvilad. restCommandDescription=Gör dig eller en vald spelare utvilad. restCommandUsage=/ [spelare] @@ -977,19 +913,11 @@ seenAccounts=§6Player has also been known as\:§c {0} seenCommandUsage1Description=Visar utloggnings-, bannlysnings-, tystnings- och UUID-information om den valda spelaren seenOffline=§6Player§c {0} §6has been §4offline§6 since §c{1}§6. seenOnline=§6Player§c {0} §6has been §aonline§6 since §c{1}§6. -sellBulkPermission=§6You do not have permission to bulk sell. -sellCommandDescription=Säljer föremålet du håller i. -sellCommandUsage2=/ hand [mängd] -sellCommandUsage3=/ all -sellCommandUsage4=/ blocks [mängd] -sellHandPermission=§6You do not have permission to hand sell. serverFull=Servern är full serverReloading=Det är mycket troligt att du läser in servern på nytt just nu. Om så är fallet måste vi bara fråga varför du hatar dig själv? Förvänta dig inte någon hjälp från oss som utvecklat EssentialsX när du använder /reload. serverTotal=Totalt på servern\: {0} serverUnsupported=Du kör en serverversion som inte stöds\! serverUnsupportedDumbPlugins=Du använder insticksprogram som visat sig skapa allvarliga problem med EssentialsX och andra insticksprogram. -setBal=§aDin kontobalans sattes till {0}. -setBalOthers=§aDu satte {0}§a''s kontobalans till {1}. setSpawner=§6Changed spawner type to§c {0}§6. sethomeCommandDescription=Ställer in din nuvarande plats som ditt hem. sethomeCommandUsage1=/ @@ -1014,10 +942,6 @@ setwarpCommandDescription=Skapar en ny respunkt. setwarpCommandUsage=/ setwarpCommandUsage1=/ setwarpCommandUsage1Description=Ställer in respunkten med det angivna namnet till din nuvarande plats -setworthCommandDescription=Ange ett föremåls försäljningsvärde -setworthCommandUsage1=/ -setworthCommandUsage1Description=Ställer in värdet på föremålet du håller i till det angivna priset -setworthCommandUsage2Description=Ställer in värdet på det valda föremålet till det angivna priset sheepMalformedColor=Felformulerad färg. shoutDisabled=§6Rop-läget är nu §cavslaget§6 för dig. shoutDisabledFor=§6Rop-läget är nu §cavslaget §6för §c{0}§6. @@ -1203,8 +1127,6 @@ tptoggleCommandDescription=Stoppar alla former av teleportering. tptoggleCommandUsage=/ [spelare] [on|off] tptoggleCommandUsage1=/ [spelare] tptoggleCommandUsageDescription=Växlar mellan om du eller en vald spelare får använda teleportering eller ej -tradeSignEmpty=Köpskylten har inget tillgängligt för dig. -tradeSignEmptyOwner=Det finns inget att från den här köpskylten. treeCommandDescription=Ett träd växer upp där du tittar. treeCommandUsage=/ treeCommandUsage1=/ @@ -1335,7 +1257,6 @@ whoisHunger=§6 - Hunger\:§r {0}/20 (+{1} mättnad) whoisIPAddress=§6 - IP-Adress\:§f {0} whoisJail=§6 - Fängelse\:§f {0} whoisLocation=§6 - Lokalisering\:§f ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Pengar\:§f {0} whoisMuted=§6 - Tystad\:§f {0} whoisMutedReason=§6 - Tystad\:§r {0} §6Anledning\: §c{1} whoisNick=§6 - Smeknamn\:§f {0} @@ -1352,12 +1273,6 @@ worldCommandUsage1=/ worldCommandUsage1Description=Teleporterar dig till motsvarande plats i nether eller övervärlden worldCommandUsage2=/ worldCommandUsage2Description=Teleporterar dig till din plats i den angivna världen -worth=§7Stapeln med {0} ({2} objekt) är värd §c{1}§7 ({3} styck) -worthCommandUsage2=/ hand [mängd] -worthCommandUsage3=/ all -worthCommandUsage4=/ blocks [mängd] -worthMeta=§7Stapeln med {0} av typ {1} ({3} objekt) är värd §c{2}§7 ({4} styck) -worthSet=Värdet inställt year=år years=år youAreHealed=§7Du har blivit läkt. diff --git a/Essentials/src/main/resources/messages_th.properties b/Essentials/src/main/resources/messages_th.properties index a4c7aaa50..74b3701c7 100644 --- a/Essentials/src/main/resources/messages_th.properties +++ b/Essentials/src/main/resources/messages_th.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} ถูกเพิ่มเข้าบัญชีของคุณ -addedToOthersAccount=§a{0} ถูกเพิ่มเข้าบัญชีของ {1} จำนวนเงินในบัญชีล่าสุด\: {2} adventure=โหมดผจญภัย afkCommandUsage=/ [ชื่อผู้เล่น/ข้อความ...] afkCommandUsage1=/ [message] @@ -43,18 +41,6 @@ backupDisabled=§aHEXCore\: §7§oไม่มีการกำหนดค่ backupFinished=§6สำรองข้อมูลเสร็จสิ้น backupStarted=§6เริ่มสำรองข้อมูล backUsageMsg=§6คุณได้กลับมายังตำแหน่งล่าสุด -balance=§aBalance\:§c {0}\n -balanceCommandDescription=ระบุยอดเงินปัจจุบันของผู้เล่น -balanceCommandUsage=/ [player] -balanceCommandUsage1=/ -balanceCommandUsage1Description=ระบุยอดเงินปัจจุบันของคุณ -balanceCommandUsage2Description=ระบุยอดเงินปัจจุบันของผู้เล่นที่ระบุ -balanceOther=§aยอดเงินในบัญชีของ {0}§aคือ §c {1} -balanceTop=§7อันดับคนที่รวยที่สุดภายในเซิฟเวอร์§f\:\n§a(§c{0}§a) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=เรียกดูผู้ที่มียอดเงินสูงสุด -balancetopCommandUsage=/ [หน้า] -balancetopCommandUsage1=/ [หน้า] banCommandDescription=แบนผู้เล่น banExempt=§4คุณไม่สามารถแบนผู้เล่นคนนี้ได้ banExemptOffline=§4คุณไม่สามารถแบนผู้เล่นออฟไลน์ได้ @@ -114,8 +100,6 @@ commandHelpLineUsage={0} §6- {1} commandNotLoaded=§7คำสั่ง §c{0}§7 ยังไม่ได้โหลด. compassBearing=§7การหมุน§f\: §a{0}§8 (§e{1} §7องศา§8) compassCommandUsage=/ -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ configFileMoveError=เกิดข้อผิดพลาดในการย้ายไฟล์ config.yml ไปยังที่อยู่ที่เก็บข้อมูลสำรอง configFileRenameError=§7ไม่สามารถเปลี่ยนชื่อไฟล์ชั่วคราวเป็นชื่อ config.yml ได้ connectedPlayers=§6ผู้เล่นที่ออนไลน์§r\n @@ -130,7 +114,6 @@ createKitSeparator=§m----------------------- creatingConfigFromTemplate=กำลังสร้าง Config จากไฟล์ต้นแบบ\:{0} creatingEmptyConfig=กำลังสร้าง Config ที่ว่างเปล่า.... {0} creative=§cโหมดสร้างสรรค์ -currency={0}{1} currentWorld=§6โลกปัจจุบัน\:§c {0} customtextCommandUsage=/ - กำหนดใน bukkit.yml day=วัน @@ -176,8 +159,6 @@ downloadingGeoIp=กำลังดาวน์โหลดฐานข้อม duplicatedUserdata=ข้อมูลของผู้ใช้ซ้ำ\: {0} และ {1} durability=§6เครื่องมือนี้สามารถใช้ได้อีก §c{0}§6 ครั้ง. east=ตะวันออก -ecoCommandUsage=/ -ecoCommandUsage1=/ ให้ editBookContents=§eตอนนี้คุณสามารถเปลี่ยนเนื้อหาของหนังสือได้แล้ว enabled=เปิดใช้งาน enableUnlimited=§6ให้ §c {0} §6 ที่ไม่จำกัด ไปยัง §c{1} §6 @@ -283,8 +264,6 @@ infoChapter=§6เลือกบท\: infoChapterPages=§e--§6 {0} §e - §6 หน้าที่ §6 §c {1} จาก §c {2} §e--- infoPages=§e--§6 {2} §e - §6 หน้าที่ §e §6/§c {1} §c {0} - infoUnknownChapter=§4บท ที่ไม่รู้จัก. -insufficientFunds=§4ยอดเงินคงเหลือไม่เพียงพอ. -invalidCharge=§4คิดค่าบริการไม่ถูกต้อง. invalidFireworkFormat=§4ตัวเลือกนี้ §c{0} §4ค่าไม่ถูกต้องสำหรับ §c{1}§4. invalidHome=§4บ้านชื่อ§c {0} §4ไม่ได้ถูกบันทึก\! invalidHomeName=§4ชื่อบ้านไม่ถูกต้อง\! @@ -366,7 +345,6 @@ mailTooLong=§4ขอความจดหมายยาวเกินไป. markMailAsRead=§6ล้างจดหมายที่ได้อ่านแล้ว, พิมพ์§c /mail clear§6. matchingIPAddress=§6ผู้เล่นต่อไปนี้เคยเข้าใช้งานด้วยที่อยู่ IP นี้มีดังนี้\: maxHomes=§4คุณไม่สามารถมีบ้านเกิน§c {0} §4ที่. -maxMoney=การทำธุรกรรมนี้อาจเกินขีดจำกัดของความสมดุลสำหรับบัญชีนี้. mayNotJail=§4คุณไม่สามารถขังผู้เล่นคนนั้นได้\! mayNotJailOffline=§4คุณอาจไม่ได้แบนผู้เล่นที่ออฟไลน์. minimumPayAmount=§cจำนวนเงินขั้นต่ำที่คุณสามารถจ่ายได้คือ {0} @@ -378,8 +356,6 @@ mobsAvailable=§6มอนสเตอร์\:§r {0} mobSpawnError=§4เกิดข้อผิดพลาดขณะทำการเปลี่ยนกรงเกิดมอนเสตอร์. mobSpawnLimit=ปริมาณของม็อบถูกจำกัดที่เซิฟเวอร์จำกัดไว้ mobSpawnTarget=§4เป้าที่ชี้จะต้องเป็นกรงเกิดมอนสเตอร์เท่านั้น. -moneyRecievedFrom=§a{0} ได้รับจาก {1}. -moneySentTo=§a{0} ได้ส่งถึง {1}. month=เดือน months=เดือน moreThanZero=§4ต้องใส่จำนวนที่มากกว่า 0. @@ -387,7 +363,6 @@ moveSpeed=§6ได้ตั้งค่า {0} ที่ความเร็ msgDisabled=§6รับข้อความ §cปิดการใช้งาน§6 msgDisabledFor=§6รับข้อความ §cปิดการใช้งาน §6สำหรับ {§c {0} §6 msgtoggleCommandUsage1=/ [player] -multipleCharges=§4คุณไม่สามารถใส่เอฟเฟคของดอกไม้ไฟนี้ได้มากกว่าหนึ่งเอฟเฟค. multiplePotionEffects=§4คุณไม่สามารถใส่เอฟเฟคของยานี้ได้มากกว่าหนึ่งเอฟเฟค. mutedPlayerFor=§6ผู้เล่น§c {0} §6ได้ถูกปิดการสนทนา เป็นเวลา§c {1}§6. muteExempt=§4คุณอาจจะไม่ได้ปิดการสนทนาผู้เล่นคนนี้. @@ -395,7 +370,6 @@ muteExemptOffline=§4คุณอาจไม่ปิดการสนทน muteNotify=§c{0} §6ได้ทำการใบ้ผู้เล่น §c{1}§6. nearCommandUsage1=/ nearbyPlayers=§6ผู้เล่นที่อยู๋ไกล้\:§r {0} -negativeBalanceError=§4ผู้เล่น ไม่สามารถมีเงินติดลบได้. nickChanged=§6ชื่อเล่นได้ถูกเปลี่ยน. nickDisplayName=§4คุณต้องเปิดใช้งาน change-displayname ในไฟล์การตั้งค่า Essentials. nickInUse=§4มีผู้เล่นได้ใช้ชื่อนี้แล้ว. @@ -429,7 +403,6 @@ noPlacePermission=คุณไม่ได้รับอนุญาติใ noPotionEffectPerm=§4คุณไม่มีสิทธิ์ในการเพิ่มเอฟเฟค §c{0} §4ให้กับยา. noPowerTools=§6คุณไม่มีเครื่องมือพิเศษที่ถูกกำหนดให้. notEnoughExperience=§4คุณมีค่าประสบการณ์ไม่พอ. -notEnoughMoney=§4คุณมียอดเงินไม่เพียงพอ. notFlying=ไม่ได้บินอยู่ nothingInHand=§4คุณไม่มีอะไรอยู่ในมือ. now=ตอนนี้ @@ -441,12 +414,7 @@ onlyDayNight=/time สามารถใช้ได้แค่ day/night เ onlyPlayers=§4เฉพาะผู้เล่นที่เล่นอยู่เท่านั้นจึงสามารถใช้ §c{0}§4 onlyPlayerSkulls=§4คุณสามารถตั้งค่าหัว Skull ของเจ้าของผู้เล่นได้ (§c397\:3§4). onlySunStorm=§4/weather สามารถใช้ได้แค่ sun/storm เท่านั้น -orderBalances=§6เรียกดูยอดเงินจาก§c {0} §6ผู้เล่น, รอสักครู่... oversizedTempban=§4คุณอาจไม่สามารถแบนผู้เล่นในช่วงเวลานี้. -payMustBePositive=§4จำนวนเงินที่จ่ายต้องเป็นค่าบวก -payconfirmtoggleCommandUsage=/ -paytoggleCommandUsage=/ [player] -paytoggleCommandUsage1=/ [player] pendingTeleportCancelled=§4คำขอการเคลื่อยนย้ายผู้เล่นถูกยกเลิก pingCommandDescription=ป่อง\! pingCommandUsage=/ @@ -522,8 +490,6 @@ requestDeniedFrom=§c{0} §6ไม่ยอมรับคำขอเทเล requestSent=§6ได้ส่งคำขอเทเลพอร์ตไปที่§c {0}§6. requestSentAlready=§4คุณส่ง {0} §4คำขอ teleport แล้ว requestTimedOut=§4หมดเวลาคำขอเทเลพอร์ต. -resetBal=§6ยอดเงินได้ถูกรีเซ็ตใหม่เป็น §c{0} §6สำหรับผู้เล่นทั้งหมดที่ออนไลน์อยู่ทุกคน. -resetBalAll=§6ยอดเงินได้ถูกรีเซ็ตใหม่เป็น §c{0} §6สำหรับผู้เล่นทั้งหมดในเซิฟเวอร์. restCommandUsage=/ [player] restCommandUsage1=/ [player] returnPlayerToJailError=§4เกิดข้อผิดพลาดในการพยายามส่งผู้เล่น§c {0} §4กลับไปขังคุก\: §c{1}§4\! @@ -535,8 +501,6 @@ seenOffline=§6ผู้เล่น§c {0} §4ไม่อยู่ในเก seenOnline=§6ผู้เล่น§c {0} §4อยู่ในเกม§6 ตั้งแต่ §c{1} serverFull=เซิฟเวอร์เต็ม\! serverTotal=§6Server ทั้งหมด\:§c {0} -setBal=§aยอดเงินของคุณได้ถูกตั้งค่าเป็น {0}. -setBalOthers=§aคุณได้ตั้งค่า {0}§a ให้มียอดเงินเหลือ {1}. setSpawner=§6เปลี่ยนกรงเกิดมอนสเตอร์เป็น§c {0}§6. sethomeCommandUsage1=/ sethomeCommandUsage2=/ \: @@ -565,8 +529,6 @@ suicideCommandUsage=/ suicideMessage=§6ลาก่อนโลกอันโหดร้าย... suicideSuccess=§6ผู้เล่น §c{0} §6ได้ใช้ชีวิตของตัวเอง. survival=โหมดเอาชีวิตรอด -takenFromAccount=§a{0} ได้รับมาจากบัญชีของคุณ. -takenFromOthersAccount=§a{0} ได้รับมากจากบัญชี {1}§a ยอดคงเหลือ\: {2}. teleportAAll=§6คำขอการเคลื่อนย้ายตัวผู้เล่นถูกส่งไปยังผู้เล่นทุกคนแล้ว... teleportAll=§6กำลังเคลื่อนย้ายผู้เล่นทั้งหมด... teleportationCommencing=§6กำลังเริ่มต้นการเทเลพอร์ต... @@ -615,8 +577,6 @@ tprCommandUsage=/ tprCommandUsage1=/ tps=§6ค่า TPS ในตอนนี้\= {0} tptoggleCommandUsage1=/ [player] -tradeSignEmpty=§4ป้ายแลกเปลี่ยนยังไม่พร้อมให้คุณใช้งาน. -tradeSignEmptyOwner=§4ไม่มีสิ่งที่จะเก็บได้จากป้ายแลกเปลี่ยนนี้ treeFailure=§4การสร้างต้นไม้ผิดพลาด. โปรดลองอีกครั้งบนหญ้าหรือดิน. treeSpawned=§6ได้เสกต้นไม้. true=§aใช่§r @@ -651,7 +611,6 @@ usingTempFolderForTesting=ใช้โฟลเดอร์ temp ชั่วค vanish=§6โหมดหายตัว สำหรับ {0}§6\: {1} vanishCommandUsage1=/ [player] vanished=§6ตอนนี้คุณได้หายตัวจากผู้เล่นคนอื่น, และซ่อนตัวอยู่ในหน้าต่างเกม. -versionOutputVaultMissing=§4Vault ยังไม่ได้ติดตั้ง การแชทและการอนุญาตอาจไม่ทำงาน versionOutputFine=§6{0} เวอร์ชั่น\: §a{1} versionOutputWarn=§6{0} เวอร์ชั่น\: §c{1}\n versionMismatch=§4เวอร์ชั่นไม่ตรงกัน\! โปรดอับเดท {0} ให้ตรงเวอร์ชั่นเดียวกัน. @@ -684,16 +643,12 @@ whoisGod=§6 - โหมด อมตะ\:§r {0} whoisHealth=§6 - ระดับเลือด\:§r {0}/20 whoisHunger=§6 - ความหิว\:§r {0}/20 (+{1} ความอิ่ม) whoisLocation=§6 - ตำแหน่ง\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - ยอดเงิน\:§r {0} whoisMuted=§6 - ได้ถูกปิดการสนทนา\:§r {0} whoisNick=§6 - ชื่อเล่น\:§r {0} whoisOp=§6 - โหมด OP\:§r {0} whoisTop=§6 \=\=\=\=\=\= รายระเอียด\:§c {0} §6\=\=\=\=\=\= workbenchCommandUsage=/ worldCommandUsage1=/ -worth=§aกองของ {0} มีมูลค่า §c{1}§a (จำนวน {2} อัน แต่ละอันมีมูลค่า {3}) -worthMeta=§aกองของ {0} ที่มี metadata ของ {1} มีมูลค่า §c{2}§a (จำนวน {3} อัน แต่ละอันมีมูลค่า {4}) -worthSet=§6อัตราการแลกเปลี่ยน year=ปี years=ปี youAreHealed=§6คุณได้รับการรักษา. diff --git a/Essentials/src/main/resources/messages_tr.properties b/Essentials/src/main/resources/messages_tr.properties index 781149b48..8a28d6b3c 100644 --- a/Essentials/src/main/resources/messages_tr.properties +++ b/Essentials/src/main/resources/messages_tr.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} hesabınıza eklendi. -addedToOthersAccount=§a{1} §aisimli oyuncunun hesabına {0} eklendi. Yeni bakiye\: {2} adventure=macera afkCommandDescription=Sizi afk (klavyeden uzakta) olarak işaretler. afkCommandUsage=/ [oyuncu/mesaj...] @@ -46,17 +44,6 @@ backupFinished=§6Yedekleme bitti. backupStarted=§6Yedekleme başladı. backupInProgress=§6Harici bir yedek taslağı işlem halinde\! Bitirilene kadar eklenti kapatma aksatılıyor. backUsageMsg=§6Önceki konuma geri dönülüyor. -balance=§aBakiye\:§c {0} -balanceCommandDescription=Bir oyuncunun şimdiki bakiyesini gösterir. -balanceCommandUsage=/ [oyuncu] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Mevcut bakiyeni görüntüler -balanceCommandUsage2=/ -balanceCommandUsage2Description=Belirtilen oyuncunun bakiyesini görüntüler -balanceOther=§a{0} §aBakiyesi\:§c {1} -balanceTop=§6Bakiye sıralaması ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=En yüksek bakiye değerini gösterir. banCommandDescription=Bir oyuncuyu banlar. banCommandUsage=/ [neden] banCommandUsage1=/ [neden] @@ -144,14 +131,9 @@ commandNotLoaded=§4Komut {0} düzgünce yüklenemedi. compassBearing=§6Pusula\: {0} ({1} derece). compassCommandDescription=Mevcut yönünüzü açıklar. compassCommandUsage=/ -condenseCommandDescription=Öğeleri daha kompakt bloklara yoğunlaştırır. -condenseCommandUsage1=/ -condenseCommandUsage1Description=Envanterindeki tüm eşyaları siler -condenseCommandUsage2=/ <öğe> configFileMoveError=config.yml dosyasını yedekleme lokasyonuna taşıma işleminde başarısız olundu. configFileRenameError=Ayarlar yüklenirken hata oluştu \! confirmClear=§7Envanter silmeyi §lDOĞRULAMAK§7 için lütfen bu komutu tekrarlayın\: §6{0} -confirmPayment=§6{0}§7 §7ödemesini §lDOĞRULAMAK§7 için lütfen bu komutu tekrarlayın\: §6{1}\n connectedPlayers=§6Bağlı oyuncular§r connectionFailed=Bağlantı kurmakta başarısız olundu. consoleName=Konsol @@ -169,7 +151,6 @@ createKitSuccess=§6Oluşturulmuş Kit\: §f{0}\n§6Gecikme\: §f{1}\n§6Bağlan creatingConfigFromTemplate={0} Şablonundan konfigürasyon oluşturuluyor. creatingEmptyConfig=Boş konfigürasyon oluşturuluyor\: {0} creative=yaratıcı -currency={0}{1} currentWorld=§6Şuanki Dünya\:§c {0} customtextCommandDescription=Özel yazı komutları oluşturmanızı sağlar. customtextCommandUsage=/ - bukkit.yml içinde tanımla @@ -228,9 +209,6 @@ downloadingGeoIp=GeoIP veritabanını indiriliyor... bu biraz zaman alabilir (ü duplicatedUserdata=Yinelenen kullanıcı verisi\: {0} ve {1}. durability=§6Bu aracın §c{0}§6 kullanım ömürü kaldı. east=D -ecoCommandDescription=Sunucu ekonomisini yönetir. -ecoCommandUsage=/ -ecoCommandUsage2Description=Belirtilen miktarda parayı belirtilen oyuncudan alır editBookContents=§eArtık bu kitabın içeriğini düzenleyebilirsin. enabled=aktif enchantCommandDescription=Oyuncunun tuttuğu öğeyi büyüler. @@ -378,9 +356,7 @@ infoCommandDescription=Sunucu sahibi tarafından ayarlanan bilgileri gösterir. infoCommandUsage=/ [bölüm] [sayfa] infoPages=§e ---- §6{2} §e--§6 Sayfa §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Bilinmeyen bölüm. -insufficientFunds=§4Bakiye yetersiz. invalidBanner=§4Geçersiz bayrak sözdizimi. -invalidCharge=§4Hatalı ücret. invalidFireworkFormat=§c{0} §4seçeneği §4{1} §ciçin geçerli bir değer değil. invalidHome=§4Ev §c{0} §4bulunamadı\! invalidHomeName=§4Geçersiz ev ismi\! @@ -472,7 +448,6 @@ kitCommandUsage=/ [kit] [oyuncu] kitCommandUsage1=/ kitCommandUsage2=/ [oyuncu]\n kitContains=§6Kit §c{0} §6şunları içerir\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Geçerli bir kit yok. kitError2=§4Bu kit düzgün bir şekilde tanımlanmamış. Lütfen bir yönetici ile iletişime geçiniz. @@ -522,7 +497,6 @@ mailTooLong=§4Posta mesajı çok uzun. Lütfen 1000 karakterden kısa tutmaya markMailAsRead=§6Postalarını okundu olarak işaretlemek için §c / mail clear§6 yaz. matchingIPAddress=§6Bu IP adresinden daha önce şu oyuncular oyuna girdi\: maxHomes=§c{0} §6adetten daha fazla ev belirleyemezsin. -maxMoney=§4Bu işlem, hesabın maksimum bakiye limitini aşacaktır. mayNotJail=§4Bu oyuncuyu hapse atamazsınız\! mayNotJailOffline=§4Çevrimdışı oyuncuları hapsedemezsin. meCommandDescription=Oyuncu bağlamındaki bir eylemi açıklar. @@ -530,7 +504,6 @@ meCommandUsage=/ meCommandUsage1=/ meSender=Ben meRecipient=ben -minimumBalanceError=§4Bir oyuncunun sahip olabileceği minimum bakiye {0}. minimumPayAmount=§cÖdeyebileceğiniz minimum miktar {0}. minute=dakika minutes=dakika @@ -540,8 +513,6 @@ mobsAvailable=§6Yaratıklar\:§r {0} mobSpawnError=§4Yaratık yaratıcısı değiştirilirken bir sorun oluştu. mobSpawnLimit=Yaratık miktarı sunucu limitiyle sınırlandı. mobSpawnTarget=§4Hedef blok bir yaratık oluşturucusu olmalı. -moneyRecievedFrom=§a{0} §a{1} §6oyuncusundan alınıldı. -moneySentTo=§a{1} isimli oyuncuya {0} gönderildi. month=ay months=ay moreCommandDescription=Eldeki öğe stackini belirtilen miktara ya da belirtilmediyse maksimum boyuta doldurur. @@ -563,7 +534,6 @@ msgIgnore=§c{0} §4mesajları alma devre dışı. msgtoggleCommandDescription=Tüm özel mesajları almayı engeller. msgtoggleCommandUsage=/ [oyuncu] [on|off] msgtoggleCommandUsage1=/ [oyuncu] -multipleCharges=§4Bu havai fişeğe birden fazla şarj uygulayamazsın. multiplePotionEffects=§4Bu iksire birden daha fazla efekt ekleyemezsiniz. muteCommandDescription=Bir oyuncuyu susturur veya geri susturur. muteCommandUsage=/ [tarihfarkı] [sebep] @@ -584,7 +554,6 @@ nearCommandUsage=/ [oyuncuadı] [yarıçap] nearCommandUsage1=/ nearCommandUsage3=/ nearbyPlayers=§6Yakındaki oyuncular\:§r {0} -negativeBalanceError=§4Kullanıcının negatif değerde bir bakiyeye sahip olmasına izin verilmiyor. nickChanged=§6Oyuncu adı değiştirildi. nickCommandDescription=Kendi veya başka bir oyuncunun kullanıcı adını değiştir. nickCommandUsage=/ [oyuncu] [kullanıcıadı|off] @@ -629,9 +598,7 @@ noPermToSpawnMob=§4Bu yaratığı oluşturmak için izniniz yok. noPlacePermission=§4Bu tabelanın yakınlarına bir blok koymak için izniniz yok. noPotionEffectPerm=§4Bu iksire §c{0} §4efektini eklemek için izniniz yok. noPowerTools=§6Ayarlanmış bir güç aracınız yok. -notAcceptingPay=§4{0} §4 ödeme kabul etmiyor. notEnoughExperience=§4Yeterli tecrübe puanınız yok. -notEnoughMoney=§4Yeterli miktarda paranız yok. notFlying=uçmuyor nothingInHand=§4Elinde hiç bir şey yok. now=şimdi @@ -645,26 +612,9 @@ onlyPlayers=§4Sadece oyun içi kullanıcılar §c{0}§4 kullanabilir. onlyPlayerSkulls=§4Sadece oyuncu kafalarının sahibini ayarlayabilirsiniz (§c397\:3§4). onlySunStorm=§4/weather sadece sun/storm destekliyor. openingDisposal=§6Tasfiye menüsü açılıyor... -orderBalances=§c{0} §6Adlı oyuncuların bakiyesi listeleniyor, lütfen bekleyin... oversizedMute=§4Bu süre boyunca bir oyuncuyu susturamazsın. oversizedTempban=§4Bu kadar uzun süreliğine bir oyuncuyu uzaklaştıramazsınız. passengerTeleportFail=§4Yolcu taşırken ışınlanamazsın. -payCommandDescription=Sizin bakiyenizden başka bir oyuncuya ödeme yapar. -payCommandUsage=/ -payCommandUsage1=/ -payConfirmToggleOff=§6Artık ödemeleri onaylamanız istenmeyecek. -payConfirmToggleOn=§6Şimdi ödemeleri onaylamanız istenecek. -payDisabledFor=§c{0}§6 için ödemelerin kabulü kapatıldı. -payEnabledFor=§c{0}§6 için ödemelerin kabulü açıldı. -payMustBePositive=§4Ödenecek tutar pozitif olmalıdır. -payOffline=§4Çevrimdışı oyuncuları uzaklaştıramazsın. -payToggleOff=§6Artık ödeme kabul etmiyorsun. -payToggleOn=§6Şimdi ödemeleri kabul ediyorsun. -payconfirmtoggleCommandDescription=Ödemeleri onaylamanız istenip istenmeyeceğini değiştirir. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Ödeme kabul edip etmeyeceğinizi değiştirir. -paytoggleCommandUsage=/ [oyuncu] -paytoggleCommandUsage1=/ [oyuncu] pendingTeleportCancelled=§4Bekleyen ışınlanma isteği iptal edildi. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -777,8 +727,6 @@ requestDeniedFrom=§c{0} §b6şınlanma isteğinizi reddetti. requestSent=§c{0}§6 isimli oyuncuya istek gönderildi. requestSentAlready=§4Zaten §c{0}§4 isimli oyuncuya bir ışınlanma isteği gönderdiniz. requestTimedOut=§4Işınlanma isteği zaman aşımına uğradı. -resetBal=§6Tüm çevrimiçi oyuncuların parası §c{0} §6olarak sıfırlandı. -resetBalAll=§6Tüm oyuncuların parası §c{0} §6olarak sıfırlandı. rest=§6Kendini iyice dinlenmiş hissediyorsun. restCommandDescription=Seni veya verilen oyuncuyu uyutur. restCommandUsage=/ [oyuncu] @@ -798,16 +746,11 @@ seenCommandUsage=/ seenCommandUsage1=/ seenOffline=§c{0} §6isimli oyuncu §c{1} §6süresinden beri §4çevrimdışı. seenOnline=§c{0} §6isimli oyuncu §c{1}§6 süresinden beri §açevrimiçi. -sellBulkPermission=§6Bir toplu satış izniniz yok. -sellCommandDescription=Elindeki öğeyi satar. -sellHandPermission=§6El ile satma yetkiniz yok. serverFull=Sunucu dolu\! serverReloading=Şu anda iyi bir sunucuyu yeniden yüklüyor olma şansın var. Eğer durum buysa, neden kendinden nefret ediyorsun? /reload kullanırken EssentialsX takımından destek beklemeyin. serverTotal=§6Sunucu Toplamı\:§c {0} serverUnsupported=Desteklenmeyen bir sunucu sürümü kullanıyorsunuz\! serverUnsupportedLimitedApi=Sınırlı API fonksiyonlu bir sunucu yönetiyorsunuz. EssentialsX hala çalışacak, ama bazı özellikler devre dışı kalabilir. -setBal=§aBakiyeniz {0} olarak ayarlandı. -setBalOthers=§a{0}§a isimli oyuncunun bakiyesini {1} olarak ayarladınız. setSpawner=§6Oluşturucu türü §c{0}§6 olarak değiştirildi. sethomeCommandDescription=Evini şimdiki noktaya ayarla. sethomeCommandUsage=/ [[player\:]isim] @@ -821,8 +764,6 @@ settprValue=§6Rasgele ışınlanma §c{0}§6, §c{1}§6 olarak ayarlandı. setwarpCommandDescription=Yeni bir bükülme noktası oluşturur. setwarpCommandUsage=/ setwarpCommandUsage1=/ -setworthCommandDescription=Bir öğenin satma değerini ayarla. -setworthCommandUsage=/ [öğeadı|id] sheepMalformedColor=§4Hatalı biçimlendirilmiş renk. shoutFormat=§6[Shout]§r {0} editsignCommandClear=§6Tabela temizlendi. @@ -880,8 +821,6 @@ suicideCommandUsage=/ suicideMessage=§6Hoşçakal zalim dünya... suicideSuccess=\ §c{0} §6adlı oyuncu kendi canını aldı. survival=hayatta kalma -takenFromAccount=§e{0}§a hesabından alındı.\n -takenFromOthersAccount={1}§a hesabından §a{0} kadar alındı . Yeni bakiye\: {2}. teleportAAll=§6Tüm oyunculara ışınlanma isteği gönderildi... teleportAll=§6Tüm oyuncular ışınlanıyor. teleportationCommencing=§6Işınlanma gerçekleşiyor... @@ -990,8 +929,6 @@ tps=§6Şuanki TPS \= {0} tptoggleCommandDescription=Tüm ışınlanma türlerini engeller. tptoggleCommandUsage=/ [oyuncu] [on|off] tptoggleCommandUsage1=/ [oyuncu] -tradeSignEmpty=§4Ticaret tabelasında senin için hiçbir şey yok. -tradeSignEmptyOwner=§4Bu ticaret tabelasından alabileceğin hiçbir şey yok. treeCommandDescription=Baktığın yere bir ağaç oluştur. treeCommandUsage=/ treeCommandUsage1=/ @@ -1047,7 +984,6 @@ vanishCommandDescription=Kendini diğer oyunculardan sakla. vanishCommandUsage=/ [oyuncu] [on|off] vanishCommandUsage1=/ [oyuncu] vanished=§6Artık tamamen normal oyunculara gizlisiniz\! Ayrıca oyun-içi komutlarda da gizlendiniz. -versionOutputVaultMissing=§4Vault kurulu değil. Sohbet ve izinler çalışmayabilir. versionOutputFine=§6{0} sürüm\: §a{1} versionOutputWarn=§6{0} sürüm\: §c{1} versionOutputUnsupported=§d{0} §6sürüm\: §d{1} @@ -1098,7 +1034,6 @@ whoisHunger=§6 - Açlık\:§r {0}/20 (+{1}) whoisIPAddress=§6 - IP Adresi\:§r {0} whoisJail=§6 - Hapis\:§r {0} whoisLocation=§6 - Lokasyon\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Para\:§r {0} whoisMuted=§6 - Susturulmuş\:§r {0} whoisMutedReason=§6 - Susturuldu\:§r {0} §6Sebep\: §c{1} whoisNick=§6 - İsim\:§r {0} @@ -1112,11 +1047,6 @@ workbenchCommandUsage=/ worldCommandDescription=Dünyalar arası geçiş yap. worldCommandUsage=/ [dünya] worldCommandUsage1=/ -worth=§a1 yığın {0} eşyasının değeri §c{1}§a. (tanesi {3}''''dan {2} eşya) -worthCommandDescription=Eldeki veya belirtilen öğelerin değerini hesaplar. -worthCommandUsage=/ <<öğeadı>||hand|inventory|blocks> [-][miktar] -worthMeta=§a{1} meta verisi ile 1 yığın {0} eşyasının değeri §c{2}§a. (Tanesi {4}''''dan {3} eşya) -worthSet=§6Edecek değeri belirlendi. year=yıl years=yıl youAreHealed=§6İyileştirildin. diff --git a/Essentials/src/main/resources/messages_uk.properties b/Essentials/src/main/resources/messages_uk.properties index efc2f9129..a5382daaa 100644 --- a/Essentials/src/main/resources/messages_uk.properties +++ b/Essentials/src/main/resources/messages_uk.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} було додано до твого облікового запису. -addedToOthersAccount=§a{0} додано до {1}§a рахунку. Новий баланс\: {2} adventure=пригодницький afkCommandDescription=Додає вас як афк. afkCommandUsage=/ [гравець/повідомлення...] @@ -47,20 +45,6 @@ backupFinished=§6Копіювання закінчено. backupStarted=§6Резервне копіювання почалося. backupInProgress=§6Триває зовнішній сценарій резервного копіювання\! Зупинення вимкнення плагіна до завершення. backUsageMsg=§6Повернення до попереднього розташування. -balance=§aБаланс\:§c {0} -balanceCommandDescription=Відображає поточний баланс гравця. -balanceCommandUsage=/ [player] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Відображає ваш поточний баланс -balanceCommandUsage2=/ -balanceCommandUsage2Description=Відображає баланс зазначеного гравця -balanceOther=§aБаланс {0}§a\:§c {1} -balanceTop=§6Топ багачів ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Показує топ найбагатших гравців. -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] -balancetopCommandUsage1Description=Відображає першу (або вказану) сторінку топу найбагатших гравців banCommandDescription=Блокує гравця. banCommandUsage=/ [reason] banCommandUsage1=/ [reason] @@ -160,16 +144,9 @@ commandNotLoaded=§4Команда {0} неправильно завантаже compassBearing=§6Азимут\: {0} ({1} градусів). compassCommandDescription=Описує ваш поточний напрямок. compassCommandUsage=/ -condenseCommandDescription=Перетворює предмети в більш компактні блоки. -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Збирає всі предмети в Вашому інвентарі -condenseCommandUsage2=/ <предмет> -condenseCommandUsage2Description=Збирає визначений предмет у Вашому інвентарі configFileMoveError=Не вдалося перемістити config.yml до резервної копії. configFileRenameError=Не вдалося перейменувати тимчасовий файл config.yml. confirmClear=§7Для §lПІДТВЕРДЖЕННЯ§7 очистки інвентаря, будь ласка, повторіть команду\: §6{0} -confirmPayment=§7Для §lПІДТВЕРДЖЕННЯ§7 платежу §6{0}§7, будь ласка, повторіть команду\: §6{1} connectedPlayers=§6Підключені гравці§r connectionFailed=Не вдалося відкрити підключення. consoleName=Консоль @@ -188,7 +165,6 @@ createKitUnsupported=$4NBT серіалізація предметів вмик creatingConfigFromTemplate=Створення конфігурації з шаблону\: {0} creatingEmptyConfig=Створення порожньої конфігурації\: {0} creative=творчий -currency={0}{1} currentWorld=§6Теперішній світ\: §c {0} customtextCommandDescription=Дозволяє вам створювати власні текстові команди. customtextCommandUsage=/ - Визначте в bukkit.yml @@ -312,16 +288,6 @@ dumpUrl=§6Створено дамп сервера\: §c{0} duplicatedUserdata=Дубльовані файли користувачів\: {0} і {1}. durability=§6Цей інструмент має ще §c{0}§6 використань. east=E -ecoCommandDescription=Керує економікою серверів. -ecoCommandUsage=/ -ecoCommandUsage1=/ give <гравець> <кількість> -ecoCommandUsage1Description=Видає зазначеному гравцю зазначену кількість грошей -ecoCommandUsage2=/ take <гравець> <кількість> -ecoCommandUsage2Description=Забирає зазначену кількість грошей в зазначеного гравця -ecoCommandUsage3=/ set <гравець> <кількість> -ecoCommandUsage3Description=Виставляє баланс зазанченого гравця на зазначену суму -ecoCommandUsage4=/ reset <гравець> <кількість> -ecoCommandUsage4Description=Скидає баланс визначеного гравця до початкового балансу editBookContents=§eВи тепер можуте редагувати вміст цієї книги. enabled=ввімкнено enchantCommandDescription=Зачаровує предмет, який тримає гравець. @@ -539,9 +505,7 @@ infoCommandDescription=Показує інформацію, встановлен infoCommandUsage=/ [chapter] [page] infoPages=§e ---- §6{2} §e--§6 Сторінка §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Невідома глава. -insufficientFunds=§4Недостатньо коштів. invalidBanner=§4Неправильний синтаксис банера. -invalidCharge=§4Неправильне значення. invalidFireworkFormat=§4Параметр §c{0} §4не є припустимим для §c{1}§4. invalidHome=§4Домівка§c {0} §4не існує\! invalidHomeName=§4Неправильна назва домівки\! @@ -658,7 +622,6 @@ kitCommandUsage1Description=Перелічує усі доступні набо kitCommandUsage2=/ <набір> [player] kitCommandUsage2Description=Видає зазначений набір Вам або іншому гравцю, якщо вказано kitContains=§6Комплект §c{0} §6contains\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Тут нема дійсних комплектів. kitError2=§4Цей комплект неправильно визначається. Зверніться до адміністратора. @@ -738,7 +701,6 @@ mailTooLong=§4Лист занадто довгий. Спробуйте, щоб markMailAsRead=§6Щоб позначити пошту як прочитану, напишіть§c /mail clear§6. matchingIPAddress=§6Наступні гравці були помічені раніше під цим IP адресом\: maxHomes=§4Ви не можете створити більше чим§c {0} §4домівок. -maxMoney=§4Ця транзакція буде перевищувати баланс цього рахунку. mayNotJail=§4Ви не можете посадити цього гравця\! mayNotJailOffline=§4Ви не ув''язнити гравця в офлайні. meCommandDescription=Описує дію від лиця гравця. @@ -747,7 +709,6 @@ meCommandUsage1=/ <опис> meCommandUsage1Description=Описує дію meSender=я meRecipient=я -minimumBalanceError=§4Мінімальний баланс, що може мати гравець, дорівнює {0}. minimumPayAmount=§cМінімальна кількість, яку ти можеш заплатити, це {0} доларів. minute=хвилина minutes=хвилини @@ -757,8 +718,6 @@ mobsAvailable=§6Моби\:§r {0} mobSpawnError=§4Помилка при зміні спавнера. mobSpawnLimit=Кількість мобів ограничена сервером. mobSpawnTarget=§4Ви маєте дивитись на спавнер. -moneyRecievedFrom=§a{0}§6 отримано від §a {1}§6. -moneySentTo=§a{0} відправлено до {1}. month=місяць months=місяців moreCommandDescription=Заповнює стак предметів в руці до максимуму або до зазначеної кількості. @@ -783,7 +742,6 @@ msgtoggleCommandDescription=Блокує отримання усіх прива msgtoggleCommandUsage=/ [player] [on|off] msgtoggleCommandUsage1=/ [player] msgtoggleCommandUsage1Description=Переключає режим польоту Вам або іншому гравцю, якщо зазначено -multipleCharges=§4Ви не можете активувати більше одного заряду до феєрверку. multiplePotionEffects=§4Ви не можете активувати більше ніж один ефект для зілля. muteCommandDescription=Глушить або розглушує гравця. muteCommandUsage=/ <гравець> [datediff] [reason] @@ -814,7 +772,6 @@ nearCommandUsage4=/ <гравець> <радіус> nearCommandUsage4Description=Перераховує усіх гравців поряд з заданим гравцем у зазначеному радіусі nearbyPlayers=§6Гравці неподалік\: §r {0} nearbyPlayersList={0}§f(§c{1}m§f) -negativeBalanceError=§4Користувачу не дозволено мати негативний баланс. nickChanged=§6Нік змінено. nickCommandDescription=Змінює Ваш нікнейм або нікнейм іншого гравця. nickCommandUsage=/ [player] <нікнейм|off> @@ -866,12 +823,10 @@ noPermToSpawnMob=§4У вас нема прав для щоб спавнити noPlacePermission=§4У вас немає прав ставити блоки коло цієї таблички. noPotionEffectPerm=§4У вас немає дозволу застосовувати ефект §c{0} §4до цього зілля. noPowerTools=§6У вас не назначено інструментів. -notAcceptingPay=§4{0} §4не приймає платіж. notAllowedToLocal=§4У Вас немає дозволу спілкуватися в локальному чаті. notAllowedToQuestion=§4У Вас немає дозволу ставити питання. notAllowedToShout=§4У Вас немає дозволу кричати. notEnoughExperience=§4У вас недостатньо досвіду. -notEnoughMoney=§4У вас недостатньо грошей. notFlying=не літає nothingInHand=§4У вас нічого немає у вашій руці. now=зараз @@ -887,28 +842,9 @@ onlyPlayers=§4Тільки гравці у грі можуть використ onlyPlayerSkulls=§4Ви можете вказувати лише власника черепа (§c397\:3§4). onlySunStorm=§4Команда /weather підтримує тільки sun/storm. openingDisposal=§6Відкриття меню розпорядку... -orderBalances=§6Підрахунок балансу§c {0} §6гравців, зачекайте... oversizedMute=§4Ви не можете замютити гравця на цей термін. oversizedTempban=§4Ви не можете забанити гравця на цей термін. passengerTeleportFail=§4Ви не можете телепортуватися доки маєте пасажирів. -payCommandDescription=Заплатити іншому гравцю суму з Вашого балансу. -payCommandUsage=/ <гравець> <сума> -payCommandUsage1=/ <гравець> <сума> -payCommandUsage1Description=Заплатити зазначеному гравцю зазначену суму грошей -payConfirmToggleOff=§6Вам більше не буде потрібно підтверджувати платежі. -payConfirmToggleOn=§6Тепер, вам треба буде підтверджувати платежі. -payDisabledFor=§6Вимкнено прийняття платежів для §c{0}§6. -payEnabledFor=§6Увімкнено прийняття платежів для §c{0}§6. -payMustBePositive=§4Кількість грошей для оплати має бути позитивним числом. -payOffline=§4Ви не можете заплатити гравцям в офлайн. -payToggleOff=§6Ви більше не приймаєте платежі. -payToggleOn=§6Тепер, ви приймаєте платежі. -payconfirmtoggleCommandDescription=Переключає підтвердження грошових переказів. -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=Переключає можливість отримувати грошові перекази. -paytoggleCommandUsage=/ [player] -paytoggleCommandUsage1=/ [player] -paytoggleCommandUsage1Description=Перемикає можливість Вам або іншому гравцю, якщо зазначено, отримувати платежі pendingTeleportCancelled=§4Запит на телепортацію скасовано. pingCommandDescription=Фіг тобі, а не пінг\! pingCommandUsage=/ @@ -1074,8 +1010,6 @@ requestSent=§6Запит надіслано до§c {0}§6. requestSentAlready=§4Ви вже надіслали {0}§4 запит на телепортацію. requestTimedOut=§4Час запиту на телепортацію вийшов. requestTimedOutFrom=§4Запит на телепортацію від §c{0} §4вичерпано. -resetBal=§6Баланс було скинуто до §c{0} §6для всіх гравців онлайн. -resetBalAll=§6Баланс було скинуто до §c{0} §6для всіх гравців. rest=§6Ви відчуваєте себе відпочившим. restCommandDescription=Робить Вас або вказаного гравця відпочившим. restCommandUsage=/ [player] @@ -1097,18 +1031,6 @@ seenCommandUsage1=/ <ім''я гравця> seenCommandUsage1Description=Показує час виходу, бан, мут та UUID вказаного гравця seenOffline=§6Гравець§c {0} §4офлайн§6 з §c{1}§6. seenOnline=§6Гравець§c {0} §4онлайн§6 з §c{1}§6. -sellBulkPermission=§6Ви не маєте дозволу на масовий продаж. -sellCommandDescription=Продає предмет у Вашій руці. -sellCommandUsage=/ <<назва предмету>||hand|inventory|blocks> [кількість] -sellCommandUsage1=/ <назва предмету> [кількість] -sellCommandUsage1Description=Продає всі вказані предмети (або вказану кількість предмета) в Вашому інвентарі -sellCommandUsage2=/ hand [amount] -sellCommandUsage2Description=Продає усі предмети (або вказану кількість предмета) в руці. -sellCommandUsage3=/ all -sellCommandUsage3Description=Продає усі можливі предмети у Вашому інвентарі -sellCommandUsage4=/ blocks [кількість] -sellCommandUsage4Description=Продає усі блоки (або вказану кількість блоків) у Вашому інвентарі -sellHandPermission=§6Ви не маєте дозволу на продаж з руки. serverFull=Сервер повний\! serverReloading=Великий шанс того, що прямо зараз Ви зараз перезапускаєте свій сервер. Якщо це так, то чого ж Ви себе так ненавидите? Підтримки команди EssentialsX не буде при використанні команди /reload. serverTotal=§6Всього на сервері\:§c {0} @@ -1119,8 +1041,6 @@ serverUnsupportedDangerous=Ви працюєте з форком сервера, serverUnsupportedLimitedApi=Ви працюєте з сервером з обмеженою функціональністю API. EssentialsX все ще буде працювати, але деякі можливості будуть недоступні. serverUnsupportedDumbPlugins=Ви використовуєте плагіни, які, як відомо, спричиняють серйозні проблеми з EssentialsX та іншими плагінами. serverUnsupportedMods=Ви працюєте з сервером, що некоректно підтримує плагіни Bukkit. Плагіни Bukkit не варто використовувати з Forge/Fabric модами\! Для Forge\: Використовуйте ForgeEssentials або SpongeForge + Nucleus. -setBal=§aВаш баланс встановлено на {0}. -setBalOthers=§aВи встановили баланс {0}§a в {1}. setSpawner=§6Змінено тип спавнеру на§c {0}§6. sethomeCommandDescription=Виставляє Ваш дім на Вашій позиції. sethomeCommandUsage=/ [[гравець\:]назва] @@ -1146,12 +1066,6 @@ setwarpCommandDescription=Створює новий варп. setwarpCommandUsage=/ setwarpCommandUsage1=/ setwarpCommandUsage1Description=Створює варп з вказаною назвою на Вашій позиції -setworthCommandDescription=Виставляє ціну продажу предмета. -setworthCommandUsage=/ [назва предмета|id] <ціна> -setworthCommandUsage1=/ <ціна> -setworthCommandUsage1Description=Виставляє вартість предмета в руці на вказану величину -setworthCommandUsage2=/ <назва предмета> <ціна> -setworthCommandUsage2Description=Виставляє вартість вказаного предмета на вказану величину sheepMalformedColor=§4Неправильний колір. shoutDisabled=§6Режиму крику §cвимкнено§6. shoutDisabledFor=§6Режим крику §cвимкнено §6на §c{0}§6. @@ -1241,8 +1155,6 @@ suicideCommandUsage=/ suicideMessage=§6Прощай жостокий світ... suicideSuccess=§6Гравець §c{0} §6закінчив життя самогубством. survival=виживання -takenFromAccount=§e{0}§a було знято з вашого рахунку. -takenFromOthersAccount=§e{0}§a знято з рахунку§e {1}§a. Його новий баланс\:§e {2} teleportAAll=§6Запит на телепортацію надісланий до всіх гравців... teleportAll=§6Телепортуємо всіх гравців... teleportationCommencing=§6Телепортація розпочинається... @@ -1396,8 +1308,6 @@ tptoggleCommandDescription=Блокує усі види телепортації tptoggleCommandUsage=/ [player] [on|off] tptoggleCommandUsage1=/ [player] tptoggleCommandUsageDescription=Перемикає можливість телепортуватися Вам або іншого гравця, якщо зазначено -tradeSignEmpty=§4В торговій табличці нічого немає. -tradeSignEmptyOwner=§4В торговій табличці нічого немає щоб зібрати. treeCommandDescription=Створює дерево там, куди Ви дивитесь. treeCommandUsage=/ treeCommandUsage1=/ @@ -1478,12 +1388,10 @@ versionDevLatest=§6Ви працюєте з останнім dev-білдом E versionError=§4Помилка при отриманні даних версії EssentialsX\! Інформація про білд\: §c{0}§6. versionErrorPlayer=§6Помилка при перевірці версії EssentialsX\! versionFetching=§6Отримання даних про версію... -versionOutputVaultMissing=§4Плагін Vault не встановлено. Чат і права можуть не працювати. versionOutputFine=§6{0} версія\: §a{1} versionOutputWarn=§6{0} версія\: §c{1} versionOutputUnsupported=§d{0} §6версія\: §d{1} versionOutputUnsupportedPlugins=§6У Вас встановлені §dнепідтримувані плагіни§6\! -versionOutputEconLayer=§6Слой економіки\: §r{0} versionMismatch=§4Версії невідповідають\! Будь ласка, оновіться до тієї самої версії {0}. versionMismatchAll=§4Версії не збігаються\! Будь ласка, оновіть всі файли .jar Essentials до однакової версії. versionReleaseLatest=§6Ви працюєте з останньою стабільною версією EssentialsX\! @@ -1545,7 +1453,6 @@ whoisHunger=§6 - Голод\:§r {0}/20 (+{1} насичення) whoisIPAddress=§6 - IP адреса\:§r {0} whoisJail=§6 - У в''язниці\:§r {0} whoisLocation=§6 - Розташування\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Гроші\:§r {0} whoisMuted=§6 - В мюті\:§r {0} whoisMutedReason=§6 - У м''юті\:§r {0} §6Причина\: §c{1} whoisNick=§6 - Нік\:§r {0} @@ -1562,19 +1469,6 @@ worldCommandUsage1=/ worldCommandUsage1Description=Телепортує до Вашої відповідної позиції в Незері або звичайному світі worldCommandUsage2=/ <світ> worldCommandUsage2Description=Телепортує до Вашої позиції у вказаному світі -worth=§aВартість стаку {0} складає §c{1}§a ({2} предметів за {3} кожен) -worthCommandDescription=Розраховує вартість предметів в руці, або як зазначено. -worthCommandUsage=/ <<назва предмету>||hand|inventory|blocks> [-][кількість] -worthCommandUsage1=/ <назва предмету> [кількість] -worthCommandUsage1Description=Перевіряє вартість всіх (або вказаної кількості, якщо зазначено) вказаних предметів у Вашому інвентарі -worthCommandUsage2=/ hand [amount] -worthCommandUsage2Description=Перевіряє вартість всіх (або вказаної кількості, якщо зазначено) предметів в руці -worthCommandUsage3=/ all -worthCommandUsage3Description=Перевіряє вартість всіх (або вказаної кількості, якщо зазначено) можливих предметів у Вашому інвентарі -worthCommandUsage4=/ blocks [кількість] -worthCommandUsage4Description=Перевіряє вартість всіх (або вказаної кількості, якщо зазначено) блоків у Вашому інвентарі -worthMeta=§aВартість стаку {0} з метаданими {1} складає §c{2}§a ({3} предметів за {4} кожен) -worthSet=§6Ціна встановлена year=рік years=роки youAreHealed=§6Ти видужав. diff --git a/Essentials/src/main/resources/messages_vi.properties b/Essentials/src/main/resources/messages_vi.properties index afd5a5315..bc22c550a 100644 --- a/Essentials/src/main/resources/messages_vi.properties +++ b/Essentials/src/main/resources/messages_vi.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} đã được thêm vào tài khoản của bạn. -addedToOthersAccount=§a{0} đã được thêm vào tài khoản {1}§a. Số dư mới\: {2} adventure=phiêu lưu afkCommandDescription=Đánh dấu bạn đã rời bàn phím. afkCommandUsage=/ [player/message...] @@ -46,19 +44,6 @@ backupFinished=§6Sao lưu thành công. backupStarted=§6Đã bắt đầu sao lưu. backupInProgress=Dữ liệu sao lưu bên ngoài hiện đang trong quá trình\! Tạm dừng việc vô hiệu hóa cho đến khi xong. backUsageMsg=§6Đang quay lại vị trí cũ. -balance=§aSố dư\:§c {0} -balanceCommandDescription=Trạng thái tiền dư hiện tại của người chơi. -balanceCommandUsage=/ [người chơi] -balanceCommandUsage1=/ -balanceCommandUsage1Description=Ghi ra số tiền của bạn -balanceCommandUsage2Description=Hiển thị số dư của người chơi được chỉ định -balanceOther=§aSố dư của {0}§a\:§c {1} -balanceTop=§6Đứng đầu số dư ({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=Lấy giá trị số dư hàng đầu. -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] -balancetopCommandUsage1Description=Hiển thị đầu tiên (hoặc được chỉ định) trang trên xếp hạng giá trị số dư banCommandDescription=Cấm người chơi. banCommandUsage=/ [reason] banCommandUsage1=/ [reason] @@ -157,16 +142,9 @@ consoleCannotUseCommand=Lệnh này chỉ có thể dùng bởi người chơi. compassBearing=§6Hướng\: {0} ({1} độ). compassCommandDescription=Mô tả phương hướng hiện tại của bạn. compassCommandUsage=/ -condenseCommandDescription=Gộp lại vật phẩm vào trong khối nhỏ gọn hơn. -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ -condenseCommandUsage1Description=Gộp lại tất cả vật phẩm trong túi đồ của bạn -condenseCommandUsage2=/ -condenseCommandUsage2Description=Gộp lại vật phẩm muốn gộp trong túi đồ của bạn configFileMoveError=Thất bại khi di chuyển config.yml tới vị trí sao lưu. configFileRenameError=Thất bại khi đổi tên tệp tin tạm thời thành config.yml. confirmClear=§7Để §lXÁC NHẬN§7 làm sạch túi đồ, vui lòng lặp lại lệnh\: §6{0} -confirmPayment=§7Để §lXÁC NHẬN§7 thanh toán của §6{0}§7, vui lòng lặp lại lệnh\: §6{1} connectedPlayers=§6Người chơi đã kết nối§r connectionFailed=Thất bại khi mở kết nối. consoleName=Bảng điều khiển @@ -185,7 +163,6 @@ createKitUnsupported=§4Vật phẩm có NBT tuần tự hóa đã được kíc creatingConfigFromTemplate=Đang tạo cấu hình từ mẫu\: {0} creatingEmptyConfig=Đang tạo cấu hình rỗng\: {0} creative=Sáng tạo -currency={0}{1} currentWorld=§6Thế giới hiện tại\:§c {0} customtextCommandDescription=Cho phép bạn tạo lệnh văn bản tùy chỉnh. customtextCommandUsage=/ - Được định nghĩa trong bukkit.yml @@ -307,16 +284,6 @@ dumpUrl=§6Đã tạo tệp dump\: §c{0} duplicatedUserdata=Dữ liệu người dùng trùng lặp\: {0} và {1}. durability=§6Công cụ này còn §c{0}§6 lần sử dụng nữa. east=E -ecoCommandDescription=Quản lý tiền tệ trong server. -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=Cho người chơi nhất định một số lượng tiền nhất định\n -ecoCommandUsage2=/ take -ecoCommandUsage2Description=Lấy số tiền được chỉ định từ người chơi được chỉ định -ecoCommandUsage3=/ set -ecoCommandUsage3Description=Chỉnh số dư của người chơi được chỉ định thành số dư được chỉ định -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=Đặt lại số dư của người chơi đã chỉ định về số dư ban đầu của server editBookContents=§eBây giờ bạn có thể chỉnh sửa nội dung của quyển sách này. enabled=kích hoạt enchantCommandDescription=Phù phép vật phẩm người dùng đang cầm. @@ -526,9 +493,7 @@ infoChapterPages=§e ---- §6{0} §e--§6 Trang §c{1}§6 của §c{2} §e---- infoCommandDescription=Hiển thị thông tin do chủ server đặt. infoPages=§e ---- §6{2} §e--§6 Trang §c{0}§6/§c{1} §e---- infoUnknownChapter=§4Chương không xác định. -insufficientFunds=§4Số dư hợp lệ không đủ. invalidBanner=§4Cú pháp biểu ngữ không hợp lệ. -invalidCharge=§4Nạp không hợp lệ. invalidFireworkFormat=§4Tuỳ chọn §c{0} §4không phải giá trị hợp lệ cho §c{1}§4. invalidHome=§4Nhà§c {0} §4không tồn tại\! invalidHomeName=§4Tên nhà không hợp lệ\! @@ -622,7 +587,6 @@ killCommandUsage1Description=Giết người chơi được chỉ định killExempt=§4Bạn không thể giết §c{0}§4. kitCommandUsage1=/ kitContains=§6Bộ dụng cụ §c{0} §6bao gồm\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4Không có bộ dụng cụ (kit) hợp lệ. kitError2=§4Bộ dụng cụ (kit) này đã bị sai, hãy liên hệ với quản trị viên. @@ -680,7 +644,6 @@ mailTooLong=§4Thư quá dài, hãy cố giữ nó dưới 1000 ký tự. markMailAsRead=§6Để đánh dấu thư đã đọc, gõ§c /mail clear§6. matchingIPAddress=§6Những người chơi sau đây đăng nhập tự địa chỉ IP trên\: maxHomes=§4Bạn không thể đặt nhiều hơn§c {0} §4nhà. -maxMoney=§4Giao dịch này sẽ vượt quá giới hạn tiền cho tài khoản nàyN không được hổ trợ trong phiên bản Bukkit này. mayNotJail=§4Bạn không thể giam người chơi này\! mayNotJailOffline=§4Bạn không thể giam người chơi ngoại tuyến. meCommandDescription=Mô tả một hành động trong ngữ cảnh của người chơi. @@ -696,8 +659,6 @@ mobsAvailable=§6MobsQuái\:§r {0} mobSpawnError=§4Có lỗi xảy ra khi thay đổi lồng quái. mobSpawnLimit=Số lượng quái bị giới hạn trên máy chủ. mobSpawnTarget=§4Đối tượng phải là một lồng quái. -moneyRecievedFrom=§a{0}§6 đã nhận được từ§a {1}§6. -moneySentTo=§aĐã gửi{0} đến {1}. month=tháng months=tháng moreCommandDescription=Làm đầy stack vật phẩm trong tay đến số lượng đã chỉ định hoặc đến kích thước tối đa nếu không có kích thước nào được chỉ định. @@ -714,7 +675,6 @@ msgtoggleCommandDescription=Chặn tất cả các tin nhắn riêng tư. msgtoggleCommandUsage=/ [player] [on|off] msgtoggleCommandUsage1=/ [người chơi] msgtoggleCommandUsage1Description=Bật tắt bay cho chính bạn hoặc người chơi khác nếu được chỉ định -multipleCharges=§4Bạn không thể thêm nhiều hơn 1 việc cho pháo hoa này. multiplePotionEffects=§4Bạn không thể đặt nhiều hơn một hiệu ứng cho thuốc này. muteCommandDescription=Tắt tiếng hoặc bỏ tắt tiếng một người chơi. mutedPlayer=§6Người chơi§c {0} §6đã bị cấm trò chuyện. @@ -730,7 +690,6 @@ muteNotifyForReason=§c{0} §6đã làm cho người chơi §c{1}§6 câm trong muteNotifyReason=§c{0} §6đã cấm người chơi §c{1}§6 trò chuyện. Lý do\: §c{2} nearCommandUsage1=/ nearbyPlayers=§6Người chơi ở gần\:§r {0} -negativeBalanceError=§4Người chơi không được phép có số dư âm. nickChanged=§6Biệt danh thay đổi. nickCommandUsage4Description=Loại bỏ một tên gọi nhất định nickDisplayName=§4Bạn phải kích hoạt change-displayname trong cấu hình Essentials. @@ -773,10 +732,8 @@ noPermToSpawnMob=§4Bạn không có quyền sinh ra quái này. noPlacePermission=§4Bạn không có quyền đặt khối ở gần cái bảng kia. noPotionEffectPerm=§4Bạn không có quyền để đặt hiệu ứng §c{0} §4to this potion. noPowerTools=§6Bạn không có công cụ điện được chỉ định. -notAcceptingPay=§4{0} §4không chấp nhận thanh toán. notAllowedToLocal=§4Bạn không đủ quyền hạn để nhắn trong kênh chat cục bộ. notEnoughExperience=§4Bạn không có đủ kinh nghiệm. -notEnoughMoney=§4Bạn không có đủ tiền. notFlying=không bay nothingInHand=§4Bạn không có gì trong tay. now=bây giờ @@ -789,18 +746,9 @@ onlyPlayers=§4Chỉ người chơi trong trò chơi có thể dùng §c{0}§4. onlyPlayerSkulls=§4Bạn chỉ có thể thiếp lập chủ nhân của cái sọ này (§c397\:3§4). onlySunStorm=§4/Chỉ hổ trợ thời tiết bão và nắng. openingDisposal=§6Opening disposal menu... -orderBalances=§6Đang tính toán số dư của§c {0} §6người chơi, xin đợi... oversizedMute=§4Bạn không thể cấm trò chuyện người chơi trong thời gian này. oversizedTempban=§4Bạn không thể cấm người chơi trong lúc này. passengerTeleportFail=§4Bạn không thể dịch chuyển khi đang chở hành khách. -payConfirmToggleOff=§6Từ giờ, bạn sẽ không còn bị nhắc xác nhận thanh toán. -payConfirmToggleOn=§6Từ giờ, bạn sẽ bị nhắc xác nhận thanh toán. -payMustBePositive=§4Số lượng phải là dương. -payToggleOff=§6Bây giờ bạn không còn chấp nhận thanh toán. -payToggleOn=§6Bây giờ bạn chấp nhận thanh toán. -payconfirmtoggleCommandUsage=/ -paytoggleCommandUsage=/ [người chơi] -paytoggleCommandUsage1=/ [người chơi] pendingTeleportCancelled=§4Việc xử lí yêu cầu dịch chuyển đã bị hủy. pingCommandDescription=Pong\! pingCommandUsage=/ @@ -892,8 +840,6 @@ requestDeniedFrom=§c{0} §6đã từ chối yêu cầu dịch chuyển của b requestSent=§6Gửi yêu cầu đến§c {0}§6. requestSentAlready=§4Bạn đã gửi {0}§4 yêu cầu dịch chuyển. requestTimedOut=§4Yêu cầu dịch chuyển đã quá hạn. -resetBal=§6Số dư đã được làm mới thành §c{0} §6cho tất cả người chơi trực tuyến. -resetBalAll=§6Số dư đã được làm mới thành §c{0} §6cho tất cả người chơi. restCommandUsage=/ [người chơi] restCommandUsage1=/ [người chơi] returnPlayerToJailError=§4Đã có lỗi khi cố gắng đưa người chơi§c {0} §4về lại tù\: §c{1}§4\! @@ -904,13 +850,9 @@ seconds=giây seenAccounts=§6Người chơi cũng được biết đến như là\:§c {0} seenOffline=§6Người chơi§c {0} §6đã §4ngoại tuyến§6 kể từ §c{1}§6. seenOnline=§6Người chơi§c {0} §6đã §atrực tuyến§6 kể từ §c{1}§6. -sellBulkPermission=§6Bạn không có quyền bán hàng loạt vật phẩm. -sellHandPermission=§6Bạn không có quyền bán vật phẩm trên tay. serverFull=Máy chủ đầy\! serverTotal=§6Tổng của máy chủ\:§c {0} serverUnsupported=Bạn đang sử dụng một phiên bản máy chủ không được hỗ trợ\! -setBal=§aSố dư của bạn được đặt thành {0}. -setBalOthers=§aBạn đa đặt số dư của {0}§a thành {1}. setSpawner=§6Chuyển loại lồng quái(Spawner) thành§c {0}§6. sethomeCommandUsage1=/ sethomeCommandUsage2=/ \: @@ -949,8 +891,6 @@ suicideCommandUsage=/ suicideMessage=§6Tạm biệt, thế giới ác độc \:< suicideSuccess=§6Người chơi §c{0} §6đã kết liễu đời mình. survival=Sinh tồn -takenFromAccount=§e{0}§a đã được rút từ tài khoản của bạn. -takenFromOthersAccount=§a{0} đã được lấy khỏi tài khoản {1}§a. Số dư mới\: {2} teleportAAll=§6Đã gửi yêu cầu dịch chuyển đến tất cả người chơi... teleportAll=§6Đã dịch chuyển tất cả người chơi teleportationCommencing=§6Đang bắt đầu dịch chuyển... @@ -1010,8 +950,6 @@ tprCommandUsage1=/ tps=§6TPS hiện tại \= {0} tptoggleCommandUsage=/ [player] [on|off] tptoggleCommandUsage1=/ [người chơi] -tradeSignEmpty=§4Cái bảng trao đổi này không có sẵn cho bạn. -tradeSignEmptyOwner=§4Không có gì để thu thập từ bảng trao đổi này. treeFailure=§4Trồng cây thất bại. Hãy thử lại trên cỏ hoặc đất. treeSpawned=§6Cây đã được trồng. true=§ađúng§r @@ -1056,7 +994,6 @@ vanish=§6Ẩn thân cho {0}§6\: {1} vanishCommandUsage=/ [player] [on|off] vanishCommandUsage1=/ [người chơi] vanished=§6Giờ bạn đã hoàn toàn tàng hình với người chơi, bạn sẽ được ẩn với các lệnh trong trò chơi. -versionOutputVaultMissing=§4Vault chưa được cài đặt. Trò chuyện và quyền có thể không hoạt động. versionOutputFine=§6{0} phiên bản\: §a{1} versionOutputWarn=§6{0} phiên bản\: §c{1} versionOutputUnsupported=§d{0} §6phiên bản\: §d{1} @@ -1101,7 +1038,6 @@ whoisHunger=§6 - Độ đói\:§r {0}/20 (+{1} bão hòa) whoisIPAddress=§6 - Địa chỉ IP\:§r {0} whoisJail=§6 - Bị giam\:§r {0} whoisLocation=§6 - Vị trí\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - Tiền\:§r {0} whoisMuted=§6 - Bị cấm trò chuyện\:§r {0} whoisMutedReason=§6 - Đã cấm trò chuyện\: §r {0} §6Lý do\: §c{1} whoisNick=§6 - Biệt danh\:§r {0} @@ -1112,9 +1048,6 @@ whoisTop=§6 \=\=\=\=\=\= WhoIs\:§c {0} §6\=\=\=\=\=\= whoisUuid=§6 - UUID\:§r {0} workbenchCommandUsage=/ worldCommandUsage1=/ -worth=§aTổng số {0} có giá trị §c{1}§a ({2} vật phẩm và {3} với mỗi vật phẩm) -worthMeta=§aTổng số {0} với dữ liệu (data) {1} có giá trị §c{2}§a ({3} vật phẩm và {4} với mỗi vật phẩm) -worthSet=§6Đặt số lượng giá trị year=năm years=năm youAreHealed=§6Bạn đã được hồi phục. diff --git a/Essentials/src/main/resources/messages_zh.properties b/Essentials/src/main/resources/messages_zh.properties index 7820e5e2a..0f6d872b5 100644 --- a/Essentials/src/main/resources/messages_zh.properties +++ b/Essentials/src/main/resources/messages_zh.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0}已被加入到你的账户。 -addedToOthersAccount=§a{0}已被加入到{1}§a的账户,目前余额:{2} adventure=冒险模式 afkCommandDescription=将你标记为暂时离开。 afkCommandUsage=/ [玩家/消息…] @@ -47,20 +45,6 @@ backupFinished=§6备份完成。 backupStarted=§6备份开始。 backupInProgress=§6外部备份脚本正在运行中!在脚本完成前插件将禁用。 backUsageMsg=§6正在回到上一位置。 -balance=§a余额:§c{0} -balanceCommandDescription=显示一位玩家当前持有的余额。 -balanceCommandUsage=/ [玩家] -balanceCommandUsage1=/ -balanceCommandUsage1Description=查看你当前的余额 -balanceCommandUsage2=/ <玩家> -balanceCommandUsage2Description=展示指定玩家当前的余额 -balanceOther=§a{0}的余额§a:§c {1} -balanceTop=§6金钱排行:({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=获取金钱排行榜。 -balancetopCommandUsage=/ [页码] -balancetopCommandUsage1=/ [页码] -balancetopCommandUsage1Description=展示金钱排行榜的第一(或指定)页 banCommandDescription=封禁一位玩家。 banCommandUsage=/ <玩家> [理由] banCommandUsage1=/ <玩家> [理由] @@ -161,16 +145,9 @@ consoleCannotUseCommand=此命令不能在控制台使用。 compassBearing=§6方向:{0}({1} 度)。 compassCommandDescription=描述你当前的方位。 compassCommandUsage=/ -condenseCommandDescription=将可合成为方块的物品合成为方块(例如:钻石合成为钻石块)。 -condenseCommandUsage=/ [物品] -condenseCommandUsage1=/ -condenseCommandUsage1Description=压缩你物品栏中的所有物品 -condenseCommandUsage2=/ <物品> -condenseCommandUsage2Description=压缩你物品栏中的指定物品 configFileMoveError=移动config.yml文件到备份位置失败。 configFileRenameError=重命名缓存文件为config.yml失败。 confirmClear=§7若要§l确认§7清空物品栏,请再输一次命令:§6{0} -confirmPayment=§7若要§l确认支付§6{0}§7,请再次输入命令:§6{1} connectedPlayers=§6当前在线:§r connectionFailed=无法建立连接。 consoleName=控制台 @@ -189,7 +166,6 @@ createKitUnsupported=§4已开启NBT序列化,但由于正在使用的服务 creatingConfigFromTemplate=从模板创建配置:{0} creatingEmptyConfig=创建空的配置:{0} creative=创造模式 -currency={0}{1} currentWorld=§6当前世界:§c{0} customtextCommandDescription=创建自定义文本命令。 customtextCommandUsage=/ - 定义于 bukkit.yml @@ -313,16 +289,6 @@ dumpUrl=§6已创建服务器转储文件:§c{0} duplicatedUserdata=重复的玩家数据:{0} 和 {1}。 durability=§6这个工具剩余耐久值为§4{0}§6。 east=E -ecoCommandDescription=管理服务器的经济。 -ecoCommandUsage=/ <玩家> <数量> -ecoCommandUsage1=/ give <玩家> <数量> -ecoCommandUsage1Description=给予指定的玩家给定数量的钱 -ecoCommandUsage2=/ take <玩家> <数量> -ecoCommandUsage2Description=从指定的玩家拿走给定数量的钱 -ecoCommandUsage3=/ set <玩家> <数量> -ecoCommandUsage3Description=设置指定的玩家的余额为给定数量 -ecoCommandUsage4=/ reset <玩家> <数量> -ecoCommandUsage4Description=使指定玩家的余额重置到服务器设置的初始余额 editBookContents=§e你现在可以编辑这本书的内容了。 enabled=开启 enchantCommandDescription=附魔正在拿着的物品。 @@ -540,9 +506,7 @@ infoCommandDescription=显示服务器所有者设置的信息。 infoCommandUsage=/ [章节] [页数] infoPages=§e----§6{2}§e--第§c{0}§e页/共§c{1}§e页---- infoUnknownChapter=§4未知章节。 -insufficientFunds=§4可用资金不足。 invalidBanner=§4非法的标题语法。 -invalidCharge=§4非法的价格。 invalidFireworkFormat=§4选项§c{0}§4对§c{1}§4不是一个有效的值§4。 invalidHome=§4家§c{0}§4不存在! invalidHomeName=§4无效的家名称! @@ -659,7 +623,6 @@ kitCommandUsage1Description=列出可用的物品包 kitCommandUsage2=/ <物品包> [玩家] kitCommandUsage2Description=给予你自己(或选定玩家)一个指定的物品包 kitContains=§6物品包§c{0}§6包含如下物品: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4没有有效的物品包。 kitError2=§4该物品包的配置不正确。请联系管理员。 @@ -739,7 +702,6 @@ mailTooLong=§4邮件字数超过限制。请使邮件字数保持在1000个字 markMailAsRead=§6若要标记你的邮件为已读,输入§c/mail clear§6。 matchingIPAddress=§6以下是使用该IP地址登录的玩家: maxHomes=§4你无法设置超过{0}个家。 -maxMoney=§4交易金额超出此账户的余额。 mayNotJail=§4你无法囚禁该玩家! mayNotJailOffline=§4你无法囚禁已离线玩家。 meCommandDescription=以第三人称描述一件事。 @@ -748,7 +710,6 @@ meCommandUsage1=/ <描述> meCommandUsage1Description=描述一个动作 meSender=我 meRecipient=我 -minimumBalanceError=§4玩家能够持有的最低余额为{0}。 minimumPayAmount=§c你可以支付的最低金额是{0}。 minute=分钟 minutes=分钟 @@ -758,8 +719,6 @@ mobsAvailable=§6生物:§r {0} mobSpawnError=§4更改刷怪笼内生物时发生错误。 mobSpawnLimit=生物数量超出服务器限制。 mobSpawnTarget=§4目标方块必须是一个刷怪笼。 -moneyRecievedFrom=从§a{1}§6收到了§a{0}§6。 -moneySentTo=§a{0}已发送到{1}。 month=月 months=月 moreCommandDescription=将手中的物品堆叠至指定值,如果未指定则为最大值。 @@ -784,7 +743,6 @@ msgtoggleCommandDescription=拒绝接收所有私信。 msgtoggleCommandUsage=/ [玩家] [on|off] msgtoggleCommandUsage1=/ [玩家] msgtoggleCommandUsage1Description=切换你(或指定玩家)的飞行模式 -multipleCharges=§4你不能对这个烟花应用多种填充物。 multiplePotionEffects=§4你不能对这个药水应用多种效果。 muteCommandDescription=禁言(或取消禁言)玩家。 muteCommandUsage=/ <玩家> [时间] [理由] @@ -815,7 +773,6 @@ nearCommandUsage4=/ <玩家> <半径> nearCommandUsage4Description=列出以指定玩家为中心给定范围内的所有玩家 nearbyPlayers=§6附近的玩家:§r{0} nearbyPlayersList={0}§f(§c{1}公尺§f) -negativeBalanceError=§4用户余额不可小于零。 nickChanged=§6昵称已修改。 nickCommandDescription=更改你的或其他玩家的昵称。 nickCommandUsage=/ [玩家] <昵称|off> @@ -867,12 +824,10 @@ noPermToSpawnMob=§4你没有生成该生物的权限。 noPlacePermission=§4你没有在那个牌子旁边放方块的权限。 noPotionEffectPerm=§4你没有权限应用效果§c{0}§4到这个药水。 noPowerTools=§6你没有绑定快捷命令工具。 -notAcceptingPay=§4{0}§4不接受付款。 notAllowedToLocal=§4你没有在本地聊天发言的权限。 notAllowedToQuestion=§4你没有提问的权限。 notAllowedToShout=§4你没有喊话的权限。 notEnoughExperience=§4你没有足够的经验值。 -notEnoughMoney=§4你没有足够的资金。 notFlying=未飞行 nothingInHand=§4你手上没有任何物品。 now=现在 @@ -888,28 +843,9 @@ onlyPlayers=§4只有在游戏的玩家才能使用§c{0}§4。 onlyPlayerSkulls=§4你只能设置玩家头颅的拥有者(§c397\:3§4)。 onlySunStorm=§4/weather 命令只有sun/storm两个参数。 openingDisposal=§6正在打开垃圾桶菜单... -orderBalances=§6排序§c{0}§6位玩家的资金中,请稍候…… oversizedMute=§4你在一段时间内无法禁言该玩家。 oversizedTempban=§4你无法在这个时段封禁玩家。 passengerTeleportFail=§4你无法在骑乘时传送。 -payCommandDescription=向一位玩家支付你的货币。 -payCommandUsage=/ <玩家> <数量> -payCommandUsage1=/ <玩家> <数量> -payCommandUsage1Description=让指定的玩家付出给定数量的钱 -payConfirmToggleOff=§6你关闭了支付确认提示。 -payConfirmToggleOn=§6你开启了支付确认提示。 -payDisabledFor=§6已拒绝接受来自§c{0}§6的付款。 -payEnabledFor=§6已允许接受来自§c{0}§6的付款。 -payMustBePositive=§4支付金额必须是一个正数。 -payOffline=§4你无法向离线玩家付款。 -payToggleOff=§6你不再接受付款了。 -payToggleOn=§6你现在接受付款了。 -payconfirmtoggleCommandDescription=切换是否在支付的时候显示确认提示。 -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=切换是否接受付款。 -paytoggleCommandUsage=/ [玩家] -paytoggleCommandUsage1=/ [玩家] -paytoggleCommandUsage1Description=让你(或其它指定玩家)接受他人付款 pendingTeleportCancelled=§4待处理的传送请求已取消 pingCommandDescription=啪! pingCommandUsage=/ @@ -1077,8 +1013,6 @@ requestSent=§6请求已发送给§c{0}§6。 requestSentAlready=§4你已经给{0}§4发送了一个传送请求。 requestTimedOut=§4传送请求已超时。 requestTimedOutFrom=§4来自§c{0}§4的传送请求已超时。 -resetBal=§6所有在线玩家的金钱已被重置为§c{0}§6。 -resetBalAll=§6所有玩家的金钱已被重置为§c{0}§6。 rest=§6你休息好了。 restCommandDescription=让自己(或你选定的玩家)休息。 restCommandUsage=/ [玩家] @@ -1100,18 +1034,6 @@ seenCommandUsage1=/ <玩家> seenCommandUsage1Description=显示指定玩家的登出时间、封禁、禁言和UUID详细信息 seenOffline=§c{0}§6于§c{1}§4离线§6。 seenOnline=§c{0}§6于§c{1}§a后在线§6。 -sellBulkPermission=§6你没有批量出售物品的权限。 -sellCommandDescription=卖出手中的物品。 -sellCommandUsage=/ <<物品名>||hand|inventory|blocks> [数量] -sellCommandUsage1=/ <物品名> [数量] -sellCommandUsage1Description=出售所有(或指定数量的)于你物品栏中的指定物品 -sellCommandUsage2=/ hand [数量] -sellCommandUsage2Description=出售所有(或指定数量的)你目前手持的物品 -sellCommandUsage3=/ all -sellCommandUsage3Description=出售所有你物品栏中有价值的东西 -sellCommandUsage4=/ blocks [数量] -sellCommandUsage4Description=出售所有(或指定数量的)于你物品栏中的指定方块 -sellHandPermission=§6你没有出售手上物品的权限。 serverFull=服务器已满! serverReloading=这可以让你的服务器立即重载。但你为什么要这样做呢?请不要指望EssentialsX团队会提供使用/reload命令后发生问题的任何支持。 serverTotal=§6服务器总和:{0} @@ -1122,8 +1044,6 @@ serverUnsupportedDangerous=你正在运行一个已知极其危险且会导致 serverUnsupportedLimitedApi=你正在运行一个API功能受限的服务器。尽管如此,EssentialsX仍然会启动。某些功能可能会因此被禁用。 serverUnsupportedDumbPlugins=你正在使用已知会与EssentialsX和其他插件产生严重问题的插件。 serverUnsupportedMods=你正在运行的服务器无法正常支持Bukkit插件。Bukkit插件不应与Forge/Fabric mod一起使用!Forge建议使用ForgeEssentials(或SpongeForge + Nucleus)代替本插件。 -setBal=§a你的余额已被设置为{0}。 -setBalOthers=§a你设置了{0}的余额为{1}。 setSpawner=§6已修改刷怪笼类别为§c{0}§6。 sethomeCommandDescription=在当前位置设置家。 sethomeCommandUsage=/ [[玩家\:]名字] @@ -1149,12 +1069,6 @@ setwarpCommandDescription=创建新的传送点。 setwarpCommandUsage=/ <传送点> setwarpCommandUsage1=/ <传送点> setwarpCommandUsage1Description=在你目前的位置设立一个指定名字的传送点 -setworthCommandDescription=设置一件物品的出售价值。 -setworthCommandUsage=/ [物品名|id] <价值> -setworthCommandUsage1=/ <价格> -setworthCommandUsage1Description=为你手持的物品设置价格 -setworthCommandUsage2=/ <物品名> <价格> -setworthCommandUsage2Description=为指定物品设置价格 sheepMalformedColor=§4格式不正确的颜色。 shoutDisabled=§6呼喊模式§c已禁用§6。 shoutDisabledFor=§6已为§c{0}禁用§6呼喊模式。 @@ -1244,8 +1158,6 @@ suicideCommandUsage=/ suicideMessage=§6再见,残酷的世界…… suicideSuccess=§c{0}§6结束了自己的生命。 survival=生存模式 -takenFromAccount=§e{0}§a已经从你的账户中扣除。 -takenFromOthersAccount=§e{1}§a账户扣除了§e{0}§a。目前余额:§e{2} teleportAAll=§6已向所有玩家发送了传送请求…… teleportAll=§6将所有玩家传送到了你这里…… teleportationCommencing=§6准备传送…… @@ -1399,8 +1311,6 @@ tptoggleCommandDescription=阻止所有形式的传送。 tptoggleCommandUsage=/ [玩家] [on|off] tptoggleCommandUsage1=/ [玩家] tptoggleCommandUsageDescription=为你自己(或指定玩家)切换是否开启传送 -tradeSignEmpty=§4交易牌上没有你可获得的东西。 -tradeSignEmptyOwner=§4交易牌上没有你可收集的东西。 treeCommandDescription=在你的光标所指向的位置生成一棵树。 treeCommandUsage=/ treeCommandUsage1=/ @@ -1481,12 +1391,10 @@ versionDevLatest=§6你正在运行最新的EssentialsX开发版本! versionError=§4获取EssentialsX版本信息时发生错误!构建信息:§c{0}§6。 versionErrorPlayer=§6检查EssentialsX版本信息时发生错误! versionFetching=§6正在获取版本信息... -versionOutputVaultMissing=§4Vault未安装。聊天与权限系统可能不会运作。 versionOutputFine=§6{0}版本:§a{1} versionOutputWarn=§6{0}版本:§c{1} versionOutputUnsupported=§d{0}§6版本:§d{1} versionOutputUnsupportedPlugins=§6你正在运行一个§d不支持的插件§6! -versionOutputEconLayer=§6经济层:§r{0} versionMismatch=§4版本不匹配!请升级{0}到相同版本。 versionMismatchAll=§4版本不匹配!请升级Essentials系列所有的jar插件到相同版本。 versionReleaseLatest=§6你正在运行最新的EssentialsX稳定版! @@ -1548,7 +1456,6 @@ whoisHunger=§6 - 饥饿:§r{0}/20(+{1}饱食度) whoisIPAddress=§6 - IP地址:§r{0} whoisJail=§6 - 监狱:§r{0} whoisLocation=§6 - 坐标:§r({0},{1}, {2}, {3}) -whoisMoney=§6 - 余额:§r{0} whoisMuted=§6 - 已被禁言:§r{0} whoisMutedReason=§6 - 已被禁言:§r{0} §6理由:§c{1} whoisNick=§6 - 昵称:§r{0} @@ -1565,19 +1472,6 @@ worldCommandUsage1=/ worldCommandUsage1Description=将你传送到下界(或主世界)的对应位置 worldCommandUsage2=/ <世界> worldCommandUsage2Description=传送你到指定世界的对应位置 -worth=§6一组{0}价值§4{1}§6({2}单位物品,每个价值{3}) -worthCommandDescription=计算手中(或指定物品)的价值。 -worthCommandUsage=/ <||hand|inventory|blocks> [-][数量] -worthCommandUsage1=/ <物品名> [数量] -worthCommandUsage1Description=检查你物品栏中所有(或指定数量的)指定物品的价值 -worthCommandUsage2=/ hand [数量] -worthCommandUsage2Description=检查你手中所持的所有(或指定数量的)指定物品的价值 -worthCommandUsage3=/ all -worthCommandUsage3Description=检查你物品栏中所有有价值的物品 -worthCommandUsage4=/ blocks [数量] -worthCommandUsage4Description=检查你物品栏中的指定方块中所有(或指定数量的)方块的价值 -worthMeta=§a一组元数据为{1}的{0}价值§c{2}§6({3}单位物品,每个价值{4}) -worthSet=§6价格已设置 year=年 years=年 youAreHealed=§6你已被治疗。 diff --git a/Essentials/src/main/resources/messages_zh_HK.properties b/Essentials/src/main/resources/messages_zh_HK.properties index 003a7310a..97183aa6b 100644 --- a/Essentials/src/main/resources/messages_zh_HK.properties +++ b/Essentials/src/main/resources/messages_zh_HK.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a{0} 已添加到你的銀行賬戶 -addedToOthersAccount=§a{0} 已被添加到 {1} §a的賬戶.目前餘額\: {2} adventure=冒險模式 alertBroke=破壞\: alertFormat=§3[{0}] §r {1} §6 {2} 於\: {3} @@ -28,9 +26,6 @@ backupDisabled=§4備份配置文件未被設置. backupFinished=§6備份完成. backupStarted=§6備份開始 backUsageMsg=§6回到上一位置 -balance=§a現金\:{0} -balanceOther=§a{0}的金錢\:§c {1} -balanceTop=§6金錢排行\:{0} banExempt=§4你不能封禁那個玩家§r banExemptOffline=§4你不能封鎖離線玩家。 banFormat=§4已封禁\:§r {0} @@ -69,7 +64,6 @@ compassBearing=§6軸承\: {0} ({1} 度). configFileMoveError=移動config.yml文件到備份位置失敗 configFileRenameError=重命名緩存文件為config.yml失敗 confirmClear=§7To §lCONFIRM§7 inventory clear, please repeat command\: §6{0} -confirmPayment=§7To §lCONFIRM§7 payment of §6{0}§7, please repeat command\: §6{1} connectedPlayers=§6目前在線\: §r connectionFailed=連接失敗. cooldownWithMessage=§4冷卻時間\:{0} @@ -82,7 +76,6 @@ createKitSuccess=§6Created Kit\: §f{0}\n§6Delay\: §f{1}\n§6Link\: §f{2}\n creatingConfigFromTemplate=從模版\:{0} 創建配置 creatingEmptyConfig=創建空的配置\:{0} creative=創造模式 -currency={0}{1} currentWorld=§6當前世界\:§4 {0} day=天 days=天 @@ -190,9 +183,7 @@ infoChapter=§6選擇章節\: infoChapterPages=§e ---- §6{0} §e--§6 頁面\: §c{1}§6 / §c{2} §e---- infoPages=§e----第 §c{0}§e 頁/共 §c{1}§e 頁---- infoUnknownChapter=§4未知章節。 -insufficientFunds=§4可用資金不足. invalidBanner=§4Invalid banner syntax. -invalidCharge=§4無效的價格 invalidFireworkFormat=§4The option §c{0} §4is not a valid value for §c{1}§4. invalidHome=§4家§c {0} §4不存在\! invalidHomeName=§4無效的家名稱\! @@ -246,7 +237,6 @@ kickExempt=§4你無法請出該玩家. kill=§6殺死了 §c{0} killExempt=§4你不能殺害 §c{0}§4。 kitContains=§6Kit §c{0} §6contains\: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4沒有有效的工具包 kitError2=§4該工具包可能不存在或者被拒絕了. @@ -278,7 +268,6 @@ mailTooLong=§4郵件訊息過長,請不要超過1000字。 markMailAsRead=§6輸入§c /mail clear§6 將郵件標示為已讀。 matchingIPAddress=§6以下是來自該IP位址的玩家\: maxHomes=§4你無法設置超過 {0} 個家. -maxMoney=§4這筆交易將超出此帳戶的餘額限制 mayNotJail=§4你無法囚禁該玩家 mayNotJailOffline=§4你不能將離線玩家關入監獄。 meSender=我 @@ -292,8 +281,6 @@ mobsAvailable=§6生物\:§r {0} mobSpawnError=§4更改刷怪籠時發生錯誤 mobSpawnLimit=生物數量太多,無法生成 mobSpawnTarget=§4目標方塊必須是一個刷怪籠 -moneyRecievedFrom=§a{0}§6 已收到來自 §a {1}§6. -moneySentTo=§a{0} 已發送到 {1} month=月 months=月 moreThanZero=§4數量必須大於0 @@ -304,7 +291,6 @@ msgEnabled=§6Receiving messages §cenabled§6. msgEnabledFor=§6Receiving messages §cenabled §6for §c{0}§6. msgFormat=§6[§c{0}§6 -> §c{1}§6] §r{2} msgIgnore=§c{0} §4has messages disabled. -multipleCharges=§4您不能對這個煙花應用多於一個的裝料. multiplePotionEffects=§4您不能對這個煙花應用多於一個的效果. mutedPlayer=§6玩家§c {0} §6被禁言了。 mutedPlayerFor=§6玩家§c {0} §6被禁言§c {1}§6。 @@ -318,7 +304,6 @@ muteNotifyFor=§c{0} §6has muted player §c{1}§6 for§c {2}§6. muteNotifyForReason=§c{0} §6已將玩家 §c{1} §6禁言. §6時長\:§c {2}§6. 原因\: §c{3} muteNotifyReason=§6玩家§c {1} §6被§c {0} §6禁言. 原因\: §c{2}§6. nearbyPlayers=§6附近的玩家\: {0} -negativeBalanceError=§4現金不可小於零 nickChanged=§6暱稱已更換 nickDisplayName=§4你需要激活change-displayname.該文件在Essentials設置文件中 nickInUse=§4那個暱稱已被使用 @@ -358,9 +343,7 @@ noPermToSpawnMob=§4你沒有生成該生物的權限 noPlacePermission=§4§4你沒有在那個牌子旁邊放方塊的權利 noPotionEffectPerm=§4你沒有權限應用特效 §c{0} §4到這個藥水. noPowerTools=§6你沒有綁定命令 -notAcceptingPay=§4{0} §4is not accepting payment. notEnoughExperience=§4你沒有足夠的經驗值 -notEnoughMoney=§4你沒有足夠的資金 notFlying=未飛行 nothingInHand=§4你沒有持有任何物品 now=現在 @@ -372,15 +355,9 @@ onlyPlayers=§4只有遊戲中的玩家可以使用 §c{0}§4。 onlyPlayerSkulls=§4你只能設定玩家頭顱 (§c397\:3§4) 的擁有者。 onlySunStorm=§4/weather 命令只有 sun/storm 兩個選擇 openingDisposal=§6Opening disposal menu... -orderBalances=§6排序 {0} §6個玩家的資金中,請稍候…… oversizedMute=§4你無法禁言該玩家. oversizedTempban=§4你可能沒有在這個時段封禁玩家. passengerTeleportFail=§4你無法在乘坐時被傳送. -payConfirmToggleOff=§6You will no longer be prompted to confirm payments. -payConfirmToggleOn=§6You will now be prompted to confirm payments. -payMustBePositive=§4Amount to pay must be positive. -payToggleOff=§6You are no longer accepting payments. -payToggleOn=§6You are now accepting payments. pendingTeleportCancelled=§4待處理的傳送請求已取消 pingCommandDescription=啪! playerBanIpAddress=§6Player§c {0} §6banned IP address§c {1} §6for\: §c{2}§6. @@ -466,8 +443,6 @@ requestDeniedFrom=§c{0}§6 拒絕了你的傳送請求 requestSent=§6請求已發送給 {0}§6 requestSentAlready=§4You have already sent {0}§4 a teleport request. requestTimedOut=§4傳送請求超時…… -resetBal=§6所有在線玩家的財產已經重置為 §c{0} §6。 -resetBalAll=§6所有玩家的財產已經重置為 §c{0} §6。 returnPlayerToJailError=§4嘗試將玩家§c {0} §4關回監獄 §c{1}§4 時發生錯誤! runningPlayerMatch=§6正在搜索匹配的玩家 §c{0}§6 (這可能會花費一些時間) second=秒 @@ -475,13 +450,9 @@ seconds=秒 seenAccounts=§6Player has also been known as\:§c {0} seenOffline=§6玩家§c {0} §6在 §c{1}§6 已經 §4離線§6。 seenOnline=§6玩家§c {0} §6在 §c{1}§6 已經 §a上線§6。 -sellBulkPermission=§6You do not have permission to bulk sell. -sellHandPermission=§6You do not have permission to hand sell. serverFull=服務器已滿 serverTotal=§6服務器總和\: {0} serverUnsupported=你正在運行不被支援的伺服器版本\! -setBal=§a你的金錢已被設置為 {0}. -setBalOthers=§a成功設置 {0} 的金錢為 {1}. setSpawner=§6改變生怪磚型態為§c {0}§6。 sheepMalformedColor=§4無效的顏色 shoutFormat=§6[喊話]§r {0} @@ -507,8 +478,6 @@ sudoRun=§6Forcing§c {0} §6to run\:§r /{1} suicideMessage=§6永別了,殘酷的世界…… suicideSuccess=§c{0} §6結束了他自己的生命 survival=生存模式 -takenFromAccount=§e{0}§a 已從你的賬戶中扣除. -takenFromOthersAccount=§e{1}§a 扣除了 §e{0}§a. 目前金錢\:§e {2} teleportAAll=§6向所有玩家發送了傳送請求…… teleportAll=§6傳送了所有玩家…… teleportationCommencing=§6準備傳送... @@ -550,8 +519,6 @@ totalSellableBlocks=§a所有可賣出方塊的價值為§c{1}§a. totalWorthAll=§a出售的所有物品和方塊,總價值 {1}. totalWorthBlocks=§a出售的所有方塊塊,總價值 {1}. tps=§6當前 TPS \= {0} -tradeSignEmpty=§4交易牌上沒有你可獲得的東西 -tradeSignEmptyOwner=§4交易牌上沒有你可收集的東西 treeFailure=§4生成樹木失敗,在草塊上或土上再試一次 treeSpawned=§6生成樹木成功 true=§a是§r @@ -586,7 +553,6 @@ userUnknown=§4警告\: 這個玩家 §c{0}§4 從來沒有加入過服務器. usingTempFolderForTesting=使用緩存文件夾來測試\: vanish=§6將 {0} §6的隱形模式 {1} vanished=§6已進入隱身模式,玩家將無法看到你. -versionOutputVaultMissing=§4未安裝 Vault. 聊天與權限可能無法運作. versionOutputFine=§6{0} 版本\: §a{1} versionOutputWarn=§6{0} 版本\: §c{1} versionOutputUnsupported=§d{0} §6版本\: §d{1} @@ -626,7 +592,6 @@ whoisHunger=§6 - 飢餓\:§r {0}/20 (+{1} 飽食度) whoisIPAddress=§6 - IP位址\:§r {0} whoisJail=§6 - 監獄\:§r {0} whoisLocation=§6 - 坐標\:§r ({0}, {1}, {2}, {3}) -whoisMoney=§6 - 現金\:§r {0} whoisMuted=§6 - 禁言\:§r {0} whoisMutedReason=§6 - 禁言\:§r {0} §6原因\: §c{1} whoisNick=§6 - 暱稱\:§r {0} @@ -635,9 +600,6 @@ whoisPlaytime=§6 - Playtime\:§r {0} whoisTempBanned=§6 - Ban expires\:§r {0} whoisTop=§6 \=\=\=\=\=\= §c {0} §6的資料\=\=\=\=\=\= whoisUuid=§6 - UUID\:§r {0} -worth=§6一組 {0} 價值 §4{1}§6({2} 單位物品,每個價值 {3}) -worthMeta=§a一組副碼為 {1} 的 {0} 價值 §c{2}§6({3} 單位物品,每個價值 {4}) -worthSet=§6價格已設置 year=年 years=年 youAreHealed=§6你已被治療 diff --git a/Essentials/src/main/resources/messages_zh_TW.properties b/Essentials/src/main/resources/messages_zh_TW.properties index a9aa8bb46..f7433902d 100644 --- a/Essentials/src/main/resources/messages_zh_TW.properties +++ b/Essentials/src/main/resources/messages_zh_TW.properties @@ -3,8 +3,6 @@ # Single quotes have to be doubled: '' # by: action=§5* {0} §5{1} -addedToAccount=§a已新增 {0} 到你的帳戶。 -addedToOthersAccount=§a已新增 {0} 到 {1} §a的帳戶。目前金錢餘額:{2}。 adventure=冒險模式 afkCommandDescription=將你標記為暫時離開。 afkCommandUsage=/ [player/message...] @@ -47,20 +45,6 @@ backupFinished=§6備份完成。 backupStarted=§6開始備份。 backupInProgress=§6正在執行外部備份腳本!直到備份完成前,插件將會持續停用。 backUsageMsg=§6返回上一個位置。 -balance=§a金錢餘額:§c{0} -balanceCommandDescription=顯示玩家目前的金錢餘額。 -balanceCommandUsage=/ [player] -balanceCommandUsage1=/ -balanceCommandUsage1Description=顯示你目前的金錢餘額 -balanceCommandUsage2=/ -balanceCommandUsage2Description=顯示指定玩家目前的金錢餘額 -balanceOther=§a{0}§a 的金錢餘額:§c{1} -balanceTop=§6金錢排行:({0}) -balanceTopLine={0}. {1}, {2} -balancetopCommandDescription=獲得金錢排行。 -balancetopCommandUsage=/ [page] -balancetopCommandUsage1=/ [page] -balancetopCommandUsage1Description=顯示第一頁或指定頁數的金錢排行 banCommandDescription=封禁玩家。 banCommandUsage=/ [reason] banCommandUsage1=/ [reason] @@ -161,16 +145,9 @@ consoleCannotUseCommand=此指令無法在控制台使用。 compassBearing=§6方位:{0}({1} 度) compassCommandDescription=描述你目前的方位。 compassCommandUsage=/ -condenseCommandDescription=合成物品為更緊實的方塊。 -condenseCommandUsage=/ [item] -condenseCommandUsage1=/ -condenseCommandUsage1Description=合成所有物品欄內的物品為更緊實的物品 -condenseCommandUsage2=/ -condenseCommandUsage2Description=合成指定物品為更緊實的物品 configFileMoveError=將 config.yml 檔案移到備份位置失敗。 configFileRenameError=將暫存檔案重新命名為 config.yml 失敗。 confirmClear=§7若§l確認§7清空物品欄,請再次輸入指令:§6{0} -confirmPayment=§7若要§l確認§7支付 §6{0}§7,請再次輸入指令:§6{1} connectedPlayers=§6目前線上玩家§r connectionFailed=開啟連接失敗。 consoleName=控制台 @@ -189,7 +166,6 @@ createKitUnsupported=§4已啟用 NBT 物品序列化,但此伺服器端並不 creatingConfigFromTemplate=從模版 {0} 建立配置。 creatingEmptyConfig=建立空白配置:{0} creative=創造模式 -currency={0}{1} currentWorld=§6目前的世界:§c{0} customtextCommandDescription=允許建立自訂文字指令。 customtextCommandUsage=/ - 定義 bukkit.yml @@ -313,16 +289,6 @@ dumpUrl=§6已建立伺服器傾印檔案:§c{0} duplicatedUserdata=玩家資料重複:{0} 和 {1}。 durability=§6此工具還有 §c{0}§6 點耐久度。 east=東 -ecoCommandDescription=管理伺服器經濟。 -ecoCommandUsage=/ -ecoCommandUsage1=/ give -ecoCommandUsage1Description=給予指定玩家指定數目的金錢 -ecoCommandUsage2=/ take -ecoCommandUsage2Description=從指定玩家提取指定金額 -ecoCommandUsage3=/ set -ecoCommandUsage3Description=設定指定玩家的金錢為指定數目 -ecoCommandUsage4=/ reset -ecoCommandUsage4Description=重設指定玩家的金錢為伺服器初始餘額 editBookContents=§e你現在可以編輯這本書的內容。 enabled=啟用 enchantCommandDescription=附魔玩家手中的物品。 @@ -540,9 +506,7 @@ infoCommandDescription=顯示伺服器所有者設定的資訊。 infoCommandUsage=/ [chapter] [page] infoPages=§e----第 §c{0}§e 頁/共 §c{1}§e 頁---- infoUnknownChapter=§4未知訊息。 -insufficientFunds=§4可用資金不足。 invalidBanner=§4無效的旗幟語法。 -invalidCharge=§4無效的價格。 invalidFireworkFormat=§4選項 §c{0} §4不是一個在 §c{1}§4 已知的設定。 invalidHome=§4家點§c {0} §4不存在! invalidHomeName=§4無效的家點名稱! @@ -659,7 +623,6 @@ kitCommandUsage1Description=列出所有可用工具包 kitCommandUsage2=/ [player] kitCommandUsage2Description=將指定工具包給予你或指定玩家 kitContains=§6工具包 §c{0} §6包含: -kitCost=\ §7§o({0})§r kitDelay=§m{0}§r kitError=§4沒有有效的工具包。 kitError2=§4此工具包的配置不正確。請聯絡管理員。 @@ -739,7 +702,6 @@ mailTooLong=§4郵件訊息過長,請不要超過 1000 字。 markMailAsRead=§6輸入§c /mail clear§6 將郵件標示為已讀。 matchingIPAddress=§6以下是使用此 IP 位址的玩家: maxHomes=§4你無法設立超過§c {0} §4個家點。 -maxMoney=§4這筆交易將超出此帳戶的金錢限制。 mayNotJail=§4你無法將此玩家關進監獄! mayNotJailOffline=§4你無法將離線玩家關進監獄。 meCommandDescription=以第三人稱描述一件事。 @@ -748,7 +710,6 @@ meCommandUsage1=/ meCommandUsage1Description=描述動作 meSender=我 meRecipient=我 -minimumBalanceError=§4玩家能夠持有的最低金錢為 {0}。 minimumPayAmount=§c你能夠支付的最小值為 {0}。 minute=分鐘 minutes=分鐘 @@ -758,8 +719,6 @@ mobsAvailable=§6生物:§r{0} mobSpawnError=§4變更生怪磚時發生錯誤。 mobSpawnLimit=生物數量超出伺服器限制。 mobSpawnTarget=§4目標方塊必須是生怪磚。 -moneyRecievedFrom=§a{0}§6 已收到來自 §a {1}§6。 -moneySentTo=§a{0} 已被傳送到 {1}。 month=月 months=月 moreCommandDescription=將手中的物品堆疊到指定的數量,如果未指定,則為最大數量。 @@ -784,7 +743,6 @@ msgtoggleCommandDescription=阻擋所有私人訊息接收。 msgtoggleCommandUsage=/ [player] [on|off] msgtoggleCommandUsage1=/ [player] msgtoggleCommandUsage1Description=切換你或指定玩家的飛行模式 -multipleCharges=§4你不能對此煙火套用多種的填充物。 multiplePotionEffects=§4你不能對此煙火套用多種的效果。 muteCommandDescription=禁言或解除禁言玩家。 muteCommandUsage=/ [datediff] [reason] @@ -815,7 +773,6 @@ nearCommandUsage4=/ nearCommandUsage4Description=列出以指定玩家為中心,指定半徑內的所有玩家 nearbyPlayers=§6附近的玩家:§r{0} nearbyPlayersList={0}§f(§c{1} 公尺§f) -negativeBalanceError=§4金錢不可小於零。 nickChanged=§6暱稱已變更。 nickCommandDescription=變更你的暱稱或其他玩家的暱稱。 nickCommandUsage=/ [player] @@ -867,12 +824,10 @@ noPermToSpawnMob=§4你沒有生成此生物的權限。 noPlacePermission=§4你沒有在告示牌旁邊放置方塊的權限。 noPotionEffectPerm=§4你沒有套用特效 §c{0} §4到此藥水的權限。 noPowerTools=§6你沒有綁定指令。 -notAcceptingPay=§4{0} §4不接受付款。 notAllowedToLocal=§4你沒有在區域聊天的權限。 notAllowedToQuestion=&c你沒有使用提問的權限。 notAllowedToShout=你沒有使用喊話的權限。 notEnoughExperience=§4你沒有足夠的經驗值。 -notEnoughMoney=§4你沒有足夠的金錢。 notFlying=未飛行 nothingInHand=§4你手中沒有任何物品。 now=現在 @@ -888,28 +843,9 @@ onlyPlayers=§4只有遊戲中的玩家可以使用 §c{0}§4。 onlyPlayerSkulls=§4你只能設定玩家頭顱的擁有者。 onlySunStorm=§4/weather 指令只有 sun/storm 兩個選擇。 openingDisposal=§6正在打開垃圾桶選單…… -orderBalances=§6正在排序§c {0} §6個玩家的金錢中,請稍候…… oversizedMute=§4你無法禁言此玩家。 oversizedTempban=§4你無法以此時長封禁玩家。 passengerTeleportFail=§4你無法在乘坐時被傳送。 -payCommandDescription=從你的金錢中扣款支付給其他玩家。 -payCommandUsage=/ -payCommandUsage1=/ -payCommandUsage1Description=向指定玩家以指定的金額付款 -payConfirmToggleOff=§6你已停用付款確認提示。 -payConfirmToggleOn=§6你已啟用付款確認提示。 -payDisabledFor=§6已拒絕來自 §c{0}§6 的付款。 -payEnabledFor=§6已接受來自 §c{0}§6 的付款。 -payMustBePositive=§4付款金額必須是正數。 -payOffline=§4你無法向離線玩家付款。 -payToggleOff=§6你不再接受付款。 -payToggleOn=§6你現在接受付款。 -payconfirmtoggleCommandDescription=切換是否提示你確認付款。 -payconfirmtoggleCommandUsage=/ -paytoggleCommandDescription=切換你是否接受付款。 -paytoggleCommandUsage=/ [player] -paytoggleCommandUsage1=/ [player] -paytoggleCommandUsage1Description=切換你或指定玩家是否接受付款 pendingTeleportCancelled=§4待處理的傳送請求已取消。 pingCommandDescription=啪! pingCommandUsage=/ @@ -1077,8 +1013,6 @@ requestSent=§6請求已傳送到§c {0}§6。 requestSentAlready=§4你已將傳送請求傳送到 {0}§4。 requestTimedOut=§4傳送請求超時。 requestTimedOutFrom=§4來自 §c{0} §4的傳送請求已超時。 -resetBal=§6所有線上玩家的金錢已被重設為 §c{0}§6。 -resetBalAll=§6所有玩家的金錢已被重設為 §c{0}§6。 rest=§6你感到精神飽滿。 restCommandDescription=讓你或指定玩家休息。 restCommandUsage=/ [player] @@ -1100,18 +1034,6 @@ seenCommandUsage1=/ seenCommandUsage1Description=顯示指定玩家的登出時間、封禁、UUID 等資訊 seenOffline=§6玩家§c {0} §6在 §c{1}§6 前已§4離線§6。 seenOnline=§6玩家§c {0} §6在 §c{1}§6 前已§a上線§6。 -sellBulkPermission=§6你沒有出售批量物品的權限。 -sellCommandDescription=賣出你手中的物品。 -sellCommandUsage=/ <||hand|inventory|blocks> [amount] -sellCommandUsage1=/ [amount] -sellCommandUsage1Description=從你的物品欄中賣出所有或指定數目的物品 -sellCommandUsage2=/ hand [amount] -sellCommandUsage2Description=從你手中賣出所有或指定數目的物品 -sellCommandUsage3=/ all -sellCommandUsage3Description=從你的物品欄中賣出有價值的物品 -sellCommandUsage4=/ blocks [amount] -sellCommandUsage4Description=從你的物品欄中賣出所有或指定數目的方塊 -sellHandPermission=§6你沒有出售手中的物品的權限。 serverFull=伺服器已滿! serverReloading=你將立即重新載入伺服器,但為什麼你要這樣做呢?EssentialsX 團隊不會提供使用 /reload 指令後,所發生問題的任何支援。 serverTotal=§6伺服器總和:§c{0} @@ -1122,8 +1044,6 @@ serverUnsupportedDangerous=你正在運行一個已知極其危險並導致資 serverUnsupportedLimitedApi=你正在運行 API 功能受限的伺服器。EssentialsX 仍然可以使用,但是某些功能可能被停用。 serverUnsupportedDumbPlugins=你正在使用已知會導致 EssentialsX 和其他插件出現嚴重問題的插件。 serverUnsupportedMods=你正在運行的伺服器端無法正常支援 Bukkit 插件。Bukkit 插件不應此與 Forge 或 Fabric 模組一起使用!建議使用 ForgeEssentials 或 SpongeForge + Nucleus 代替本插件。 -setBal=§a你的金錢已被設定為 {0}。 -setBalOthers=§a成功設定 {0} §a的金錢為 {1}。 setSpawner=§6變更生怪磚類型為§c {0}§6。 sethomeCommandDescription=在你目前的位置設立家點。 sethomeCommandUsage=/ [[player\:]name] @@ -1149,12 +1069,6 @@ setwarpCommandDescription=建立新的地標。 setwarpCommandUsage=/ setwarpCommandUsage1=/ setwarpCommandUsage1Description=在你的位置使用指定名稱設立地標 -setworthCommandDescription=設定賣出物品的價值。 -setworthCommandUsage=/ [itemname|id] -setworthCommandUsage1=/ -setworthCommandUsage1Description=以指定的值設定你手中的物品價格 -setworthCommandUsage2=/ -setworthCommandUsage2Description=以指定的值設定指定物品的物品價格 sheepMalformedColor=§4無效的顏色。 shoutDisabled=§c已停用§6喊話模式。 shoutDisabledFor=§c已停用 {0} §6的喊話模式。 @@ -1244,8 +1158,6 @@ suicideCommandUsage=/ suicideMessage=§6永別了,殘酷的世界…… suicideSuccess=§6玩家 §c{0} §6結束了自己的生命。 survival=生存模式 -takenFromAccount=§e{0}§a 已從你的帳戶中扣除。 -takenFromOthersAccount=§e{1}§a 從帳戶中扣除了 §e{0}§a。目前金錢餘額:§e{2}。 teleportAAll=§6向所有玩家傳送傳送請求…… teleportAll=§6正在傳送所有玩家…… teleportationCommencing=§6準備傳送…… @@ -1399,8 +1311,6 @@ tptoggleCommandDescription=阻止所有形式的傳送。 tptoggleCommandUsage=/ [player] [on|off] tptoggleCommandUsage1=/ [player] tptoggleCommandUsageDescription=切換你或指定玩家是否啟用傳送 -tradeSignEmpty=§4交易告示牌上沒有你可用的東西。 -tradeSignEmptyOwner=§4交易告示牌上沒有你可收集的東西。 treeCommandDescription=在你的前方生成一棵樹木。 treeCommandUsage=/ treeCommandUsage1=/ @@ -1481,12 +1391,10 @@ versionDevLatest=§6你正在運行最新的 EssentialsX 開發版本! versionError=§4獲得 EssentialsX 版本資訊時發生錯誤!開發版本資訊:§c{0}§6。 versionErrorPlayer=§6檢查 EssentialsX 版本資訊時發生錯誤! versionFetching=§6正在獲得版本資訊…… -versionOutputVaultMissing=§4未安裝 Vault 插件,聊天與權限可能無法正常運作。 versionOutputFine=§6{0} 版本:§a{1} versionOutputWarn=§6{0} 版本:§c{1} versionOutputUnsupported=§d{0} §6版本:§d{1} versionOutputUnsupportedPlugins=§6你正在運行§d不受支援的插件§6! -versionOutputEconLayer=§6經濟層:§r{0} versionMismatch=§4版本不匹配!請升級 {0} 到相同版本。 versionMismatchAll=§4版本不匹配!請升級所有 Essentials 系列的插件到相同版本。 versionReleaseLatest=§6你正在運行最新的 EssentialsX 穩定版本! @@ -1548,7 +1456,6 @@ whoisHunger=§6 - 飢餓值:§r{0}/20(+{1} 飽食度) whoisIPAddress=§6 - IP 位址:§r{0} whoisJail=§6 - 監禁:§r{0} whoisLocation=§6 - 座標:§r({0}, {1}, {2}, {3}) -whoisMoney=§6 - 金錢:§r{0} whoisMuted=§6 - 禁言:§r{0} whoisMutedReason=§6 - 禁言:§r{0} §6原因:§c{1} whoisNick=§6 - 暱稱:§r{0} @@ -1565,19 +1472,6 @@ worldCommandUsage1=/ worldCommandUsage1Description=傳送你到地獄或其他世界的對應座標 worldCommandUsage2=/ worldCommandUsage2Description=傳送你到指定世界的對應位置 -worth=§a一組 {0} 價值 §c{1}§a(總共 {2} 個物品,每個價值 {3})。 -worthCommandDescription=計算手中的物品價值。 -worthCommandUsage=/ <||hand|inventory|blocks> [-][amount] -worthCommandUsage1=/ [amount] -worthCommandUsage1Description=檢查物品欄內所有具有價值或者指定數量的物品 -worthCommandUsage2=/ hand [amount] -worthCommandUsage2Description=檢查手中所有具有價值或者指定數量的物品 -worthCommandUsage3=/ all -worthCommandUsage3Description=檢查物品欄內所有具有價值的物品 -worthCommandUsage4=/ blocks [amount] -worthCommandUsage4Description=檢查物品欄內所有具有價值或者指定數量的方塊 -worthMeta=§a一組元資料 {1} 的 {0} 價值 §c{2}§a(總共 {3} 個物品,每個價值 {4})。 -worthSet=§6已設定價格 year=年 years=年 youAreHealed=§6你已被治療。 diff --git a/Essentials/src/main/resources/plugin.yml b/Essentials/src/main/resources/plugin.yml index f8aad568d..591012944 100644 --- a/Essentials/src/main/resources/plugin.yml +++ b/Essentials/src/main/resources/plugin.yml @@ -5,7 +5,7 @@ main: com.earth2me.essentials.Essentials version: @full.version@ website: https://essentialsx.net/ description: Provides an essential, core set of commands for Bukkit. -softdepend: [Vault, LuckPerms] +softdepend: [LuckPerms] authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Iaccidentally, drtshock, vemacs, SupaHam, mdcfe, JRoy, pop4959] api-version: "1.13" commands: @@ -29,14 +29,6 @@ commands: description: Runs the backup if configured. usage: / aliases: [ebackup] - balance: - description: States the current balance of a player. - usage: / [player] - aliases: [bal,ebal,ebalance,money,emoney] - balancetop: - description: Gets the top balance values. - usage: / [page] - aliases: [ebalancetop,baltop,ebaltop] ban: description: Bans a player. usage: / [reason] @@ -89,10 +81,6 @@ commands: description: Toggles whether you are prompted to confirm inventory clears. usage: / aliases: [eclearinventoryconfirmtoggle, clearinventoryconfirmoff, eclearinventoryconfirmoff, clearconfirmoff, eclearconfirmoff, clearconfirmon, eclearconfirmon, clearconfirm, eclearconfirm] - condense: - description: Condenses items into a more compact blocks. - usage: / [itemname] - aliases: [econdense,compact,ecompact,blocks,eblocks,toblocks,etoblocks] compass: description: Describes your current bearing. usage: / @@ -128,10 +116,6 @@ commands: description: Opens a portable disposal menu. usage: / aliases: [edisposal,trash,etrash] - eco: - description: Manages the server economy. - usage: / - aliases: [eeco,economy,eeconomy] enchant: description: Enchants the item the user is holding. usage: / [level] @@ -332,18 +316,6 @@ commands: description: Teleport to a player's last known logout location usage: / aliases: [otp, offlinetp, tpoff, tpoffline, etpoffline] - pay: - description: Pays another player from your balance. - usage: / - aliases: [epay] - paytoggle: - description: Toggles whether you are accepting payments. - usage: / [player] - aliases: [epaytoggle, payoff, epayoff, payon, epayon] - payconfirmtoggle: - description: Toggles whether you are prompted to confirm payments. - usage: / - aliases: [epayconfirmtoggle, payconfirmoff, epayconfirmoff, payconfirmon, epayconfirmon, payconfirm, epayconfirm] ping: description: Pong! usage: / @@ -412,10 +384,6 @@ commands: description: Shows the last logout time of a player. usage: / aliases: [eseen, ealts, alts] - sell: - description: Sells the item currently in your hand. - usage: / <||hand|inventory|blocks> [amount] - aliases: [esell] sethome: description: Set your home to your current location. usage: / [[player:]name] @@ -432,10 +400,6 @@ commands: description: Creates a new warp. usage: / aliases: [createwarp,ecreatewarp,esetwarp] - setworth: - description: Set the sell value of an item. - usage: / [itemname|id] - aliases: [esetworth] showkit: description: Show contents of a kit. usage: / @@ -604,10 +568,6 @@ commands: description: Switch between worlds. usage: / [world] aliases: [eworld] - worth: - description: Calculates the worth of items in hand or as specified. - usage: / <||hand|inventory|blocks> [-][amount] - aliases: [eprice,price,eworth] permissions: essentials.*: @@ -686,9 +646,6 @@ permissions: essentials.nick.allowunsafe: default: false description: If a player has this, they can set their username to any value. Use with caution, as this has the potential to break userdata files. - essentials.balancetop.exclude: - default: false - description: Players with this permission are excluded from the balancetop essentials.back.onteleport: default: true description: Players with this permission will have back location stored during any teleportation diff --git a/README.md b/README.md index 7f00b8161..1162c990c 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,8 @@ Clone this repository, then run the following command: ## Changes over EssentialsX +- Removed Essentials economy and removed vault support. + - Added option to stop cancelling teleports during damage events. - Removed log4j. diff --git a/settings.gradle.kts b/settings.gradle.kts index be4cce1ca..7eb5f92bd 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,10 +6,7 @@ dependencyResolutionManagement { maven("https://repo.purpurmc.org/snapshots/") maven("https://hub.spigotmc.org/nexus/content/groups/public/") maven("https://repo.papermc.io/repository/maven-public/") - maven("https://jitpack.io") { - content { includeGroup("com.github.milkbowl") } - content { includeGroup("com.github.MinnDevelopment") } - } + maven("https://jitpack.io") { content { includeGroup("com.github.MinnDevelopment") } } maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") { content { includeGroup("me.clip") } }