Fix medical conditions' effects not working

injected_interfaces/interfaces.json

@@ -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"
     ]
 }

src/generated/resources/assets/gtceu/lang/en_us.json

@@ -1737,10 +1737,22 @@
   "command.gtceu.cape.use.success": "%s is now using cape %s",
   "command.gtceu.cape.use.success.none": "%s is no longer using a cape",
   "command.gtceu.dump_data.success": "Dumped %s resources from registry %s to %s",
-  "command.gtceu.medical_condition.get": "Player %s has these medical conditions:",
-  "command.gtceu.medical_condition.get.element": "Condition %s§r: %s minutes %s seconds",
-  "command.gtceu.medical_condition.get.element.permanent": "Condition %s§r: %s minutes %s seconds (permanent)",
-  "command.gtceu.medical_condition.get.empty": "Player %s has no medical conditions.",
+  "command.gtceu.medical_condition.clear.everything.failed": "Target has no conditions to remove",
+  "command.gtceu.medical_condition.clear.everything.success.multiple": "Removed all conditions from %s targets",
+  "command.gtceu.medical_condition.clear.everything.success.single": "Removed all conditions from %s",
+  "command.gtceu.medical_condition.clear.specific.failed": "Target doesn't have the requested condition",
+  "command.gtceu.medical_condition.clear.specific.success.multiple": "Removed %s from %s targets",
+  "command.gtceu.medical_condition.clear.specific.success.single": "Removed %s from %s",
+  "command.gtceu.medical_condition.get": "%s has",
+  "command.gtceu.medical_condition.get.element": "- %s for %s minutes %s seconds",
+  "command.gtceu.medical_condition.get.element.permanent": "- %s for %s minutes %s seconds (permanent)",
+  "command.gtceu.medical_condition.get.empty": "%s is perfectly healthy.",
+  "command.gtceu.medical_condition.get.symptoms": "Currently %s has these symptoms:",
+  "command.gtceu.medical_condition.get.symptoms.element": "- %s",
+  "command.gtceu.medical_condition.get.symptoms.empty": "%s has no symptoms.",
+  "command.gtceu.medical_condition.give.failed": "Unable to apply this condition (invalid target)",
+  "command.gtceu.medical_condition.give.success.multiple": "Applied %s to %s targets",
+  "command.gtceu.medical_condition.give.success.single": "Applied %s to %s",
   "command.gtceu.place_vein.failure": "Failed to place vein %s at position %s",
   "command.gtceu.place_vein.success": "Placed vein %s at position %s",
   "command.gtceu.share_prospection_data.notification": "%s is sharing prospecting data with you!",
@@ -1751,6 +1763,7 @@
   "config.gtceu.option.animationTime": "animationTime",
   "config.gtceu.option.arcRecyclingYield": "arcRecyclingYield",
   "config.gtceu.option.armorHud": "armorHud",
+  "config.gtceu.option.autoRebuildResources": "autoRebuildResources",
   "config.gtceu.option.batchDuration": "batchDuration",
   "config.gtceu.option.bedrockOreDistance": "bedrockOreDistance",
   "config.gtceu.option.bedrockOreDropTagPrefix": "bedrockOreDropTagPrefix",
@@ -2162,11 +2175,11 @@
   "death.attack.gtceu.medical_condition/chemical_burns": "%s had a chemical accident",
   "death.attack.gtceu.medical_condition/irritant": "%s got a §n§lREALLY§r bad rash",
   "death.attack.gtceu.medical_condition/methanol_poisoning": "%s tried to drink moonshine during the prohibition",
-  "death.attack.gtceu.medical_condition/nausea": "%s died of nausea",
+  "death.attack.gtceu.medical_condition/nausea": "%s succumbed to nausea",
   "death.attack.gtceu.medical_condition/none": "%s died of... nothing?",
   "death.attack.gtceu.medical_condition/poison": "%s forgot that poisonous materials are, in fact, poisonous",
-  "death.attack.gtceu.medical_condition/silicosis": "%s didn't die of tuberculosis. it was silicosis.",
-  "death.attack.gtceu.medical_condition/weak_poison": "%s ate lead (or mercury!)",
+  "death.attack.gtceu.medical_condition/silicosis": "%s didn't die of tuberculosis. It was silicosis",
+  "death.attack.gtceu.medical_condition/weak_poison": "%s ate lead",
   "death.attack.gtceu.mining_hammer": "%s was mistaken for Ore by %s",
   "death.attack.gtceu.mortar": "%s was ground to dust by %s",
   "death.attack.gtceu.pickaxe": "%s got mined by %s",
