Skip to content

Commit 232754d

Browse files
DoomedArtemisDoomedArtemis
committed
- Added Flax Seed
- Added Flax Crop - Split Flax Crop textures into bottom and top - Added to burnables: Flax Flower (50t) - Added to compostables: Flax Flower, Flax Seed - Added Recipe to craft Flax Flower into Light Blue Dye
1 parent 29d1494 commit 232754d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+555
-4
lines changed

‎src/generated/resources/.cache/236d47bc0498c41b2a1b672b45e9c1a35494d975‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
// 1.21.1 2025-10-11T20:56:35.2084895 Item Models: floraexpansion
1+
// 1.21.1 2025-10-14T23:58:40.090308 Item Models: floraexpansion
2+
2f17957ad080497f8e30fd11ec5d5ae18149716c assets/floraexpansion/models/item/flax_fiber.json
3+
1acdbfa53164f4899cd00b728d115c70e1fa74a0 assets/floraexpansion/models/item/flax_flower.json
4+
e71689c5525359e1cfc4251696517db8547aa590 assets/floraexpansion/models/item/flax_seed.json
25
ed54c98a55c1c5f1a4dcfb3bbf364978b2cecb6b assets/floraexpansion/models/item/forest_snack.json
36
0fa9ec917dbf9c53cb32d2ea083173f18715bbd2 assets/floraexpansion/models/item/pine_cone.json
47
db1eb7875bb4e25c3075aa43ae4b17cd52df720e assets/floraexpansion/models/item/pine_nuts.json

‎src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.1 2025-10-13T22:55:31.7472663 Recipes
1+
// 1.21.1 2025-10-15T00:52:56.3262785 Recipes
22
d36b7482d644f2d192c669ca386ec459f9aa171f data/floraexpansion/advancement/recipes/food/toasted_pine_nuts_from_campfire_cooking.json
33
8af93f0f6731114fb9467d1ccc71945c3dee693d data/floraexpansion/advancement/recipes/food/toasted_pine_nuts_from_smelting.json
44
3f26d4040f28986817eaa78a7cd37fc4e44c4bec data/floraexpansion/advancement/recipes/food/toasted_pine_nuts_from_smoking.json
@@ -13,5 +13,7 @@ b89fb3ecc04b276a698181304e7fe7106147f5c1 data/floraexpansion/recipe/pine_nuts.js
1313
1ccd179d4855270b234a4d3531c596ebae283790 data/floraexpansion/recipe/toasted_pine_nuts_from_smelting.json
1414
181653fb0fdcce7d36a7eb6eb66bcb3c20ca3494 data/floraexpansion/recipe/toasted_pine_nuts_from_smoking.json
1515
91c7365e6464dbaa46f104f1c587a70f38d1ec3f data/floraexpansion/recipe/twig_ladder.json
16+
946cc27fe9b882bcdf246ddd31220789fd24caf0 data/minecraft/advancement/recipes/misc/light_blue_dye.json
1617
bee48aae1bf36716cd1f154de58bc29f5d0f12ed data/minecraft/advancement/recipes/misc/stick.json
18+
9a332992f4536dd9a11f8736b9cc9d174f82797c data/minecraft/recipe/light_blue_dye.json
1719
f2de22222d7468505d515f56c074cf3a365d3d0f data/minecraft/recipe/stick.json

‎src/generated/resources/.cache/d1cd0ce54e4c2b2b2e5b4cfb44f37dd0ebe4e322‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.21.1 2025-10-13T22:19:16.9554937 Languages: en_us for mod: floraexpansion
2-
52393ac6bc13d8e98e555d3c55995367d1fa8ec4 assets/floraexpansion/lang/en_us.json
1+
// 1.21.1 2025-10-14T23:58:40.0863224 Languages: en_us for mod: floraexpansion
2+
f8e8317c7ead465896d15cd690178daac47d6380 assets/floraexpansion/lang/en_us.json

‎src/generated/resources/assets/floraexpansion/lang/en_us.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
{
2+
"block.floraexpansion.flax_crop": "Flax Crop",
23
"block.floraexpansion.leaf_litter": "Leaf Litter",
34
"block.floraexpansion.pine_litter": "Pine Litter",
45
"block.floraexpansion.twig_ladder": "Twig Ladder",
56
"floraexpansion.creative_tab": "Artemis' Flora Expansion",
7+
"item.floraexpansion.flax_fiber": "Flax Fiber",
8+
"item.floraexpansion.flax_flower": "Flax Flower",
9+
"item.floraexpansion.flax_seed": "Flax Seed",
610
"item.floraexpansion.forest_snack": "Forest Snack",
711
"item.floraexpansion.pine_cone": "Pine Cone",
812
"item.floraexpansion.pine_nuts": "Pine Nuts",

‎src/generated/resources/assets/floraexpansion/models/item/flax_fiber.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "floraexpansion:item/flax_fiber"
5+
}
6+
}

‎src/generated/resources/assets/floraexpansion/models/item/flax_flower.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "floraexpansion:item/flax_flower"
5+
}
6+
}

‎src/generated/resources/assets/floraexpansion/models/item/flax_seed.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "floraexpansion:item/flax_seed"
5+
}
6+
}

‎src/generated/resources/data/minecraft/advancement/recipes/misc/light_blue_dye.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_flax_flower": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "floraexpansion:flax_flower"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "minecraft:light_blue_dye"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_flax_flower"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"minecraft:light_blue_dye"
30+
]
31+
}
32+
}

‎src/generated/resources/data/minecraft/recipe/light_blue_dye.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"type": "minecraft:crafting_shapeless",
3+
"category": "misc",
4+
"ingredients": [
5+
{
6+
"item": "floraexpansion:flax_flower"
7+
}
8+
],
9+
"result": {
10+
"count": 1,
11+
"id": "minecraft:light_blue_dye"
12+
}
13+
}

‎src/main/java/de/artemis/floraexpansion/ModCreativeModeTabs.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ public class ModCreativeModeTabs {
2727
output.accept(ModItems.TWIG);
2828
output.accept(ModBlocks.TWIG_LADDER);
2929
output.accept(ModItems.FOREST_SNACK);
30+
output.accept(ModItems.FLAX_SEED);
31+
output.accept(ModItems.FLAX_FIBER);
32+
output.accept(ModItems.FLAX_FLOWER);
3033

3134
}).build());
3235

0 commit comments

Comments
 (0)