From 20e2417e1575a19e24404131430c6cc4413aeb77 Mon Sep 17 00:00:00 2001
From: Ujhik <ujhik@usal.es>
Date: Mon, 9 Feb 2026 08:05:07 +0100
Subject: [PATCH] bugfix: Aged alcohols now are drinkable when player water is
 full (#3001)

---
 .../tfcagedalcohol/tfc/drinkables/aged_beer.json   | 14 ++++++++++++++
 .../tfcagedalcohol/tfc/drinkables/aged_cider.json  | 14 ++++++++++++++
 .../tfc/drinkables/aged_corn_whiskey.json          | 13 +++++++++++++
 .../tfcagedalcohol/tfc/drinkables/aged_mead.json   | 13 +++++++++++++
 .../tfcagedalcohol/tfc/drinkables/aged_rum.json    | 13 +++++++++++++
 .../tfc/drinkables/aged_rye_whiskey.json           | 13 +++++++++++++
 .../tfcagedalcohol/tfc/drinkables/aged_sake.json   | 13 +++++++++++++
 .../tfcagedalcohol/tfc/drinkables/aged_vodka.json  | 13 +++++++++++++
 .../tfc/drinkables/aged_whiskey.json               | 13 +++++++++++++
 9 files changed, 119 insertions(+)
 create mode 100644 kubejs/data/tfcagedalcohol/tfc/drinkables/aged_beer.json
 create mode 100644 kubejs/data/tfcagedalcohol/tfc/drinkables/aged_cider.json
 create mode 100644 kubejs/data/tfcagedalcohol/tfc/drinkables/aged_corn_whiskey.json
 create mode 100644 kubejs/data/tfcagedalcohol/tfc/drinkables/aged_mead.json
 create mode 100644 kubejs/data/tfcagedalcohol/tfc/drinkables/aged_rum.json
 create mode 100644 kubejs/data/tfcagedalcohol/tfc/drinkables/aged_rye_whiskey.json
 create mode 100644 kubejs/data/tfcagedalcohol/tfc/drinkables/aged_sake.json
 create mode 100644 kubejs/data/tfcagedalcohol/tfc/drinkables/aged_vodka.json
 create mode 100644 kubejs/data/tfcagedalcohol/tfc/drinkables/aged_whiskey.json

diff --git a/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_beer.json b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_beer.json
new file mode 100644
index 000000000..50054c419
--- /dev/null
+++ b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_beer.json
@@ -0,0 +1,14 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "ingredient": "tfcagedalcohol:aged_beer",
+  "thirst": 15,
+  "intoxication": 2000,
+  "may_drink_when_full": true,
+  "effects": [
+    {
+      "type": "minecraft:absorption",
+      "duration": 6400,
+      "amplifier": 1
+    }
+  ]
+}
\ No newline at end of file
diff --git a/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_cider.json b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_cider.json
new file mode 100644
index 000000000..36ce6cfc5
--- /dev/null
+++ b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_cider.json
@@ -0,0 +1,14 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "ingredient": "tfcagedalcohol:aged_cider",
+  "thirst": 15,
+  "intoxication": 2000,
+  "may_drink_when_full": true,
+  "effects": [
+    {
+      "type": "minecraft:speed",
+      "duration": 6400,
+      "amplifier": 0
+    }
+  ]
+}
\ No newline at end of file
diff --git a/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_corn_whiskey.json b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_corn_whiskey.json
new file mode 100644
index 000000000..1209b4fbb
--- /dev/null
+++ b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_corn_whiskey.json
@@ -0,0 +1,13 @@
+{
+  "ingredient": "tfcagedalcohol:aged_corn_whiskey",
+  "thirst": 15,
+  "intoxication": 2000,
+  "may_drink_when_full": true,
+  "effects": [
+    {
+      "type": "minecraft:haste",
+      "duration": 6400,
+      "amplifier": 0
+    }
+  ]
+}
\ No newline at end of file
diff --git a/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_mead.json b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_mead.json
new file mode 100644
index 000000000..731953261
--- /dev/null
+++ b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_mead.json
@@ -0,0 +1,13 @@
+{
+  "ingredient": "tfcagedalcohol:aged_mead",
+  "thirst": 15,
+  "intoxication": 2000,
+  "may_drink_when_full": true,
+  "effects": [
+    {
+      "type": "minecraft:regeneration",
+      "duration": 6400,
+      "amplifier": 0
+    }
+  ]
+}
\ No newline at end of file
diff --git a/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_rum.json b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_rum.json
new file mode 100644
index 000000000..de1caafbc
--- /dev/null
+++ b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_rum.json
@@ -0,0 +1,13 @@
+{
+  "ingredient": "tfcagedalcohol:aged_rum",
+  "thirst": 15,
+  "intoxication": 2000,
+  "may_drink_when_full": true,
+  "effects": [
+    {
+      "type": "minecraft:speed",
+      "duration": 3200,
+      "amplifier": 1
+    }
+  ]
+}
\ No newline at end of file
diff --git a/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_rye_whiskey.json b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_rye_whiskey.json
new file mode 100644
index 000000000..396a922b5
--- /dev/null
+++ b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_rye_whiskey.json
@@ -0,0 +1,13 @@
+{
+  "ingredient": "tfcagedalcohol:aged_rye_whiskey",
+  "thirst": 15,
+  "intoxication": 2000,
+  "may_drink_when_full": true,
+  "effects": [
+    {
+      "type": "minecraft:haste",
+      "duration": 6400,
+      "amplifier": 0
+    }
+  ]
+}
\ No newline at end of file
diff --git a/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_sake.json b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_sake.json
new file mode 100644
index 000000000..570645808
--- /dev/null
+++ b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_sake.json
@@ -0,0 +1,13 @@
+{
+  "ingredient": "tfcagedalcohol:aged_sake",
+  "thirst": 15,
+  "intoxication": 2000,
+  "may_drink_when_full": true,
+  "effects": [
+    {
+      "type": "minecraft:resistance",
+      "duration": 6400,
+      "amplifier": 0
+    }
+  ]
+}
\ No newline at end of file
diff --git a/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_vodka.json b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_vodka.json
new file mode 100644
index 000000000..e28f6d19a
--- /dev/null
+++ b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_vodka.json
@@ -0,0 +1,13 @@
+{
+  "ingredient": "tfcagedalcohol:aged_vodka",
+  "thirst": 15,
+  "intoxication": 2000,
+  "may_drink_when_full": true,
+  "effects": [
+    {
+      "type": "minecraft:resistance",
+      "duration": 3200,
+      "amplifier": 1
+    }
+  ]
+}
\ No newline at end of file
diff --git a/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_whiskey.json b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_whiskey.json
new file mode 100644
index 000000000..e6aaba294
--- /dev/null
+++ b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_whiskey.json
@@ -0,0 +1,13 @@
+{
+  "ingredient": "tfcagedalcohol:aged_whiskey",
+  "thirst": 15,
+  "intoxication": 2000,
+  "may_drink_when_full": true,
+  "effects": [
+    {
+      "type": "minecraft:haste",
+      "duration": 3200,
+      "amplifier": 1
+    }
+  ]
+}
\ No newline at end of file