@@ -2295,6 +2308,8 @@
   "gtceu.creative_tooltip.3": "§7 to use this",
   "gtceu.cutter": "Cutter",
   "gtceu.debug.f3_h.enabled": "GregTech has modified the debug info! For Developers: enable the misc:debug config option in the GregTech config file to see more",
+  "gtceu.debug.resource_rebuild.done": "Gradle resource rebuild done in %s",
+  "gtceu.debug.resource_rebuild.start": "Invoking gradle resource rebuild (./gradlew :processResources)",
   "gtceu.direction.tooltip.back": "Back",
   "gtceu.direction.tooltip.down": "Down",
   "gtceu.direction.tooltip.front": "Front",
@@ -2492,12 +2507,6 @@
   "gtceu.gui.toggle_view.disabled": "Toggle View (Fluids)",
   "gtceu.gui.toggle_view.enabled": "Toggle View (Items)",
   "gtceu.gui.waiting_list": "Sending Queue:",
-  "gtceu.hazard_trigger.any": "Any contact",
-  "gtceu.hazard_trigger.description": "Caused by:",
-  "gtceu.hazard_trigger.inhalation": "Inhalation",
-  "gtceu.hazard_trigger.none": "Nothing",
-  "gtceu.hazard_trigger.protection.description": "Protects from:",
-  "gtceu.hazard_trigger.skin_contact": "Skin contact",
   "gtceu.implosion_compressor": "Implosion Compressor",
   "gtceu.io.both": "Both",
   "gtceu.io.export": "Export",
@@ -3253,25 +3262,6 @@
   "gtceu.maintenance.configurable_time": "Time: %fx",
   "gtceu.maintenance.configurable_time.changed_description": "Maintenance problems will occur at %fx the normal rate.",
   "gtceu.maintenance.configurable_time.unchanged_description": "Maintenance problems will occur at normal rate. Change configuration to update.",
-  "gtceu.medical_condition.antidote.description": "§aAntidote §7Hold Shift to show details",
-  "gtceu.medical_condition.antidote.description.effect_removed": "Removes %s%% of current conditions' effects",
-  "gtceu.medical_condition.antidote.description.effect_removed.all": "Removes all of current conditions' effects",
-  "gtceu.medical_condition.antidote.description_shift": "§aCures these conditions:",
-  "gtceu.medical_condition.arsenicosis": "§bArsenicosis",
-  "gtceu.medical_condition.asbestosis": "§dAsbestosis",
-  "gtceu.medical_condition.berylliosis": "§5Berylliosis",
-  "gtceu.medical_condition.carbon_monoxide_poisoning": "§7Carbon Monoxide Poisoning",
-  "gtceu.medical_condition.carcinogen": "§eCarcinogenic",
-  "gtceu.medical_condition.chemical_burns": "§5Chemical burns",
-  "gtceu.medical_condition.description": "§l§cHAZARDOUS §7Hold Shift to show details",
-  "gtceu.medical_condition.description_shift": "§l§cHAZARDOUS:",
-  "gtceu.medical_condition.irritant": "§6Irritant",
-  "gtceu.medical_condition.methanol_poisoning": "§6Methanol Poisoning",
-  "gtceu.medical_condition.nausea": "§3Nauseating",
-  "gtceu.medical_condition.none": "§2Not Dangerous",
-  "gtceu.medical_condition.poison": "§2Poisonous",
-  "gtceu.medical_condition.silicosis": "§1Silicosis",
-  "gtceu.medical_condition.weak_poison": "§aWeakly poisonous",
   "gtceu.minimap.ore_vein.depleted": "Depleted",
   "gtceu.mixer": "Mixer",
   "gtceu.mode.both": "§dBoth (Fluid And Item)§r",
@@ -3655,6 +3645,9 @@
   "gtceu.placeholder_info.if.0": "Returns one of the arguments depending on the condition. The condition is considered true if it is not an empty string and is not equal to 0.",
   "gtceu.placeholder_info.if.1": "Usage:",
   "gtceu.placeholder_info.if.2": "  {if <condition> <returned_if_true> [returned_if_false]}",
