Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extend the Folia Support from SirYwell #2171

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
a9e1d50
fix: add null-check for brush in traceMask (#2160)
dordsor21 Mar 31, 2023
b42f6a2
Update renovate.json (#2167)
NotMyFault Apr 1, 2023
ec343a9
Add folia support
TheMeinerLP Mar 30, 2023
a6e5950
Set paperweight to local dev build
TheMeinerLP Apr 2, 2023
9095a74
Add a local folia dev build
TheMeinerLP Apr 2, 2023
7bb5815
Add run folia task
TheMeinerLP Apr 2, 2023
2c042b5
Port taskmanager for folia
TheMeinerLP Apr 2, 2023
abc39c3
Fix tasks manager
TheMeinerLP Apr 2, 2023
db4808b
Fix port for folia
TheMeinerLP Apr 2, 2023
4f84e36
Remove maven local
TheMeinerLP Apr 2, 2023
84e7dd4
Build back to paper adapter
TheMeinerLP Apr 2, 2023
07ae60d
Add special adapter load for folia
TheMeinerLP Apr 2, 2023
6c9bf0a
Add folia adapter
TheMeinerLP Apr 2, 2023
5dd8903
Fix package for classes
TheMeinerLP Apr 2, 2023
bd59522
Fix package for classes
TheMeinerLP Apr 2, 2023
240bf81
Improve search for folia adapter
TheMeinerLP Apr 2, 2023
48d50ae
Fix shading of folia adapters
TheMeinerLP Apr 2, 2023
4bee821
Add runFolia with snapshot version of run paper
TheMeinerLP Apr 2, 2023
e763695
Fix regen command
TheMeinerLP Apr 2, 2023
b3a56de
Fix UnsupportedOperationException on disable
TheMeinerLP Apr 2, 2023
7c3c91f
Use new method to check of is running on "main thread"
TheMeinerLP Apr 3, 2023
034aa10
Implement dirty workaround for get data from right ticking region
TheMeinerLP Apr 3, 2023
ba778fe
Implement dirty workaround for get data from right ticking region
TheMeinerLP Apr 3, 2023
b605445
Implement dirty workaround for get data from right ticking region
TheMeinerLP Apr 3, 2023
434a58f
Improve scheduling for chunk data of regen
TheMeinerLP Apr 3, 2023
6c0b7ac
Fix compass tool
TheMeinerLP Apr 3, 2023
eb34a4f
Merge remote-tracking branch 'fork-https/feature/folia-support' into …
TheMeinerLP Apr 5, 2023
2b51896
Improve testability by adding more versions of runPaper to the build …
TheMeinerLP Apr 7, 2023
bb8c9d2
Update dependency org.bstats:bstats-base to v3.0.2 (#2170)
renovate[bot] Apr 7, 2023
2dc8f7b
Update paperweight version for 1.19.4 (#2166)
NotMyFault Apr 7, 2023
a42864e
[ci skip] Move renovate config to .github folder
NotMyFault Apr 7, 2023
da4d966
Fix Misaligned SVG In IJ project view (#2174)
TheMeinerLP Apr 10, 2023
e4158ac
fix: invalidate cached FaweMask when a plot is unlinked (#2157)
dordsor21 Apr 13, 2023
5cd9616
fix: Ensure BaseBlock is not returned when a BlockState is wanted in …
dordsor21 Apr 13, 2023
86acb1c
Simplify command dispatch to ensure command order (#2131)
SirYwell Apr 18, 2023
05afaf0
Address incompatibilities after CraftChunk changes in spigot (#2179)
SirYwell Apr 21, 2023
8cfb8cb
chore: add chunk tickets to all chunks accessed (#2163)
dordsor21 Apr 22, 2023
488a2e5
Add an explanation to Disallowed-Blocks Comment (#2186)
360shvit Apr 22, 2023
c86dfe4
Ensure regen step not running on the main thread (#2185)
SirYwell Apr 23, 2023
abe1202
Release 2.6.1
NotMyFault Apr 23, 2023
9f3c909
Back to snapshot for development
NotMyFault Apr 23, 2023
ffe704d
Update dependency org.mockito:mockito-core to v5.3.1 (#2204)
renovate[bot] May 1, 2023
909b7d2
Update dependency org.ajoberstar.grgit:grgit-gradle to v5.2.0 (#2203)
renovate[bot] May 1, 2023
4779bd4
Update plugin xyz.jpenilla.run-paper to v2.1.0 (#2205)
renovate[bot] May 1, 2023
950a3f9
Update dependency com.github.TownyAdvanced:Towny to v0.99.0.5 (#2202)
renovate[bot] May 1, 2023
92a6ff5
Update dependency io.papermc.paperweight.userdev:io.papermc.paperweig…
renovate[bot] May 1, 2023
e2cb7ea
Merge branch 'main' into feature/folia-support
TheMeinerLP May 31, 2023
f1bb12c
Fix duplicated import
TheMeinerLP May 31, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion renovate.json → .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@
],
"labels": ["Renovate"],
"rebaseWhen": "conflicted",
"schedule": ["on the first day of the week"]
"schedule": ["on the first day of the month"]
}
2 changes: 1 addition & 1 deletion .github/workflows/announce-release-on-discord.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
DISCORD_USERNAME: FastAsyncWorldEdit Release
DISCORD_AVATAR: https://raw.githubusercontent.com/IntellectualSites/Assets/main/plugins/FastAsyncWorldEdit/FastAsyncWorldEdit.png
uses: Ilshidur/action-discord@0c4b27844ba47cb1c7bee539c8eead5284ce9fa9 # ratchet:Ilshidur/action-discord@0.3.2
uses: Ilshidur/[email protected]
with:
args: |
"<@&525015715300900875> <@&706463154804097105> <@&671372968462516240>"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v3
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1
uses: gradle/wrapper-validation-action@v1
- name: Setup Java
uses: actions/setup-java@v3
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v3
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1
uses: gradle/wrapper-validation-action@v1
- name: Setup Java
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
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/main'}}
uses: cpina/github-action-push-to-another-repository@0a14457bb28b04dfa1652e0ffdfda866d2845c73 # main
uses: cpina/github-action-push-to-another-repository@main
env:
SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
with:
Expand All @@ -56,7 +56,7 @@ jobs:
target-directory: worldedit-core
- name: Publish bukkit javadoc
if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
uses: cpina/github-action-push-to-another-repository@0a14457bb28b04dfa1652e0ffdfda866d2845c73 # main
uses: cpina/github-action-push-to-another-repository@main
env:
SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
with:
Expand All @@ -78,7 +78,7 @@ jobs:
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
- name: Publish to CurseForge
if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
uses: itsmeow/curseforge-upload@13f278adc4cc7b881555f87e6ea528387dd6492b # v3
uses: itsmeow/curseforge-upload@v3
with:
file_path: worldedit-bukkit/build/libs/FastAsyncWorldEdit-Bukkit-${{ github.event.release.tag_name }}.jar
# https://minecraft.curseforge.com/api/game/versions?token=redacted
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3
- name: Initialize CodeQL
uses: github/codeql-action/init@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
- name: Autobuild
uses: github/codeql-action/autobuild@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
uses: github/codeql-action/autobuild@v2
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
uses: github/codeql-action/analyze@v2
4 changes: 2 additions & 2 deletions .github/workflows/upload-release-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v3
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1
uses: gradle/wrapper-validation-action@v1
- name: Setup Java
uses: actions/setup-java@v3
with:
Expand All @@ -19,7 +19,7 @@ jobs:
- name: Clean Build
run: ./gradlew clean build --no-daemon
- name: Upload Release Assets
uses: AButler/upload-release-assets@ec6d3263266dc57eb6645b5f75e827987f7c217d # ratchet:AButler/upload-release-assets@v2.0
uses: AButler/[email protected]
with:
files: 'worldedit-bukkit/build/libs/FastAsyncWorldEdit-Bukkit-*.jar'
repo-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
140 changes: 104 additions & 36 deletions .idea/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 24 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import org.ajoberstar.grgit.Grgit
import java.time.format.DateTimeFormatter
import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
import xyz.jpenilla.runpaper.task.RunServer
import java.net.URI
import java.time.format.DateTimeFormatter

plugins {
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
id("xyz.jpenilla.run-paper") version "2.0.1"
id("xyz.jpenilla.run-paper") version "2.1.0"
}

if (!File("$rootDir/.git").exists()) {
Expand All @@ -33,7 +34,7 @@ logger.lifecycle("""
*******************************************
""")

var rootVersion by extra("2.6.0")
var rootVersion by extra("2.6.2")
var snapshot by extra("SNAPSHOT")
var revision: String by extra("")
var buildNumber by extra("")
Expand Down Expand Up @@ -82,14 +83,34 @@ allprojects {
}

applyCommonConfiguration()
val supportedVersions = listOf("1.16.5", "1.17", "1.17.1", "1.18.2", "1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4")

tasks {
supportedVersions.forEach {
register<RunServer>("runServer-$it") {
minecraftVersion(it)
pluginJars(*project(":worldedit-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
.toTypedArray())
jvmArgs("-DPaper.IgnoreJavaVersion=true", "-Dcom.mojang.eula.agree=true")
group = "run paper"
runDirectory.set(file("run-$it"))
}
}
runServer {
minecraftVersion("1.19.3")
pluginJars(*project(":worldedit-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
.toTypedArray())

}
register<RunServer>("runFolia") {
downloadsApiService.set(xyz.jpenilla.runtask.service.DownloadsAPIService.folia(project))
minecraftVersion("1.19.4")
group = "run paper"
runDirectory.set(file("run-folia"))
jvmArgs("-DPaper.IgnoreJavaVersion=true", "-Dcom.mojang.eula.agree=true")
pluginJars(*project(":worldedit-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
.toTypedArray())
}
}

nexusPublishing {
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ val properties = Properties().also { props ->

dependencies {
implementation(gradleApi())
implementation("org.ajoberstar.grgit:grgit-gradle:5.0.0")
implementation("org.ajoberstar.grgit:grgit-gradle:5.2.0")
implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.5.3")
implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.5.5")
}

kotlin {
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ mapmanager = "1.8.0-SNAPSHOT"
griefprevention = "16.18.1"
griefdefender = "2.1.0-SNAPSHOT"
residence = "4.5._13.1"
towny = "0.98.4.18"
towny = "0.99.0.5"

# Third party
bstats = "3.0.1"
bstats = "3.0.2"
sparsebitset = "1.2"
parallelgzip = "1.0.5"
adventure = "4.9.3"
Expand All @@ -36,7 +36,7 @@ text = "3.0.4"
piston = "0.5.7"

# Tests
mockito = "5.2.0"
mockito = "5.3.1"

# Gradle plugins
pluginyml = "0.5.3"
Expand Down
Loading