v7 is here (#3982)

* Update MiniMessage to 4.10.1 (#3617) * chore!: bump MiniMessage to 4.10.1 BREAKING CHANGE: bumping MiniMessage and Adventure removes the adventure Template class and breaks the whole messaging system api wise * chore: fix minimessage messages, fix circular method reference * build: Update to Paper 1.18.2 (#3622) build: Align MM and Adventure version * Replace legacy color codes in flag examples (#3520) * chore: Change maven group and artifact ID (#3632) chore: Change maven group and artifact ID * v7 is 7.0.0-SNAPSHOT * build: Update bom * Chore: General deprecations (#3660) Address deprecations for removal throughout the plugin * Address deprecations in queue/generation code (#3658) * Update to new Spigot generation API (#3659) * Address deprecations in queue/generation code * Move to new generation API - Currently not working due to lack of biome-setting capability via BiomeProvider for flat worlds * Any fixes to flat world biome setting will target 1.19 * Ensure compiled is actually set to true in BlockBucket * Delegate to platformGenerator in deprecated generation method if applicable when using new generation methods (1.19) * Re-add wrongly removed method * Handle exceptions using logger * We can simplify getting relative offset using floormod * Replace many booleans with EnumSet * Address comments, remove needless boolean return for populateChunk * Ensure use of new generation methods only on 1.19 and above * refactor: simplify timeout logic in uuid pipeline (#3760) simplify timeout logic * Fix compile errors * Revert GAV changes * Update javadoc links * Start deployment of v7 snapshots * Temporarily create javadocs for v7 snapshots * Temporarily create javadocs for v7 snapshots * Fixes #3919 * Fix relocation of informative annotations * Drop HTTP4J (#3916) * Fixes #3906 by fine-graining the help menu generation localization support * Clean up merge * *Actually clean up * chore: Remove things marked as for removal (#3941) * chore: Remove things marked as for removal * Address feedback Co-authored-by: Alexander Brandes <mc.cache@web.de> * Resolved conflicts * Cleanup deprecated methods * Revert "Cleanup deprecated methods" This reverts commit 26692d6. * Record-inize methods (#3976) * Delete unused HyperverseWorldManager file * Migrate left over occurrences to enhanced switches (#3979) * Migrate left-overs to enhanced switches * More * Cleanup deprecated methods (#3980) * Perform code formatting according to editorconfig (#3981) * Perform code reformatting * Fix javadoc errors * Don't format JSON files --------- Co-authored-by: Pierre Maurice Schwang <mail@pschwang.eu> Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com> Co-authored-by: dordsor21 <dordsor21@gmail.com>
IntellectualSites · Mar 6, 2023 · f11f5f0 · f11f5f0
1 parent ea19ff7
commit f11f5f0
Show file tree

Hide file tree

Showing 221 changed files with 3,369 additions and 4,490 deletions.
diff --git a/.github/workflows/announce-release-on-discord.yml b/.github/workflows/announce-release-on-discord.yml
@@ -1,7 +1,7 @@
 name: Announce release on discord
 on:
   release:
-    types: [published]
+    types: [ published ]
 jobs:
   send_announcement:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -1,12 +1,12 @@
 name: Build PR
-on: [pull_request]
+on: [ pull_request ]
 jobs:
   build_pr:
     if: github.repository_owner == 'IntellectualSites'
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: build
 on:
   push:
     branches:
-      - v6
+      - v7
 jobs:
   build:
     if: github.repository_owner == 'IntellectualSites'
@@ -28,22 +28,23 @@ jobs:
             echo "STATUS=release" >> $GITHUB_ENV
           fi
       - name: Publish Release
-        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}}
+        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}}
         run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
         env:
           ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
           ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
       - name: Publish Snapshot
-        if: ${{ runner.os == 'Linux' && env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6' }}
+        if: ${{ runner.os == 'Linux' && env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7' }}
         run: ./gradlew publishToSonatype
         env:
           ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
           ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
       - name: Publish core javadoc
-        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}}
-        uses: cpina/github-action-push-to-another-repository@0a14457bb28b04dfa1652e0ffdfda866d2845c73 # main
+        # if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}}
+        if: ${{ runner.os == 'Linux' && env.STATUS == 'snapshot' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}}
+        uses: cpina/github-action-push-to-another-repository@0a14457bb28b04dfa1652e0ffdfda866d2845c73
         env:
           SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
         with:
@@ -52,9 +53,10 @@ jobs:
           destination-repository-name: 'plotsquared-javadocs'
           user-email: ${{ secrets.USER_EMAIL }}
           target-branch: main
-          target-directory: core
+          target-directory: v7/core
       - name: Publish bukkit javadoc
-        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}}
+        # if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}}
+        if: ${{ runner.os == 'Linux' && env.STATUS == 'snapshot' && github.event_name == 'push' && github.ref == 'refs/heads/v7'}}
         uses: cpina/github-action-push-to-another-repository@0a14457bb28b04dfa1652e0ffdfda866d2845c73 # main
         env:
           SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
@@ -64,4 +66,4 @@ jobs:
           destination-repository-name: 'plotsquared-javadocs'
           user-email: ${{ secrets.USER_EMAIL }}
           target-branch: main
