Skip to content

Commit

Permalink
Support Folia
Browse files Browse the repository at this point in the history
  • Loading branch information
Euphillya committed Sep 29, 2024
0 parents commit fbe48bf
Show file tree
Hide file tree
Showing 8 changed files with 706 additions and 0 deletions.
46 changes: 46 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Gradle Build
on: [push, pull_request]

jobs:
build:
name: Build WorldGuardExtraFlags on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: 21
distribution: 'temurin'

- name: Grant execute permission to script
run: bash -c "chmod +x script.sh"
- name: Update upstream and apply patches
shell: bash
run: |
git config --global user.email "action@github.com"
git config --global user.name "Action Github"
./script.sh updateUpstream
./script.sh applyPatches
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
with:
cache-read-only: ${{ !(github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/version/')) }}

- name: Execute Gradle build
run: |
cd WorldGuardExtraFlags-Patchs
mvn -B package --file pom.xml
- name: Upload WorldGuardExtraFlags jar
uses: actions/upload-artifact@v4
with:
name: WorldGuardExtraFlags-Folia-Snapshot
path: WorldGuardExtraFlags-Patchs/Spigot/target/WorldGuardExtraFlags.jar*
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*-Patchs/
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "WorldGuardExtraFlags"]
path = WorldGuardExtraFlags
url = https://github.com/aromaa/WorldGuardExtraFlags
1 change: 1 addition & 0 deletions WorldGuardExtraFlags
Submodule WorldGuardExtraFlags added at e0d50b
82 changes: 82 additions & 0 deletions patches/plugins/0001-Rebrand-Folia.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
From 3110e85f612c730d16a1a8e7a7cdf73ba295f5c7 Mon Sep 17 00:00:00 2001
From: Euphyllia Bierque <bierque.euphyllia@gmail.com>
Date: Sun, 29 Sep 2024 17:58:17 +0200
Subject: [PATCH 1/2] Rebrand Folia

---
Spigot/pom.xml | 10 +++++-----
Spigot/src/main/resources/plugin.yml | 1 +
WG/pom.xml | 10 +++++-----
3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Spigot/pom.xml b/Spigot/pom.xml
index 71e32f5..6931a40 100644
--- a/Spigot/pom.xml
+++ b/Spigot/pom.xml
@@ -50,8 +50,8 @@

<repositories>
<repository>
- <id>spigot-repo</id>
- <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+ <id>papermc</id>
+ <url>https://repo.papermc.io/repository/maven-public/</url>
</repository>
<repository>
<id>sk89q-repo</id>
@@ -76,9 +76,9 @@
</dependency>

<dependency>
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot-api</artifactId>
- <version>1.20.6-R0.1-SNAPSHOT</version>
+ <groupId>io.papermc.paper</groupId>
+ <artifactId>paper-api</artifactId>
+ <version>1.21.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/Spigot/src/main/resources/plugin.yml b/Spigot/src/main/resources/plugin.yml
index b7227c0..72d714b 100644
--- a/Spigot/src/main/resources/plugin.yml
+++ b/Spigot/src/main/resources/plugin.yml
@@ -3,6 +3,7 @@ description: Adds more flags to WorldGuard to help manage your server easily!

version: 4.2.5-SNAPSHOT
api-version: 1.13
+folia-supported: true

author: isokissa3
website: https://joniaromaa.fi
diff --git a/WG/pom.xml b/WG/pom.xml
index 0460fa0..f68fed6 100644
--- a/WG/pom.xml
+++ b/WG/pom.xml
@@ -11,8 +11,8 @@

<repositories>
<repository>
- <id>spigot-repo</id>
- <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+ <id>papermc</id>
+ <url>https://repo.papermc.io/repository/maven-public/</url>
</repository>
<repository>
<id>sk89q-repo</id>
@@ -22,9 +22,9 @@

<dependencies>
<dependency>
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot-api</artifactId>
- <version>1.20.6-R0.1-SNAPSHOT</version>
+ <groupId>io.papermc.paper</groupId>
+ <artifactId>paper-api</artifactId>
+ <version>1.21.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
--
2.45.1.windows.1

Loading

0 comments on commit fbe48bf

Please sign in to comment.