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
2 changes: 2 additions & 0 deletions mods/base/assets/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions mods/base/assets/lang/ru_ru.lang
Original file line number Diff line number Diff line change
Expand Up @@ -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 = Деревянная лопата
Expand Down
Binary file added mods/base/assets/textures/item/clay_ball.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/base/assets/textures/item/flint.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions mods/base/src/blocks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
5 changes: 5 additions & 0 deletions mods/base/src/items.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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; `<tag>/<material>` picks the recipe (see recipes.rs).
Expand Down Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions mods/base/src/recipes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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/<m>` packs its `ingots/<m>` or `gems/<m>`, and its ores smelt into them.
for kind in ["#ingots/{m}", "#gems/{m}"] {
Expand Down
Loading