Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: andrei1058/BedWars1058
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 23.12
Choose a base ref
...
head repository: andrei1058/BedWars1058
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 7 commits
  • 76 files changed
  • 3 contributors

Commits on Dec 7, 2023

  1. Release 23.12.1 (#944)

    * fix bStats tracked id
    
    * remove scoreboard numbers, replace with team status when applicable on 1.20.3 scoreboard
    
    * fix default blast protection from fireballs on 1.8.8 (#937)
    
    * add deprecation notice for 1.8.8, 1.17.1, 1.19.1 and 1.20 (#939)
    
    * fix metric tracking
    
    * add 1.20.3 support
    andrei1058 authored Dec 7, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    91e6a76 View commit details
  2. Fix sidebar version (#945)

    * fix bStats tracked id
    
    * remove scoreboard numbers, replace with team status when applicable on 1.20.3 scoreboard
    
    * fix default blast protection from fireballs on 1.8.8 (#937)
    
    * add deprecation notice for 1.8.8, 1.17.1, 1.19.1 and 1.20 (#939)
    
    * fix metric tracking
    
    * add 1.20.3 support
    andrei1058 authored Dec 7, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    978c24a View commit details

Commits on Dec 10, 2023

  1. add 1.20.4 support (#949)

    add 1.20.4 support
    andrei1058 authored Dec 10, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3895fd0 View commit details

Commits on Mar 15, 2024

  1. Fixed NullPointerException error in NPCRemoveEvent event

    Fixed NullPointerException error in NPCRemoveEvent event
    ImYenil committed Mar 15, 2024
    Copy the full SHA
    1f5a2ff View commit details

Commits on Apr 20, 2024

  1. Merge pull request #1000 from ImYenil/Fix-NPCRemoveEvent-NullPointerE…

    …xception-
    
    Fixed NullPointerException error in NPCRemoveEvent event
    andrei1058 authored Apr 20, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    89129b2 View commit details

Commits on Sep 5, 2024

  1. Some release (#1042)

    - add new sidebar layout for playing state but eliminated (new path will be created: sidebar.Default.playing.eliminated) by andrei1058
    - fix message paths for money rewards [ #1021](#1021) by andrei1058
    -[ Fixed tag apply for VersionSupport#setShopUpgradeIdentifier](https://github.com/andrei1058/BedWars1058/pull/976/files), will fix shop item tier lost issue on mc 1.12 by [ImYenil](https://github.com/ImYenil)
    - [Fixed DespawnableProvider error in versions 1.20.3 & 1.20.4](#994) by [ImYenil](https://github.com/ImYenil)
    - [Fix TNT setSource method error in versions 1.20.3 & 1.20.4](#1003) by [ImYenil](https://github.com/ImYenil)
    - [Fix #1006 - Sidebar support for 1.16.5](#1010)
    - [Fix NBTTag tag apply for 1.18.2, 1.17.1, 1.12.2 and 1.8.8](#969) by [KKiiya](https://github.com/KKiiya)
    -[ Fix null pointer error while trying to apply NBT tags to AIR](#967) by [ImYenil](https://github.com/ImYenil)
    - [Add spigot 1.20.3 support](#943) by andrei1058
    - [Fix bStats metric tracking](5f1c526) by andrei1058
    - [ fix default blast protection from fireballs on 1.8.8](#937) by Owner
    [andrei1058](https://github.com/andrei1058)
    - [fix bStats resource ID](f6bfd88) by andrei1058
    andrei1058 authored Sep 5, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    b88998d View commit details

Commits on Feb 9, 2025

  1. Develop (#1072)

    * fix tracked id
    
    * downgrade support to java 17
    
    * downgrade support to java 17
    
    * Update deploy_snapshot.yml (#932)
    
    * Update deploy_snapshot.yml (#934)
    
    * Update compile_snapshot.yml (#933)
    
    * update sidebar lib (#931)
    
    * Update deploy_snapshot.yml
    
    * Update deploy.yml (#935)
    
    * Update deploy_snapshot.yml
    
    * fix default blast protection from fireballs on 1.8.8 (#937)
    
    * add deprecation notice for 1.8.8, 1.17.1, 1.19.1 and 1.20 (#939)
    
    * fix metric tracking
    
    * WIP: Add 1.20.3 support (#943)
    
    * wip add 1.20.3 support
    
    * add 1.20.3 support
    
    * update sidebar version
    
    * add 1.20.4 support (#948)
    
    add 1.20.4 support
    
    * distinguish eliminated player sidebar from spectators (#953)
    
    * Fixed tag apply (#969)
    
    * add 1.20.4 support (#949)
    
    add 1.20.4 support
    
    * Fixed tag apply
    
    Fixed tag apply for 1.18.2, 1.17.1, 1.12.2 and 1.8.8 where the tag wouldnt get applied ever (because the NBTTag was getting applied only if the item was null with no additive tags)
    
    ---------
    
    Co-authored-by: Andrei Dascălu <andrew.dascalu@gmail.com>
    
    * Fixed NullPointerException (#967)
    
    * add 1.20.4 support (#949)
    
    add 1.20.4 support
    
    * Fixed NullPointerException
    
    Fixed NullPointerException
    
    Error Log: https://pastebin.com/DCWeqQKQ
    
    ---------
    
    Co-authored-by: Andrei Dascălu <andrew.dascalu@gmail.com>
    
    * Fixed tag apply for VersionSupport#setShopUpgradeIdentifier
    
    * Fixed DespawnableProvider error in versions 1.20.3 & 1.20.4
    
    Fixed DespawnableProvider error in versions 1.20.3 & 1.20.4
    
    * Fix setSource method error in versions 1.20.3 & 1.20.4
    
    Fixed setSource method error in versions 1.20.3 & 1.20.4
    
    * Fix #1006 - Sidebar support for 1.16.5 (#1010)
    
    * fix dependency
    
    * Fix message path for money rewards
    
    Fix message path for money rewards
    
    * Fix 947 - holograms on 1.20.2-4 (#1071)
    
    * slime format conversion improvement (#908)
    
    * fix #906, slime world conversion improvement
    
    * downgrade java version to 17 for 1.20 and 1.19
    
    * Some release (#1042)
    
    - add new sidebar layout for playing state but eliminated (new path will be created: sidebar.Default.playing.eliminated) by andrei1058
    - fix message paths for money rewards [ #1021](#1021) by andrei1058
    -[ Fixed tag apply for VersionSupport#setShopUpgradeIdentifier](https://github.com/andrei1058/BedWars1058/pull/976/files), will fix shop item tier lost issue on mc 1.12 by [ImYenil](https://github.com/ImYenil)
    - [Fixed DespawnableProvider error in versions 1.20.3 & 1.20.4](#994) by [ImYenil](https://github.com/ImYenil)
    - [Fix TNT setSource method error in versions 1.20.3 & 1.20.4](#1003) by [ImYenil](https://github.com/ImYenil)
    - [Fix #1006 - Sidebar support for 1.16.5](#1010)
    - [Fix NBTTag tag apply for 1.18.2, 1.17.1, 1.12.2 and 1.8.8](#969) by [KKiiya](https://github.com/KKiiya)
    -[ Fix null pointer error while trying to apply NBT tags to AIR](#967) by [ImYenil](https://github.com/ImYenil)
    - [Add spigot 1.20.3 support](#943) by andrei1058
    - [Fix bStats metric tracking](5f1c526) by andrei1058
    - [ fix default blast protection from fireballs on 1.8.8](#937) by Owner
    [andrei1058](https://github.com/andrei1058)
    - [fix bStats resource ID](f6bfd88) by andrei1058
    
    * reduce packets spam
    
    * deprecate gen holo
    
    * recycle code
    
    * fix #947 on 1.20.4
    
    * version string update
    
    * fix 1.20.3-4 support
    
    * fix 1.20.2 holograms
    
    * update workflows
    
    * remove dependency
    
    * change repository order
    
    * update papermc repo url
    
    * pom update
    
    ---------
    
    Co-authored-by: Kiiya <105589176+KKiiya@users.noreply.github.com>
    Co-authored-by: Yenil <85287520+ImYenil@users.noreply.github.com>
    3 people authored Feb 9, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    aa4e5ef View commit details
Showing with 2,355 additions and 116 deletions.
  1. +6 −6 .github/workflows/compile_snapshot.yml
  2. +4 −4 .github/workflows/deploy.yml
  3. +3 −4 .github/workflows/deploy_snapshot.yml
  4. +1 −1 bedwars-api/pom.xml
  5. +1 −0 bedwars-api/src/main/java/com/andrei1058/bedwars/api/arena/generator/IGenHolo.java
  6. +4 −2 bedwars-api/src/main/java/com/andrei1058/bedwars/api/language/Messages.java
  7. +57 −31 bedwars-plugin/pom.xml
  8. +12 −0 bedwars-plugin/src/main/java/com/andrei1058/bedwars/BedWars.java
  9. +1 −4 bedwars-plugin/src/main/java/com/andrei1058/bedwars/arena/OreGenerator.java
  10. +3 −1 bedwars-plugin/src/main/java/com/andrei1058/bedwars/configuration/MainConfig.java
  11. +64 −0 bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Bangla.java
  12. +69 −0 bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/English.java
  13. +68 −0 bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Hindi.java
  14. +68 −0 bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Indonesia.java
  15. +68 −0 bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Italian.java
  16. +72 −0 bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Persian.java
  17. +68 −0 bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Polish.java
  18. +68 −0 bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Portuguese.java
  19. +72 −0 bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Romanian.java
  20. +68 −0 bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Russian.java
  21. +68 −0 bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/SimplifiedChinese.java
  22. +68 −0 bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Spanish.java
  23. +68 −0 bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Turkish.java
  24. +6 −1 bedwars-plugin/src/main/java/com/andrei1058/bedwars/listeners/DamageDeathMove.java
  25. +9 −8 bedwars-plugin/src/main/java/com/andrei1058/bedwars/sidebar/BwSidebar.java
  26. +26 −0 bedwars-plugin/src/main/java/com/andrei1058/bedwars/sidebar/BwSidebarLine.java
  27. +7 −2 bedwars-plugin/src/main/java/com/andrei1058/bedwars/sidebar/SidebarService.java
  28. +2 −0 bedwars-plugin/src/main/java/com/andrei1058/bedwars/support/citizens/CitizensListener.java
  29. +18 −9 pom.xml
  30. +1 −1 resetadapter_aswm/pom.xml
  31. +1 −1 resetadapter_slime/pom.xml
  32. +1 −1 resetadapter_slimepaper/pom.xml
  33. +1 −1 versionsupport_1_12_R1/pom.xml
  34. +8 −4 versionsupport_1_12_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_12_R1/v1_12_R1.java
  35. +1 −1 versionsupport_1_8_R3/pom.xml
  36. +1 −0 versionsupport_1_8_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_8_R3/IGolem.java
  37. +1 −0 versionsupport_1_8_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_8_R3/Silverfish.java
  38. +9 −4 versionsupport_1_8_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_8_R3/v1_8_R3.java
  39. +1 −1 versionsupport_common/pom.xml
  40. +1 −1 versionsupport_v1_16_R3/pom.xml
  41. +8 −4 versionsupport_v1_16_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_16_R3/v1_16_R3.java
  42. +1 −1 versionsupport_v1_17_R1/pom.xml
  43. +1 −0 versionsupport_v1_17_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_17_R1/IGolem.java
  44. +1 −0 ...ionsupport_v1_17_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_17_R1/Silverfish.java
  45. +9 −4 versionsupport_v1_17_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_17_R1/v1_17_R1.java
  46. +1 −1 versionsupport_v1_18_R2/pom.xml
  47. +8 −4 versionsupport_v1_18_R2/src/main/java/com/andrei1058/bedwars/support/version/v1_18_R2/v1_18_R2.java
  48. +1 −1 versionsupport_v1_19_R2/pom.xml
  49. +1 −0 .../main/java/com/andrei1058/bedwars/support/version/v1_19_R2/despawnable/DespawnableAttributes.java
  50. +1 −0 ...src/main/java/com/andrei1058/bedwars/support/version/v1_19_R2/despawnable/DespawnableFactory.java
  51. +1 −0 ...rc/main/java/com/andrei1058/bedwars/support/version/v1_19_R2/despawnable/DespawnableProvider.java
  52. +1 −0 ...R2/src/main/java/com/andrei1058/bedwars/support/version/v1_19_R2/despawnable/DespawnableType.java
  53. +1 −0 ...9_R2/src/main/java/com/andrei1058/bedwars/support/version/v1_19_R2/despawnable/TeamIronGolem.java
  54. +1 −0 ..._R2/src/main/java/com/andrei1058/bedwars/support/version/v1_19_R2/despawnable/TeamSilverfish.java
  55. +1 −0 versionsupport_v1_19_R2/src/main/java/com/andrei1058/bedwars/support/version/v1_19_R2/v1_19_R2.java
  56. +1 −1 versionsupport_v1_19_R3/pom.xml
  57. +5 −5 versionsupport_v1_20_R1/pom.xml
  58. +1 −0 .../main/java/com/andrei1058/bedwars/support/version/v1_20_R1/despawnable/DespawnableAttributes.java
  59. +1 −0 ...src/main/java/com/andrei1058/bedwars/support/version/v1_20_R1/despawnable/DespawnableFactory.java
  60. +1 −0 ...rc/main/java/com/andrei1058/bedwars/support/version/v1_20_R1/despawnable/DespawnableProvider.java
  61. +1 −0 ...R1/src/main/java/com/andrei1058/bedwars/support/version/v1_20_R1/despawnable/DespawnableType.java
  62. +1 −0 ...0_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_20_R1/despawnable/TeamIronGolem.java
  63. +1 −0 ..._R1/src/main/java/com/andrei1058/bedwars/support/version/v1_20_R1/despawnable/TeamSilverfish.java
  64. +1 −0 versionsupport_v1_20_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_20_R1/v1_20_R1.java
  65. +11 −5 versionsupport_v1_20_R2/pom.xml
  66. +2 −2 versionsupport_v1_20_R2/src/main/java/com/andrei1058/bedwars/support/version/v1_20_R2/v1_20_R2.java
  67. +70 −0 versionsupport_v1_20_R3/pom.xml
  68. +5 −0 .../main/java/com/andrei1058/bedwars/support/version/v1_20_R3/despawnable/DespawnableAttributes.java
  69. +27 −0 ...src/main/java/com/andrei1058/bedwars/support/version/v1_20_R3/despawnable/DespawnableFactory.java
  70. +71 −0 ...rc/main/java/com/andrei1058/bedwars/support/version/v1_20_R3/despawnable/DespawnableProvider.java
  71. +6 −0 ...R3/src/main/java/com/andrei1058/bedwars/support/version/v1_20_R3/despawnable/DespawnableType.java
  72. +58 −0 ...0_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_20_R3/despawnable/TeamIronGolem.java
  73. +56 −0 ..._R3/src/main/java/com/andrei1058/bedwars/support/version/v1_20_R3/despawnable/TeamSilverfish.java
  74. +838 −0 versionsupport_v1_20_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_20_R3/v1_20_R3.java
  75. +74 −0 versionsupport_v1_20_R4/pom.xml
  76. +12 −0 versionsupport_v1_20_R4/src/main/java/com/andrei1058/bedwars/support/version/v1_20_R4/v1_20_R4.java
12 changes: 6 additions & 6 deletions .github/workflows/compile_snapshot.yml
Original file line number Diff line number Diff line change
@@ -10,16 +10,16 @@ on:
jobs:
build:
runs-on: ubuntu-latest
environment:
name: development
url: https://repo.andrei1058.dev
# environment:
# name: development
# url: https://repo.andrei1058.dev
steps:
- uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: '19.0.2+7'
distribution: 'adopt'
java-version: '21'
distribution: 'temurin'
- name: Deploy snapshot with Maven
env:
MVN_REPO_USER: ${{ secrets.MVN_REPO_USER }}
@@ -32,4 +32,4 @@ jobs:
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
echo "UPDATE_VERSION=$UPDATE_VERSION" >> $GITHUB_ENV
8 changes: 4 additions & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -9,14 +9,14 @@ jobs:
runs-on: ubuntu-latest
environment:
name: production
url: https://repo.andrei1058.com
url: https://repo.andrei1058.dev
steps:
- uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: '19.0.2+7'
distribution: 'adopt'
java-version: '21'
distribution: 'temurin'
- name: Deploy with Maven
env:
MVN_REPO_USER: ${{ secrets.MVN_REPO_USER }}
@@ -44,4 +44,4 @@ jobs:
with:
generate_release_notes: true
name: ${{env.UPDATE_VERSION}}
tag_name: ${{env.UPDATE_VERSION}}
tag_name: ${{env.UPDATE_VERSION}}
7 changes: 3 additions & 4 deletions .github/workflows/deploy_snapshot.yml
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@ on:
push:
branches:
- develop

jobs:
build:
runs-on: ubuntu-latest
@@ -16,8 +15,8 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: '19.0.2+7'
distribution: 'adopt'
java-version: '21'
distribution: 'temurin'
- name: Deploy snapshot with Maven
env:
MVN_REPO_USER: ${{ secrets.MVN_REPO_USER }}
@@ -30,4 +29,4 @@ jobs:
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
echo "UPDATE_VERSION=$UPDATE_VERSION" >> $GITHUB_ENV
2 changes: 1 addition & 1 deletion bedwars-api/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<artifactId>BedWars1058</artifactId>
<groupId>com.andrei1058.bedwars</groupId>
<version>23.10.1-SNAPSHOT</version>
<version>25.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>bedwars-api</artifactId>
Original file line number Diff line number Diff line change
@@ -22,6 +22,7 @@

import org.bukkit.entity.Player;

@Deprecated
public interface IGenHolo {

/**
Original file line number Diff line number Diff line change
@@ -314,6 +314,8 @@ public class Messages {
public static String SCOREBOARD_DEFAULT_STARTING_SPEC = "sidebar.Default.starting.spectator";
public static String SCOREBOARD_DEFAULT_PLAYING = "sidebar.Default.playing.alive";
public static String SCOREBOARD_DEFAULT_PLAYING_SPEC = "sidebar.Default.playing.spectator";
public static String SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED = "sidebar.Default.playing.eliminated";

public static String SCOREBOARD_DEFAULT_RESTARTING_SPEC = "sidebar.Default.restarting.spectator";
public static String SCOREBOARD_DEFAULT_RESTARTING_WIN1 = "sidebar.Default.restarting.winner-alive";
public static String SCOREBOARD_DEFAULT_RESTARTING_WIN2 = "sidebar.Default.restarting.winner-eliminated";
@@ -386,8 +388,8 @@ public class Messages {
public static String XP_REWARD_FINAL_KILL = "xp-reward-final-kill";

public static String MONEY_REWARD_WIN = "money-reward-game-win";
public static String MONEY_REWARD_PER_MINUTE = "money-reward-per-teammate";
public static String MONEY_REWARD_PER_TEAMMATE = "money-reward-per-minute";
public static String MONEY_REWARD_PER_MINUTE = "money-reward-per-minute";
public static String MONEY_REWARD_PER_TEAMMATE = "money-reward-per-teammate";
public static String MONEY_REWARD_BED_DESTROYED = "money-reward-bed-destroyed";
public static String MONEY_REWARD_FINAL_KILL = "money-reward-final-kill";
public static String MONEY_REWARD_REGULAR_KILL = "money-reward-regular-kill";
88 changes: 57 additions & 31 deletions bedwars-plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -5,31 +5,14 @@
<parent>
<artifactId>BedWars1058</artifactId>
<groupId>com.andrei1058.bedwars</groupId>
<version>23.10.1-SNAPSHOT</version>
<version>25.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>bedwars-plugin</artifactId>
<packaging>jar</packaging>
<version>${project.parent.version}</version>

<pluginRepositories>
<pluginRepository>
<!-- This is a temporary reference as the Maven Shade plugin
that supports Java 17 is not released yet -->
<id>maven-snapshots</id>
<url>https://repository.apache.org/content/repositories/snapshots/</url>
</pluginRepository>
</pluginRepositories>

<repositories>
<repository>
<id>simonsators-repo</id>
<url>https://simonsator.de/repo/</url>
</repository>
<repository>
<id>citizens</id>
<url>https://maven.citizensnpcs.co/repo</url>
</repository>
<repository>
<id>placeholderapi</id>
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
@@ -50,6 +33,15 @@
<id>codemc-nms</id>
<url>https://repo.codemc.io/repository/nms/</url>
</repository>
<repository>
<id>simonsators-repo</id>
<url>https://simonsator.de/repo/</url>
</repository>
<repository>
<id>citizens</id>
<url>https://maven.citizensnpcs.co/repo</url>
</repository>

<repository>
<id>spigotmc-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
@@ -68,7 +60,7 @@
</repository>
<repository>
<id>papermc</id>
<url>https://papermc.io/repo/repository/maven-public/</url>
<url>https://repo.papermc.io/repository/maven-public/</url>
</repository>
</repositories>

@@ -192,6 +184,16 @@
<artifactId>versionsupport_v1_20_R2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.andrei1058.bedwars</groupId>
<artifactId>versionsupport_v1_20_R3</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.andrei1058.bedwars</groupId>
<artifactId>versionsupport_v1_20_R4</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.andrei1058.bedwars</groupId>
<artifactId>versionsupport-common</artifactId>
@@ -206,7 +208,7 @@
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.11.3</version>
<version>2.11.6</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -247,61 +249,85 @@
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-base</artifactId>
<version>23.10</version>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_8_R3</artifactId>
<version>23.10</version>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_12_R1</artifactId>
<version>23.10</version>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_16_R1</artifactId>
<version>23.10</version>
<artifactId>sidebar-v1_16_R3</artifactId>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_17_R1</artifactId>
<version>23.10</version>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_18_R2</artifactId>
<version>23.10</version>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_19_R2</artifactId>
<version>23.10</version>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_19_R3</artifactId>
<version>23.10</version>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_20_R1</artifactId>
<version>23.10</version>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_20_R2</artifactId>
<version>23.10</version>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_20_R3</artifactId>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_20_R4</artifactId>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_20_R4</artifactId>
<version>23.12</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_20_R4</artifactId>
<version>23.12</version>
<scope>compile</scope>
</dependency>
<!-- End of Sidebar LIB-->
12 changes: 12 additions & 0 deletions bedwars-plugin/src/main/java/com/andrei1058/bedwars/BedWars.java
Original file line number Diff line number Diff line change
@@ -516,6 +516,9 @@ public void onEnable() {

// TNT Spoil Feature
SpoilPlayerTNTFeature.init();

// Warn user if current server version support is deprecated
this.performDeprecationCheck();
}

/**
@@ -753,6 +756,15 @@ public static void setParty(Party party) {
BedWars.party = party;
}

public void performDeprecationCheck() {
Bukkit.getScheduler().runTaskAsynchronously(this, () -> {
if (Arrays.stream(nms.getClass().getAnnotations()).anyMatch(annotation -> annotation instanceof Deprecated)) {
this.getLogger().warning("Support for "+getServerVersion()+" is scheduled for removal. " +
"Please consider upgrading your server software to a newer Minecraft version.");
}
});
}

@Override
public ChunkGenerator getDefaultWorldGenerator(String worldName, String id) {
return new VoidChunkGenerator();
Original file line number Diff line number Diff line change
@@ -263,10 +263,7 @@ public HoloGram(String iso) {
@Override
public void updateForAll() {
for (Player p2 : timer.getWorld().getPlayers()) {
if (Language.getPlayerLanguage(p2).getIso().equalsIgnoreCase(iso)) continue;
nms.hideEntity(tier, p2);
nms.hideEntity(timer, p2);
nms.hideEntity(name, p2);
updateForPlayer(p2, Language.getPlayerLanguage(p2).getIso());
}
}

Original file line number Diff line number Diff line change
@@ -116,7 +116,8 @@ public MainConfig(Plugin plugin, String name) {
yml.addDefault(ConfigPath.GENERAL_TNT_JUMP_DAMAGE_OTHERS, 10);

// tnd block blast resistance
yml.addDefault(ConfigPath.GENERAL_TNT_PROTECTION_END_STONE_BLAST, 12f);
// on 1.8.8 it has to be around 69, on 1.20 and 1.18 it works fine with 12 (tested)
yml.addDefault(ConfigPath.GENERAL_TNT_PROTECTION_END_STONE_BLAST, BedWars.nms.getVersion() == 0 ? 69f : 12f);
yml.addDefault(ConfigPath.GENERAL_TNT_PROTECTION_GLASS_BLAST, 300f);
yml.addDefault(ConfigPath.GENERAL_TNT_RAY_BLOCKED_BY_GLASS, true);

@@ -382,6 +383,7 @@ public MainConfig(Plugin plugin, String name) {
try {
Bukkit.spigot().getConfig().save("spigot.yml");
} catch (IOException e) {
//noinspection CallToPrintStackTrace
e.printStackTrace();
}

Loading