diff --git a/CHANGELOG.md b/CHANGELOG.md index 62c2b2f24..9b0d62267 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## Unreleased ### Changes -- Added "too cold to handle" and "too light to handle" for cold things and lighter-than-air things. Uses the same mechanic as tongs. Lighter-than-air things can also be negated with something Very Heavy in your inventory, and all effects (including "too hot to handle") are negated by super tanks/chests and cells, but *not* drums or buckets. Check the `tfg:hot_protection_equipment`, `tfg:cold_protection_equipment`, and `tfg:floating_protection_equipment` tags for equipment that makes you immune to these effects. @Pyritie +- Added "too cold to handle" and "too light to handle" for cold things and lighter-than-air things. Uses the same mechanic as tongs. Lighter-than-air things can also be negated with something Very Heavy in your inventory, and all effects (including "too hot to handle") are negated by super tanks/chests and cells, but *not* drums or buckets. Check the `tfg:hot_protection_equipment`, `tfg:cold_protection_equipment`, and `tfg:floating_protection_equipment` tags for equipment that makes you immune to these effects. The equipment also protects against pipes! @Pyritie - GregTech hot ingots are also now properly included in the "too hot to handle" system so the same protection applies @Pyritie - Added debuff effects for all medical conditions, so you're immediately notified when carrying something hazardous instead of wondering why you have Hunger II. @Pyritie - The hazard effect that previously instantly killed you (which did not spawn a corpse) now gives you Wither III instead. @Pyritie diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index dc9a6a042..80e62153a 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1515,9 +1515,9 @@ "tfg.tooltip.cooling_foods": "§bCools you by: 2°C", "tfg.tooltip.cooling_foods_strong": "§bCools you by: 10°C", "tfg.tooltip.warming_foods": "§6Warms you by: 4°C", - "tfg.tooltip.hotornot_container": "§aSafely contains §6hot§a, §bcold§a, and §elighter-than-air§a items and fluids.§r", - "tfg.tooltip.hotornot_hot_equipment": "§7Provides protection from all §6hot§7 items and fluids.§r", - "tfg.tooltip.hotornot_cold_equipment": "§7Provides protection from all §bcold§7 items and fluids.§r", + "tfg.tooltip.hotornot_container": "§aSafely contains §6hot§a, §bcold§a, and §elighter-than-air§a gases.§r", + "tfg.tooltip.hotornot_hot_equipment": "§7Provides protection from all §6hot§7 items, fluids, and pipes.§r", + "tfg.tooltip.hotornot_cold_equipment": "§7Provides protection from all §bcold§7 items, fluids, and pipes.§r", "tfg.tooltip.hotornot_floating_equipment": "§7Provides protection from all §elighter-than-air§7 items and fluids.§r", "tfg.tooltip.machine.one_energy_hatch": "Accepts exactly §6One§r Energy Hatch", "tfg.tooltip.machine.two_energy_hatches": "Accepts up to §6Two§r Energy Hatches", diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 4f956c4aa..3d604631f 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -94,37 +94,52 @@ const registerTooltips = (event) => { text.add(3, Text.translate('tfg.tooltip.machine.one_energy_hatch')); }) + // Hot or not containers + event.addAdvanced(['#tfg:insulating_container'], (item, advanced, text) => { + text.add(1, Text.translate("tfg.tooltip.hotornot_container")) + }) + // Do these in reverse order so the hot one appears on top + event.addAdvanced(['#tfg:floating_protection_equipment'], (item, advanced, text) => { + text.add(1, Text.translate("tfg.tooltip.hotornot_floating_equipment")) + }) + event.addAdvanced(['#tfg:cold_protection_equipment'], (item, advanced, text) => { + text.add(1, Text.translate("tfg.tooltip.hotornot_cold_equipment")) + }) + event.addAdvanced(['#tfg:hot_protection_equipment'], (item, advanced, text) => { + text.add(1, Text.translate("tfg.tooltip.hotornot_hot_equipment")) + }) + // Insulation event.addAdvanced(['create:copper_diving_helmet', 'create:copper_backtank', 'create:copper_diving_boots'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.armor.copper_diving_suit_warmth')), - text.add(2, Text.translate('tfg.tooltip.armor.copper_diving_suit_insulation')) + text.add(1, Text.translate('tfg.tooltip.armor.copper_diving_suit_warmth')); + text.add(2, Text.translate('tfg.tooltip.armor.copper_diving_suit_insulation')); }) event.addAdvanced(['create:netherite_diving_helmet', 'create:netherite_backtank', 'create:netherite_diving_boots', 'minecraft:netherite_leggings', 'minecraft:netherite_boots'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.armor.netherite_diving_suit_warmth')), - text.add(2, Text.translate('tfg.tooltip.armor.netherite_diving_suit_insulation')) - text.add(3, Text.translate('tfg.tooltip.armor.netherite_diving_suit_set')) + text.add(1, Text.translate('tfg.tooltip.armor.netherite_diving_suit_warmth')); + text.add(2, Text.translate('tfg.tooltip.armor.netherite_diving_suit_insulation')); + text.add(3, Text.translate('tfg.tooltip.armor.netherite_diving_suit_set')); }) event.addAdvanced(['gtceu:nanomuscle_helmet', 'gtceu:nanomuscle_chestplate', 'gtceu:nanomuscle_leggings', 'gtceu:nanomuscle_boots', 'gtceu:advanced_nanomuscle_chestplate'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.armor.nanomuscle_warmth')), - text.add(2, Text.translate('tfg.tooltip.armor.nanomuscle_insulation')) - text.add(3, Text.translate('tfg.tooltip.armor.nanomuscle_set')) + text.add(1, Text.translate('tfg.tooltip.armor.nanomuscle_warmth')); + text.add(2, Text.translate('tfg.tooltip.armor.nanomuscle_insulation')); + text.add(3, Text.translate('tfg.tooltip.armor.nanomuscle_set')); if (item === 'gtceu:nanomuscle_leggings') { - text.add(4, Text.translate('tfg.tooltip.armor.nanomuscle_legs_buff')) + text.add(4, Text.translate('tfg.tooltip.armor.nanomuscle_legs_buff')); } }) event.addAdvanced(['gtceu:quarktech_helmet', 'gtceu:quarktech_chestplate', 'gtceu:quarktech_leggings', 'gtceu:quarktech_boots', 'gtceu:advanced_quarktech_chestplate'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.armor.quarktech_warmth')), - text.add(2, Text.translate('tfg.tooltip.armor.quarktech_insulation')) - text.add(3, Text.translate('tfg.tooltip.armor.quarktech_set')) + text.add(1, Text.translate('tfg.tooltip.armor.quarktech_warmth')); + text.add(2, Text.translate('tfg.tooltip.armor.quarktech_insulation')); + text.add(3, Text.translate('tfg.tooltip.armor.quarktech_set')); }) event.addAdvanced([ 'ad_astra:space_helmet', 'ad_astra:space_suit', 'ad_astra:space_pants', 'ad_astra:space_boots', 'ad_astra:netherite_space_helmet', 'ad_astra:netherite_space_suit', 'ad_astra:netherite_space_pants', 'ad_astra:netherite_space_boots', 'ad_astra:jet_suit_helmet', 'ad_astra:jet_suit', 'ad_astra:jet_suit_pants', 'ad_astra:jet_suit_boots' ], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.armor.space_suit_warmth')), - text.add(2, Text.translate('tfg.tooltip.armor.space_suit_insulation')) - text.add(3, Text.translate('tfg.tooltip.armor.space_suit_set')) + text.add(1, Text.translate('tfg.tooltip.armor.space_suit_warmth')); + text.add(2, Text.translate('tfg.tooltip.armor.space_suit_insulation')); + text.add(3, Text.translate('tfg.tooltip.armor.space_suit_set')); }) // Supports @@ -178,7 +193,7 @@ const registerTooltips = (event) => { }) event.addAdvanced(['gtceu:large_solar_panel_tier3'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.solar_panel.large_tier3')) + text.add(1, Text.translate('tfg.tooltip.solar_panel.large_tier3')); text.add(2, Text.translate('tfg.tooltip.machine.parallel')) }) @@ -188,12 +203,12 @@ const registerTooltips = (event) => { }) event.addAdvanced(['tfg:sniffer_egg'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.attribution.sniffer')), + text.add(1, Text.translate('tfg.tooltip.attribution.sniffer')); text.add(2, Text.translate('tfg.tooltip.large_egg')) }) event.addAdvanced(['tfg:wraptor_egg'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.attribution.wraptor')), + text.add(1, Text.translate('tfg.tooltip.attribution.wraptor')); text.add(2, Text.translate('tfg.tooltip.large_egg')) }) @@ -283,20 +298,6 @@ const registerTooltips = (event) => { text.add(1, Text.translate("gtceu.universal.tooltip.item_storage_capacity", "9")) }) - // Hot or not containers - event.addAdvanced(['#tfg:insulating_container'], (item, advanced, text) => { - text.add(1, Text.translate("tfg.tooltip.hotornot_container")) - }) - event.addAdvanced(['#tfg:hot_protection_equipment'], (item, advanced, text) => { - text.add(1, Text.translate("tfg.tooltip.hotornot_hot_equipment")) - }) - event.addAdvanced(['#tfg:cold_protection_equipment'], (item, advanced, text) => { - text.add(1, Text.translate("tfg.tooltip.hotornot_cold_equipment")) - }) - event.addAdvanced(['#tfg:floating_protection_equipment'], (item, advanced, text) => { - text.add(1, Text.translate("tfg.tooltip.hotornot_floating_equipment")) - }) - //Nuclear Fission Tooltips event.addAdvanced(['minecraft:blue_ice'], (item, advanced, text) => { text.add(1, Text.translate("tfg.tooltip.component.blue_ice")) @@ -321,15 +322,15 @@ const registerTooltips = (event) => { }) event.addAdvanced(['tfg:nuclear_turbine'], (item, advanced, text) => { - text.add(1, Text.translate("tfg.tooltip.component.nuclear_turbine_1")) - text.add(2, Text.translate("tfg.tooltip.component.nuclear_turbine_2")) + text.add(1, Text.translate("tfg.tooltip.component.nuclear_turbine_1")); + text.add(2, Text.translate("tfg.tooltip.component.nuclear_turbine_2")); }) event.addAdvanced(['tfg:food/slice_of_cheese'], (item, advanced, text) => { if (!event.isShift()) { text.add(1, Text.translate("tfg.tooltip.fake_nutrition_info_listener")) } else { - text.add(1, Text.translate("tfg.tooltip.fake_nutrition_info")) + text.add(1, Text.translate("tfg.tooltip.fake_nutrition_info")); text.add(2, Text.translate("tfg.tooltip.cheese_slice_microplastics")) }; }); @@ -337,9 +338,9 @@ const registerTooltips = (event) => { // AE2 event.addAdvanced(['tfg:wireless_card'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.wireless_card_1')) - text.add(2, Text.translate('tfg.tooltip.wireless_card_2')) - text.add(3, Text.translate('tfg.tooltip.wireless_card_3')) + text.add(1, Text.translate('tfg.tooltip.wireless_card_1')); + text.add(2, Text.translate('tfg.tooltip.wireless_card_2')); + text.add(3, Text.translate('tfg.tooltip.wireless_card_3')); }) // Deprecated Items diff --git a/kubejs/server_scripts/tfchotornot/tags.js b/kubejs/server_scripts/tfchotornot/tags.js index 7e1daaf8b..9bb1a6891 100644 --- a/kubejs/server_scripts/tfchotornot/tags.js +++ b/kubejs/server_scripts/tfchotornot/tags.js @@ -35,21 +35,37 @@ const registerHotOrNotItemTags = (event) => { event.add('tfg:insulating_container', 'gtceu:tungsten_steel_fluid_cell') event.add('tfg:hot_protection_equipment', 'tfc:metal/chestplate/blue_steel') + event.add('tfg:hot_protection_equipment', 'tfc:metal/boots/blue_steel') + event.add('tfg:hot_protection_equipment', 'sns:blue_steel_toe_hiking_boots') + event.add('tfg:hot_protection_equipment', 'minecraft:netherite_boots') event.add('tfg:hot_protection_equipment', 'create:netherite_backtank') + event.add('tfg:hot_protection_equipment', 'create:netherite_diving_boots') event.add('tfg:hot_protection_equipment', 'ad_astra:netherite_space_suit') + event.add('tfg:hot_protection_equipment', 'ad_astra:netherite_space_boots') + event.add('tfg:hot_protection_equipment', 'gtceu:hazmat_chestpiece') + event.add('tfg:hot_protection_equipment', 'gtceu:hazmat_boots') event.add('tfg:hot_protection_equipment', 'gtceu:quarktech_chestplate') event.add('tfg:hot_protection_equipment', 'gtceu:advanced_quarktech_chestplate') + event.add('tfg:hot_protection_equipment', 'gtceu:quarktech_boots') event.add('tfg:cold_protection_equipment', 'tfc:metal/chestplate/red_steel') + event.add('tfg:cold_protection_equipment', 'tfc:metal/boots/red_steel') + event.add('tfg:cold_protection_equipment', 'sns:red_steel_toe_hiking_boots') + event.add('tfg:cold_protection_equipment', 'ad_astra:space_boots') event.add('tfg:cold_protection_equipment', 'ad_astra:space_suit') event.add('tfg:cold_protection_equipment', 'ad_astra:netherite_space_suit') + event.add('tfg:cold_protection_equipment', 'ad_astra:netherite_space_boots') + event.add('tfg:cold_protection_equipment', 'gtceu:hazmat_chestpiece') + event.add('tfg:cold_protection_equipment', 'gtceu:hazmat_boots') event.add('tfg:cold_protection_equipment', 'gtceu:quarktech_chestplate') event.add('tfg:cold_protection_equipment', 'gtceu:advanced_quarktech_chestplate') + event.add('tfg:cold_protection_equipment', 'gtceu:quarktech_boots') event.add('tfg:floating_protection_equipment', 'create:copper_diving_boots') event.add('tfg:floating_protection_equipment', 'create:netherite_diving_boots') event.add('tfg:floating_protection_equipment', 'ad_astra:space_boots') event.add('tfg:floating_protection_equipment', 'ad_astra:netherite_space_boots') + event.add('tfg:floating_protection_equipment', 'gtceu:hazmat_boots') event.add('tfg:floating_protection_equipment', 'gtceu:quarktech_boots') }