illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ethanol and methanol are drinkable now too I guess

Browse source
This commit is contained in:
Pyritie 2025-12-28 23:43:47 +00:00
parent 0049a2755a
commit 65e39bf4fe
5 changed files with 68 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -26,7 +26,7 @@
- Removed the cleanroom requirement for level emitters since they were also craftable in a crafting grid (#2529) @Jeuvke
- Overhauled photographic film development @Pyritie
- Lowered the temperature of gas fuels and their related gases/fluids @Pyritie
- Added buff effects to wine @Pyritie
- Added drink effects to wines, ethanol, and methanol @Pyritie
### Bug fixes
- Fix for food stacking everywhere! @Mqrius
- Fixed the grappling hook crashing and sending you to the void if you use it while travelling between dimensions (#2514) @Mqrius

52
kubejs/client_scripts/tooltips.js
View file

@ -119,16 +119,16 @@ const registerTooltips = (event) => {
// 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(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(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(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'));
@ -136,7 +136,7 @@ const registerTooltips = (event) => {
})
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(2, Text.translate('tfg.tooltip.armor.quarktech_insulation'));
text.add(3, Text.translate('tfg.tooltip.armor.quarktech_set'));
})
event.addAdvanced([
@ -145,7 +145,7 @@ const registerTooltips = (event) => {
'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(2, Text.translate('tfg.tooltip.armor.space_suit_insulation'));
text.add(3, Text.translate('tfg.tooltip.armor.space_suit_set'));
})
@ -211,12 +211,12 @@ const registerTooltips = (event) => {
event.addAdvanced(['tfg:sniffer_egg'], (item, advanced, text) => {
text.add(1, Text.translate('tfg.tooltip.attribution.sniffer'));
text.add(2, Text.translate('tfg.tooltip.large_egg'))
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(2, Text.translate('tfg.tooltip.large_egg'))
text.add(2, Text.translate('tfg.tooltip.large_egg'))
})
event.addAdvanced(['tfg:sniffer_wool'], (item, advanced, text) => {
@ -357,60 +357,68 @@ const registerTooltips = (event) => {
// Drink effects
event.addAdvanced(['tfc_gurman:compote_bucket'], (item, advanced, text) => {
text.add(1, Text.of("Jump Boost II (00:30)").blue());
text.add(1, Text.translate("effect.minecraft.jump_boost").append(Text.of(" II (00:30)")).blue());
})
event.addAdvanced(['tfc_gurman:kvass_bucket'], (item, advanced, text) => {
text.add(1, Text.of("Strength (01:20)").blue());
text.add(1, Text.translate("effect.minecraft.strength").append(Text.of(" (01:20)")).blue());
text.add(2, Text.translate('tfg.tooltip.cooling_foods'));
})
event.addAdvanced(['tfc_gurman:lemonade_bucket'], (item, advanced, text) => {
text.add(1, Text.of("Haste (00:30)").blue());
text.add(1, Text.translate("effect.minecraft.haste").append(Text.of(" (00:30)")).blue());
text.add(2, Text.translate('tfg.tooltip.cooling_foods'));
})
event.addAdvanced(['tfc_gurman:coffee_bucket'], (item, advanced, text) => {
text.add(1, Text.of("Speed (00:30)").blue());
text.add(1, Text.translate("effect.minecraft.speed").append(Text.of(" (00:30)")).blue());
text.add(2, Text.translate('tfg.tooltip.warming_foods'));
})
event.addAdvanced(['tfc_gurman:cocoa_bucket'], (item, advanced, text) => {
text.add(1, Text.of("Haste (00:30)").blue());
text.add(1, Text.translate("effect.minecraft.haste").append(Text.of(" (00:30)")).blue());
text.add(2, Text.translate('tfg.tooltip.warming_foods'));
})
event.addAdvanced(['tfc_gurman:tea_mint_bucket'], (item, advanced, text) => {
text.add(1, Text.of("Regeneration (00:30)").blue());
text.add(1, Text.translate("effect.minecraft.regeneration").append(Text.of(" (00:30)")).blue());
text.add(2, Text.translate('tfg.tooltip.warming_foods'));
})
event.addAdvanced(['tfc_gurman:tea_chamomile_bucket'], (item, advanced, text) => {
text.add(1, Text.of("Resistance (00:30)").blue());
text.add(1, Text.translate("effect.minecraft.resistance").append(Text.of(" (00:30)")).blue());
text.add(2, Text.translate('tfg.tooltip.warming_foods'));
})
event.addAdvanced(['tfc_gurman:tea_nettle_bucket'], (item, advanced, text) => {
text.add(1, Text.of("Slow Falling (00:30)").blue());
text.add(1, Text.translate("effect.minecraft.slow_falling").append(Text.of(" (00:30)")).blue());
text.add(2, Text.translate('tfg.tooltip.warming_foods'));
})
event.addAdvanced(['tfc_gurman:tea_rosehip_bucket'], (item, advanced, text) => {
text.add(1, Text.of("Absorption (00:30)").blue());
text.add(1, Text.translate("effect.minecraft.absorption").append(Text.of(" (00:30)")).blue());
text.add(2, Text.translate('tfg.tooltip.warming_foods'));
})
event.addAdvanced(['tfc_gurman:nalivka_bucket'], (item, advanced, text) => {
text.add(1, Text.of("Strength (02:40)").blue());
text.add(1, Text.translate("effect.minecraft.strength").append(Text.of(" (02:40)")).blue());
text.add(2, Text.translate('tfg.tooltip.cooling_foods'));
})
event.addAdvanced(['tfc:bucket/spring_water'], (item, advanced, text) => {
text.add(1, Text.translate('tfg.tooltip.warming_foods'));
})
event.addAdvanced(['firmalife:bucket/red_wine'], (item, advanced, text) => {
text.add(1, Text.of("Strength (05:20)").blue());
text.add(1, Text.translate("effect.minecraft.strength").append(Text.of(" (05:20)")).blue());
})
event.addAdvanced(['firmalife:bucket/rose_wine'], (item, advanced, text) => {
text.add(1, Text.of("Dolphin's Grace (05:20)").blue());
text.add(1, Text.translate("effect.minecraft.dolphins_grace").append(Text.of(" (05:20)")).blue());
})
event.addAdvanced(['firmalife:bucket/white_wine'], (item, advanced, text) => {
text.add(1, Text.of("Wither Resistance (05:20)").blue());
text.add(1, Text.translate("effect.species.wither_resistance").append(Text.of(" (05:20)")).blue());
})
event.addAdvanced(['firmalife:bucket/dessert_wine'], (item, advanced, text) => {
text.add(1, Text.of("Knockback Resistance (05:20)").blue());
text.add(1, Text.translate("effect.species.iron_will").append(Text.of(" (05:20)")).blue());
})
event.addAdvanced(['firmalife:bucket/sparkling_wine'], (item, advanced, text) => {
text.add(1, Text.of("Jump Boost II (05:20)").blue());
text.add(1, Text.translate("effect.minecraft.jump_boost").append(Text.of(" II (05:20)")).blue());
})
event.addAdvanced(['gtceu:ethanol_bucket'], (item, advanced, text) => {
text.add(1, Text.translate("effect.minecraft.nausea").append(Text.of(" (01:00)")).red());
text.add(1, Text.translate("effect.minecraft.poison").append(Text.of(" II (00:30)")).red());
})
event.addAdvanced(['gtceu:methanol_bucket'], (item, advanced, text) => {
text.add(1, Text.translate("effect.minecraft.blindness").append(Text.of(" (05:00)")).red());
text.add(1, Text.translate("effect.minecraft.wither").append(Text.of(" II (01:00)")).red());
})
}

16
kubejs/data/gtceu/tfc/drinkables/ethanol.json Normal file
View file

@ -0,0 +1,16 @@
{
"ingredient": "gtceu:ethanol",
"thirst": 5,
"effects": [
{
"type": "minecraft:nausea",
"duration": 1200,
"amplifier": 0
},
{
"type": "minecraft:poison",
"duration": 600,
"amplifier": 1
}
]
}

16
kubejs/data/gtceu/tfc/drinkables/methanol.json Normal file
View file

@ -0,0 +1,16 @@
{
"ingredient": "gtceu:methanol",
"thirst": 5,
"effects": [
{
"type": "minecraft:blindness",
"duration": 6000,
"amplifier": 0
},
{
"type": "minecraft:wither",
"duration": 1200,
"amplifier": 1
}
]
}

5
kubejs/server_scripts/tfg/tags.js
View file

@ -162,6 +162,11 @@ const registerTFGFluidTags = (event) => {
event.add('tfc:drinkables', 'tfg:light_stock')
event.add('tfc:any_drinkables', 'tfg:light_stock')
event.add('tfc:drinkables', 'gtceu:ethanol')
event.add('tfc:any_drinkables', 'gtceu:ethanol')
event.add('tfc:drinkables', 'gtceu:methanol')
event.add('tfc:any_drinkables', 'gtceu:methanol')
global.BREATHABLE_COMPRESSED_AIRS.forEach(x => {
event.add('tfg:breathable_compressed_air', x)
})