+  "gtceu.placeholder_info.item.0": "Returns the amount and id of the item in a specified slot",
+  "gtceu.placeholder_info.item.1": "Usage:",
+  "gtceu.placeholder_info.item.2": "  {item <slot>} -> \"31 minecraft:diamond\" (for example)",
   "gtceu.placeholder_info.itemCount.0": "Returns the amount of items (can be filtered).",
   "gtceu.placeholder_info.itemCount.1": "Usage:",
   "gtceu.placeholder_info.itemCount.2": "  {itemCount} -> total item amount",
@@ -3668,6 +3661,9 @@
   "gtceu.placeholder_info.maxProgress.1": "Example: 'Progress: {calc {calc {progress} / {maxProgress}} * 100}%'",
   "gtceu.placeholder_info.maxProgress.2": "Usage:",
   "gtceu.placeholder_info.maxProgress.3": "  {maxProgress} -> the max progress of the currently running recipe",
+  "gtceu.placeholder_info.module.0": "Renders the module in the specified slot onto the central monitor (does not work in a cover)",
+  "gtceu.placeholder_info.module.1": "Usage:",
+  "gtceu.placeholder_info.module.2": "  {module <slot> <x> <y>} -> empty string",
   "gtceu.placeholder_info.nbt.0": "Returns the nbt data of the item in the specified slot",
   "gtceu.placeholder_info.nbt.1": "Usage:",
   "gtceu.placeholder_info.nbt.2": "  {nbt <slot> [key1] [key2] [key3] ...} -> item_nbt[key1][key2][key3][...]",
@@ -3681,9 +3677,16 @@
   "gtceu.placeholder_info.progress.1": "Note that progress is an integer between 0 and {maxProgress}",
   "gtceu.placeholder_info.progress.2": "Usage:",
   "gtceu.placeholder_info.progress.3": "  {progress} -> the progress of the currently running recipe",
+  "gtceu.placeholder_info.quad.0": "Draws a quad (must specify parameters for all 4 vertices)",
+  "gtceu.placeholder_info.quad.1": "Usage:",
+  "gtceu.placeholder_info.quad.2": "  {quad <x1> <y1> <x2> <y2> <x3> <y3> <x4> <y4> <color1> <color2> <color3> <color4>} -> empty string",
   "gtceu.placeholder_info.random.0": "Returns a random number in the specified interval (inclusive).",
   "gtceu.placeholder_info.random.1": "Usage:",
   "gtceu.placeholder_info.random.2": "  {random <min> <max>} -> a random number between min and max (inclusive)",
+  "gtceu.placeholder_info.rect.0": "Draws a rectangle at the specified position with the specified coordinates and size",
+  "gtceu.placeholder_info.rect.1": "Usage:",
+  "gtceu.placeholder_info.rect.2": "  {rect <x> <y> <width> <height> <colorARGB>} -> empty string",
+  "gtceu.placeholder_info.rect.3": "  {rect 0.5 0.25 2 1 0xFFFFFFFF} -> draws a white rectangle at (0.5, 0.25) with the size (2, 1)",
   "gtceu.placeholder_info.redstone.0": "Returns the redstone signal strength or sets the redstone output strength",
   "gtceu.placeholder_info.redstone.1": "Usage:",
   "gtceu.placeholder_info.redstone.2": "  {redstone get <up|down|north|south|east|west>} -> redstone signal strength (0-15) at the specified side",
@@ -3696,6 +3699,9 @@
   "gtceu.placeholder_info.select.0": "Returns the argument at the specified index (starting from 0)",
   "gtceu.placeholder_info.select.1": "Usage:",
   "gtceu.placeholder_info.select.2": "  {select <index> [arg1] [arg2] [arg3] ... -> argument at the specified index",
+  "gtceu.placeholder_info.setImage.0": "Sets the image URL in an image module in the specified slot",
+  "gtceu.placeholder_info.setImage.1": "Usage:",
+  "gtceu.placeholder_info.setImage.2": "  {setImage <slot> <url>} -> empty string",
   "gtceu.placeholder_info.strike.0": "Returns the text from the first text, displaying it as if it was crossed out",
   "gtceu.placeholder_info.strike.1": "Usage:",
   "gtceu.placeholder_info.strike.2": "  {strike <text>} -> crossed-out text",
