From 6a8c0b62556d0912414de6e15c128e0808593481 Mon Sep 17 00:00:00 2001
From: zax71
Date: Sun, 26 Feb 2023 13:56:56 +0000
Subject: [PATCH 01/12] Update README.md
---
README.md | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/README.md b/README.md
index a884097a..5ad04249 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,32 @@
![Multiverse 2](config/multiverse2-long.png)
-[![Maven CI/CD](https://github.com/Multiverse/Multiverse-Core/actions/workflows/build.yml/badge.svg)](https://github.com/Multiverse/Multiverse-Core/actions/workflows/build.yml)
+
+[![Modrinth](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/available/modrinth_vector.svg)](https://modrinth.com/plugin/multiverse-core)
+[![bukkit](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/supported/bukkit_vector.svg)](https://dev.bukkit.org/projects/multiverse-core)
+[![Spigot](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/supported/spigot_vector.svg)](https://www.spigotmc.org/resources/multiverse-core.390/)
+
[![Release](https://img.shields.io/nexus/r/com.onarandombox.multiversecore/Multiverse-Core?label=release&server=https%3A%2F%2Frepo.onarandombox.com%2F)](https://dev.bukkit.org/projects/multiverse-core)
[![Dev builds](https://img.shields.io/nexus/s/com.onarandombox.multiversecore/Multiverse-Core?label=dev%20builds&server=http%3A%2F%2Frepo.onarandombox.com%2F)](https://ci.onarandombox.com/job/Multiverse-Core/)
[![Discord](https://img.shields.io/discord/325459248047980545?label=discord&logo=discord)](https://discord.gg/NZtfKky)
-[![Support me on Patreon](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Ddumptruckman%26type%3Dpatrons&style=flat)](https://patreon.com/dumptruckman)
+[![Support us on Patreon](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Ddumptruckman%26type%3Dpatrons&style=flat)](https://patreon.com/dumptruckman)
[![License](https://img.shields.io/github/license/Multiverse/Multiverse-Core)](LICENSE.md)
-About
-========
+
+
+# About
+
[Multiverse](https://dev.bukkit.org/projects/multiverse-core) was created at the dawn of Bukkit multiworld support. It has since then grown into a **complete world management solution!** Multiverse provides the easiest to use world management solution for your Minecraft server, big or small, and with great addons like [Portals](https://dev.bukkit.org/projects/multiverse-portals) and [NetherPortals](https://dev.bukkit.org/projects/multiverse-netherportals/), what's not to love!
-
+
Now it's time to create your very own Multiverse server, do check out our [Wiki](https://github.com/Multiverse/Multiverse-Core/wiki) and [Usage Guide](https://github.com/Multiverse/Multiverse-Core/wiki/Basics) to get started. Feel free to hop onto our [Discord](https://discord.gg/NZtfKky) if you have any question or just want to have a chat with us!
-### Amazing sub-modules available:
+## Amazing sub-modules available:
+
* [Multiverse-NetherPortals](https://github.com/Multiverse/Multiverse-NetherPortals) -> Have separate nether and end worlds for each of your overworlds!
* [Multiverse-Portals](https://github.com/Multiverse/Multiverse-Portals) -> Make custom portals to go to any destination!
* [Multiverse-Inventories](https://github.com/Multiverse/Multiverse-Inventories) -> Have separated players stats and inventories per world or per group of worlds.
-* [Multiverse-SignPortals](https://github.com/Multiverse/Multiverse-SignPortals) -> Signs as teleprompters!
+* [Multiverse-SignPortals](https://github.com/Multiverse/Multiverse-SignPortals) -> Signs as teleporters!
-Building
-========
+## Building
Simply build the source with Gradle:
```
./gradlew build
@@ -28,17 +34,16 @@ Simply build the source with Gradle:
More details are available on the [build instructions wiki page](https://github.com/Multiverse/Multiverse-Core/wiki/Building).
-Contributing
-=======
+## Contributing
+
**Want to help improve Multiverse?** There are several ways you can support and contribute to the project.
* Take a look at our "Bug: Unconfirmed" issues, where you can find issues that need extra testing and investigation.
* Want others to love Multiverse too? You can join the [Multiverse Discord community](https://discord.gg/NZtfKky) and help others with issues and setup!
* A Multiverse guru? You can update our [Wiki](https://github.com/Multiverse/Multiverse-Core/wiki) with your latest tip, tricks and guides! The wiki open for all to edit and improve.
* Love coding? You could look at ["State: Open to PR"](https://github.com/Multiverse/Multiverse-Core/labels/State%3A%20Open%20to%20PR) and ["Resolution: Accepted"](https://github.com/Multiverse/Multiverse-Core/labels/Resolution%3A%20Accepted) issues. We're always happy to receive bug fixes and feature additions as [pull requests](https://www.freecodecamp.org/news/how-to-make-your-first-pull-request-on-github-3/).
-* If you'd like to make a financial contribution to the project, do consider joining our [patreon](https://www.patreon.com/dumptruckman) or make a one-time donation [here](https://paypal.me/dumptruckman)!
+* If you'd like to make a financial contribution to the project, do consider joining our [Patreon](https://www.patreon.com/dumptruckman) or make a one-time donation [here](https://paypal.me/dumptruckman)!
Additionally, we would like to give a big thanks to everyone that has supported Multiverse over the years, as well as those in the years to come. Thank you!
-License
-=======
+## License
Multiverse-Core is licensed under BSD-3-Clause License. Please see [LICENSE.md](LICENSE.md) for more info.
From c3eb0ee8bdf33dcd89005645968be97b32d27219 Mon Sep 17 00:00:00 2001
From: zax71
Date: Sun, 26 Feb 2023 14:00:37 +0000
Subject: [PATCH 02/12] Center Logo
---
README.md | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 5ad04249..96286c7d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
-![Multiverse 2](config/multiverse2-long.png)
-
+
+
+
[![Modrinth](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/available/modrinth_vector.svg)](https://modrinth.com/plugin/multiverse-core)
[![bukkit](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/supported/bukkit_vector.svg)](https://dev.bukkit.org/projects/multiverse-core)
From 101ddae4434e880c4ad0d401c9b35ca8afa92457 Mon Sep 17 00:00:00 2001
From: Jeremy Wood
Date: Tue, 28 Feb 2023 23:03:50 -0500
Subject: [PATCH 03/12] Create CODEOWNERS.
---
.github/CODEOWNERS | 1 +
1 file changed, 1 insertion(+)
create mode 100644 .github/CODEOWNERS
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..8ddb02e8
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @dumptruckman @benwoo1110 @nicegamer7
From d5ebde53b9b8dee278a7228079ee52ce022d1dcb Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Thu, 2 Mar 2023 12:32:07 +0800
Subject: [PATCH 04/12] Add maven central to repositories (#2859)
Co-authored-by: Jeremy Wood
---
build.gradle | 2 ++
1 file changed, 2 insertions(+)
diff --git a/build.gradle b/build.gradle
index c4b2e7ca..5328d394 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,6 +15,8 @@ java.sourceCompatibility = JavaVersion.VERSION_11
repositories {
mavenLocal()
+ mavenCentral()
+
maven {
url = uri('https://hub.spigotmc.org/nexus/content/repositories/snapshots/')
}
From 39287f55efbfa08db5f3e1114cc961d832cbd083 Mon Sep 17 00:00:00 2001
From: Jeremy Wood
Date: Wed, 1 Mar 2023 23:36:41 -0500
Subject: [PATCH 05/12] Delete CODEOWNERS.
---
.github/CODEOWNERS | 1 -
1 file changed, 1 deletion(-)
delete mode 100644 .github/CODEOWNERS
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
deleted file mode 100644
index 8ddb02e8..00000000
--- a/.github/CODEOWNERS
+++ /dev/null
@@ -1 +0,0 @@
-* @dumptruckman @benwoo1110 @nicegamer7
From e536dff1a88fd3fe98e6bf13965e1818d9f3353a Mon Sep 17 00:00:00 2001
From: Jeremy Wood
Date: Thu, 2 Mar 2023 00:37:30 -0500
Subject: [PATCH 06/12] Use a separate bukkit dependency for tests.
---
build.gradle | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 5328d394..790907de 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,7 +43,7 @@ repositories {
}
dependencies {
- implementation('org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT') {
+ compileOnly('org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT') {
exclude group: 'junit', module: 'junit'
}
@@ -66,6 +66,9 @@ dependencies {
api 'de.themoep.idconverter:mappings:1.2-SNAPSHOT'
api 'org.jetbrains:annotations:16.0.2'
+ testImplementation('org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT') {
+ exclude group: 'junit', module: 'junit'
+ }
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:3.11.2'
testImplementation 'commons-io:commons-io:2.4'
From 85d744d79f672731247903b382dfea376081417a Mon Sep 17 00:00:00 2001
From: Jeremy Wood
Date: Thu, 2 Mar 2023 00:44:32 -0500
Subject: [PATCH 07/12] Run tests against spigot-api 1.19.3.
---
build.gradle | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 790907de..60ebea60 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,7 +66,8 @@ dependencies {
api 'de.themoep.idconverter:mappings:1.2-SNAPSHOT'
api 'org.jetbrains:annotations:16.0.2'
- testImplementation('org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT') {
+ testImplementation 'org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT'
+ testImplementation('com.googlecode.json-simple:json-simple:1.1.1') {
exclude group: 'junit', module: 'junit'
}
testImplementation 'junit:junit:4.12'
From b6574245b8254468488765a105c6c5858fe6ae4e Mon Sep 17 00:00:00 2001
From: Jeremy Wood
Date: Thu, 2 Mar 2023 00:48:54 -0500
Subject: [PATCH 08/12] Remove junit exclusion from compileOnly bukkit.
---
build.gradle | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/build.gradle b/build.gradle
index 60ebea60..9e0beda1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,9 +43,7 @@ repositories {
}
dependencies {
- compileOnly('org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT') {
- exclude group: 'junit', module: 'junit'
- }
+ compileOnly 'org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT'
implementation('com.github.MilkBowl:VaultAPI:1.7') {
exclude group: 'org.bukkit', module: 'bukkit'
From 68c97f7ae6d1c634cc1f099f39f42cb2218e6ef7 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Fri, 3 Mar 2023 23:21:36 +0800
Subject: [PATCH 09/12] build: Add artifacting of PR build
---
.github/workflows/test.yml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fe2e3b1d..c5b55297 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,6 +18,12 @@ jobs:
distribution: 'adopt'
cache: gradle
+ - name: Get PR number
+ id: pr
+ run: echo "::set-output name=pull_request_number::$(gh pr view --json number -q .number || echo "")"
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1
@@ -26,4 +32,14 @@ jobs:
with:
arguments: build
env:
+ GITHUB_VERSION: pr${{ steps.pr.outputs.pull_request_number }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Staging artifact
+ run: mkdir staging && cp build/libs/*.jar staging
+
+ - name: Artifact output
+ uses: actions/upload-artifact@v2
+ with:
+ name: multiverse-core-pr${{ steps.pr.outputs.pull_request_number }}
+ path: staging
From 3b44ea218dc84786addd0dc353e6ef587eeb5ed4 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Fri, 3 Mar 2023 23:28:55 +0800
Subject: [PATCH 10/12] build: Fix PR build number
---
.github/workflows/test.yml | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c5b55297..68d7ff4e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,12 +18,6 @@ jobs:
distribution: 'adopt'
cache: gradle
- - name: Get PR number
- id: pr
- run: echo "::set-output name=pull_request_number::$(gh pr view --json number -q .number || echo "")"
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1
@@ -32,14 +26,11 @@ jobs:
with:
arguments: build
env:
- GITHUB_VERSION: pr${{ steps.pr.outputs.pull_request_number }}
+ GITHUB_VERSION: pr${{ github.event.pull_request.number }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- - name: Staging artifact
- run: mkdir staging && cp build/libs/*.jar staging
-
- name: Artifact output
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
with:
- name: multiverse-core-pr${{ steps.pr.outputs.pull_request_number }}
- path: staging
+ name: multiverse-core-pr${{ github.event.pull_request.number }}
+ path: build/libs/multiverse-core-pr${{ github.event.pull_request.number }}.jar
From 6d351300decc8cdf03950c1c3daa2d6ba1dbaa36 Mon Sep 17 00:00:00 2001
From: zax71
Date: Sun, 26 Mar 2023 18:26:23 +0100
Subject: [PATCH 11/12] chore: remove Modrinth for now
Signed-off-by: zax71
---
README.md | 1 -
1 file changed, 1 deletion(-)
diff --git a/README.md b/README.md
index 96286c7d..23fe5ae5 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@
-[![Modrinth](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/available/modrinth_vector.svg)](https://modrinth.com/plugin/multiverse-core)
[![bukkit](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/supported/bukkit_vector.svg)](https://dev.bukkit.org/projects/multiverse-core)
[![Spigot](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/supported/spigot_vector.svg)](https://www.spigotmc.org/resources/multiverse-core.390/)
From 14b54d5269da4fb5d92368356417edf677c486fb Mon Sep 17 00:00:00 2001
From: Jeremy Wood
Date: Wed, 5 Apr 2023 08:38:37 -0400
Subject: [PATCH 12/12] Remove the published jar classifier for maven publish.
Fixes #2906.
---
build.gradle | 1 +
1 file changed, 1 insertion(+)
diff --git a/build.gradle b/build.gradle
index 9e0beda1..0df8c53f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -171,6 +171,7 @@ shadowJar {
configurations = [project.configurations.api]
archiveFileName = "$baseName-$version.$extension"
+ classifier = ''
}
build.dependsOn shadowJar