diff --git a/CHANGELOG.md b/CHANGELOG.md index d7f811b58..be3799ba0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Changes - Doubled the durability of all space suits @Pyritie ### Bug fixes +- Fixed aged sake, vodka, and whiskey losing their buff effects, but for real this time @Pyritie ### Translation updates ## [0.11.10] - 9-12-2025 diff --git a/config/tfchotornot-common.toml b/config/tfchotornot-common.toml index fa6a16ee1..44eb98f1c 100644 --- a/config/tfchotornot-common.toml +++ b/config/tfchotornot-common.toml @@ -19,7 +19,7 @@ hotFluidTemperature = 1300 #This sets the temperature when a cold fluid should add effects to the player (in kelvin). #Range: > -2147483648 - coldFluidTemperature = 273 + coldFluidTemperature = 223 #Modifier for how much the offhand item should heat up when holding hot items. Holding multiple hot items will heat your insulating items faster! #Range: 4.9E-324 ~ 1.7976931348623157E308 itemTemperatureModifier = 2.0 diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index ac9749489..3bea31680 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -105,6 +105,7 @@ ServerEvents.tags('fluid', event => { registerCreateAdditionsFluidTags(event) registerGTCEUFluidTags(event) registerGreateFluidTags(event) + registerHotOrNotFluidTags(event) registerFirmaLifeFluidTags(event) registerTFCFluidTags(event) registerTFGFluidTags(event) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 0c59df65c..d5d3d82e4 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -584,6 +584,10 @@ function registerTFCFluidTags(event) { if (temp >= 1300) { event.add("tfchotornot:hot_whitelist", idStr); } + // Frostburns ya. + if (temp < 223) { + event.add("tfchotornot:cold_whitelist", idStr); + } // Blue steel: can do heat, can't do cryo. if (temp >= 120) { event.add("tfc:usable_in_blue_steel_bucket", idStr); @@ -611,7 +615,9 @@ function registerTFCFluidTags(event) { const isPlasmatic = wrapperHas(plasmaticWrapper); const isHidden = wrapperHas(hiddenWrapper); - if (isGaseous || isPlasmatic || isHidden) return; + if (isGaseous || isPlasmatic || isHidden) + return; + event.add('forge:liquid', idString); }; diff --git a/kubejs/server_scripts/tfchotornot/tags.js b/kubejs/server_scripts/tfchotornot/tags.js index 2d5c2772c..8813879f0 100644 --- a/kubejs/server_scripts/tfchotornot/tags.js +++ b/kubejs/server_scripts/tfchotornot/tags.js @@ -10,10 +10,40 @@ const registerHotOrNotItemTags = (event) => { }) event.add('tfchotornot:hot_whitelist', '#forge:hot_ingots') + event.add('tfchotornot:cold_whitelist', 'minecraft:blue_ice') + event.add('tfchotornot:cold_whitelist', 'tfg:dry_ice') event.add('firmalife:usable_on_oven', '#tfchotornot:insulating') event.add('tfg:insulating_container', 'gtceu:ulv_super_tank') + event.add('tfg:insulating_container', 'gtceu:lv_super_tank') + event.add('tfg:insulating_container', 'gtceu:mv_super_tank') + event.add('tfg:insulating_container', 'gtceu:hv_super_tank') + event.add('tfg:insulating_container', 'gtceu:ev_super_tank') + event.add('tfg:insulating_container', 'gtceu:iv_quantum_tank') + event.add('tfg:insulating_container', 'gtceu:luv_quantum_tank') + event.add('tfg:insulating_container', 'gtceu:zpm_quantum_tank') + event.add('tfg:insulating_container', 'gtceu:uv_quantum_tank') + event.add('tfg:insulating_container', 'gtceu:uhv_quantum_tank') + event.add('tfg:insulating_container', '#tfc:barrels') + event.add('tfg:insulating_container', 'gtceu:fluid_cell') + event.add('tfg:insulating_container', 'gtceu:universal_fluid_cell') + event.add('tfg:insulating_container', 'gtceu:steel_fluid_cell') + event.add('tfg:insulating_container', 'gtceu:aluminium_fluid_cell') + event.add('tfg:insulating_container', 'gtceu:stainless_steel_fluid_cell') + event.add('tfg:insulating_container', 'gtceu:titanium_fluid_cell') + event.add('tfg:insulating_container', 'gtceu:tungsten_steel_fluid_cell') + + event.add('tfg:prevents_gas_floating', 'create:copper_diving_boots') + event.add('tfg:prevents_gas_floating', 'create:netherite_diving_boots') +} + +const registerHotOrNotFluidTags = (event) => { + event.add("tfchotornot:gaseous_whitelist", 'gtceu:helium') + event.add("tfchotornot:gaseous_whitelist", 'gtceu:helium_3') + event.add("tfchotornot:gaseous_whitelist", 'gtceu:hydrogen') + event.add("tfchotornot:gaseous_whitelist", 'gtceu:coal_gas') + event.add("tfchotornot:gaseous_whitelist", 'gtceu:methane') } const registerHotOrNotBlockTags = (event) => { diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index b651df6fb..8d41ff94e 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -15,6 +15,7 @@ BlockEvents.modification(event => { }) ItemEvents.modification(event => { + registerAdAstraItemModifications(event) registerBeneathItemModifications(event) registerCreateItemModifications(event) registerFirmalifeItemModifications(event)