From 11bb854c7a2547fd0fbf9b7d5638f6ffa01f5b21 Mon Sep 17 00:00:00 2001 From: Drefvelin <54400154+Drefvelin@users.noreply.github.com> Date: Fri, 25 Sep 2026 15:59:21 +0000 Subject: [PATCH] Set the default chicken egg interval to one hour. egg-timer in husbandry.yml remains the control, and a missing config now falls back to the same hour. --- .../net/tfminecraft/cooking/husbandry/HusbandryConfig.java | 2 +- .../net/tfminecraft/cooking/husbandry/HusbandryLoader.java | 4 ++-- src/main/resources/husbandry.yml | 3 ++- .../java/net/tfminecraft/cooking/item/EggIngredientTest.java | 2 ++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/tfminecraft/cooking/husbandry/HusbandryConfig.java b/src/main/java/net/tfminecraft/cooking/husbandry/HusbandryConfig.java index d85276a..6373360 100644 --- a/src/main/java/net/tfminecraft/cooking/husbandry/HusbandryConfig.java +++ b/src/main/java/net/tfminecraft/cooking/husbandry/HusbandryConfig.java @@ -29,7 +29,7 @@ public final class HusbandryConfig { private static int growUpSeconds = 3600; private static int shedTimerSeconds = 28800; private static double shedChance = 0.15; - private static int eggTimerSeconds = 600; + private static int eggTimerSeconds = 3600; private static String tameItem = ""; private static String coOwnItem = ""; private static String feedItem = ""; diff --git a/src/main/java/net/tfminecraft/cooking/husbandry/HusbandryLoader.java b/src/main/java/net/tfminecraft/cooking/husbandry/HusbandryLoader.java index ae7a4c5..5b7c796 100644 --- a/src/main/java/net/tfminecraft/cooking/husbandry/HusbandryLoader.java +++ b/src/main/java/net/tfminecraft/cooking/husbandry/HusbandryLoader.java @@ -54,7 +54,7 @@ public void load(File file) { HusbandryDuration.parseSeconds(config, "grow-up", null, 1, 3600), HusbandryDuration.parseSeconds(config, "shed-timer", null, 1, 28800), config.getDouble("shed-chance", 0.15), - HusbandryDuration.parseSeconds(config, "egg-timer", null, 1, 600), + HusbandryDuration.parseSeconds(config, "egg-timer", null, 1, 3600), config.getString("items.tame", ""), config.getString("items.co-own", ""), config.getString("items.feed", ""), @@ -307,7 +307,7 @@ private static void applyDefaults() { 3600, 28800, 0.15, - 600, + 3600, "", "", "", diff --git a/src/main/resources/husbandry.yml b/src/main/resources/husbandry.yml index d89843c..47f4bf5 100644 --- a/src/main/resources/husbandry.yml +++ b/src/main/resources/husbandry.yml @@ -10,7 +10,8 @@ milk-cooldown: 20m wool-timer: 4h shed-timer: 4h shed-chance: 0.15 -egg-timer: 10m +# Time between eggs from a loaded, mature, happy chicken. +egg-timer: 1h affliction: mean: 6h diff --git a/src/test/java/net/tfminecraft/cooking/item/EggIngredientTest.java b/src/test/java/net/tfminecraft/cooking/item/EggIngredientTest.java index 8b350ba..c6b490b 100644 --- a/src/test/java/net/tfminecraft/cooking/item/EggIngredientTest.java +++ b/src/test/java/net/tfminecraft/cooking/item/EggIngredientTest.java @@ -40,6 +40,8 @@ void eggStatesAndHusbandryQualityAreConfigured() throws Exception { assertTrue(types.contains("edible-when-cooked: true")); assertTrue(conversions.contains("v.egg egg(type=egg;origin=Egg;tags=freshness.0:cooked.0)")); assertTrue(husbandry.contains("food(type=egg;origin=Egg;tags=freshness.0:cooked.0)")); + assertTrue(husbandry.contains("egg-timer: 1h")); + assertFalse(husbandry.contains("egg-timer: 10m")); for (String id : List.of( "egg_rotten", "fried_egg_raw",