-
Notifications
You must be signed in to change notification settings - Fork 326
Fix medical conditions' effects not working #4066
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.
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
Open
screret
wants to merge
28
commits into
GregTechCEu:1.20.1
Choose a base branch
from
screret:sc/fix-medical-conditions
base: 1.20.1
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
8d78f91
clean up medical condition-related translation keys
screret 2dd369a
make medical conditions use an actual registry instead of faking one
screret 96d4ca4
rename a couple methods' parameters, add clarifying comments to some,…
screret 67a76ad
add documentation on how lang keys are chosen for medical condition
screret 60e5659
special case the health debuff condition so it can resync the player'…
screret 763bf1c
add a "consumption" hazard trigger that triggers when a player eats s…
screret 9baf0b5
symptom that gives the darkness effect (the one wardens use)
screret 7bd0bce
add separate "affected" text for most conditions because "Player <pla…
screret 73b12fa
fix compile errors
screret e497cb3
spotless, datagen
screret 548aea3
make fastutil be loaded from maven central so we can get its source a…
screret 7d1d121
merge IMedicalConditionTracker into MedicalConditionTracker
screret 2933348
use absolute values for symptoms for clarity
screret e46ac75
remove silicosis and berylliosis as they were only annoying and added…
screret 7229894
track the max air symptom's value changes in the entity rather than t…
screret 8883f62
use fastutil reference maps for the progress tracking so we don't was…
screret cdc4a6f
add descriptions of the various "generic" conditions to GTMedicalCond…
screret 7c3a79b
spotless
screret 7395929
tweak the language of `/medical_condition query` to be easier to read…
screret 1d00512
respect the item's material amount when progressing conditions
screret 8e99861
reset air supply debuff when clearing effects
screret 1501ca7
properly remove cleared conditions' symptoms
screret e90818d
allow passing negative values into `/medical_condition apply <conditi…
screret 9d65d51
tag all medical condition damage types as bypasses_cooldown
screret c7c66d0
datagen
screret f0f8219
run datagen and fix the other translations
screret b9372b4
Merge branch '1.20.1' into sc/fix-medical-conditions
screret 3a75ee2
Merge branch '1.20.1' into sc/fix-medical-conditions
screret File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,9 @@ | ||
| { | ||
| "net/minecraft/client/renderer/block/model/BakedQuad": [ | ||
| "com/gregtechceu/gtceu/core/IGTBakedQuad" | ||
| ], | ||
| "net/minecraft/world/entity/Entity": [ | ||
| "com/gregtechceu/gtceu/core/IFireImmuneEntity", | ||
| "com/gregtechceu/gtceu/core/IBreathingEntity" | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 0 additions & 5 deletions
5
src/generated/resources/data/gtceu/damage_type/medical_condition/berylliosis.json
This file was deleted.
Oops, something went wrong.
5 changes: 0 additions & 5 deletions
5
src/generated/resources/data/gtceu/damage_type/medical_condition/silicosis.json
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
src/generated/resources/data/minecraft/tags/damage_type/bypasses_cooldown.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| { | ||
| "values": [ | ||
| "gtceu:medical_condition/none", | ||
| "gtceu:medical_condition/chemical_burns", | ||
| "gtceu:medical_condition/poison", | ||
| "gtceu:medical_condition/weak_poison", | ||
| "gtceu:medical_condition/irritant", | ||
| "gtceu:medical_condition/nausea", | ||
| "gtceu:medical_condition/carcinogen", | ||
| "gtceu:medical_condition/asbestosis", | ||
| "gtceu:medical_condition/arsenicosis", | ||
| "gtceu:medical_condition/methanol_poisoning", | ||
| "gtceu:medical_condition/carbon_monoxide_poisoning" | ||
| ] | ||
| } |
15 changes: 15 additions & 0 deletions
15
src/generated/resources/data/minecraft/tags/damage_type/bypasses_invulnerability.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| { | ||
| "values": [ | ||
| "gtceu:medical_condition/none", | ||
| "gtceu:medical_condition/chemical_burns", | ||
| "gtceu:medical_condition/poison", | ||
| "gtceu:medical_condition/weak_poison", | ||
| "gtceu:medical_condition/irritant", | ||
| "gtceu:medical_condition/nausea", | ||
| "gtceu:medical_condition/carcinogen", | ||
| "gtceu:medical_condition/asbestosis", | ||
| "gtceu:medical_condition/arsenicosis", | ||
| "gtceu:medical_condition/methanol_poisoning", | ||
| "gtceu:medical_condition/carbon_monoxide_poisoning" | ||
| ] | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be made into its own PR