First release of 2023 (#640)

* Some PAFBungeecord Fixes (#442)

fix PAFBungeecord adapter

* Register Indonesia Languange on start up (#452)

* fix env var passing

* Enhance levelling system (#448)

* Updated Levelling System

* Fixed if with Java convention

* Change BED_DESTROYED to BED_DESTROY

* workflow update

* Update readme to link to wiki for addons/setups (#462)

* band-aid fix for ConcurrentModificationException on disable (#460)

* [enhancement] Fix Invisibility Potions on 1.8 and some cosmetic changes (#408)

* Make titles smoothly fade out

* What was the point for such long cooldown?

* Fix english grammar error

* Fix Invisibility Potion not working on 1_8_R3

* Revert "What was the point for such long cooldown?"

This reverts commit f66e035.

Co-authored-by: MarcelDutko <32849144+MarcelDutko@users.noreply.github.com>

* Implement command for set max build Y (#428)

* TeamEliminatedEvent (#465)

* Update deprecated versions (#495)

* fix arenaGroup list command requiring unnecisary args (#484)

* register forgotten listener

* allow enabling of hunger (#485)

* Reload command in console (#506)

* Make reload command executable by console

* Inline the Player casting

* update #canSee so console sees the command

i find really no need to retest this but whatever

* Remove unused import + fix a typo

* Italian Language Update (#501)

* Fix traps not activating when someone is on island (#546)

* Update stuff (#545)

* Update Repos/Maven Plugins and fix some build warning

* Remove old Gitlab stuff

* 17.0.3 Workflow

* Didn't mean to remove this

* Java 11 Minimum Requirement (#541)

* Fix Players sometimes can't Pickup items (#530)

Fixes #520

* Remove Support for: (#538)

1.9.4 (v1_9_R2)
1.10 - 1.10.2 (v1_10_R1)
1.11 (v1_11_R1)
1.13.1 - 1.13.2 (v1_13_R2)
1.14 - 1.14.2 (v1_14_R1)
1.15 - 1.15.2 (v1_15_R1)
1.16.1 - 1.16.3 (v1_16_R1/2)

* Fix Red not auto-scanning (#519)

* Fix Red not auto-scanning

* Fix Red not auto-scanning

Co-authored-by: Bart <bart@pop-os.localdomain>
Co-authored-by: DevSolaris <dev.solaris.2002@gmail.com>

* Fix readme for Java 11 (#556)

* Use NMS and Don't call event when player is afk to save resources (#584)

* Update Spanish.java (#523)

* Fix Light Gray (#518)

Co-authored-by: Bart <bart@pop-os.localdomain>

* Fixes issues with invsibility potion and armor & bug with inv. shop when click on bottom inv (#590)

* Fix shop interacting through own inventory

* Fix visible armor when drink invisibility potion

* Fix stats placeholder throwing exceptions when a player is unloaded + a small cleanup (#567)

* fixed citizens repo (#609)

* Fixed the nms setSource method in versions: 1_17_R1 and 1_18_R2 (#615)

* Fixed source field's name

* Fixed source field's name

* Remove Spigot Update Checker (no longer use spigotmc) (#616)

* Remove Spigot Update Checker (no longer use spigotmc)

* Updates

* Add the Max in team placeholder to the signs (#594)

* Add the Max in team placeholder to the signs

* Bug fix on server restart

Co-authored-by: Angel <contact@angelillo15.es>

* Cancel Pickup if player is AFK and remove extra listener (#587)

* Cancel Pickup if player is AFK and remove extra listener

* Forgot

* SidebarLib implementation and 1.19.3 support (#617)

implement sidebar lib, add 1.19.3 support

* Money bug fix (#585)

sync with main thread, clean up threads

* Money fix (#582)

give rewards if greater than zero, do not give rewards for team assist on solo

* Make Armor shop message say equipped (#565)

make armor-shop say equipped and not maxed as that does not make sense for armor

* implement async teleport on paper servers (#561)

implement async teleport on paper servers

* Built in Pop-Up tower (#496)

* prevent generators from spawning on game end, clean inventories and dropped items (#487)

prevent generators from spawning on game end, clean inventories and dropped items

* Built-in heal pool animations (#467)

* Polish translation update (#431)

* fix: could not pass event PlayerJoinEvent

fix NullPointerException at player join when game has no set arena yet

Co-authored-by: J.T. McQuigg <J.T.McQuigg12@gmail.com>
Co-authored-by: JektDV <jektdv@gmail.com>
Co-authored-by: Xxyuri2005xX <84080587+Xxyuri2005xX@users.noreply.github.com>
Co-authored-by: ajgeiss0702 <ajgeiss0702@users.noreply.github.com>
Co-authored-by: Marcelektro <32849144+Marcelektro@users.noreply.github.com>
Co-authored-by: MarcelDutko <32849144+MarcelDutko@users.noreply.github.com>
Co-authored-by: Ricardo <63428864+reussy@users.noreply.github.com>
Co-authored-by: iiAhmedYT <61851106+iiAhmedYT@users.noreply.github.com>
Co-authored-by: Memexurer <nemerux@gmail.com>
Co-authored-by: IIHERO4 <46909116+IIHERO4@users.noreply.github.com>
Co-authored-by: DevSolaris <105156235+DevSolaris@users.noreply.github.com>
Co-authored-by: Bart <bart@pop-os.localdomain>
Co-authored-by: DevSolaris <dev.solaris.2002@gmail.com>
Co-authored-by: Danidev819 <38832869+Danidev819@users.noreply.github.com>
Co-authored-by: Zoiter7 <zoiterplays@gmail.com>
Co-authored-by: Doãn Hiệp <33453150+dhiepp@users.noreply.github.com>
Co-authored-by: PmzHeroV69 <91284999+PmzHeroV69@users.noreply.github.com>
Co-authored-by: Angelillo15 <43421778+Angelillo15@users.noreply.github.com>
Co-authored-by: Angel <contact@angelillo15.es>
Co-authored-by: Seriously Not Beluga <79474077+OskiBoski483@users.noreply.github.com>
Co-authored-by: jonathan-up <admin@56fkj.cn>
Co-authored-by: MrCeasar <tomkeuper@live.nl>

.github/workflows/compile_snapshot.yml

@@ -15,10 +15,10 @@ jobs:
       url: https://repo.andrei1058.dev
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 17.0.3
+      - name: Set up JDK 17.0.5
         uses: actions/setup-java@v2
         with:
-          java-version: '17.0.3'
+          java-version: '17.0.5'
           distribution: 'adopt'
       - name: Deploy snapshot with Maven
         env:

.github/workflows/deploy.yml

@@ -12,10 +12,10 @@ jobs:
       url: https://repo.andrei1058.com
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 17.0.3
+      - name: Set up JDK 17.0.5
         uses: actions/setup-java@v2
         with:
-          java-version: '17.0.3'
+          java-version: '17.0.5'
           distribution: 'adopt'
       - name: Deploy with Maven
         env:

.github/workflows/deploy_snapshot.yml

@@ -14,10 +14,10 @@ jobs:
       url: https://repo.andrei1058.dev
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 17.0.3
+      - name: Set up JDK 17.0.5
         uses: actions/setup-java@v2
         with:
-          java-version: '17.0.3'
+          java-version: '17.0.5'
           distribution: 'adopt'
       - name: Deploy snapshot with Maven
         env:

README.md

@@ -12,7 +12,7 @@ Once your bed is destroyed, you cannot respawn.
 This software runs on [Spigot](https://www.spigotmc.org/) and NMS.
 Spigot forks without compiled NMS code are not supported.
 Officially supported servers are [spigot](https://www.spigotmc.org/) and [paper](https://papermc.io/).
-It is recommended to use Java 11.
+It is required to use Java 11 or newer.
 
 The internal world restore system is based on zipping and unzipping maps which can become
 heavy if you are still making use of HDD in 2021, and you do not have a decent CPU, for a better

bedwars-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BedWars1058</artifactId>
         <groupId>com.andrei1058.bedwars</groupId>
-        <version>22.3-SNAPSHOT</version>
+        <version>22.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bedwars-api</artifactId>
@@ -36,6 +36,12 @@
             <version>1.8.8-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>1.16.3-R0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -51,6 +57,14 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

bedwars-api/src/main/java/com/andrei1058/bedwars/api/arena/team/TeamColor.java

@@ -234,7 +234,7 @@ public static String enName(@NotNull String material) {
                 name = "Red";
                 break;
             case "LIGHT_GRAY_WOOL":
-                name = "lGray";
+                name = "Gray";
                 break;
             case "BLUE_WOOL":
                 name = "Blue";
@@ -252,7 +252,7 @@ public static String enName(@NotNull String material) {
                 name = "Yellow";
                 break;
             case "GRAY_WOOL":
-                name = "Gray";
+                name = "Dark_Gray";
                 break;
         }
         return name;

bedwars-api/src/main/java/com/andrei1058/bedwars/api/configuration/ConfigPath.java

@@ -228,10 +228,17 @@ public class ConfigPath {
     public static final String GENERAL_CONFIGURATION_PERFORMANCE_ROTATE_GEN = GENERAL_CONFIGURATION_PERFORMANCE_PATH + ".rotate-generators";
     public static final String GENERAL_CONFIGURATION_PERFORMANCE_SPOIL_TNT_PLAYERS = GENERAL_CONFIGURATION_PERFORMANCE_PATH + ".spoil-tnt-players";
 
+    public static final String GENERAL_CONFIGURATION_PERFORMANCE_PAPER_FEATURES = GENERAL_CONFIGURATION_PERFORMANCE_PATH + ".paper-features";
+
+    private static final String GENERAL_CONFIGURATION_HEAL_POOL = GENERAL_CONFIGURATION_PERFORMANCE_PATH+".heal-pool";
+    public static final String GENERAL_CONFIGURATION_HEAL_POOL_ENABLE = GENERAL_CONFIGURATION_HEAL_POOL+".enable";
+    public static final String GENERAL_CONFIGURATION_HEAL_POOL_SEEN_TEAM_ONLY = GENERAL_CONFIGURATION_HEAL_POOL_ENABLE+".seen-by-team-only";
     public static final String SHOP_SETTINGS_PATH = "shop-settings";
     public static final String SHOP_SPECIALS_PATH = "shop-specials";
     public static final String SHOP_QUICK_DEFAULTS_PATH = "quick-buy-defaults";
 
+    public static final String SHOP_SPECIAL_TOWER_ENABLE = SHOP_SPECIALS_PATH + ".tower.enable";
+    public static final String SHOP_SPECIAL_TOWER_MATERIAL = SHOP_SPECIALS_PATH + ".tower.material";
     public static final String SHOP_SPECIAL_SILVERFISH_ENABLE = SHOP_SPECIALS_PATH + ".silverfish.enable";
     public static final String SHOP_SPECIAL_SILVERFISH_MATERIAL = SHOP_SPECIALS_PATH + ".silverfish.material";
     public static final String SHOP_SPECIAL_SILVERFISH_DATA = SHOP_SPECIALS_PATH + ".silverfish.data";

bedwars-api/src/main/java/com/andrei1058/bedwars/api/language/Language.java

@@ -39,6 +39,7 @@ public class Language extends ConfigManager {
     private static final HashMap<UUID, Language> langByPlayer = new HashMap<>();
     private static final List<Language> languages = new ArrayList<>();
     private static Language defaultLanguage;
+    private String serverIp;
 
     public Language(Plugin plugin, String iso) {
         super(plugin, "messages_" + iso, plugin.getDataFolder().getPath() + "/Languages");
@@ -136,7 +137,17 @@ public String m(String path) {
             System.err.println("Missing message key " + path + " in language " + getIso());
             message = "MISSING_LANG";
         }
-        return ChatColor.translateAlternateColorCodes('&', message.replace("{prefix}", prefix));
+        if (null == serverIp) {
+            BedWars api = Bukkit.getServicesManager().getRegistration(BedWars.class).getProvider();
+            if (null != api.getConfigs().getMainConfig()) {
+                serverIp = api.getConfigs().getMainConfig().
+                        getString(ConfigPath.GENERAL_CONFIG_PLACEHOLDERS_REPLACEMENTS_SERVER_IP);
+            }
+        }
+
+        return ChatColor.translateAlternateColorCodes('&', message.replace("{prefix}", (prefix == null? "":prefix))
+                .replace("{serverIp}", serverIp == null ? "" : serverIp)
+        );
     }
 
     /**

bedwars-api/src/main/java/com/andrei1058/bedwars/api/language/Messages.java

@@ -23,6 +23,7 @@
 import com.andrei1058.bedwars.api.configuration.ConfigPath;
 
 @SuppressWarnings("WeakerAccess")
+@Deprecated
 public class Messages {
 
     public static String PREFIX = "prefix";
@@ -169,10 +170,32 @@ public class Messages {
     public static String FORMATTING_SCOREBOARD_TAB_SUFFIX_STARTING = "format-sb-tab-suffix.starting";
     public static String FORMATTING_SCOREBOARD_TAB_PREFIX_PLAYING = "format-sb-tab-prefix.playing";
     public static String FORMATTING_SCOREBOARD_TAB_SUFFIX_PLAYING = "format-sb-tab-suffix.playing";
+
+    public static String FORMATTING_SIDEBAR_TAB_HEADER_LOBBY = "format-sb-tab-header.lobby";
+    public static String FORMATTING_SIDEBAR_TAB_HEADER_WAITING = "format-sb-tab-header.waiting";
+    public static String FORMATTING_SIDEBAR_TAB_HEADER_STARTING = "format-sb-tab-header.starting";
+    public static String FORMATTING_SIDEBAR_TAB_HEADER_PLAYING = "format-sb-tab-header.playing";
+    public static String FORMATTING_SIDEBAR_TAB_HEADER_RESTARTING = "format-sb-tab-header.restarting";
+    public static String FORMATTING_SIDEBAR_TAB_HEADER_SPECTATOR = "format-sb-tab-header.spectator";
+
+    public static String FORMATTING_SIDEBAR_TAB_FOOTER_LOBBY = "format-sb-tab-footer.lobby";
+    public static String FORMATTING_SIDEBAR_TAB_FOOTER_WAITING = "format-sb-tab-footer.waiting";
+    public static String FORMATTING_SIDEBAR_TAB_FOOTER_STARTING = "format-sb-tab-footer.starting";
+    public static String FORMATTING_SIDEBAR_TAB_FOOTER_PLAYING = "format-sb-tab-footer.playing";
+    public static String FORMATTING_SIDEBAR_TAB_FOOTER_RESTARTING = "format-sb-tab-footer.restarting";
+    public static String FORMATTING_SIDEBAR_TAB_FOOTER_SPECTATOR = "format-sb-tab-footer.spectator";
+    @Deprecated
     public static String FORMATTING_SCOREBOARD_TAB_PREFIX_PRESTARTING = "format-sb-tab-prefix.restarting";
+    public static String FORMATTING_SCOREBOARD_TAB_PREFIX_RESTARTING = "format-sb-tab-prefix.restarting";
+    @Deprecated
     public static String FORMATTING_SCOREBOARD_TAB_SUFFIX_PRESTARTING = "format-sb-tab-suffix.restarting";
+    public static String FORMATTING_SCOREBOARD_TAB_SUFFIX_RESTARTING = "format-sb-tab-suffix.restarting";
+    public static String FORMATTING_SCOREBOARD_TAB_PREFIX_SPECTATOR = "format-sb-tab-prefix.spectator";
+    public static String FORMATTING_SCOREBOARD_TAB_SUFFIX_SPECTATOR = "format-sb-tab-suffix.spectator";
     public static String FORMATTING_SPECTATOR_TEAM = "format-spectator-team";
+    @Deprecated
     public static String FORMATTING_SPECTATOR_COLOR = "format-spectator-color";
+
     public static String FORMATTING_SCOREBOARD_TEAM_ELIMINATED = "format-sb-team-eliminated";
     public static String FORMATTING_SCOREBOARD_BED_DESTROYED = "format-sb-bed-destroyed";
     public static String FORMATTING_SCOREBOARD_TEAM_ALIVE = "format-sb-team-alive";
@@ -333,6 +356,7 @@ public class Messages {
     public static final String SHOP_LORE_STATUS_CANT_AFFORD = "shop-lore-status-cant-afford";
     public static final String SHOP_LORE_STATUS_CAN_BUY = "shop-lore-status-can-buy";
     public static final String SHOP_LORE_STATUS_MAXED  = "shop-lore-status-tier-maxed";
+    public static final String SHOP_LORE_STATUS_ARMOR = "shop-lore-status-armor";
     public static final String SHOP_LORE_QUICK_ADD  = "shop-lore-quick-add";
     public static final String SHOP_LORE_QUICK_REMOVE  = "shop-lore-quick-remove";
     public static final String SHOP_INDEX_NAME = SHOP_PATH + ".inventory-name";

bedwars-api/src/main/java/com/andrei1058/bedwars/api/server/VersionSupport.java

@@ -50,6 +50,8 @@
 public abstract class VersionSupport {
 
     private static String name2;
+    public static String PLUGIN_TAG_GENERIC_KEY = "BedWars1058";
+    public static String PLUGIN_TAG_TIER_KEY = "tierIdentifier";
 
     private Effect eggBridge;
 
@@ -435,4 +437,10 @@ public void spigotHidePlayer(Player victim, Player receiver) {
     public abstract void playRedStoneDot(Player player);
 
     public abstract void clearArrowsFromPlayerBody(Player player);
+
+    public abstract void placeTowerBlocks(Block b, IArena a, TeamColor color, int x, int y,int z);
+
+    public abstract void placeLadder(Block b, int x, int y, int z, IArena a, int ladderdata);
+
+    public abstract void playVillagerEffect(Player player, Location location);
 }

bedwars-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BedWars1058</artifactId>
         <groupId>com.andrei1058.bedwars</groupId>
-        <version>22.3-SNAPSHOT</version>
+        <version>22.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bedwars-plugin</artifactId>
@@ -28,16 +28,12 @@
         </repository>
         <repository>
             <id>citizens</id>
-            <url>https://repo.citizensnpcs.co/</url>
+            <url>https://maven.citizensnpcs.co/repo</url>
         </repository>
         <repository>
             <id>placeholderapi</id>
             <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
         </repository>
-        <repository>
-            <id>spigotutils-maven</id>
-            <url>https://gitlab.com/api/v4/projects/14374071/packages/maven</url>
-        </repository>
         <repository>
             <id>codemc-public</id>
             <url>https://repo.codemc.io/repository/maven-public/</url>
@@ -64,15 +60,29 @@
         </repository>
         <repository>
             <id>andrei1058-releases</id>
-            <url>https://repo.andrei1058.com/releases/</url>
+            <url>https://repo.andrei1058.dev/releases/</url>
+        </repository>
+        <repository>
+            <id>citizens-repo</id>
+            <url>https://maven.citizensnpcs.co/repo</url>
+        </repository>
+        <repository>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
         </repository>
     </repositories>
 
     <dependencies>
+        <dependency>
+            <groupId>io.papermc</groupId>
+            <artifactId>paperlib</artifactId>
+            <version>1.0.7</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>de.simonsator</groupId>
             <artifactId>Party-and-Friends-MySQL-Edition-Spigot-API</artifactId>
-            <version>1.5.3</version>
+            <version>1.5.4-RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -101,7 +111,7 @@
         </dependency>
         <dependency>
             <groupId>net.citizensnpcs</groupId>
-            <artifactId>citizens</artifactId>
+            <artifactId>citizens-main</artifactId>
             <version>2.0.30-SNAPSHOT</version>
             <scope>provided</scope>
             <exclusions>
@@ -159,7 +169,12 @@
         </dependency>
         <dependency>
             <groupId>com.andrei1058.bedwars</groupId>
-            <artifactId>versionsupport_v1_18_R1</artifactId>
+            <artifactId>versionsupport_v1_18_R2</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.andrei1058.bedwars</groupId>
+            <artifactId>versionsupport_v1_19_R2</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -176,7 +191,7 @@
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.11.1</version>
+            <version>2.11.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -185,11 +200,6 @@
             <version>[1.0,)</version>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>com.andrei1058.spigotutils</groupId>
-            <artifactId>spigotutils</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
         <!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
         <dependency>
             <groupId>commons-io</groupId>
@@ -214,15 +224,51 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.36</version>
+            <version>2.0.5</version>
             <optional>true</optional>
         </dependency>
 
         <!--        Sidebar LIB-->
         <dependency>
             <groupId>com.andrei1058.spigot.sidebar</groupId>
-            <artifactId>sidebar-api</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <artifactId>sidebar-base</artifactId>
+            <version>22.12</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.andrei1058.spigot.sidebar</groupId>
+            <artifactId>sidebar-eight</artifactId>
+            <version>22.12</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.andrei1058.spigot.sidebar</groupId>
+            <artifactId>sidebar-twelve</artifactId>
+            <version>22.12</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.andrei1058.spigot.sidebar</groupId>
+            <artifactId>sidebar-sixteen</artifactId>
+            <version>22.12</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.andrei1058.spigot.sidebar</groupId>
+            <artifactId>sidebar-seventeen</artifactId>
+            <version>22.12</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.andrei1058.spigot.sidebar</groupId>
+            <artifactId>sidebar-eighteen</artifactId>
+            <version>22.12</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.andrei1058.spigot.sidebar</groupId>
+            <artifactId>sidebar-nineteen</artifactId>
+            <version>22.12</version>
             <scope>compile</scope>
         </dependency>
         <!--        End of Sidebar LIB-->
@@ -242,7 +288,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.1</version>
                 <configuration>
                     <relocations>
                         <relocation>