@@ -4789,7 +4795,7 @@
   "item.gtceu.tool.behavior.block_rotation": "§2Mechanic: §fRotates Blocks",
   "item.gtceu.tool.behavior.crop_harvesting": "§aHarvester: §fHarvests Crops",
   "item.gtceu.tool.behavior.damage_boost": "§4Damage Boost: §fExtra damage against %s",
-  "item.gtceu.tool.behavior.dowse_campfire": "§1Firefighter: §fDowses Campfires",
+  "item.gtceu.tool.behavior.dowse_campfire": "§6Firefighter: §fDowses Campfires",
   "item.gtceu.tool.behavior.grass_path": "§eLandscaper: §fCreates Grass Paths",
   "item.gtceu.tool.behavior.ground_tilling": "§eFarmer: §fTills Ground",
   "item.gtceu.tool.behavior.plunger": "§9Plumber: §fDrains Fluids",
@@ -5687,6 +5693,23 @@
   "material.gtceu.zinc_sulfide": "Zinc Sulfide",
   "material.gtceu.zincite": "Zincite",
   "material.gtceu.zirconium": "Zirconium",
+  "medical_condition.gtceu.arsenicosis": "§bArsenicosis",
+  "medical_condition.gtceu.asbestosis": "§dAsbestosis",
+  "medical_condition.gtceu.carbon_monoxide_poisoning": "§7Carbon Monoxide Poisoning",
+  "medical_condition.gtceu.carcinogen": "§eCarcinogenic",
+  "medical_condition.gtceu.carcinogen.affected": "§eCancer",
+  "medical_condition.gtceu.chemical_burns": "§5Chemical burns",
+  "medical_condition.gtceu.irritant": "§6Irritant",
+  "medical_condition.gtceu.irritant.affected": "§6Irritation",
+  "medical_condition.gtceu.methanol_poisoning": "§6Methanol Poisoning",
+  "medical_condition.gtceu.nausea": "§3Nauseating",
+  "medical_condition.gtceu.nausea.affected": "§3Nausea",
+  "medical_condition.gtceu.none": "§2Not Dangerous",
+  "medical_condition.gtceu.none.affected": "§2Nothing?",
+  "medical_condition.gtceu.poison": "§2Poisonous",
+  "medical_condition.gtceu.poison.affected": "§2Poisoning",
+  "medical_condition.gtceu.weak_poison": "§aWeakly poisonous",
+  "medical_condition.gtceu.weak_poison.affected": "§aMinor poisoning",
   "message.gtceu.new_veins.amount": "Prospected %d new veins!",
   "message.gtceu.new_veins.name": "Prospected %s!",
   "metaarmor.energy_share.disable": "Energy Supply: Gadgets charging disabled",
@@ -5809,6 +5832,20 @@
   "recipe.condition.rain.tooltip": "Rain Level: %d",
   "recipe.condition.steam_vent.tooltip": "Clean steam vent",
   "recipe.condition.thunder.tooltip": "Thunder Level: %d",
+  "symptom.gtceu.air_supply_debuff": "Lowered lung capacity",
+  "symptom.gtceu.blindness": "Blindness",
+  "symptom.gtceu.darkness": "Darkness",
+  "symptom.gtceu.death": "Death",
+  "symptom.gtceu.health_debuff": "Lowered maximum health",
+  "symptom.gtceu.hunger": "Increased appetite",
+  "symptom.gtceu.mining_fatigue": "Fatigue",
+  "symptom.gtceu.nausea": "Nausea",
+  "symptom.gtceu.poisoning": "Poisoning",
+  "symptom.gtceu.random_damage": "Occasional damage",
+  "symptom.gtceu.slowness": "Slowness",
+  "symptom.gtceu.weak_poisoning": "Weak poisoning",
+  "symptom.gtceu.weakness": "Weakness",
+  "symptom.gtceu.wither": "Necrosis",
   "tagprefix.andesite": "Andesite %s Ore",
   "tagprefix.basalt": "Basalt %s Ore",
   "tagprefix.blackstone": "Blackstone %s Ore",
@@ -5920,5 +5957,17 @@
   "tile.gtceu.petrified_foam.name": "Petrified Foam",
   "tile.gtceu.reinforced_foam.name": "Reinforced Foam",
   "tile.gtceu.reinforced_stone.name": "Reinforced Stone",
