From d637797628d3d6daa6bd4ba2b6a992b53c301e92 Mon Sep 17 00:00:00 2001
From: Kas-tle <26531652+Kas-tle@users.noreply.github.com>
Date: Thu, 3 Dec 2020 17:59:30 -0800
Subject: [PATCH 1/7] Load before Hyperverse as well
Hyperverse is an alternate world management plugin that is being developed by some of the FAWE devs. See https://github.com/Incendo/Hyperverse. Assuming the implementation here is just load the world in a separate folder, don't think there should be any issues beyond this.
---
src/main/resources/plugin.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index f34a7ed..654e1a9 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -3,4 +3,5 @@ main: buttondevteam.customdimensions.CustomDimensions
version: '1.4'
api-version: '1.16'
loadbefore:
- - Multiverse-Core
\ No newline at end of file
+ - Multiverse-Core
+ - Hyperverse
From b43ca077224a8f29bfee92fbb0c0465f614a23ac Mon Sep 17 00:00:00 2001
From: Kas-tle <26531652+Kas-tle@users.noreply.github.com>
Date: Thu, 3 Dec 2020 18:12:41 -0800
Subject: [PATCH 2/7] Automate building with Maven action
---
.github/workflows/maven.yml | 53 +++++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
create mode 100644 .github/workflows/maven.yml
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 0000000..e47f744
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,53 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+ push:
+ tags:
+ - '*'
+ pull_request:
+ branches: [ master ]
+
+jobs:
+ build:
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+ - name: Get version information
+ id: version
+ uses: ncipollo/semantic-version-action@v1
+ - name: Set up JDK 8
+ uses: actions/setup-java@v1
+ with:
+ java-version: 8
+ - name: Cache Maven packages
+ uses: actions/cache@v1
+ with:
+ path: ~/.m2
+ key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+ restore-keys: ${{ runner.os }}-m2
+ - name: Build with Maven
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ run: mvn -B package --file pom.xml
+ - run: mkdir staging && cp target/*.jar staging
+ - name: Generate release diff
+ env:
+ BEGIN_COMMIT: ${{ steps.version.outputs.previous_tag }}
+ END_COMMIT: ${{ steps.version.outputs.tag }}
+ run: git fetch --tags --force && git log --pretty=format:"* %s (%h)" ${BEGIN_COMMIT}..${END_COMMIT} > release_notes.md
+ - name: Create release
+ uses: ncipollo/release-action@v1
+ with:
+ artifacts: staging/*
+ allowUpdates: true
+ bodyFile: "release_notes.md"
+ draft: false
+ prerelease: false
+ token: ${{ secrets.GITHUB_TOKEN }}
From 914f4a5b31616d92e4b26ac161325db49badc8f3 Mon Sep 17 00:00:00 2001
From: Kas-tle <26531652+Kas-tle@users.noreply.github.com>
Date: Thu, 3 Dec 2020 18:14:32 -0800
Subject: [PATCH 3/7] Add maven build badge
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index 17affde..98e5fb0 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+![Java CI with Maven](https://github.com/Kas-tle/CustomDimensions/workflows/Java%20CI%20with%20Maven/badge.svg)
# CustomDimensions
Custom dimension support for 1.16.4 Bukkit/Spigot/Paper servers
From c54880e5c25aad82ec536e20050b793d83f19101 Mon Sep 17 00:00:00 2001
From: Kas-tle <26531652+Kas-tle@users.noreply.github.com>
Date: Thu, 3 Dec 2020 18:15:39 -0800
Subject: [PATCH 4/7] Bump version and go semantic
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index b7fc051..5d24cc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.github.TBMCPlugins
CustomDimensions
- 1.4
+ 1.5.0
@@ -76,4 +76,4 @@
-
\ No newline at end of file
+
From 722ddffdd28184a0fbc03989bf671ac1f11c1e6e Mon Sep 17 00:00:00 2001
From: Kastle <26531652+Kas-tle@users.noreply.github.com>
Date: Thu, 3 Dec 2020 19:44:47 -0800
Subject: [PATCH 5/7] Run buildtools so that we may access NMS.
This will need to be manually updated to use the current version supported by the plugin for the moment.
---
.github/workflows/maven.yml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index e47f744..ab65c82 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -25,7 +25,11 @@ jobs:
- name: Set up JDK 8
uses: actions/setup-java@v1
with:
- java-version: 8
+ java-version: 11
+ java-package: jdk # (jre, jdk, or jdk+fx) - defaults to jdk
+ architecture: x86 # (x64 or x86) - defaults to x64
+ - run: wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
+ - run: java -jar BuildTools.jar --rev 1.16.4
- name: Cache Maven packages
uses: actions/cache@v1
with:
From 17989601833b98851067b00c042708885185cf8a Mon Sep 17 00:00:00 2001
From: Kastle <26531652+Kas-tle@users.noreply.github.com>
Date: Thu, 3 Dec 2020 19:45:47 -0800
Subject: [PATCH 6/7] Update pom.xml
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5d24cc7..122de08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.github.TBMCPlugins
CustomDimensions
- 1.5.0
+ 1.5.1
From 415fa6b5d2291236a5be31a82f967faae1c21931 Mon Sep 17 00:00:00 2001
From: Kastle <26531652+Kas-tle@users.noreply.github.com>
Date: Thu, 3 Dec 2020 19:47:28 -0800
Subject: [PATCH 7/7] Action should say 11; my bad
---
.github/workflows/maven.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index ab65c82..cdf2a7b 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -22,7 +22,7 @@ jobs:
- name: Get version information
id: version
uses: ncipollo/semantic-version-action@v1
- - name: Set up JDK 8
+ - name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11