Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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", ""),
Expand Down Expand Up @@ -307,7 +307,7 @@ private static void applyDefaults() {
3600,
28800,
0.15,
600,
3600,
"",
"",
"",
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/husbandry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down