diff --git a/mods/base/assets/lang/en_us.lang b/mods/base/assets/lang/en_us.lang index 20b4a24f..b73956ec 100644 --- a/mods/base/assets/lang/en_us.lang +++ b/mods/base/assets/lang/en_us.lang @@ -113,6 +113,8 @@ item.base.leather = Leather item.base.bone = Bone item.base.string = String item.base.sugar = Sugar +item.base.clay_ball = Clay Ball +item.base.flint = Flint item.base.wood_pickaxe = Wooden Pickaxe item.base.wood_axe = Wooden Axe item.base.wood_shovel = Wooden Shovel diff --git a/mods/base/assets/lang/ru_ru.lang b/mods/base/assets/lang/ru_ru.lang index cecfdf35..7f8deb37 100644 --- a/mods/base/assets/lang/ru_ru.lang +++ b/mods/base/assets/lang/ru_ru.lang @@ -90,6 +90,8 @@ item.base.leather = Кожа item.base.bone = Кость item.base.string = Нить item.base.sugar = Сахар +item.base.clay_ball = Комок глины +item.base.flint = Кремень item.base.wood_pickaxe = Деревянная кирка item.base.wood_axe = Деревянный топор item.base.wood_shovel = Деревянная лопата diff --git a/mods/base/assets/textures/item/clay_ball.png b/mods/base/assets/textures/item/clay_ball.png new file mode 100644 index 00000000..37b3537f Binary files /dev/null and b/mods/base/assets/textures/item/clay_ball.png differ diff --git a/mods/base/assets/textures/item/flint.png b/mods/base/assets/textures/item/flint.png new file mode 100644 index 00000000..fec5e7d0 Binary files /dev/null and b/mods/base/assets/textures/item/flint.png differ diff --git a/mods/base/src/blocks.rs b/mods/base/src/blocks.rs index 48f82413..913938db 100644 --- a/mods/base/src/blocks.rs +++ b/mods/base/src/blocks.rs @@ -194,11 +194,19 @@ pub fn register(r: &mut Registry) { .mined_by("shovel", tool_tier::HAND) .falling() .tab(&crate::tabs::NATURAL); + // Vanilla: flint one time in ten instead of the gravel. + r.loot(&GRAVEL).pool( + Pool::new() + .when(Cond::harvested()) + .entry(Entry::item("flint")) + .entry(Entry::item("gravel").weight(9)), + ); r.block(&CLAY) .sound_group("gravel") .hardness(0.6) .mined_by("shovel", tool_tier::HAND) .tag("clay") + .drops("clay_ball", 4) .tab(&crate::tabs::NATURAL); r.block(&SANDSTONE) .sound_group("stone") diff --git a/mods/base/src/items.rs b/mods/base/src/items.rs index a94b0f90..b729a422 100644 --- a/mods/base/src/items.rs +++ b/mods/base/src/items.rs @@ -8,6 +8,8 @@ pub static DIAMOND: Item = Item::named("diamond"); pub static WHEAT_SEEDS: Item = Item::named("wheat_seeds"); pub static WHEAT: Item = Item::named("wheat"); pub static BUCKET: Item = Item::named("bucket"); +pub static FLINT: Item = Item::named("flint"); +pub static CLAY_BALL: Item = Item::named("clay_ball"); pub use base_api::{ARMOR, Armor, FLAMMABLE, FOOD, FUEL, Food}; /// Tags of armor pieces, head to feet; `/` picks the recipe (see recipes.rs). @@ -64,6 +66,9 @@ pub fn register(r: &mut Registry) { r.item(&WHEAT) .tag("crops/wheat") .tab(&crate::tabs::INGREDIENTS); + // What gravel and clay drop. + r.item(&FLINT).tab(&crate::tabs::INGREDIENTS); + r.item(&CLAY_BALL).tab(&crate::tabs::INGREDIENTS); // Filled buckets come with their liquids (blocks.rs); the engine fills and pours them. r.item(&BUCKET).max_stack(16).tab(&crate::tabs::TOOLS); r.set("lava_bucket", &FUEL, 20000); diff --git a/mods/base/src/recipes.rs b/mods/base/src/recipes.rs index 8cf900f4..be5bce45 100644 --- a/mods/base/src/recipes.rs +++ b/mods/base/src/recipes.rs @@ -30,6 +30,7 @@ pub fn register(r: &mut Registry) { r.shaped(C, "glowstone", 1, &["ttt", "tgt", "ttt"], &[('t', "#torches"), ('g', "#glass")]); r.shapeless(C, "#lamps/{m}", 1, &["#glowstone", "#dyes/{m}"], 0); r.shapeless(C, "#stained_glass/{m}", 1, &["#glass", "#dyes/{m}"], 0); + r.shaped(C, "clay", 1, &["##", "##"], &[('#', "clay_ball")]); // Every mod's `ore_blocks/` packs its `ingots/` or `gems/`, and its ores smelt into them. for kind in ["#ingots/{m}", "#gems/{m}"] {