-          target-directory: bukkit
+          target-directory: v7/bukkit
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -1,8 +1,11 @@
 name: "CodeQL"
 on:
+  push:
+    branches: [ v7 ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [v6]
+    branches: [ v7 ]
+
 jobs:
   analyze:
     name: Analyze
@@ -14,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: ['java']
+        language: [ 'java' ]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -4,9 +4,9 @@ on:
     branches:
       - v6
   pull_request:
-    types: [opened, reopened, synchronize]
+    types: [ opened, reopened, synchronize ]
   pull_request_target:
-    types: [opened, reopened, synchronize]
+    types: [ opened, reopened, synchronize ]
 jobs:
   update_release_draft:
     if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}

diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts
@@ -48,7 +48,6 @@ dependencies {
 
     // Our libraries
     implementation(libs.arkitektonika)
-    implementation(libs.http4j)
     implementation("com.intellectualsites.paster:Paster")
     implementation("com.intellectualsites.informative-annotations:informative-annotations")
 
@@ -88,7 +87,7 @@ tasks.named<ShadowJar>("shadowJar") {
     relocate("javax.inject", "com.plotsquared.core.annotation.inject")
     relocate("net.jcip", "com.plotsquared.core.annotations.jcip")
     relocate("edu.umd.cs.findbugs", "com.plotsquared.core.annotations.findbugs")
-    relocate("com.intellectualsites.informative-annotations", "com.plotsquared.core.annotation.informative")
+    relocate("com.intellectualsites.annotations", "com.plotsquared.core.annotations.informative")
 
     // Get rid of all the libs which are 100% unused.
     minimize()
@@ -100,10 +99,10 @@ tasks {
     withType<Javadoc> {
         val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
         val opt = options as StandardJavadocDocletOptions
-        opt.links("https://jd.papermc.io/paper/1.18/")
+        opt.links("https://jd.papermc.io/paper/1.19/")
         opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
         opt.links("https://intellectualsites.github.io/plotsquared-javadocs/core/")
-        opt.links("https://jd.adventure.kyori.net/api/4.9.3/")
+        opt.links("https://jd.adventure.kyori.net/api/4.12.0/")
         opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
         opt.links("https://checkerframework.org/api/")
         opt.isLinkSource = true

diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
@@ -49,6 +49,7 @@
 import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.bukkit.util.BukkitWorld;
 import com.plotsquared.bukkit.util.SetGenCB;
+import com.plotsquared.bukkit.util.TranslationUpdateManager;
 import com.plotsquared.bukkit.util.UpdateUtility;
 import com.plotsquared.bukkit.util.task.BukkitTaskManager;
 import com.plotsquared.bukkit.util.task.PaperTimeConverter;
@@ -140,6 +141,7 @@
 import org.incendo.serverlib.ServerLib;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -293,6 +295,12 @@ public void onEnable() {
                 );
         this.injector.injectMembers(this);
 
+        try {
+            this.injector.getInstance(TranslationUpdateManager.class).upgradeTranslationFile();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
         this.serverLocale = Locale.forLanguageTag(Settings.Enabled_Components.DEFAULT_LOCALE);
 
         if (PremiumVerification.isPremium() && Settings.Enabled_Components.UPDATE_NOTIFICATIONS) {
@@ -358,7 +366,7 @@ public void onEnable() {
             getServer().getPluginManager().registerEvents(injector().getInstance(ServerListener.class), this);
             getServer().getPluginManager().registerEvents(injector().getInstance(EntitySpawnListener.class), this);
             if (PaperLib.isPaper() && Settings.Paper_Components.PAPER_LISTENERS) {
-                    getServer().getPluginManager().registerEvents(injector().getInstance(PaperListener.class), this);
+                getServer().getPluginManager().registerEvents(injector().getInstance(PaperListener.class), this);
             } else {
                 getServer().getPluginManager().registerEvents(injector().getInstance(SpigotListener.class), this);
             }
@@ -1177,9 +1185,17 @@ public void setGenerator(final @NonNull String worldName) {
     public @NonNull String worldEditImplementations() {
         StringBuilder msg = new StringBuilder();
         if (Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit") != null) {
-            msg.append("FastAsyncWorldEdit: ").append(Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit").getDescription().getVersion());
+            msg.append("FastAsyncWorldEdit: ").append(Bukkit
+                    .getPluginManager()
+                    .getPlugin("FastAsyncWorldEdit")
+                    .getDescription()
+                    .getVersion());
         } else if (Bukkit.getPluginManager().getPlugin("AsyncWorldEdit") != null) {
-            msg.append("AsyncWorldEdit: ").append(Bukkit.getPluginManager().getPlugin("AsyncWorldEdit").getDescription().getVersion()).append("\n");
+            msg.append("AsyncWorldEdit: ").append(Bukkit
+                    .getPluginManager()
+                    .getPlugin("AsyncWorldEdit")
+                    .getDescription()
+                    .getVersion()).append("\n");
             msg.append("WorldEdit: ").append(Bukkit.getPluginManager().getPlugin("WorldEdit").getDescription().getVersion());
         } else {
             msg.append("WorldEdit: ").append(Bukkit.getPluginManager().getPlugin("WorldEdit").getDescription().getVersion());