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.

Sign up for GitHub

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

Jump to bottom

Refactor citizen and make sure no duplicates spawn and none get lost! #2501

Merged
merged 27 commits into from Jun 1, 2018
Merged

Refactor citizen and make sure no duplicates spawn and none get lost! #2501

merged 27 commits into from Jun 1, 2018

Conversation

Raycoms
Copy link
Contributor

@Raycoms Raycoms commented May 31, 2018 •
edited

Closes #2498
Closes #2494
Closes #2499

Changes proposed in this pull request:

  • Rework to avoid lag from updating inactive colonies
  • Rework of duplicate detection
  • Refactor citizen in abstract class and several handlers.
  • Fix issue with barracks tower

Review please

Raycoms added 20 commits May 30, 2018 01:45
@Raycoms
Add some logging and make code easier
da3f28d
@Raycoms
make it lighter for now!
ca480dd
@Raycoms
okay, do less work if block not loaded or player not online.
3636c31
@Raycoms
remove this for now to avoid artificial duplicates
0adddee
@Raycoms
add more logging
1fba263
@Raycoms
add some more logging and refinement
398ab9a
@Raycoms
further improve performance
2a10868
@Raycoms
even less mark dirty
7d211df
@Raycoms
first part of reworking citizen
91e8ee3
@Raycoms
Merge branch 'version/1.12' into debug
6606e7e
@Raycoms
Refactor citizen and move into own handler classes
afa5a24
@Raycoms
Also create sleep and stuck handlers
de1d7fd
@Raycoms
remove not needed handler.
ec5350e
@Raycoms
Revert "remove not needed handler."
bbba71d 
This reverts commit ec5350e.
@Raycoms
adapt changes to other classes #1
b29a758
@Raycoms
Finish connecting classes
2b7bc99
@Raycoms
Refactor and fix citizen spawn
330acae
@Raycoms
Revert "make it lighter for now!"
3c67541 
This reverts commit ca480dd.
@Raycoms
fix build
632e17d
@Raycoms
improve style
9f0a023
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
@ldtteam ldtteam deleted a comment May 31, 2018
BuildTeamLinter
BuildTeamLinter reviewed May 31, 2018
View reviewed changes
src/main/java/com/minecolonies/coremod/colony/Colony.java
@@ -10,6 +10,7 @@
import com.minecolonies.api.util.BlockPosUtil;
import com.minecolonies.api.util.LanguageHandler;
import com.minecolonies.api.util.constant.Suppression;
import com.minecolonies.blockout.Log;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MINOR Remove this unused import 'com.minecolonies.blockout.Log'. rule

Asherslab
Asherslab approved these changes Jun 1, 2018
View reviewed changes
Copy link
Member

@Asherslab Asherslab left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great. Hopefully this'll be the end of these stupid duplicates!

marchermans
marchermans approved these changes Jun 1, 2018
View reviewed changes
Copy link
Contributor

@marchermans marchermans left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks amazing. A lot cleaner.

@Raycoms Raycoms merged commit 4243a10 into version/1.12 Jun 1, 2018
@Raycoms Raycoms deleted the debug branch June 1, 2018 12:55
@BuildTeamLinter
Copy link

SonarQube analysis reported 213 issues

  • CRITICAL 15 critical
  • MAJOR 159 major
  • MINOR 27 minor
  • INFO 12 info

Watch the comments in this conversation to review them.

Top 10 extra issues

Note: The following issues were found on lines that were not modified in the pull request. Because these issues can't be reported as line comments, they are summarized here:

  1. CRITICAL CitizenData.java#L218: Use already-defined constant 'TAG_SKILLS' instead of duplicating its value here. rule
  2. CRITICAL CitizenData.java#L219: Use already-defined constant 'TAG_SKILL_STRENGTH' instead of duplicating its value here. rule
  3. CRITICAL CitizenData.java#L220: Use already-defined constant 'TAG_SKILL_STAMINA' instead of duplicating its value here. rule
  4. CRITICAL CitizenData.java#L221: Use already-defined constant 'TAG_SKILL_SPEED' instead of duplicating its value here. rule
  5. CRITICAL CitizenData.java#L222: Use already-defined constant 'TAG_SKILL_INTELLIGENCE' instead of duplicating its value here. rule
  6. CRITICAL CitizenData.java#L223: Use already-defined constant 'TAG_SKILL_DEXTERITY' instead of duplicating its value here. rule
  7. CRITICAL CitizenData.java#L855: Use already-defined constant 'TAG_INVENTORY' instead of duplicating its value here. rule
  8. CRITICAL AbstractBuilding.java#L97: Remove this call from a constructor to the overridable "setupRsDataStore" method. rule
  9. CRITICAL AbstractBuilding.java#L500: Remove usage of generic wildcard type. rule
  10. CRITICAL AbstractBuilding.java#L515: Remove usage of generic wildcard type. rule

TheYoxy added a commit that referenced this pull request Jun 4, 2018
@TheYoxy
Merge version/1.12
83de7a5 
* remotes/origin/version/1.12:
  commit (#2505)
  Refactor citizen and make sure no duplicates spawn and none get lost! (#2501)
  Buff Chief Sword (#2503)
  Add Website to readme
  Fix/lumberjack replant default (#2502)
  Guidebook is now given to new players onWorldJoinEvent (#2489)
  Port1.12/rework/guards (#2483)

# Conflicts:
#	src/main/java/com/minecolonies/coremod/colony/managers/CitizenManager.java
TheYoxy added a commit that referenced this pull request Jun 4, 2018
@TheYoxy
Merge version/1.12
40663b5 
* remotes/origin/version/1.12:
  commit (#2505)
  Refactor citizen and make sure no duplicates spawn and none get lost! (#2501)
  Buff Chief Sword (#2503)
  Add Website to readme
  Fix/lumberjack replant default (#2502)
  Guidebook is now given to new players onWorldJoinEvent (#2489)
  Port1.12/rework/guards (#2483)

# Conflicts:
#	src/main/java/com/minecolonies/coremod/colony/managers/CitizenManager.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BuildTeamLinter BuildTeamLinter BuildTeamLinter left review comments

@marchermans marchermans marchermans approved these changes

@Asherslab Asherslab Asherslab approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Raycoms @BuildTeamLinter @marchermans @Asherslab