-  "tile.gtceu.seal.name": "Sealed Block"
+  "tile.gtceu.seal.name": "Sealed Block",
+  "tooltip.gtceu.antidote.description": "§aAntidote §7Hold Shift to show details",
+  "tooltip.gtceu.antidote.description.effect_removed": "Removes %s%% of current conditions' effects",
+  "tooltip.gtceu.antidote.description.effect_removed.all": "Removes all of current conditions' effects",
+  "tooltip.gtceu.antidote.description_shift": "§aCures these conditions:",
+  "tooltip.gtceu.hazard_trigger": "Caused by:",
+  "tooltip.gtceu.hazard_trigger.any": "Any contact",
+  "tooltip.gtceu.hazard_trigger.inhalation": "Inhalation",
+  "tooltip.gtceu.hazard_trigger.none": "Nothing",
+  "tooltip.gtceu.hazard_trigger.protection": "Protects from:",
+  "tooltip.gtceu.hazard_trigger.skin_contact": "Skin contact",
+  "tooltip.gtceu.medical_condition.description": "§l§cHAZARDOUS §7Hold Shift to show details",
+  "tooltip.gtceu.medical_condition.description_shift": "§l§cHAZARDOUS:"
 }

src/generated/resources/data/minecraft/tags/damage_type/bypasses_armor.json

@@ -9,8 +9,6 @@
     "gtceu:medical_condition/carcinogen",
     "gtceu:medical_condition/asbestosis",
     "gtceu:medical_condition/arsenicosis",
-    "gtceu:medical_condition/silicosis",
-    "gtceu:medical_condition/berylliosis",
     "gtceu:medical_condition/methanol_poisoning",
     "gtceu:medical_condition/carbon_monoxide_poisoning",
     "gtceu:heat",

src/generated/resources/data/minecraft/tags/damage_type/bypasses_cooldown.json

@@ -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"
+  ]
+}

src/generated/resources/data/minecraft/tags/damage_type/bypasses_invulnerability.json

@@ -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"
+  ]
+}

src/generated/resources/data/minecraft/tags/damage_type/bypasses_resistance.json

@@ -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"
+  ]
+}

src/main/java/com/gregtechceu/gtceu/api/capability/GTCapability.java

@@ -1,6 +1,7 @@
 package com.gregtechceu.gtceu.api.capability;
 
 import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMaintenanceMachine;
+import com.gregtechceu.gtceu.common.capability.MedicalConditionTracker;
 
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.capabilities.CapabilityManager;
@@ -33,7 +34,7 @@ public class GTCapability {
     public static final Capability<IMonitorComponent> CAPABILITY_MONITOR_COMPONENT = CapabilityManager
             .get(new CapabilityToken<>() {});
 
-    public static final Capability<IMedicalConditionTracker> CAPABILITY_MEDICAL_CONDITION_TRACKER = CapabilityManager
+    public static final Capability<MedicalConditionTracker> CAPABILITY_MEDICAL_CONDITION_TRACKER = CapabilityManager
             .get(new CapabilityToken<>() {});
 
     public static void register(RegisterCapabilitiesEvent event) {
@@ -48,7 +49,7 @@ public static void register(RegisterCapabilitiesEvent event) {
         event.register(ILaserContainer.class);
         event.register(IOpticalComputationProvider.class);
         event.register(IDataAccessHatch.class);
-        event.register(IMedicalConditionTracker.class);
+        event.register(MedicalConditionTracker.class);
         event.register(IHazardParticleContainer.class);
         event.register(IMonitorComponent.class);
     }

src/main/java/com/gregtechceu/gtceu/api/capability/GTCapabilityHelper.java

@@ -1,6 +1,7 @@
 package com.gregtechceu.gtceu.api.capability;
 
 import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMaintenanceMachine;
+import com.gregtechceu.gtceu.common.capability.MedicalConditionTracker;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -123,7 +124,7 @@ private static <T> T getBlockEntityCapability(Capability<T> capability, Level le
     }
 
     @Nullable
-    public static IMedicalConditionTracker getMedicalConditionTracker(@NotNull Entity entity) {
+    public static MedicalConditionTracker getMedicalConditionTracker(@NotNull Entity entity) {
         return entity.getCapability(GTCapability.CAPABILITY_MEDICAL_CONDITION_TRACKER, null).resolve().orElse(null);
     }
 }