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

V5.4.0-rc1 to master #5272

Open
wants to merge 114 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
c83f16d
test(StorageManager): convert TTE tests to MTE
keturn Jun 11, 2022
03dd618
test: add a subsystem with default naming to make custom test subsyst…
keturn Jun 13, 2022
cb32dad
Merge branch 'develop' into test/5032/storageManagerMTE
keturn Jun 26, 2022
4c595f9
chore: prepare snapshot builds for 5.4.0-SNAPSHOT
jdrueckert Sep 3, 2022
b496df4
Merge branch 'develop' into test/5032/storageManagerMTE
jdrueckert Sep 26, 2022
16993c1
Merge pull request #5045 from MovingBlocks/test/5032/storageManagerMTE
keturn Oct 1, 2022
68ddfff
chore(StorageManager): replace TaskMaster with Reactor
keturn Jun 9, 2022
f8f6f89
Merge pull request #4800 from MovingBlocks/refactor/rework-transactio…
keturn Oct 15, 2022
4ad7b68
ci: add workflow to auto-add issues and PRs to projects (#5070)
jdrueckert Nov 5, 2022
232909c
ci: add workflow autoclosing issues with unresponsive authors (#5071)
jdrueckert Nov 5, 2022
e8380cf
ci: fix syntax errors in project-autoadd workflow
jdrueckert Nov 13, 2022
df98a45
ci: fix project-autoadd github action (#5080)
jdrueckert Nov 26, 2022
f95b815
doc: document restrictions for BindButtonEvent (#5079)
skaldarnar Nov 26, 2022
119dbec
fix: remove Rendering Module Settings screen (#5083)
skaldarnar Dec 17, 2022
2666812
feat: add check for facet provider requirements (#5073)
MrGizmo123 Dec 17, 2022
ecf17d9
test(MTE): new parametrizable IntegrationEnvironment annotation for M…
keturn Dec 18, 2022
2dab9f6
refactor: head bobbing setting title
NikitasMaragkos Jan 28, 2023
a2cdbd5
build(distribution): re-enable SecurityManager in distributions runni…
BenjaminAmos Apr 6, 2023
8943264
doc: replace LGTM badges with code climate (#5095)
sfavello Apr 10, 2023
4c177c6
ci: update autoclose file version and fix github username (#5097)
sfavello Apr 12, 2023
2404f94
fix: disable SecurityManager at runtime when using Java 18 and above
BenjaminAmos Jul 5, 2023
c89f64a
Revert "build(distribution): re-enable SecurityManager in distributio…
BenjaminAmos Jul 5, 2023
324376a
refactor: remove vr support (#5112)
jdrueckert Jul 9, 2023
37f95dc
Merge branch 'develop' into java-18-disable-securitymanager
jdrueckert Jul 11, 2023
9a9bd19
refactor!: remove TeraEd facade (#5115)
skaldarnar Jul 13, 2023
85e64df
ci: configure jenkins to abort builds if new builds are triggered (#5…
jdrueckert Jul 15, 2023
828cd51
refactor(netork)!: rewrite ping logic (#5106)
skaldarnar Jul 15, 2023
1d831ea
test(TypeHandler): More tests for empty collections (#5117)
skaldarnar Jul 16, 2023
26d5b52
refactor!: remove multi-world support (#5116)
skaldarnar Jul 17, 2023
9cca631
Merge branch 'develop' into java-18-disable-securitymanager
jdrueckert Jul 17, 2023
9b863dd
refactor: merge StartPlaying (spawn preview) screen into WorldPreGene…
jdrueckert Jul 20, 2023
e33518e
doc(facade/PC): add README (#5123)
skaldarnar Jul 31, 2023
36591e1
feat: fix ExecutorCompletionService workaround in ChunkProcessingPipe…
BenjaminAmos Aug 13, 2023
e710b36
chore: consume CrashReporter v5.0.0 (#5131)
jdrueckert Sep 3, 2023
43a7e05
build(gradle): upgrade gradle 6.4.2 >>> 8.2.1 (#5109)
DarkWeird Sep 3, 2023
1ce6368
build: Add Gradle task to assemble module build harness (#5137)
skaldarnar Sep 10, 2023
aa43873
Merge branch 'develop' into java-18-disable-securitymanager
jdrueckert Sep 24, 2023
55f30ff
Merge pull request #5107 from BenjaminAmos/java-18-disable-securityma…
BenjaminAmos Sep 24, 2023
5957641
build: update groovy wrapper (#5141)
jdrueckert Sep 25, 2023
f907533
New Artifactory URL (#5142)
Cervator Sep 26, 2023
c7d9a37
gradle 8.3, supporting java-20 via its kotlin dependency
soloturn Sep 17, 2023
983bba1
Merge pull request #5138 from soloturn/gradle-8.3
BenjaminAmos Oct 1, 2023
bef4757
gradle-8.4, fix pmd warnings
soloturn Oct 7, 2023
1494c02
Merge pull request #5146 from soloturn/develop
BenjaminAmos Oct 16, 2023
254db60
fix: make entity dump filename windows compatible (#5145)
jdrueckert Oct 18, 2023
4d79e5e
convert settings.gradle to kotlin (#5147)
soloturn Oct 21, 2023
c3e2466
Update build files to remove deprecation warnings
PurityLake Aug 21, 2023
5938af4
Fixed a build deprecation warning
PurityLake Aug 21, 2023
ec81b2b
gradle warnings, integrate review comments from BenjaminAmos
soloturn Oct 26, 2023
07176f7
Merge pull request #5153 from soloturn/gradle-deprecations
BenjaminAmos Oct 26, 2023
3433696
Fix crash when system locale is complex
rzats Oct 31, 2023
2d8ef61
doc: move wiki content to docsify page (#5155)
skaldarnar Oct 31, 2023
21b7279
i18n: update Ukrainian locale with current strings (#5156)
rzats Oct 31, 2023
d5643c3
Create CNAME
skaldarnar Nov 4, 2023
13a5fa7
Delete CNAME
skaldarnar Nov 4, 2023
d3bbd77
perf(rendering): use MONO rendering stage (#5160)
skaldarnar Nov 5, 2023
6b55dc1
Merge branch 'develop' into fix/invalid-locale
jdrueckert Nov 6, 2023
dc4cb4c
Fix after review
rzats Nov 7, 2023
e679a98
Merge pull request #5158 from rzats/fix/invalid-locale
rzats Nov 7, 2023
0342fad
chore: init metrics only if monitoring enabled (#5165)
jdrueckert Nov 7, 2023
7d66366
fix: move readme images back into docs folder (#5163)
jdrueckert Nov 8, 2023
478d579
doc: add link to docsified engine wiki (#5164)
jdrueckert Nov 8, 2023
8545be0
qa: logger qa, use parameterized logger (#5170)
soloturn Nov 11, 2023
1cef7c1
refactor: address IntelliJ QAPlug plugin findings (#5149)
jdrueckert Nov 11, 2023
1b286a6
test: split and improve ObjectFieldMapTypeHandlerFactoryTests (#5168)
jdrueckert Nov 13, 2023
c237660
refactor: merge universe setup into world pregen screen (#5122)
jdrueckert Nov 13, 2023
84228c1
refactor: remove unused local var for artifactview (#5175)
jdrueckert Nov 17, 2023
3aa68c0
Compile against Java 17 (#5162)
BenjaminAmos Nov 17, 2023
8b4b6b9
qa: fix typehandlerlibrary spotbugs findings (#5154)
soloturn Nov 18, 2023
432bcb5
doc: fix broken links (#5172)
jdrueckert Nov 18, 2023
317154b
qa: consume TeraConfig v2.2.0 (#5179)
jdrueckert Nov 19, 2023
c56c4dd
qa: parametrize logger usages (#5173)
jdrueckert Nov 19, 2023
4f42a8f
revert: "qa: parametrize logger usages (#5173)" (#5180)
jdrueckert Nov 19, 2023
48b5034
doc: Contributor Quick Start JDK 17 (#5184)
jdrueckert Nov 22, 2023
1f3e359
qa: improve code quality in engine tests (#5178)
soloturn Dec 3, 2023
1b57c1b
build: update dependencies (#5189)
soloturn Dec 5, 2023
d81cc97
refactor: component field visibility public (#5191)
jdrueckert Dec 6, 2023
0c2b722
qa: parametrize logger usages (#5181)
jdrueckert Dec 6, 2023
bf78a58
prepare switch over to kotlin, "new" java date formatting (#5195)
soloturn Dec 23, 2023
14937d2
Terasology engine (#5192)
soloturn Dec 24, 2023
2f6b32c
remove double javadoc, static is uppercase (#5199)
soloturn Jan 3, 2024
f3140ef
build: prepare subprojects.settings.gradle for kotlin (#5204)
soloturn Jan 6, 2024
8f37f92
build: migrate subprojects.settings.gradle to kotlin (#5203)
soloturn Jan 8, 2024
1363a5d
convert main build.gradle to kotlin (#5197)
soloturn Jan 20, 2024
3e9b5b6
remove logback RegexFilterAction, not supported any more (#5193)
soloturn Jan 20, 2024
dbb0dae
refactor: use logger instead of `System.out.println` (#5188)
soloturn Jan 21, 2024
20da7f2
chore: upgrade slf4j to 2.0.11 (#5207)
soloturn Jan 21, 2024
285ba2f
build: convert engine-tests build.gradle to kotlin (#5202)
soloturn Jan 27, 2024
397652e
chore: consume gestalt v7.2.0 (#5210)
jdrueckert Feb 4, 2024
ae83461
fix(arm64): lwjgl for macOS-arm64, protoc 3.17.0 -> 3.22.0
priya4991 Feb 18, 2024
23b83d6
feat: prevent serialisation of private component fields (#5208)
BenjaminAmos Mar 3, 2024
ed7a3d6
test: add private serialisation cases to type serialiser tests (#5217)
BenjaminAmos Mar 8, 2024
10857c5
doc: remove gooey tour link (#5218)
jdrueckert Mar 8, 2024
b3edb2c
chore: remove year from idea copyright template (#5221)
jdrueckert Mar 10, 2024
bcae39f
doc: guidance on PMD guard log statement warning (#5220)
jdrueckert Mar 10, 2024
1b48033
doc: link TypeHandlerLibrary readme (#5222)
jdrueckert Mar 13, 2024
d0c6e86
introduce JUnit tag "flaky", to exclude tests from running. (#5231)
soloturn Apr 5, 2024
82fd5c4
chore: update gradle to 8.7 (#5230)
soloturn Apr 6, 2024
215e968
feat: make WorldConfigurator subscribable (#5233)
jdrueckert Apr 14, 2024
5eceac7
chore: update JNBullet to 1.0.4 (#5225)
skaldarnar Apr 20, 2024
84dd22e
refactor: merge world config in setup screen (#5226)
jdrueckert Apr 21, 2024
1c52f5e
feat: throttle chunk processing based on deadline (#5238)
BenjaminAmos Apr 26, 2024
33dabf5
feat: make number of chunk processing threads configurable (#5237)
BenjaminAmos Apr 28, 2024
072d207
update sonar version for qa (#5194)
soloturn May 4, 2024
81b53f4
fix: fix windowed fullscreen overlapping taskbar on Windows (#5243)
Khaled-Dridi May 7, 2024
66d62f5
fix(facades): fix command line args not working
Imitater967 May 9, 2024
6077f50
Merge pull request #5245 from Imitater967/fix-broken-parameter
Cervator May 10, 2024
13c07b8
convert engine build to kotlin (#5196)
soloturn May 14, 2024
30bc83a
chore: screen merge follow-ups (#5241)
jdrueckert May 16, 2024
0c00a08
qa: address PMD GuardLogStatement warnings (#5209)
soloturn May 17, 2024
304d7be
ui: reduce button height to text field height (#5248)
jdrueckert May 30, 2024
6fd4cc9
doc: fix broken forum links (#5249)
jdrueckert May 30, 2024
9b498fa
fix: fix server crash when executing console commands (#5250)
BenjaminAmos Jun 2, 2024
05373e9
fix(Movement): water super jump bug (#5252)
engiValk Jun 15, 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
feat: throttle chunk processing based on deadline (#5238)
BenjaminAmos authored Apr 26, 2024
commit 1c52f5e7b9d9722fa62cf07a964ddc1bd0fd0115
Original file line number Diff line number Diff line change
@@ -82,6 +82,7 @@ public class LocalChunkProvider implements ChunkProvider {

private static final Logger logger = LoggerFactory.getLogger(LocalChunkProvider.class);
private static final int UNLOAD_PER_FRAME = 64;
private static final int UPDATE_PROCESSING_DEADLINE_MS = 24;
private final EntityManager entityManager;
private final BlockingQueue<Chunk> readyChunks = Queues.newLinkedBlockingQueue();
private final BlockingQueue<TShortObjectMap<TIntList>> deactivateBlocksQueue = Queues.newLinkedBlockingQueue();
@@ -229,8 +230,16 @@ public void update() {
deactivateBlocks();
checkForUnload();
Chunk chunk;

long processingStartTime = System.currentTimeMillis();
while ((chunk = readyChunks.poll()) != null) {
processReadyChunk(chunk);
long totalProcessingTime = System.currentTimeMillis() - processingStartTime;
if (!readyChunks.isEmpty() && totalProcessingTime > UPDATE_PROCESSING_DEADLINE_MS) {
logger.warn("Chunk processing took too long this tick ({}/{}ms). {} chunks remain.", totalProcessingTime,
UPDATE_PROCESSING_DEADLINE_MS, readyChunks.size());
break;
}
}
}