release (#554)

* 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 * pliz * oh gosh * 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 <[email protected]> * 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 <[email protected]> Co-authored-by: DevSolaris <[email protected]> Co-authored-by: J.T. McQuigg <[email protected]> Co-authored-by: JektDV <[email protected]> Co-authored-by: Xxyuri2005xX <[email protected]> Co-authored-by: ajgeiss0702 <[email protected]> Co-authored-by: Marcelektro <[email protected]> Co-authored-by: MarcelDutko <[email protected]> Co-authored-by: Ricardo <[email protected]> Co-authored-by: iiAhmedYT <[email protected]> Co-authored-by: Memexurer <[email protected]> Co-authored-by: IIHERO4 <[email protected]> Co-authored-by: DevSolaris <[email protected]> Co-authored-by: Bart <[email protected]> Co-authored-by: DevSolaris <[email protected]>
andrei1058 · Jul 3, 2022 · e7d5322 · e7d5322
1 parent 10d9535
commit e7d5322
Show file tree

Hide file tree

Showing 79 changed files with 414 additions and 7,872 deletions.
diff --git a/.github/workflows/compile_snapshot.yml b/.github/workflows/compile_snapshot.yml
@@ -0,0 +1,35 @@
+name: Compile snapshot with Maven
+
+on:
+  push:
+    branches-ignore:
+      - master
+      - development
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    environment:
+      name: development
+      url: https://repo.andrei1058.dev
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 17.0.3
+        uses: actions/setup-java@v2
+        with:
+          java-version: '17.0.3'
+          distribution: 'adopt'
+      - name: Deploy snapshot with Maven
+        env:
+          MVN_REPO_USER: ${{ secrets.MVN_REPO_USER }}
+          MVN_REPO_PASS: ${{ secrets.MVN_REPO_PASS }}
+          ANDEV_RES_ID: 1
+        run: |
+          sudo apt install jq -y
+          curl -X GET https://api.andrei1058.dev/v1/resources/$ANDEV_RES_ID/versioning/current -H "Accept: application/json" >> version.json
+          export UPDATE_VERSION=`jq '.version' version.json | tr -d '"'`
+          mvn versions:set -DnewVersion=$UPDATE_VERSION-SNAPSHOT
+          mvn versions:update-child-modules
+          mvn clean install -s ci_settings.xml
+          echo "UPDATE_VERSION=$UPDATE_VERSION" >> $GITHUB_ENV
diff --git a/.github/workflows/deploy.yml b/.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.2
+      - name: Set up JDK 17.0.3
         uses: actions/setup-java@v2
         with:
-          java-version: '17.0.2'
+          java-version: '17.0.3'
           distribution: 'adopt'
       - name: Deploy with Maven
         env:

diff --git a/.github/workflows/deploy_snapshot.yml b/.github/workflows/deploy_snapshot.yml
@@ -0,0 +1,34 @@
+name: Deploy snapshot with Maven
+
+on:
+  push:
+    branches:
+      - master
+      - development
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    environment:
+      name: development
+      url: https://repo.andrei1058.dev
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 17.0.3
+        uses: actions/setup-java@v2
+        with:
+          java-version: '17.0.3'
+          distribution: 'adopt'
+      - name: Deploy snapshot with Maven
+        env:
+          MVN_REPO_USER: ${{ secrets.MVN_REPO_USER }}
+          MVN_REPO_PASS: ${{ secrets.MVN_REPO_PASS }}
+          ANDEV_RES_ID: 1
+        run: |
+          sudo apt install jq -y
+          curl -X GET https://api.andrei1058.dev/v1/resources/$ANDEV_RES_ID/versioning/current -H "Accept: application/json" >> version.json
+          export UPDATE_VERSION=`jq '.version' version.json | tr -d '"'`
+          mvn versions:set -DnewVersion=$UPDATE_VERSION-SNAPSHOT
+          mvn versions:update-child-modules
+          mvn clean deploy -s ci_settings.xml
+          echo "UPDATE_VERSION=$UPDATE_VERSION" >> $GITHUB_ENV
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/.gitlab/issue_templates/suggestion.md b/.gitlab/issue_templates/suggestion.md
diff --git a/README.md b/README.md
@@ -19,30 +19,9 @@ heavy if you are still making use of HDD in 2021, and you do not have a decent C
 and faster restore system install [SlimeWorldManager](https://www.spigotmc.org/resources/slimeworldmanager.69974/) or [AdvancedWorldManager](https://www.spigotmc.org/resources/advanced-slimeworldmanager.87209/).
 BedWars1058 will hook into it and do everything for you.
 
-# Pre-made setups
-You can contact us, so we can add yours here :)
-
-- by Adi100 - [BEDWARS SETUP ✨Generator Upgrade | Afk System | Custom Menus | NPCs](https://www.mc-market.org/resources/12378/?__cf_chl_jschl_tk__=pmd_zUe1xjS2ei0EP72mxwcz.hbPaDehkT0pn1EYURI9QEk-1635185029-0-gqNtZGzNAnujcnBszQj9)
-- by Ruben_Artz - [BEDWARS + DISCORD BOT](https://polymart.org/resource/bedwars-discord-bot-setup.544)
-- (**new**) by DyeEarth - [❄️ Premade Bedwars - Setups](https://polymart.org/resource/premade-bedwars-setups.1679)
-- By StudioBeam Development - [✨BEDWARS SETUP - With 100+ Pre-Made Arenas, Custom Menus, Grappling Hooks {Exclusive Features!}](https://polymart.org/resource/bedwars-setup-studiobeam-dev.1968)
-# Community Add-ons
-
-- [Private Games - Create private games and play with friends](https://polymart.org/resource/1620) - by Mher
-- [Compass - Team Tracker, Quick Communications, Multi-language support](https://www.spigotmc.org/resources/91537/) - by Mher
-- [Sponge - Playing cool effect when placing a sponge](https://www.spigotmc.org/resources/93540/) - by Mher
-- [AntiDrop - Players Not Allow To Drop The Items In The Void](https://www.spigotmc.org/resources/86391/) - by Mher
-- [LuckyBlock NTD - Add LuckyBlocks to your ingame spawners](https://www.spigotmc.org/resources/94872/) - by danirod12
-- [Team Selector - Select your color before the game starts](https://www.spigotmc.org/resources/60438/) - by andrei1058
-- [BedWarsProxy - Arena selector for bungee scalable mode](https://www.spigotmc.org/resources/66642/) - by andrei1058
-- [Reward commands - Execute commands in certain moments of the game](https://www.spigotmc.org/resources/55381/) - by andrei1058
-- [Web stats - Display player stats on a web page](https://www.spigotmc.org/resources/55523/) - by MrDuckBoy_Xx
-- [Pop-up Towers](https://www.spigotmc.org/resources/83661/) - by KimoVoidDSGN
-- [Generator Split](https://www.spigotmc.org/resources/83883/) - by KimoVoidDSGN
-- [Discord Stats](https://www.mc-market.org/resources/20403/) - by Zorino
-- [BedWars Spectator & Play-Again Addon {Menu}](https://polymart.org/resource/bw1058-spectator-options-free.1937) - by StudioBeam Development
-- [BedWars Arena Start Messages](https://polymart.org/resource/bedwars1058-arena-start-message.1880) - by StudioBeam Development
+# Pre-made setups and community addons
 
+You can find a list of pre-made setups and community addons [on the wiki](https://wiki.andrei1058.dev/docs/BedWars1058/addons)
 
 # Main features
 

diff --git a/bedwars-api/pom.xml b/bedwars-api/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bedwars-api</artifactId>
-    <version>${parent.version}</version>
+    <version>${project.parent.version}</version>
 
     <repositories>
         <repository>

diff --git a/bedwars-api/src/main/java/com/andrei1058/bedwars/api/arena/team/TeamColor.java b/bedwars-api/src/main/java/com/andrei1058/bedwars/api/arena/team/TeamColor.java
@@ -230,7 +230,7 @@ public static String enName(@NotNull String material) {
             case "PINK_WOOL":
                 name = "Pink";
                 break;
-            case "RED":
+            case "RED_WOOL":
                 name = "Red";
                 break;
             case "LIGHT_GRAY_WOOL":

diff --git a/bedwars-api/src/main/java/com/andrei1058/bedwars/api/configuration/ConfigPath.java b/bedwars-api/src/main/java/com/andrei1058/bedwars/api/configuration/ConfigPath.java
@@ -112,6 +112,9 @@ public class ConfigPath {
     public static final String GENERAL_CONFIGURATION_DRAGON_SPAWN_COUNTDOWN = "countdowns.next-event-dragon-spawn";
     public static final String GENERAL_CONFIGURATION_GAME_END_COUNTDOWN = "countdowns.next-event-game-end";
 
+    public static final String GENERAL_CONFIGURATION_HUNGER_WAITING = "allow-hunger-depletion.waiting";
+    public static final String GENERAL_CONFIGURATION_HUNGER_INGAME = "allow-hunger-depletion.ingame";
+
     public static final String GENERAL_CONFIGURATION_ARENA_GROUPS = "arenaGroups";
     public static final String GENERAL_CONFIGURATION_REJOIN_TIME = "rejoin-time";
     public static final String GENERAL_CONFIGURATION_RE_SPAWN_INVULNERABILITY = "re-spawn-invulnerability";

diff --git a/...main/java/com/andrei1058/bedwars/api/events/spectator/SpectatorFirstPersonEnterEvent.java b/...main/java/com/andrei1058/bedwars/api/events/spectator/SpectatorFirstPersonEnterEvent.java
@@ -43,8 +43,8 @@ public class SpectatorFirstPersonEnterEvent extends Event implements Cancellable
     private Function<Player, String> title;
     private Function<Player, String> subTitle;
     private int fadeIn = 0;
-    private int stay = 30;
-    private int fadeOut = 0;
+    private int stay = 40;
+    private int fadeOut = 10;
 
     // A list of all players spectating in first person
     private static List<UUID> spectatingInFirstPerson = new ArrayList<>();

diff --git a/...main/java/com/andrei1058/bedwars/api/events/spectator/SpectatorFirstPersonLeaveEvent.java b/...main/java/com/andrei1058/bedwars/api/events/spectator/SpectatorFirstPersonLeaveEvent.java
@@ -36,8 +36,8 @@ public class SpectatorFirstPersonLeaveEvent extends Event {
     private Function<Player, String> title;
     private Function<Player, String> subTitle;
     private int fadeIn = 0;
-    private int stay = 30;
-    private int fadeOut = 0;
+    private int stay = 40;
+    private int fadeOut = 10;
 
     public SpectatorFirstPersonLeaveEvent(Player spectator, IArena arena, Function<Player, String> title, Function<Player, String> subtitle) {
         this.spectator = spectator;

diff --git a/bedwars-api/src/main/java/com/andrei1058/bedwars/api/events/team/TeamEliminatedEvent.java b/bedwars-api/src/main/java/com/andrei1058/bedwars/api/events/team/TeamEliminatedEvent.java
@@ -0,0 +1,38 @@
+package com.andrei1058.bedwars.api.events.team;
+
+import com.andrei1058.bedwars.api.arena.IArena;
+import com.andrei1058.bedwars.api.arena.team.ITeam;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+public class TeamEliminatedEvent extends Event {
+    private static final HandlerList HANDLERS = new HandlerList();
+
+    private final IArena arena;
+    private final ITeam eliminated;
+
+    /**
+     * Called when all Team gets killed and Bed is broken during the game.
+     *
+     *
+     */
+
+    public TeamEliminatedEvent(IArena arena, ITeam eliminated) {
+        this.arena = arena;
+        this.eliminated = eliminated;
+    }
+
+    public IArena getArena() {
+        return arena;
+    }
+
+    public ITeam getTeam() {return eliminated;}
+
+    public HandlerList getHandlers() {
+        return HANDLERS;
+    }
+
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
+    }
+}
diff --git a/bedwars-api/src/main/java/com/andrei1058/bedwars/api/server/VersionSupport.java b/bedwars-api/src/main/java/com/andrei1058/bedwars/api/server/VersionSupport.java
@@ -130,6 +130,11 @@ protected void loadDefaultEffects() {
      */
     public abstract boolean isProjectile(ItemStack itemStack);
 
+    /**
+     * Check if itemstack is Invisibility Potion
+     */
+    public abstract boolean isInvisibilityPotion(ItemStack itemStack);
+
     /**
      * Register custom entities
      */