diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json index 0b0ece009..6df042bd6 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json @@ -22,7 +22,17 @@ }, { "type": "patchouli:text", - "text": "$(li)Aged Beer: Absorption II (20:00)$(li)Aged Cider: Speed (5:20)$(li)Aged Rum: Speed II (2:40)$(li)Aged Sake: Resistance (5:20)$(li)Aged Vodka: Resistance II (2:40)$(li)Aged Corn Whiskey: Haste (5:20)$(li)Aged Rye Whiskey: Haste (5:20)$(li)Aged Whiskey: Haste II (2:40)$(li)Aged Mead: Regeneration (5:20)" + "text": "$(li)Aged Beer: Absorption II (5:20)$(li)Aged Cider: Speed (5:20)$(li)Aged Rum: Speed II (2:40)$(li)Aged Sake: Resistance (5:20)$(li)Aged Vodka: Resistance II (2:40)$(li)Aged Corn Whiskey: Haste (5:20)$(li)Aged Rye Whiskey: Haste (5:20)$(li)Aged Whiskey: Haste II (2:40)$(li)Aged Mead: Regeneration (5:20)" + }, + { + "type": "patchouli:spotlight", + "title": "Vintage Alcohol", + "text": "$(thing)Vintage Alcohols$() are prepared by further ageing aged alcohol in sealed barrels. These alcohols provide a stronger effect and a longer duration.", + "item": "tfg:vintage_beer_bucket,tfg:vintage_cider_bucket,tfg:vintage_rum_bucket,tfg:vintage_sake_bucket,tfg:vintage_vodka_bucket,tfg:vintage_whiskey_bucket,tfg:vintage_corn_whiskey_bucket,tfg:vintage_rye_whiskey_bucket" + }, + { + "type": "patchouli:text", + "text": "$(li)Vintage Beer: Absorption III (8:00)$(li)Vintage Cider: Speed II (8:00)$(li)Vintage Rum: Speed III (4:00)$(li)Vintage Sake: Resistance II (8:00)$(li)Vintage Vodka: Resistance III (4:00)$(li)Vintage Corn Whiskey: Haste II (8:00)$(li)Vintage Rye Whiskey: Haste II (8:00)$(li)Vintage Whiskey: Haste III (4:00)$(li)Vintage Mead: Regeneration II (8:00)" }, { "type": "patchouli:text", diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 57c891e9f..4a4f171b0 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -502,6 +502,33 @@ const registerTooltips = (event) => { event.addAdvanced(['gtceu:ice_bucket'], (item, advanced, text) => { text.add(1, Text.translate('tfg.tooltip.cooling_foods')); }) + event.addAdvanced(['tfg:vintage_beer_bucket'], (item, advanced, text) => { + text.add(1, Text.translate("effect.minecraft.absorption").append(Text.of(" III (08:00)")).blue()); + }) + event.addAdvanced(['tfg:vintage_cider_bucket'], (item, advanced, text) => { + text.add(1, Text.translate("effect.minecraft.speed").append(Text.of(" II (08:00)")).blue()); + }) + event.addAdvanced(['tfg:vintage_rum_bucket'], (item, advanced, text) => { + text.add(1, Text.translate("effect.minecraft.speed").append(Text.of(" III (04:00)")).blue()); + }) + event.addAdvanced(['tfg:vintage_mead_bucket'], (item, advanced, text) => { + text.add(1, Text.translate("effect.minecraft.regeneration").append(Text.of(" II (08:00)")).blue()); + }) + event.addAdvanced(['tfg:vintage_sake_bucket'], (item, advanced, text) => { + text.add(1, Text.translate("effect.minecraft.resistance").append(Text.of(" II (08:00)")).blue()); + }) + event.addAdvanced(['tfg:vintage_vodka_bucket'], (item, advanced, text) => { + text.add(1, Text.translate("effect.minecraft.resistance").append(Text.of(" III (04:00)")).blue()); + }) + event.addAdvanced(['tfg:vintage_whiskey_bucket'], (item, advanced, text) => { + text.add(1, Text.translate("effect.minecraft.haste").append(Text.of(" III (04:00)")).blue()); + }) + event.addAdvanced(['tfg:vintage_corn_whiskey_bucket'], (item, advanced, text) => { + text.add(1, Text.translate("effect.minecraft.haste").append(Text.of(" II (08:00)")).blue()); + }) + event.addAdvanced(['tfg:vintage_rye_whiskey_bucket'], (item, advanced, text) => { + text.add(1, Text.translate("effect.minecraft.haste").append(Text.of(" II (08:00)")).blue()); + }) // Saw can silk harvest ice //This kinda sucks, but it works. We're basically getting the default "silk_ice" harvesting tooltip, getting the index, then removing it. diff --git a/kubejs/data/tfc/tfc/drinkables/vintage_beer.json b/kubejs/data/tfc/tfc/drinkables/vintage_beer.json new file mode 100644 index 000000000..beb34152c --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/vintage_beer.json @@ -0,0 +1,13 @@ +{ + "ingredient": "tfg:vintage_beer", + "thirst": 5, + "intoxication": 4000, + "may_drink_when_full": true, + "effects": [ + { + "type": "minecraft:absorption", + "duration": 9600, + "amplifier": 2 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/vintage_cider.json b/kubejs/data/tfc/tfc/drinkables/vintage_cider.json new file mode 100644 index 000000000..318204c9e --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/vintage_cider.json @@ -0,0 +1,13 @@ +{ + "ingredient": "tfg:vintage_cider", + "thirst": 5, + "intoxication": 4000, + "may_drink_when_full": true, + "effects": [ + { + "type": "minecraft:speed", + "duration": 9600, + "amplifier": 1 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/vintage_corn_whiskey.json b/kubejs/data/tfc/tfc/drinkables/vintage_corn_whiskey.json new file mode 100644 index 000000000..1ecbef20f --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/vintage_corn_whiskey.json @@ -0,0 +1,13 @@ +{ + "ingredient": "tfg:vintage_corn_whiskey", + "thirst": 5, + "intoxication": 4000, + "may_drink_when_full": true, + "effects": [ + { + "type": "minecraft:haste", + "duration": 9600, + "amplifier": 1 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/vintage_mead.json b/kubejs/data/tfc/tfc/drinkables/vintage_mead.json new file mode 100644 index 000000000..09d50ab86 --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/vintage_mead.json @@ -0,0 +1,13 @@ +{ + "ingredient": "tfg:vintage_mead", + "thirst": 5, + "intoxication": 4000, + "may_drink_when_full": true, + "effects": [ + { + "type": "minecraft:regeneration", + "duration": 9600, + "amplifier": 1 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/vintage_rum.json b/kubejs/data/tfc/tfc/drinkables/vintage_rum.json new file mode 100644 index 000000000..49c50efd8 --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/vintage_rum.json @@ -0,0 +1,13 @@ +{ + "ingredient": "tfg:vintage_rum", + "thirst": 5, + "intoxication": 4000, + "may_drink_when_full": true, + "effects": [ + { + "type": "minecraft:speed", + "duration": 4800, + "amplifier": 2 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/vintage_rye_whiskey.json b/kubejs/data/tfc/tfc/drinkables/vintage_rye_whiskey.json new file mode 100644 index 000000000..302e81214 --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/vintage_rye_whiskey.json @@ -0,0 +1,13 @@ +{ + "ingredient": "tfg:vintage_rye_whiskey", + "thirst": 5, + "intoxication": 4000, + "may_drink_when_full": true, + "effects": [ + { + "type": "minecraft:haste", + "duration": 9600, + "amplifier": 1 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/vintage_sake.json b/kubejs/data/tfc/tfc/drinkables/vintage_sake.json new file mode 100644 index 000000000..016877ee7 --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/vintage_sake.json @@ -0,0 +1,13 @@ +{ + "ingredient": "tfg:vintage_sake", + "thirst": 5, + "intoxication": 4000, + "may_drink_when_full": true, + "effects": [ + { + "type": "minecraft:resistance", + "duration": 9600, + "amplifier": 1 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/vintage_vodka.json b/kubejs/data/tfc/tfc/drinkables/vintage_vodka.json new file mode 100644 index 000000000..9414ad140 --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/vintage_vodka.json @@ -0,0 +1,13 @@ +{ + "ingredient": "tfg:vintage_vodka", + "thirst": 5, + "intoxication": 4000, + "may_drink_when_full": true, + "effects": [ + { + "type": "minecraft:resistance", + "duration": 4800, + "amplifier": 2 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/vintage_whiskey.json b/kubejs/data/tfc/tfc/drinkables/vintage_whiskey.json new file mode 100644 index 000000000..955e6928a --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/vintage_whiskey.json @@ -0,0 +1,13 @@ +{ + "ingredient": "tfg:vintage_whiskey", + "thirst": 5, + "intoxication": 4000, + "may_drink_when_full": true, + "effects": [ + { + "type": "minecraft:haste", + "duration": 4800, + "amplifier": 2 + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/food/recipes.food.js b/kubejs/server_scripts/tfg/food/recipes.food.js index b982734fe..0d5c08e7f 100644 --- a/kubejs/server_scripts/tfg/food/recipes.food.js +++ b/kubejs/server_scripts/tfg/food/recipes.food.js @@ -983,6 +983,51 @@ function registerTFGFoodRecipes(event) { }) }) + event.recipes.tfc.barrel_sealed(576000) + .inputFluid(Fluid.of('tfcagedalcohol:aged_beer', 1000)) + .outputFluid(Fluid.of('tfg:vintage_beer', 750)) + .id('tfg:barrel/aged_to_vintage_beer') + + event.recipes.tfc.barrel_sealed(576000) + .inputFluid(Fluid.of('tfcagedalcohol:aged_cider', 1000)) + .outputFluid(Fluid.of('tfg:vintage_cider', 750)) + .id('tfg:barrel/aged_to_vintage_cider') + + event.recipes.tfc.barrel_sealed(576000) + .inputFluid(Fluid.of('tfcagedalcohol:aged_rum', 1000)) + .outputFluid(Fluid.of('tfg:vintage_rum', 750)) + .id('tfg:barrel/aged_to_vintage_rum') + + event.recipes.tfc.barrel_sealed(576000) + .inputFluid(Fluid.of('tfcagedalcohol:aged_sake', 1000)) + .outputFluid(Fluid.of('tfg:vintage_sake', 750)) + .id('tfg:barrel/aged_to_vintage_sake') + + event.recipes.tfc.barrel_sealed(576000) + .inputFluid(Fluid.of('tfcagedalcohol:aged_vodka', 1000)) + .outputFluid(Fluid.of('tfg:vintage_vodka', 750)) + .id('tfg:barrel/aged_to_vintage_vodka') + + event.recipes.tfc.barrel_sealed(576000) + .inputFluid(Fluid.of('tfcagedalcohol:aged_whiskey', 1000)) + .outputFluid(Fluid.of('tfg:vintage_whiskey', 750)) + .id('tfg:barrel/aged_to_vintage_whiskey') + + event.recipes.tfc.barrel_sealed(576000) + .inputFluid(Fluid.of('tfcagedalcohol:aged_corn_whiskey', 1000)) + .outputFluid(Fluid.of('tfg:vintage_corn_whiskey', 750)) + .id('tfg:barrel/aged_to_vintage_corn_whiskey') + + event.recipes.tfc.barrel_sealed(576000) + .inputFluid(Fluid.of('tfcagedalcohol:aged_rye_whiskey', 1000)) + .outputFluid(Fluid.of('tfg:vintage_rye_whiskey', 750)) + .id('tfg:barrel/aged_to_vintage_rye_whiskey') + + event.recipes.tfc.barrel_sealed(576000) + .inputFluid(Fluid.of('tfcagedalcohol:aged_mead', 1000)) + .outputFluid(Fluid.of('tfg:vintage_mead', 750)) + .id('tfg:barrel/aged_to_vintage_mead') + //#endregion //#region Cakes diff --git a/kubejs/startup_scripts/tfg/fluids.js b/kubejs/startup_scripts/tfg/fluids.js index 87bba4564..f07770e00 100644 --- a/kubejs/startup_scripts/tfg/fluids.js +++ b/kubejs/startup_scripts/tfg/fluids.js @@ -13,6 +13,51 @@ const registerTFGFluids = (event) => { .bucketColor(0xba6900) .noBlock() + event.create('tfg:vintage_whiskey') + .thinTexture(0x392e14) + .bucketColor(0x392e14) + .noBlock() + + event.create('tfg:vintage_beer') + .thinTexture(0x6b5d21) + .bucketColor(0x6b5d21) + .noBlock() + + event.create('tfg:vintage_cider') + .thinTexture(0x62651f) + .bucketColor(0x62651f) + .noBlock() + + event.create('tfg:vintage_rum') + .thinTexture(0x461519) + .bucketColor(0x461519) + .noBlock() + + event.create('tfg:vintage_sake') + .thinTexture(0x65785e) + .bucketColor(0x65785e) + .noBlock() + + event.create('tfg:vintage_corn_whiskey') + .thinTexture(0x75705c) + .bucketColor(0x75705c) + .noBlock() + + event.create('tfg:vintage_rye_whiskey') + .thinTexture(0x6c4e2d) + .bucketColor(0x6c4e2d) + .noBlock() + + event.create('tfg:vintage_mead') + .thinTexture(0x6c5d1a) + .bucketColor(0x6c5d1a) + .noBlock() + + event.create('tfg:vintage_vodka') + .thinTexture(0x76796d) + .bucketColor(0x76796d) + .noBlock() + // Moon event.create('tfg:cryogenized_fluix') .thickTexture(0xde8cfb)