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

通用数据 #821

Merged
merged 59 commits into from
Nov 9, 2024
Merged
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
abc35ba
feat: init universal inv design
StarWishsama Dec 4, 2023
78737b3
feat: init universal inv design
StarWishsama Dec 4, 2023
241fe90
Merge branch 'dev' into feat/universal-inventory
StarWishsama Dec 10, 2023
cc74fa3
feat: universal inventory progress
StarWishsama Dec 10, 2023
343af6c
chore: sync up
StarWishsama Dec 18, 2023
a0b4a96
Merge branch 'dev' into feat/universal-inventory
StarWishsama Jan 18, 2024
0fdd70c
feat(universal): fill universal menu api
StarWishsama Jan 18, 2024
7aef5b4
Merge branch 'dev' into feat/universal-inventory
StarWishsama Mar 9, 2024
3ad782b
chore(api): fix scope
StarWishsama Mar 9, 2024
d91b633
feat: sync up change (WIP)
StarWishsama Mar 11, 2024
2eeef99
Merge branch 'dev' into feat/universal-inventory
StarWishsama Mar 27, 2024
4f15465
feat(unidata): universal data progress
StarWishsama Mar 29, 2024
fe71242
fix(githook): fix git hook not cleanup code properly
StarWishsama Mar 29, 2024
01a3158
fix: missing scope cover
StarWishsama Mar 29, 2024
28b4df4
feat(unidata): more progress
StarWishsama Mar 30, 2024
ddf3093
feat(unidata): complete create/remove unidata
StarWishsama Apr 2, 2024
4af94d2
feat(unidata): use pdc to identify uni container
StarWishsama Apr 2, 2024
3d4cdb9
feat(unidata): update unidata `lastPresent`
StarWishsama Apr 2, 2024
05e0151
fix(android): use unidata on move
StarWishsama Apr 7, 2024
1185b0e
chore: sync up
StarWishsama Apr 27, 2024
406fdff
feat(sql): refine unidata table creation
StarWishsama May 28, 2024
a67b272
Merge branch 'refs/heads/dev' into feat/universal-inventory
StarWishsama May 28, 2024
d5bd151
Merge branch 'refs/heads/dev' into feat/universal-inventory
StarWishsama Jul 5, 2024
789191d
feat: rewrite ticker to tick universal ticker
StarWishsama Jul 5, 2024
9f77172
refactor: enforce material check for universal item
StarWishsama Jul 5, 2024
434dd1b
Merge branch 'refs/heads/dev' into feat/universal-inventory
StarWishsama Jul 16, 2024
96a8480
fix: remove pattern matching from java 21
StarWishsama Jul 16, 2024
90a30bb
Merge branch 'refs/heads/dev' into feat/universal-inventory
StarWishsama Jul 17, 2024
86ee53d
Merge branch 'refs/heads/dev' into feat/universal-inventory
StarWishsama Jul 21, 2024
b950cbe
fix(sqlite): missing actual table name sqlite side
StarWishsama Jul 21, 2024
7580a41
fix(sqlite): missing actual table name sqlite side
StarWishsama Jul 21, 2024
a8f41ac
fix(unidata): fix broken universal data system
StarWishsama Jul 21, 2024
841396d
fix(unidata): huge fix for universal data
StarWishsama Jul 21, 2024
b98fe2c
chore: do not modify build artifact name
StarWishsama Jul 21, 2024
2b5b822
fix(ci): fix version regex
StarWishsama Jul 21, 2024
291360a
fix: debug fish unable to identify universal block
StarWishsama Jul 31, 2024
e3141e5
fix(unidata): more fix on universal menu
StarWishsama Aug 7, 2024
34d4376
fix(unidata): fix recursive problem on init
StarWishsama Aug 8, 2024
ab59c65
fix(android): fix android not update location
StarWishsama Aug 8, 2024
762a6e0
Merge branch 'refs/heads/dev' into feat/universal-inventory
StarWishsama Sep 15, 2024
2624b45
fix: refill missing method
StarWishsama Sep 15, 2024
dcf7f03
refactor: rework on tickertask storage
StarWishsama Sep 15, 2024
1b72b4a
Merge branch 'refs/heads/dev' into feat/universal-inventory
StarWishsama Sep 15, 2024
01baeef
Merge branch 'refs/heads/dev' into feat/universal-inventory
StarWishsama Sep 15, 2024
16a8f52
Merge branch 'refs/heads/dev' into feat/universal-inventory
StarWishsama Sep 15, 2024
850953d
chore: spotless
StarWishsama Sep 15, 2024
b439401
refactor: use BlockPosition in ticker
StarWishsama Oct 14, 2024
b7a8d51
feat: migrate android machine data
StarWishsama Oct 14, 2024
09ff45e
chore: add docs
StarWishsama Oct 14, 2024
b8176ae
Merge branch 'refs/heads/dev' into feat/universal-inventory
StarWishsama Oct 14, 2024
742acad
Merge branch 'refs/heads/dev' into feat/universal-inventory
StarWishsama Oct 20, 2024
29009af
fix: merge follow up fix
StarWishsama Oct 20, 2024
d9deb08
feat: complete android data migration
StarWishsama Oct 20, 2024
9dd4922
Merge branch 'refs/heads/dev' into feat/universal-inventory
StarWishsama Oct 20, 2024
ba3d64e
refactor: make universal data more flexible
StarWishsama Oct 25, 2024
286871b
feat: add reserved key check
StarWishsama Oct 25, 2024
165cfdc
fix(unidata): use proper way to reserved key
StarWishsama Nov 9, 2024
385137d
fix: uni block ticker not be enabled
StarWishsama Nov 9, 2024
711d351
Merge branch 'dev' into feat/universal-inventory
StarWishsama Nov 9, 2024
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
Prev Previous commit
Next Next commit
fix: uni block ticker not be enabled
StarWishsama committed Nov 9, 2024

Verified

This commit was signed with the committer’s verified signature.
brendan-defi Brendan from DeFi
commit 385137de7c5eb227d5b78756e6b883d1194ab72f
Original file line number Diff line number Diff line change
@@ -234,7 +234,7 @@ public ASlimefunDataContainer createBlock(Location l, String sfId) {
if (sfItem instanceof UniversalBlock) {
var re = createUniversalBlockData(l, sfId);
if (Slimefun.getRegistry().getTickerBlocks().contains(sfId)) {
Slimefun.getTickerTask().enableTicker(l);
Slimefun.getTickerTask().enableTicker(l, re.getUUID());
}
return re;
} else {
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.xzavier0722.mc.plugin.slimefun4.storage.controller;

import city.norain.slimefun4.api.menu.UniversalMenu;
import city.norain.slimefun4.utils.ClassUtil;
import com.xzavier0722.mc.plugin.slimefun4.storage.controller.attributes.UniversalDataTrait;
import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
import java.util.HashSet;
@@ -48,7 +47,9 @@ protected void setTraitData(UniversalDataTrait trait, String val) {

if (!trait.getReservedKey().isBlank()) {
setCacheInternal(trait.getReservedKey(), val, true);
Slimefun.getDatabaseManager().getBlockDataController().scheduleDelayedUniversalDataUpdate(this, trait.getReservedKey());
Slimefun.getDatabaseManager()
.getBlockDataController()
.scheduleDelayedUniversalDataUpdate(this, trait.getReservedKey());
}
}