Feature implementation from commits eab2201..e836747

.github/ISSUE_TEMPLATE/report-a-bug.yml

@@ -1,6 +1,7 @@
 name: Report bug
 description: Report a bug in EssentialsX.
 labels: 'bug: unconfirmed'
+type: Bug
 body:
 - type: markdown
  attributes:

.github/ISSUE_TEMPLATE/request-a-feature.yml

@@ -1,6 +1,7 @@
 name: Request a feature
 description: Suggest a feature you want to see in EssentialsX!
 labels: 'type: enhancement'
+type: Feature
 body:
 - type: markdown
  attributes:

Essentials/src/main/java/com/earth2me/essentials/ISettings.java

@@ -424,6 +424,8 @@ public interface ISettings extends IConf {
 
  boolean showZeroBaltop();
 
+ String getNickRegex();
+
  BigDecimal getMultiplier(final User user);
 
  int getMaxItemLore();

Essentials/src/main/java/com/earth2me/essentials/IUser.java

@@ -177,6 +177,17 @@ default boolean hasOutstandingTeleportRequest() {
 
  String getFormattedJailTime();
 
+ /**
+ * Returns last activity time.
+ * <p>
+ * It is used internally to determine if user's afk status should be set to
+ * true because of ACTIVITY {@link AfkStatusChangeEvent.Cause}, or the player
+ * should be kicked for being afk too long.
+ *
+ * @return Last activity time (Epoch Milliseconds)
+ */
+ long getLastActivityTime();
+
  @Deprecated
  List<String> getMails();
 

Essentials/src/main/java/com/earth2me/essentials/MobCompat.java

@@ -9,6 +9,8 @@
 import org.bukkit.entity.Axolotl;
 import org.bukkit.entity.Boat;
 import org.bukkit.entity.Camel;
+import org.bukkit.entity.Chicken;
+import org.bukkit.entity.Cow;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Fox;
@@ -18,22 +20,39 @@
 import org.bukkit.entity.Ocelot;
 import org.bukkit.entity.Panda;
 import org.bukkit.entity.Parrot;
+import org.bukkit.entity.Pig;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Salmon;
 import org.bukkit.entity.TropicalFish;
 import org.bukkit.entity.Villager;
 import org.bukkit.entity.Wolf;
 import org.bukkit.inventory.ItemStack;
 
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 import java.lang.reflect.Method;
 
 import static com.earth2me.essentials.utils.EnumUtil.getEntityType;
 
 public final class MobCompat {
 
  // Constants for mob interfaces added in later versions
- @SuppressWarnings("rawtypes")
- public static final Class RAIDER = ReflUtil.getClassCached("org.bukkit.entity.Raider");
+ public static final Class<?> RAIDER = ReflUtil.getClassCached("org.bukkit.entity.Raider");
+
+ // Stupid hacks to avoid Commodore rewrites.
+ private static final Class<?> COW = ReflUtil.getClassCached("org.bukkit.entity.Cow");
+ private static final Class<?> COW_VARIANT = ReflUtil.getClassCached("org.bukkit.entity.Cow$Variant");
+ private static final MethodHandle COW_VARIANT_HANDLE;
+
+ static {
+ MethodHandle handle = null;
+ try {
+ handle = MethodHandles.lookup().findVirtual(COW, "setVariant", MethodType.methodType(void.class, COW_VARIANT));
+ } catch (final Throwable ignored) {
+ }
+ COW_VARIANT_HANDLE = handle;
+ }
 
  // Constants for mobs added in later versions
  public static final EntityType LLAMA = getEntityType("LLAMA");
@@ -250,6 +269,41 @@ public static void setSalmonSize(Entity spawned, String s) {
  }
  }
 
+ public static void setCowVariant(final Entity spawned, final String variant) {
+ if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_21_5_R01) || COW_VARIANT_HANDLE == null) {
+ return;
+ }
+
+ if (spawned instanceof Cow) {
+ try {
+ COW_VARIANT_HANDLE.invoke(spawned, RegistryUtil.valueOf(COW_VARIANT, variant));
+ } catch (Throwable ignored) {
+ }
+ }
+ }
+
+ public static void setChickenVariant(final Entity spawned, final String variant) {
+ if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_21_5_R01)) {
+ return;
+ }
+
+ if (spawned instanceof Chicken) {
+ //noinspection DataFlowIssue
+ ((Chicken) spawned).setVariant(RegistryUtil.valueOf(Chicken.Variant.class, variant));
+ }
+ }
+
+ public static void setPigVariant(final Entity spawned, final String variant) {
+ if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_21_5_R01)) {
+ return;
+ }
+
+ if (spawned instanceof Pig) {
+ //noinspection DataFlowIssue
+ ((Pig) spawned).setVariant(RegistryUtil.valueOf(Pig.Variant.class, variant));
+ }
+ }
+
  public enum CatType {
  // These are (loosely) Mojang names for the cats
  SIAMESE("SIAMESE", "SIAMESE_CAT"),

Essentials/src/main/java/com/earth2me/essentials/MobData.java

@@ -10,6 +10,7 @@
 import org.bukkit.entity.Ageable;
 import org.bukkit.entity.Boat;
 import org.bukkit.entity.ChestedHorse;
+import org.bukkit.entity.Chicken;
 import org.bukkit.entity.Creeper;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
@@ -221,6 +222,15 @@ public enum MobData {
  SMALL_SALMON("small", MobCompat.SALMON, "salmon:SMALL", true),
  MEDIUM_SALMON("medium", MobCompat.SALMON, "salmon:MEDIUM", true),
  LARGE_SALMON("large", MobCompat.SALMON, "salmon:LARGE", true),
+ TEMPERATE_COW("temperate", EntityType.COW.getEntityClass(), "cow:TEMPERATE", true),
+ WARM_COW("warm", EntityType.COW.getEntityClass(), "cow:WARM", true),
+ COLD_COW("cold", EntityType.COW.getEntityClass(), "cow:COLD", true),
+ TEMPERATE_CHICKEN("temperate", Chicken.class, "chicken:TEMPERATE", true),
+ WARM_CHICKEN("warm", Chicken.class, "chicken:WARM", true),
+ COLD_CHICKEN("cold", Chicken.class, "chicken:COLD", true),
+ TEMPERATE_PIG("temperate", Pig.class, "pig:TEMPERATE", true),
+ WARM_PIG("warm", Pig.class, "pig:WARM", true),
+ COLD_PIG("cold", Pig.class, "pig:COLD", true),
  ;
 
  final private String nickname;
@@ -442,6 +452,15 @@ public void setData(final Entity spawned, final Player target, final String rawD
  case "salmon":
  MobCompat.setSalmonSize(spawned, split[1]);
  break;
+ case "cow":
+ MobCompat.setCowVariant(spawned, split[1]);
+ break;
+ case "chicken":
+ MobCompat.setChickenVariant(spawned, split[1]);
+ break;
+ case "pig":
+ MobCompat.setPigVariant(spawned, split[1]);
+ break;
  }
  } else {
  Essentials.getWrappedLogger().warning("Unknown mob data type: " + this.toString());

Essentials/src/main/java/com/earth2me/essentials/Settings.java

@@ -2120,6 +2120,11 @@ public boolean showZeroBaltop() {
  return config.getBoolean("show-zero-baltop", true);
  }
 
+ @Override
+ public String getNickRegex() {
+ return config.getString("allowed-nicks-regex", "^[a-zA-Z_0-9§]+$");
+ }
+
  @Override
  public BigDecimal getMultiplier(final User user) {
  BigDecimal multiplier = defaultMultiplier;

Essentials/src/main/java/com/earth2me/essentials/User.java

@@ -775,6 +775,11 @@ public boolean checkMuteTimeout(final long currentTime) {
  return false;
  }
 
+ @Override
+ public long getLastActivityTime() {
+ return this.lastActivity;
+ }
+
  @Deprecated
  public void updateActivity(final boolean broadcast) {
  updateActivity(broadcast, AfkStatusChangeEvent.Cause.UNKNOWN);

Essentials/src/main/java/com/earth2me/essentials/commands/Commandbalancetop.java

@@ -7,6 +7,7 @@
 import com.earth2me.essentials.utils.AdventureUtil;
 import com.earth2me.essentials.utils.EnumUtil;
 import com.earth2me.essentials.utils.NumberUtil;
+import com.earth2me.essentials.utils.VersionUtil;
 import com.google.common.collect.Lists;
 import net.essentialsx.api.v2.services.BalanceTop;
 import org.bukkit.Bukkit;
@@ -121,9 +122,14 @@ public void run() {
  final User user = ess.getUser(entry.getKey());
 
  final Statistic PLAY_ONE_TICK = EnumUtil.getStatistic("PLAY_ONE_MINUTE", "PLAY_ONE_TICK");
+ final boolean offlineStatisticSupported = VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_15_2_R01);
  final long playtime;
  if (user.getBase() == null || !user.getBase().isOnline()) {
- playtime = Bukkit.getServer().getOfflinePlayer(entry.getKey()).getStatistic(PLAY_ONE_TICK);
+ if (offlineStatisticSupported) {
+ playtime = Bukkit.getServer().getOfflinePlayer(entry.getKey()).getStatistic(PLAY_ONE_TICK);
+ } else {
+ playtime = -1;
+ }
  } else {
  playtime = user.getBase().getStatistic(PLAY_ONE_TICK);
  }
@@ -133,7 +139,8 @@ public void run() {
  // Checking if player meets the requirements of minimum balance and minimum playtime to be listed in baltop list
  if ((ess.getSettings().showZeroBaltop() || balance.compareTo(BigDecimal.ZERO) > 0)
  && balance.compareTo(ess.getSettings().getBaltopMinBalance()) >= 0 &&
- playTimeSecs >= ess.getSettings().getBaltopMinPlaytime()) {
+ // Skip playtime check for offline players on versions below 1.15.2
+ (playtime == -1 || playTimeSecs >= ess.getSettings().getBaltopMinPlaytime())) {
  newCache.getLines().add(AdventureUtil.miniToLegacy(tlLiteral("balanceTopLine", pos, entry.getValue().getDisplayName(), AdventureUtil.parsed(NumberUtil.displayCurrency(balance, ess)))));
  }
  pos++;

Essentials/src/main/java/com/earth2me/essentials/commands/Commanddelhome.java

@@ -30,10 +30,10 @@ private void deleteHome(CommandSource sender, User user, String home) {
 
  try {
  user.delHome(home);
+ sender.sendTl("deleteHome", home);
  } catch (Exception e) {
  sender.sendTl("invalidHome", home);
  }
- sender.sendTl("deleteHome", home);
  }
 
  @Override

Essentials/src/main/java/com/earth2me/essentials/commands/Commandnick.java

@@ -63,7 +63,7 @@ protected void updatePlayer(final Server server, final CommandSource sender, fin
 
  private String formatNickname(final User user, final String nick) throws Exception {
  final String newNick = user == null ? FormatUtil.replaceFormat(nick) : FormatUtil.formatString(user, "essentials.nick", nick);
- if (!newNick.matches("^[a-zA-Z_0-9" + ChatColor.COLOR_CHAR + "]+$") && user != null && !user.isAuthorized("essentials.nick.allowunsafe")) {
+ if (!newNick.matches(ess.getSettings().getNickRegex()) && user != null && !user.isAuthorized("essentials.nick.allowunsafe")) {
  throw new TranslatableException("nickNamesAlpha");
  } else if (getNickLength(newNick) > ess.getSettings().getMaxNickLength()) {
  throw new TranslatableException("nickTooLong");

Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java

@@ -3,6 +3,7 @@
 import com.earth2me.essentials.ChargeException;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
+import net.ess3.api.events.SignTransactionEvent;
 import net.ess3.api.IEssentials;
 import net.ess3.api.MaxMoneyException;
 import org.bukkit.inventory.ItemStack;
@@ -45,6 +46,12 @@ protected boolean onSignInteract(final ISign sign, final User player, final Stri
  }
 
  charge.isAffordableFor(player);
+ final SignTransactionEvent signTransactionEvent = new SignTransactionEvent(sign, this, player, items.getItemStack(), SignTransactionEvent.TransactionType.BUY, charge.getMoney());
+
+ ess.getServer().getPluginManager().callEvent(signTransactionEvent);
+ if (signTransactionEvent.isCancelled()) {
+ return true;
+ }
  if (!items.pay(player)) {
  throw new ChargeException("inventoryFull");
  }

Essentials/src/main/java/com/earth2me/essentials/signs/SignSell.java

@@ -4,6 +4,7 @@
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.Trade.OverflowType;
 import com.earth2me.essentials.User;
+import net.ess3.api.events.SignTransactionEvent;
 import net.ess3.api.IEssentials;
 import net.ess3.api.MaxMoneyException;
 import org.bukkit.inventory.ItemStack;
@@ -47,6 +48,13 @@ protected boolean onSignInteract(final ISign sign, final User player, final Stri
  }
 
  charge.isAffordableFor(player);
+
+ final SignTransactionEvent signTransactionEvent = new SignTransactionEvent(sign, this, player, charge.getItemStack(), SignTransactionEvent.TransactionType.SELL, money.getMoney());
+ ess.getServer().getPluginManager().callEvent(signTransactionEvent);
+ if (signTransactionEvent.isCancelled()) {
+ return false;
+ }
+
  money.pay(player, OverflowType.DROP);
  charge.charge(player);
  Trade.log("Sign", "Sell", "Interact", username, charge, username, money, sign.getBlock().getLocation(), player.getMoney(), ess);