From 8fba57695e2533929a0ac9940c355ddbbd25d3a6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 23 Jan 2026 21:10:24 +0000 Subject: [PATCH] fix drinks giving too much hydration --- kubejs/data/firmalife/tfc/drinkables/red_wine.json | 4 +++- kubejs/data/firmalife/tfc/drinkables/rose_wine.json | 6 ++++-- kubejs/data/firmalife/tfc/drinkables/sparkling_wine.json | 6 ++++-- kubejs/data/firmalife/tfc/drinkables/white_wine.json | 4 +++- kubejs/data/gtceu/tfc/drinkables/ethanol.json | 1 + kubejs/data/gtceu/tfc/drinkables/ice_slush.json | 1 + kubejs/data/gtceu/tfc/drinkables/methanol.json | 1 + kubejs/data/tfc_gurman/tfc/drinkables/cocoa.json | 3 ++- kubejs/data/tfc_gurman/tfc/drinkables/coffee.json | 3 ++- kubejs/data/tfc_gurman/tfc/drinkables/compote.json | 3 ++- kubejs/data/tfc_gurman/tfc/drinkables/kvass.json | 3 ++- kubejs/data/tfc_gurman/tfc/drinkables/lemonade.json | 3 ++- kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json | 4 +++- kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json | 3 ++- kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json | 3 ++- kubejs/data/tfc_gurman/tfc/drinkables/tea_nettle.json | 3 ++- kubejs/data/tfc_gurman/tfc/drinkables/tea_rosehip.json | 3 ++- 17 files changed, 38 insertions(+), 16 deletions(-) diff --git a/kubejs/data/firmalife/tfc/drinkables/red_wine.json b/kubejs/data/firmalife/tfc/drinkables/red_wine.json index 12c0c6a23..80917d52f 100644 --- a/kubejs/data/firmalife/tfc/drinkables/red_wine.json +++ b/kubejs/data/firmalife/tfc/drinkables/red_wine.json @@ -1,6 +1,8 @@ { "ingredient": "firmalife:red_wine", - "thirst": 15, + "thirst": 10, + "intoxication": 4000, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:strength", diff --git a/kubejs/data/firmalife/tfc/drinkables/rose_wine.json b/kubejs/data/firmalife/tfc/drinkables/rose_wine.json index 3c0747575..ce11502bc 100644 --- a/kubejs/data/firmalife/tfc/drinkables/rose_wine.json +++ b/kubejs/data/firmalife/tfc/drinkables/rose_wine.json @@ -1,9 +1,11 @@ { "ingredient": "firmalife:rose_wine", - "thirst": 15, + "thirst": 10, + "intoxication": 4000, + "may_drink_when_full": true, "effects": [ { - "type": "minecraft:dolphins_grace", + "type": "minecraft:strength", "duration": 6400, "amplifier": 0 } diff --git a/kubejs/data/firmalife/tfc/drinkables/sparkling_wine.json b/kubejs/data/firmalife/tfc/drinkables/sparkling_wine.json index e0004b982..77749fdda 100644 --- a/kubejs/data/firmalife/tfc/drinkables/sparkling_wine.json +++ b/kubejs/data/firmalife/tfc/drinkables/sparkling_wine.json @@ -1,6 +1,8 @@ { - "ingredient": "firmalife:dessert_wine", - "thirst": 15, + "ingredient": "firmalife:sparkling_wine", + "thirst": 10, + "intoxication": 4000, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:jump_boost", diff --git a/kubejs/data/firmalife/tfc/drinkables/white_wine.json b/kubejs/data/firmalife/tfc/drinkables/white_wine.json index 7b7bc3c28..da19eb209 100644 --- a/kubejs/data/firmalife/tfc/drinkables/white_wine.json +++ b/kubejs/data/firmalife/tfc/drinkables/white_wine.json @@ -1,6 +1,8 @@ { "ingredient": "firmalife:white_wine", - "thirst": 15, + "thirst": 10, + "intoxication": 4000, + "may_drink_when_full": true, "effects": [ { "type": "species:wither_resistance", diff --git a/kubejs/data/gtceu/tfc/drinkables/ethanol.json b/kubejs/data/gtceu/tfc/drinkables/ethanol.json index 96e808d58..653b9e83b 100644 --- a/kubejs/data/gtceu/tfc/drinkables/ethanol.json +++ b/kubejs/data/gtceu/tfc/drinkables/ethanol.json @@ -1,6 +1,7 @@ { "ingredient": "gtceu:ethanol", "thirst": 5, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:nausea", diff --git a/kubejs/data/gtceu/tfc/drinkables/ice_slush.json b/kubejs/data/gtceu/tfc/drinkables/ice_slush.json index 1f05cb9c9..ed162e575 100644 --- a/kubejs/data/gtceu/tfc/drinkables/ice_slush.json +++ b/kubejs/data/gtceu/tfc/drinkables/ice_slush.json @@ -1,6 +1,7 @@ { "ingredient": "gtceu:ice", "thirst": 10, + "may_drink_when_full": true, "effects": [ { "type": "tfg:cooling", diff --git a/kubejs/data/gtceu/tfc/drinkables/methanol.json b/kubejs/data/gtceu/tfc/drinkables/methanol.json index cba19d83e..84fc684f1 100644 --- a/kubejs/data/gtceu/tfc/drinkables/methanol.json +++ b/kubejs/data/gtceu/tfc/drinkables/methanol.json @@ -1,6 +1,7 @@ { "ingredient": "gtceu:methanol", "thirst": 5, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:blindness", diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/cocoa.json b/kubejs/data/tfc_gurman/tfc/drinkables/cocoa.json index 5d403ba69..0f59bce41 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/cocoa.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/cocoa.json @@ -1,6 +1,7 @@ { "ingredient": "tfc_gurman:cocoa", - "thirst": 15, + "thirst": 10, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:haste", diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/coffee.json b/kubejs/data/tfc_gurman/tfc/drinkables/coffee.json index 13dec7feb..c64e29166 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/coffee.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/coffee.json @@ -1,6 +1,7 @@ { "ingredient": "tfc_gurman:coffee", - "thirst": 15, + "thirst": 10, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:speed", diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/compote.json b/kubejs/data/tfc_gurman/tfc/drinkables/compote.json index 6956998dd..d86db6987 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/compote.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/compote.json @@ -1,6 +1,7 @@ { "ingredient": "tfc_gurman:compote", - "thirst": 15, + "thirst": 10, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:jump_boost", diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/kvass.json b/kubejs/data/tfc_gurman/tfc/drinkables/kvass.json index 052d6cd35..2f70a543d 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/kvass.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/kvass.json @@ -1,6 +1,7 @@ { "ingredient": "tfc_gurman:kvass", - "thirst": 15, + "thirst": 10, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:strength", diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/lemonade.json b/kubejs/data/tfc_gurman/tfc/drinkables/lemonade.json index 66d8a3f8c..d5d810fe4 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/lemonade.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/lemonade.json @@ -1,6 +1,7 @@ { "ingredient": "tfc_gurman:lemonade", - "thirst": 15, + "thirst": 10, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:haste", diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json b/kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json index 8e4d8f5a0..563b57b30 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json @@ -1,6 +1,8 @@ { "ingredient": "tfc_gurman:nalivka", - "thirst": 15, + "thirst": 10, + "intoxication": 4000, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:strength", diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json index 6e8dda27f..bb7a5223f 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json @@ -1,6 +1,7 @@ { "ingredient": "tfc_gurman:tea_chamomile", - "thirst": 15, + "thirst": 10, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:resistance", diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json index e96941a4c..e43e41414 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json @@ -1,6 +1,7 @@ { "ingredient": "tfc_gurman:tea_mint", - "thirst": 15, + "thirst": 10, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:regeneration", diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/tea_nettle.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_nettle.json index cc2c300bb..a9e53654d 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/tea_nettle.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/tea_nettle.json @@ -1,6 +1,7 @@ { "ingredient": "tfc_gurman:tea_nettle", - "thirst": 15, + "thirst": 10, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:slow_falling", diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/tea_rosehip.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_rosehip.json index ad3d523f9..9f45aa167 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/tea_rosehip.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/tea_rosehip.json @@ -1,6 +1,7 @@ { "ingredient": "tfc_gurman:tea_rosehip", - "thirst": 15, + "thirst": 10, + "may_drink_when_full": true, "effects": [ { "type": "minecraft:absorption",