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

Implemented suggestions from #42, #43, and #48 - [merged] #104

Closed
SamB440 opened this issue May 14, 2021 · 49 comments
Closed

Implemented suggestions from #42, #43, and #48 - [merged] #104

SamB440 opened this issue May 14, 2021 · 49 comments
Labels
gitlab merge request

Comments

@SamB440
Copy link
Owner

SamB440 commented May 14, 2021

In GitLab by @JordanPlayz158 on May 14, 2021, 21:13

Merges master -> master

As described in the title, I have implemented the suggestions described/specified in issues #42, #43, and #48.
@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

No star imports

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

I am not sure about having a different entity, but if it's absolutely neccesary, could it be GUILDMASTER_DEFENDER or something more descriptive than just clone?

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

No star imports

8 similar comments
@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

No star imports

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

No star imports

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

No star imports

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

No star imports

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

No star imports

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

No star imports

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

No star imports

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

No star imports

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

Should have private modifier

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

Why REPLACE_EXISTING? do we not want this configurable? this would reset it?

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

No star imports

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

As we have a separate entity, I'm pretty sure you can get rid of this method and just put it in the init goals.

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:33

Commented on src/main/java/com/convallyria/taleofkingdoms/client/entity/render/TOKBipedRender.java line 12

changed this line in version 2 of the diff

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:33

Commented on src/main/java/com/convallyria/taleofkingdoms/common/entity/guild/GuildArcherEntity.java line 12

changed this line in version 2 of the diff

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:33

Commented on src/main/java/com/convallyria/taleofkingdoms/common/entity/reficule/ReficuleMageEntity.java line 14

changed this line in version 2 of the diff

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:33

Commented on src/main/java/com/convallyria/taleofkingdoms/common/entity/reficule/ReficuleMageEntity.java line 16

changed this line in version 2 of the diff

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:33

Commented on src/main/java/com/convallyria/taleofkingdoms/common/generator/GatewayGenerator.java line 7

changed this line in version 2 of the diff

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:33

Commented on src/main/java/com/convallyria/taleofkingdoms/common/generator/ReficuleVillageGenerator.java line 7

changed this line in version 2 of the diff

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:33

Commented on src/main/java/com/convallyria/taleofkingdoms/common/gson/BlockPosAdapter.java line 3

changed this line in version 2 of the diff

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:33

Commented on src/main/java/com/convallyria/taleofkingdoms/common/listener/StartWorldListener.java line 18

changed this line in version 2 of the diff

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:33

added 2 commits

  • be38028 - Revert "Changes: - Let the ide optimize the imports of all of our code...
  • b18ba38 - Re-commited changes from the revert that were accepted.

Compare with previous version

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:34

Commented on src/main/java/com/convallyria/taleofkingdoms/client/entity/render/TOKBipedRender.java line 12

Reverted!

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:35

Commented on src/main/java/com/convallyria/taleofkingdoms/client/gui/entity/BlacksmithScreen.java line 14

Reverted!

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:35

Commented on src/main/java/com/convallyria/taleofkingdoms/client/gui/entity/FoodShopScreen.java line 14

Reverted!

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:35

Commented on src/main/java/com/convallyria/taleofkingdoms/common/entity/guild/GuildArcherEntity.java line 12

Reverted!

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:35

Commented on src/main/java/com/convallyria/taleofkingdoms/common/entity/EntityTypes.java line 7

Reverted!

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:35

Commented on src/main/java/com/convallyria/taleofkingdoms/common/entity/reficule/ReficuleMageEntity.java line 14

Reverted!

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:35

Commented on src/main/java/com/convallyria/taleofkingdoms/common/entity/reficule/ReficuleMageEntity.java line 16

Reverted!

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:35

Commented on src/main/java/com/convallyria/taleofkingdoms/common/generator/GatewayGenerator.java line 7

Reverted!

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:35

Commented on src/main/java/com/convallyria/taleofkingdoms/common/generator/ReficuleVillageGenerator.java line 7

Reverted!

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:35

Commented on src/main/java/com/convallyria/taleofkingdoms/common/gson/BlockPosAdapter.java line 3

Reverted!

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:37

Commented on src/main/java/com/convallyria/taleofkingdoms/common/listener/StartWorldListener.java line 18

Reverted!

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:40

Commented on src/main/java/com/convallyria/taleofkingdoms/common/listener/CoinListener.java line 32

changed this line in version 3 of the diff

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:40

added 1 commit

  • e6b86dc - Added private access modifier to the worthinessJson JsonObject.

Compare with previous version

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:40

Commented on src/main/java/com/convallyria/taleofkingdoms/common/listener/CoinListener.java line 32

Done!

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:54

Commented on src/main/java/com/convallyria/taleofkingdoms/client/entity/render/RenderSetup.java line 23

Ok it will be renamed to GUILDMASTER_DEFENDER and i'm not sure if it's absolutely neccesary but it was the way that made the most sense in my head but in the future, if we feel it is unnecessary we can change it.

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 14:54

Commented on src/main/java/com/convallyria/taleofkingdoms/common/world/ConquestInstance.java line 128

Done, will be committed soon after testing that everything still works.

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 15:07

Commented on src/main/java/com/convallyria/taleofkingdoms/client/entity/render/RenderSetup.java line 23

changed this line in version 4 of the diff

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 15:07

Commented on src/main/java/com/convallyria/taleofkingdoms/common/world/ConquestInstance.java line 128

changed this line in version 4 of the diff

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 15:07

added 1 commit

  • 236a93f - Addressed all suggestions in pull request !32:

Compare with previous version

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 15:07

Commented on src/main/java/com/convallyria/taleofkingdoms/client/entity/render/RenderSetup.java line 23

Done!

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 15:08

Commented on src/main/java/com/convallyria/taleofkingdoms/common/world/ConquestInstance.java line 128

Done!

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

In GitLab by @JordanPlayz158 on May 15, 2021, 15:23

Commented on src/main/java/com/convallyria/taleofkingdoms/common/listener/CoinListener.java line 129

Nono, line 128 verifies that the file does not already exist, I'm not sure why but back when I tried copying files, this is the only way I could get it to work but it does work fine, it doesn't replace or reset the config, it will only copy the file to that location if the file doesn't already exist.

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

resolved all threads

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

approved this merge request

@SamB440
Copy link
Owner Author

SamB440 commented May 15, 2021

mentioned in commit 690e50e

@SamB440 SamB440 closed this as completed May 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
gitlab merge request
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@SamB440