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

SamB440 / Tale-of-Kingdoms

An adventure of glory in the world of Minecraft - Revival of Tale of Kingdoms mod

GNU General Public License v3.0

17 stars 3 forks source link

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

Closed SamB440 closed 2 years ago

SamB440 commented 3 years ago

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 commented 3 years ago

No star imports

SamB440 commented 3 years ago

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 commented 3 years ago

No star imports

SamB440 commented 3 years ago

No star imports

SamB440 commented 3 years ago

No star imports

SamB440 commented 3 years ago

No star imports

SamB440 commented 3 years ago

No star imports

SamB440 commented 3 years ago

No star imports

SamB440 commented 3 years ago

No star imports

SamB440 commented 3 years ago

No star imports

SamB440 commented 3 years ago

No star imports

SamB440 commented 3 years ago

Should have private modifier

SamB440 commented 3 years ago

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

SamB440 commented 3 years ago

No star imports

SamB440 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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

added 2 commits

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

Compare with previous version

SamB440 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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

added 1 commit

e6b86dc2 - Added private access modifier to the worthinessJson JsonObject.

Compare with previous version

SamB440 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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

added 1 commit

236a93fd - Addressed all suggestions in pull request !32:

Compare with previous version

SamB440 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

resolved all threads

SamB440 commented 3 years ago

approved this merge request

SamB440 commented 3 years ago

mentioned in commit 690e50eba9de41585a18335318872e656d20c51b