Rework diseases to become datapacks #10361

Thodor12 · 2024-10-25T17:17:40Z

Changes proposed in this pull request

Diseases use datapacks in favor of configuration values
Upgraded the RandomCollection introduced in Rework lucky ores to become datapacks #10343 to allow for key based values
Improved code regarding diseases by using more up-to-date code

Testing

Yes I tested this before submitting it.
I also did a multiplayer test.

Review please

uecasm · 2024-10-25T22:02:33Z

I was planning to do this (you beat me to it 😁) but only in 1.21 to reduce compatibility headaches. Also putting the files inside colony/diseases and not just diseases to reduce possible clashes with other mods (we already had to do that with quests). The latter at least I'd definitely still recommend doing.

# Conflicts: # src/main/java/com/minecolonies/api/compatibility/CompatibilityManager.java

src/main/java/com/minecolonies/api/crafting/ItemStorage.java

src/main/java/com/minecolonies/api/entity/citizen/citizenhandlers/ICitizenDiseaseHandler.java

src/main/java/com/minecolonies/core/colony/buildings/workerbuildings/BuildingHospital.java

src/main/java/com/minecolonies/core/datalistener/DiseasesListener.java

src/main/java/com/minecolonies/core/entity/ai/minimal/EntityAISickTask.java

src/main/java/com/minecolonies/core/entity/ai/workers/service/EntityAIWorkHealer.java

src/main/java/com/minecolonies/core/datalistener/DiseasesListener.java

# Conflicts: # src/main/java/com/minecolonies/core/entity/citizen/citizenhandlers/CitizenDiseaseHandler.java # src/main/resources/assets/minecolonies/lang/manual_en_us.json

src/main/java/com/minecolonies/core/entity/ai/workers/service/EntityAIWorkHealer.java

src/main/java/com/minecolonies/core/util/RandomCollection.java

# Conflicts: # src/main/resources/assets/minecolonies/lang/manual_en_us.json

Raycoms

Looks good now, please do another testrun after the changes to make sure we don't break things =D

# Conflicts: # src/main/java/com/minecolonies/api/compatibility/CompatibilityManager.java # src/main/java/com/minecolonies/api/configuration/ServerConfiguration.java # src/main/java/com/minecolonies/api/entity/citizen/citizenhandlers/ICitizenDiseaseHandler.java # src/main/java/com/minecolonies/apiimp/initializer/InteractionValidatorInitializer.java # src/main/java/com/minecolonies/core/colony/buildings/workerbuildings/BuildingHospital.java # src/main/java/com/minecolonies/core/entity/ai/minimal/EntityAISickTask.java # src/main/java/com/minecolonies/core/entity/ai/workers/service/EntityAIWorkHealer.java # src/main/java/com/minecolonies/core/entity/citizen/citizenhandlers/CitizenDiseaseHandler.java # src/main/java/com/minecolonies/core/event/FMLEventHandler.java

Diseases use datapacks in favor of configuration values Upgraded the RandomCollection introduced in Rework lucky ores to become datapacks #10343 to allow for key based values Improved code regarding diseases by using more up-to-date code

Thodor12 added 2 commits October 25, 2024 19:15

Use datapacks for diseases

dab6da5

Remove always true condition

4928cf3

Thodor12 added 2 commits October 27, 2024 14:07

Use colony directory

69cbad5

Merge branch 'version/main' into feature/diseases_datapack

a35961b

# Conflicts: # src/main/java/com/minecolonies/api/compatibility/CompatibilityManager.java