more bearable & gradual hazard effects #1329
Merged
Conversation
This file contains 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
…it, I just made the framework) oops, I forgot to commit at all.
…t might somehow need it??
…the automatic eating
…a hazard property set
…f just forgetting them
# Conflicts: # src/main/java/com/gregtechceu/gtceu/api/data/chemical/ChemicalHelper.java # src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java # src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/HazardProperty.java # src/main/java/com/gregtechceu/gtceu/api/item/TagPrefixItem.java # src/main/java/com/gregtechceu/gtceu/api/item/forge/GTBucketItem.java # src/main/java/com/gregtechceu/gtceu/common/ServerCommands.java # src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java # src/main/java/com/gregtechceu/gtceu/common/data/materials/ElementMaterials.java # src/main/java/com/gregtechceu/gtceu/common/data/materials/FirstDegreeMaterials.java # src/main/java/com/gregtechceu/gtceu/common/data/materials/OrganicChemistryMaterials.java # src/main/java/com/gregtechceu/gtceu/common/data/materials/UnknownCompositionMaterials.java # src/main/java/com/gregtechceu/gtceu/common/item/armor/QuarkTechSuite.java # src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java # src/main/java/com/gregtechceu/gtceu/core/mixins/EntityMixin.java # src/main/java/com/gregtechceu/gtceu/core/mixins/InventoryMixin.java # src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java # src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java # src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ChemistryRecipes.java # src/main/java/com/gregtechceu/gtceu/forge/ForgeCommonEventListener.java # src/main/java/com/gregtechceu/gtceu/utils/GTUtil.java
…c/better-hazard-effects
YoungOnionMC
requested changes
May 29, 2024
src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java
Outdated
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/common/data/materials/ElementMaterials.java
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java
Outdated
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java
Outdated
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java
Outdated
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java
Outdated
Show resolved
Hide resolved
src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java
Outdated
Show resolved
Hide resolved
YoungOnionMC
approved these changes
May 29, 2024
screret
added a commit
that referenced
this pull request
Jun 1, 2024
* remake hazard logic to be more bearable (needs someone else to tweak it, I just made the framework) oops, I forgot to commit at all. * it works, needs balancing still * update REI * make Nq, Nt radioactive * rename GT poison to weak_poison * optimize fluid -> material mapping * make UnificationEntry able to have a nullable TagPrefix for stuff that might somehow need it?? * fix fluid buckets not applying hazard effects * make QuarkTech eating take the offhand items into account when doing the automatic eating * remove unused code in TagPrefixItem * nerf the default poison hazard (it was way too strong) * make parent hazards only apply if this material doesn't already have a hazard property set * add lower-tier variants of hazmat for head (face mask) & chest (rubber gloves) * run datagen * actually save the amounts of hazards the player is carrying instead of just forgetting them * damage hazmat if you're carrying hazardous materials * I forgot to add the tag to the tag * apply spotless * omfg it forgot the annotation * how did spotless miss this the first time?? * add paracetamol pills as a temporary antidote for all ailments, more coming soon * run datagen, spotless * oops. wrong lang key. also paracetamol wasn't edible. * add evaporation plant for: iodine process, bromine process (from brine) * add Prussian blue, part 2 of RadAway:tm: * add Diethylenetriaminepentaacetic acid, the 3rd and final part of RadAway * holy shit RadAway™ * datagen * remove some unused files * reviews * run datagen + spotless
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
makes rashes not kill you in 10 seconds.