Fix world generation on first join & Implement an improved PriorityExecutor & Clean up GlowWorld - [merged] #158

Closed jdonkervliet closed 4 years ago

In GitLab by @swabbur on May 26, 2020, 22:51

Merges bugfix/world-generation-first-join -> development

Resolves issue #63

Fix the problem with the world not generating properly on first join. Also, adds an improved version of the priority executors based on a sortable BlockingQueue. Lastly, includes some clean up of the existing code in ChunkRunnable and GlowWorld.

In GitLab by @wubero on May 26, 2020, 23:10

Commented on src/main/java/net/glowstone/GlowWorld.java line 592

Missing javadoc on this method. Even though its private I would prefer javadoc here since it's in such a big class.

In GitLab by @wubero on May 26, 2020, 23:12

Commented on src/main/java/net/glowstone/GlowWorld.java line 726

We use this line of code in other methods aswell right? Might be nice to make a seperate method for this and explain why we do the 1 + player.getViewDistance in the javadoc?

In GitLab by @swabbur on May 27, 2020, 01:08

Commented on src/main/java/net/glowstone/GlowWorld.java line 726

We won't do that in this commit as it will be replaced and extracted once we fix the existing view distance bug.

In GitLab by @swabbur on May 27, 2020, 01:12

added 1 commit

0b810232 - Add missing JavaDoc

Compare with previous version

In GitLab by @swabbur on May 27, 2020, 01:13

Commented on src/main/java/net/glowstone/GlowWorld.java line 592

I've added a small description.

In GitLab by @julian9499 on May 27, 2020, 08:02

Commented on src/main/java/net/glowstone/executor/PriorityExecutor.java line 24

Add exception throwing or remove this line

In GitLab by @JimVliet on May 27, 2020, 08:26

added 1 commit

47a3de14 - Add throws clause to the PriorityExecutor

Compare with previous version

In GitLab by @wubero on May 27, 2020, 08:56

Commented on src/main/java/net/glowstone/GlowWorld.java line 726

Alright thats fine

In GitLab by @wubero on May 27, 2020, 08:56

resolved all threads

In GitLab by @JimVliet on May 27, 2020, 10:02

added 1 commit

c189e5c7 - Make the standard remove if run in linear time

Compare with previous version

In GitLab by @JimVliet on May 27, 2020, 10:02

added 17 commits

c189e5c7...492f3947 - 2 commits from branch development
614f41f2 - Fix world generation on first join
4a4752b4 - Fix chunkrunnables not being reenqueued
a08e87ed - WIP: Refactor streamchunks with sortable queue
4964da3b - Fix chunk unloading
8bff3340 - Await on chunk load message
d90de7a8 - Fix and document the linearRemoveIf method
3804be8e - Clean up active chunk collection and updating
8effce28 - Clean up GlowWorld.pulse and GlowWorld.streamChunks
641ee7e3 - Clean up PriorityExecutor and ChunkRunnable
a9272884 - Fix JavaDoc and missing unused imports
e811e4c3 - Fix ChunkRunnable and PriorityExecutor tests
32535c46 - Fix broken ChunkRunnable test
a598815f - Add missing JavaDoc
36eaeecf - Add throws clause to the PriorityExecutor
b25770c0 - Make the standard remove if run in linear time

Compare with previous version

In GitLab by @JimVliet on May 27, 2020, 10:02

marked as a Work In Progress from a08e87ed661a444c3e280919204c7f51f29e4bbb

In GitLab by @JimVliet on May 27, 2020, 10:03

unmarked as a Work In Progress

In GitLab by @wubero on May 27, 2020, 10:07

Commented on src/main/java/net/glowstone/GlowWorld.java line 546

Since this method is decently cleaned up we should probably remove the comments in this method as well right?

In GitLab by @swabbur on May 27, 2020, 10:09

Commented on src/main/java/net/glowstone/GlowWorld.java line 546

They are a reminder for future refactoring in the branch features/entities.

In GitLab by @wubero on May 27, 2020, 10:09

Commented on src/main/java/net/glowstone/GlowWorld.java line 773

Remove comments in this method. In my opinion they are not necessary

In GitLab by @wubero on May 27, 2020, 10:12

Commented on src/main/java/net/glowstone/GlowWorld.java line 755

Remove comment?

In GitLab by @wubero on May 27, 2020, 10:13

Commented on src/main/java/net/glowstone/GlowWorld.java line 2561

Change javadoc since you're shutting down the executor as well

In GitLab by @wubero on May 27, 2020, 10:13

Commented on src/main/java/net/glowstone/entity/EntityManager.java line 66

Change javadoc since it's an arraylist now

In GitLab by @wubero on May 27, 2020, 10:16

Commented on src/main/java/net/glowstone/GlowWorld.java line 546

Alright then its fine

In GitLab by @larsdetombe on May 27, 2020, 10:32

Commented on src/main/java/net/glowstone/GlowWorld.java line 716

This log should be removed, otherwise it logs every unload which is not desired.

In GitLab by @JimVliet on May 27, 2020, 10:33

Commented on src/main/java/net/glowstone/GlowWorld.java line 716

changed this line in version 6 of the diff

In GitLab by @JimVliet on May 27, 2020, 10:33

added 1 commit

1a6172ef - Add missing branch priority executor test

Compare with previous version

In GitLab by @JimVliet on May 27, 2020, 10:42

Commented on src/main/java/net/glowstone/GlowWorld.java line 755

changed this line in version 7 of the diff

In GitLab by @JimVliet on May 27, 2020, 10:42

Commented on src/main/java/net/glowstone/GlowWorld.java line 2561

changed this line in version 7 of the diff

In GitLab by @JimVliet on May 27, 2020, 10:42

Commented on src/main/java/net/glowstone/entity/EntityManager.java line 66

changed this line in version 7 of the diff

In GitLab by @JimVliet on May 27, 2020, 10:42

added 1 commit

008df9b3 - Update outdated docs and remove redundant comments

Compare with previous version

In GitLab by @JimVliet on May 27, 2020, 10:50

resolved all threads

In GitLab by @JimVliet on May 27, 2020, 11:08

added 1 commit

3556b206 - Use normal send for chunks and do not await on it

Compare with previous version

In GitLab by @swabbur on May 27, 2020, 11:59

merged

In GitLab by @swabbur on May 27, 2020, 11:59

mentioned in commit 36f1cf12dfba558708d3ab6840200ddf057bf4b1

atlarge-research / opencraft

Fix world generation on first join & Implement an improved PriorityExecutor & Clean up GlowWorld - [merged] #158