forked from Slimefun/Slimefun4
-
-
Notifications
You must be signed in to change notification settings - Fork 80
支持 Folia #1059
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
Open
StarWishsama
wants to merge
200
commits into
dev
Choose a base branch
from
feature/folia
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
支持 Folia #1059
Changes from 27 commits
Commits
Show all changes
200 commits
Select commit
Hold shift + click to select a range
3141a30
chore(deps): use dough from jitpack
ybw0014 7affe4c
chore: Merge branch 'dev'
StarWishsama 54c1294
chore: Merge branch 'dev'
StarWishsama ffd3ced
chore: fixed git hook
StarWishsama d813882
fix: missing tab completer
StarWishsama 40b4cac
chore: cleanup
StarWishsama c01a969
fix(android): ensure android status before execute instruction
StarWishsama e35c108
chore(deps): introduced lombok
StarWishsama 84fdef6
fix(deps): missing annotation processor
StarWishsama f29813d
fix(research): convert rate not being updated
StarWishsama 2727655
chore: fix pre-commit hook
StarWishsama 296ac2b
chore: spotless stuff
StarWishsama 6eeae92
🔧 Bump me.clip:placeholderapi from 2.11.3 to 2.11.4 (#35)
dependabot[bot] 8cf003d
🔧 Bump com.rudikershaw.gitbuildhook:git-build-hook-maven-plugin (#37)
dependabot[bot] 1a2c98b
🔧 Bump com.gmail.nossr50.mcMMO:mcMMO from 2.1.223 to 2.1.225 (#38)
dependabot[bot] c1cc2ca
🔧 Bump com.sk89q.worldedit:worldedit-core from 7.2.15 to 7.2.17 (#36)
dependabot[bot] 292d0a5
fix(tool): closes #809
StarWishsama c326314
chore: fixing pre-commit
StarWishsama 651c832
fix(tool): duplicated code
StarWishsama 42bc3f8
🔧 Bump com.zaxxer:HikariCP from 5.0.1 to 5.1.0 (#40)
dependabot[bot] 8f7b5e2
🔧 Bump me.clip:placeholderapi from 2.11.4 to 2.11.5 (#39)
dependabot[bot] 8aa175f
chore(deps): bump dependencies
ybw0014 39fe312
Merge upstream (#44)
ybw0014 2c3c5fe
feat: e2e test (#45)
ybw0014 bd791bf
chore: 最小化部分数据库报错
StarWishsama c1ad75f
🔧 Bump net.guizhanss:GuizhanLib-common from 1.5.0 to 1.6.1 (#47)
dependabot[bot] 6a5ae60
🔧 Bump net.guizhanss:GuizhanLib-updater from 1.5.0 to 1.6.1 (#48)
dependabot[bot] 4f137a9
chore: backpack 默认 op 权限
StarWishsama 61f4cc4
chore(deps): use dough from jitpack
ybw0014 50f52a2
fix: version
dependabot[bot] 2945e6a
ci: fix jitpack
ybw0014 c35b36f
Merge branch 'dev'
StarWishsama eabaa21
Merge remote-tracking branch 'origin/master'
StarWishsama 40c4284
Merge branch 'dev'
StarWishsama 5f642d0
chore(deps): bump org.postgresql:postgresql from 42.6.0 to 42.7.2
dependabot[bot] 1e05b50
Merge pull request #845 from StarWishsama/dependabot/maven/org.postgr…
StarWishsama 35a49db
Merge branch 'dev'
StarWishsama ea9e628
Merge branch 'refs/heads/dev'
StarWishsama faea471
chore: 尝试让构建站重新构建
ybw0014 f9f4bb9
chore: 尝试让构建站再次重新构建
ybw0014 ea2c1d2
chore(renovate): 配置 renovate
ybw0014 226af9b
Merge branch 'refs/heads/dev'
StarWishsama 7f9f9b2
fix(radiation): 让玩家在进入是获得辐射免疫 (#907)
JWJUN233233 47ebbd4
Revert "fix(radiation): 让玩家在进入是获得辐射免疫 (#907)"
StarWishsama af4cb3b
Merge pull request #917 from SlimefunGuguProject/revert-907-fix/radia…
StarWishsama ebd90ae
Merge branch 'refs/heads/dev'
StarWishsama 3525534
Merge branch 'refs/heads/dev'
StarWishsama be9a3e5
Merge branch 'refs/heads/dev'
StarWishsama d36ce9d
Merge branch 'refs/heads/dev'
StarWishsama 5d89728
Merge branch 'refs/heads/dev'
StarWishsama 538e41a
Merge branch 'refs/heads/dev'
ybw0014 dc72b4b
Merge branch 'refs/heads/dev'
StarWishsama 9fdeb08
Merge branch 'refs/heads/dev'
StarWishsama 7bb1ab3
Merge branch 'refs/heads/dev'
StarWishsama 0021742
Merge branch 'refs/heads/dev'
StarWishsama b974f06
Merge branch 'refs/heads/dev'
StarWishsama 9ddebfa
1.21.x
haiman233 6664da3
Merge pull request #968 from haiman233/master
StarWishsama 3d075ee
[ci skip] chore(readme): update supported versions
ybw0014 e3b684a
Merge branch 'dev'
StarWishsama d2df303
Merge branch 'dev'
StarWishsama 386bf8f
Merge branch 'dev'
StarWishsama 65aa5c6
Merge branch 'dev'
StarWishsama 9ad7550
Merge branch 'dev'
StarWishsama 7735bfd
Merge branch 'dev'
StarWishsama 3746932
Merge branch 'dev'
StarWishsama aa17f1e
Merge branch 'dev'
StarWishsama 8b33145
Merge branch 'dev'
StarWishsama f1d7ce2
Merge branch 'dev'
StarWishsama b728ecb
Merge branch 'dev'
StarWishsama 88ddfb3
Merge branch 'dev'
StarWishsama e13d830
Merge branch 'dev'
StarWishsama 1ee27c0
Merge pull request #1042 from SlimefunGuguProject/dev
StarWishsama 5ff8f5f
Merge branch 'dev'
StarWishsama 915794c
chore(ci): update github action components
StarWishsama a7be2fb
feat: init folia support
StarWishsama ee65c10
feat(ticker): run asyncable task by location in folia
StarWishsama e750eb4
fix(folia): `runSync` delay min value should > 0
StarWishsama 0c61cb0
refactor: replace some scheduler usage
StarWishsama 8d8528d
Merge branch 'dev'
StarWishsama b59bd2f
chore(deps): bump org.postgresql:postgresql from 42.7.4 to 42.7.7
dependabot[bot] 82c9aae
Merge pull request #1070 from SlimefunGuguProject/dependabot/maven/or…
StarWishsama 5a2291d
fix(quickshop): close #1071
mcchampions 981aeb5
fix(drop): Potential duplicate drops
mcchampions 3abd488
Merge pull request #1072 from mcchampions/fix/qs-shop
StarWishsama 7e32bd5
Revert "Fix #1071"
StarWishsama 1b05f95
Merge pull request #1073 from SlimefunGuguProject/revert-1072-fix/qs-…
StarWishsama 742f76d
Merge branch 'dev' into feature/folia
StarWishsama 9d1437d
fix(deps): update `FoliaLib` maven repo
StarWishsama 3c7bf12
Merge branch 'dev'
StarWishsama 94f61b6
Merge branch 'dev' into feature/folia
StarWishsama 529ca4a
feat(ticker): introduced `AsyncTickerService`
StarWishsama d089f10
feat(ticker): shutdown async ticker gracefully
StarWishsama fa49cd7
fix(energy): use concurrent-safe set for discovering network
StarWishsama 7cd0a8f
fix(task): `TaskQueue` should handle runAtLoc/Entity properly
StarWishsama 7e03f83
chore: fully use our async ticker service
StarWishsama b0469ca
fix: use `teleportAsync`
StarWishsama 9ff6129
Merge branch 'dev' into feature/folia
StarWishsama 1169394
chore: update README
StarWishsama 4299eb3
chore: cleanup project
StarWishsama 85e09d3
chore(dev): introduced `javadoc-deploy`
StarWishsama 2638ae1
chore: separate javadoc deployer to single repo
StarWishsama 660f472
fix: enforced concurrency safe
StarWishsama bc85e7f
Merge branch 'dev' into feature/folia
StarWishsama 974fd35
Merge branch 'dev'
StarWishsama 489a68f
Merge branch 'dev' into feature/folia
StarWishsama 3b76350
feat(ticker): introduced custom async ticker config
StarWishsama d13c1d0
chore: update workflow
ybw0014 e886a24
chore(ci): introduced `spotless-apply` workflow
StarWishsama 68fdf11
Merge branch 'dev' into feature/folia
StarWishsama 9c80c2f
fix(ci): use inherit secrets properly
StarWishsama dc8af50
fix(soulbound): soulbound not working in folia
StarWishsama 5fd00db
fix: async chunk retrieval
StarWishsama 3c81fde
fix(ci): wrong condition on validate next ci
StarWishsama b66e23e
Merge branch 'dev' into feature/folia
StarWishsama 1ad4fd3
chore: adjust async ticker thread pool rule
StarWishsama ad72100
ci: only replace first `<version>`
StarWishsama f73d588
fix(ci): bad pattern
StarWishsama f124484
fix(ci): env var not be filled
StarWishsama 3e05ca6
Merge pull request #1091 from SlimefunGuguProject/dev
StarWishsama 7510f8d
Update README.md
shixinzia 4825460
chore: 在readme中移除对于1.20之前版本的支持
Xzavier0722 c7d316e
chore: 添加声明
Xzavier0722 735147d
fix: 排版问题
Xzavier0722 66fe95b
chore: update docs
StarWishsama dcee40b
chore(ci): fix spotless
StarWishsama 89c13fb
Merge branch 'dev'
StarWishsama b2832fc
Merge branch 'dev' into feature/folia
StarWishsama f2f885f
Merge branch 'dev'
StarWishsama b261642
Merge branch 'dev' into feature/folia
StarWishsama d8a7e24
feat(api): introduced `isConcurrentSafe` for identify concurrent-safe…
StarWishsama 06f2d5f
refactor: adjust ticker thread pool reject strategy
StarWishsama f84248c
fix: add fallback ticker service graceful shutdown
StarWishsama a53fc9e
Merge branch 'dev'
StarWishsama d7dbb22
细化1.21.x版本
haiman233 be0a1a1
Update .github/ISSUE_TEMPLATE/bug-report.yml
haiman233 9156390
Merge pull request #1129 from haiman233/patch-1
StarWishsama b7944e0
change version
haiman233 1d852db
Merge pull request #1133 from haiman233/patch-2
ybw0014 cdf0412
Merge branch 'dev'
StarWishsama c780aa5
Merge branch 'dev'
StarWishsama 3419f04
Merge branch 'dev'
StarWishsama c25059c
Merge branch 'dev'
StarWishsama feb14b6
Merge branch 'dev' into feature/folia
StarWishsama 1193a7e
refactor(api): update method signature
StarWishsama 5c188a3
Merge branch 'dev'
StarWishsama 1281a87
Merge branch 'dev'
StarWishsama f292b35
Merge branch 'dev' into feature/folia
StarWishsama 6a2c653
chore: followup merge fix
StarWishsama d626fd1
Merge branch 'dev'
StarWishsama 6441f7c
Merge branch 'dev' into feature/folia
StarWishsama 41e3460
fix(config): inconsistent config mapping
StarWishsama d1c76be
Merge branch 'dev'
StarWishsama cb85043
Merge branch 'dev'
StarWishsama e5e6041
Merge branch 'dev'
StarWishsama bc8f1b8
Merge branch 'dev'
StarWishsama ec383aa
Merge branch 'dev'
StarWishsama 8aafa26
Merge branch 'dev'
StarWishsama 71e05ec
Merge branch 'dev'
StarWishsama 14d23f3
chore(style): spotless apply
noraincity-bot 1e66bfd
Merge branch 'dev'
StarWishsama eb550b4
Merge branch 'dev'
StarWishsama 17ab784
Merge branch 'dev'
StarWishsama effc0bd
Merge branch 'dev'
StarWishsama d082a50
Merge branch 'dev' into feature/folia
StarWishsama 4dfada9
chore: spotless
StarWishsama 34b2592
chore: cleanup codes
StarWishsama 5a3e26c
Merge branch 'dev'
ybw0014 38fdff8
Merge branch 'dev' into feature/folia
StarWishsama d43c621
fix(trashcan): remove explicitly close inv when lock
StarWishsama ce3731d
fix(trashcan): avoid frequent lock acquire
StarWishsama a081f25
Initial plan
Copilot 3603d26
fix: improve async ticker pool size validation to cover values of 0 a…
Copilot 77edb20
refactor: extract async ticker pool validation into separate method
Copilot 1bc2657
Merge pull request #1192 from SlimefunGuguProject/copilot/sub-pr-1059
StarWishsama 0697fe3
Initial plan
Copilot 26844d9
fix: use ConcurrentHashMap and computeIfAbsent in SoulboundListener t…
Copilot da10b80
Merge branch 'dev'
StarWishsama e708b2e
Merge pull request #1193 from SlimefunGuguProject/copilot/sub-pr-1059…
StarWishsama a9ad669
Merge branch 'dev'
StarWishsama dc9ab9e
Merge branch 'dev'
StarWishsama 8debeb0
fix(ci): gradlew permission
StarWishsama 6616a08
fix(ci): fix dependsOn
StarWishsama 3c61e1a
Update dependabot.yml
StarWishsama 5d42825
chore: trigger deployment
ybw0014 9f224b5
chore: trigger deployment
ybw0014 b8e276f
chore: trigger deployment
ybw0014 f228111
Merge branch 'dev'
StarWishsama cf196a2
Merge remote-tracking branch 'origin/master'
StarWishsama b79ae49
Merge branch 'dev'
StarWishsama 9cc77e3
Merge branch 'dev' into feature/folia
StarWishsama 165ffa8
chore: update folialib gradle config
StarWishsama 23ca761
fix: import
StarWishsama 7fdff76
chore: spotless
StarWishsama 82c19d9
Merge branch 'dev'
ybw0014 9879f76
Revert "refactor(data): data unload strategy"
StarWishsama e9595d3
Optimize universal block cache checks
StarWishsama 1dd713f
Merge pull request #1222 from SlimefunGuguProject/codex/github-mention
StarWishsama 76fe043
Merge branch 'master' into feature/folia
StarWishsama c7ad12f
fix: pick Craft233MC/Slimefun4
StarWishsama File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| package city.norain.slimefun4.dough; | ||
|
|
||
| import java.util.function.IntConsumer; | ||
| import javax.annotation.Nonnull; | ||
| import javax.annotation.Nullable; | ||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
| import org.apache.commons.lang.Validate; | ||
| import org.bukkit.Location; | ||
| import org.bukkit.entity.Entity; | ||
|
|
||
| class TaskNode { | ||
|
|
||
| private final IntConsumer runnable; | ||
|
|
||
| @Getter | ||
| private final boolean asynchronous; | ||
|
|
||
| @Getter | ||
| private int delay = 0; | ||
|
|
||
| @Nullable @Getter | ||
| @Setter | ||
| private Location location; | ||
|
|
||
| @Nullable @Getter | ||
| @Setter | ||
| private Entity entity; | ||
|
|
||
| private TaskNode nextNode; | ||
|
|
||
| protected TaskNode(@Nonnull IntConsumer consumer, boolean async) { | ||
| this.runnable = consumer; | ||
| this.asynchronous = async; | ||
| } | ||
|
|
||
| protected TaskNode(@Nonnull IntConsumer consumer, int delay, boolean async) { | ||
| this.runnable = consumer; | ||
| this.delay = delay; | ||
| this.asynchronous = async; | ||
| } | ||
|
|
||
| protected boolean hasNextNode() { | ||
| return nextNode != null; | ||
| } | ||
|
|
||
| public @Nullable TaskNode getNextNode() { | ||
| return nextNode; | ||
| } | ||
|
|
||
| public void setNextNode(@Nullable TaskNode node) { | ||
| this.nextNode = node; | ||
| } | ||
|
|
||
| public void execute(int index) { | ||
| runnable.accept(index); | ||
| } | ||
|
|
||
| public void setDelay(int delay) { | ||
| Validate.isTrue(delay >= 0, "The delay cannot be negative."); | ||
|
|
||
| this.delay = delay; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The sed command has been changed to only replace the first occurrence of the version tag. While this is likely intentional to avoid replacing version tags in dependencies, the pattern
0,/<version>[^<]*<\/version>/could be fragile. The pattern uses[^<]*which matches any character except '<', but XML version tags could theoretically contain other elements. Consider adding a comment explaining why only the first occurrence should be replaced, or use a more specific pattern that targets the project version specifically.