Skip to content

Commit 8a9be2d

Browse files
DoomedArtemisDoomedArtemis
committed
- Changed Pine Litter class to PineLitterBlock
- Updated Pine Litter model json - Added Twig - Removed Pine Litter crafting recipe - Added ModBlockStateProperties - Replaced FLOWER_AMOUNT with SEGMENT_AMOUNT for all litter blocks - Added Leaf Litter - Added Client Events / Foliage Color Capability
1 parent 6f0a41f commit 8a9be2d

Some content is hidden

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

46 files changed

+695
-149
lines changed

‎src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.1 2025-10-10T20:56:53.9496643 Registries
1+
// 1.21.1 2025-10-11T18:08:52.3240325 Registries
22
711f3684b5125ecbf7aedc0cd8de7091f662017c data/floraexpansion/neoforge/biome_modifier/add_pine_litter.json
3-
8c2b5b38fe4b8b0816964c84c25f776bf3c7fab0 data/floraexpansion/worldgen/configured_feature/pine_litter.json
3+
a29dc1a441b94d271e5641fc4571119b90179936 data/floraexpansion/worldgen/configured_feature/pine_litter.json
44
808300495952012cfdf78e7fcdf623763288073c data/floraexpansion/worldgen/placed_feature/pine_litter_placed.json

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// 1.21.1 2025-10-10T19:49:31.5592133 Item Models: floraexpansion
1+
// 1.21.1 2025-10-11T16:03:58.0503594 Item Models: floraexpansion
22
0fa9ec917dbf9c53cb32d2ea083173f18715bbd2 assets/floraexpansion/models/item/pine_cone.json
33
db1eb7875bb4e25c3075aa43ae4b17cd52df720e assets/floraexpansion/models/item/pine_nuts.json
44
6ced3f4a75a3076381a1bcc55661e08b48ec9d62 assets/floraexpansion/models/item/toasted_pine_nuts.json
5+
b577ebba0d45060a04e8704e0304bf56c861c371 assets/floraexpansion/models/item/twig.json

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
// 1.21.1 2025-10-10T21:00:15.5982595 Recipes
1+
// 1.21.1 2025-10-11T17:07:50.1468766 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
55
54ddccae971fc1cb31fb6d0cc471efbb76533cc2 data/floraexpansion/advancement/recipes/misc/pine_cone.json
6-
cb401e9f5aa85a92f8c29cbf3c36dba87184717f data/floraexpansion/advancement/recipes/misc/pine_litter.json
76
67833b0e977709de2e283a3002ec30aef3a44958 data/floraexpansion/advancement/recipes/misc/pine_nuts.json
87
c36dd48e353651460e6c31804127f9a6195cd46f data/floraexpansion/recipe/pine_cone.json
9-
2c62a1caead3b0282bb323a3954fa1f961d39e51 data/floraexpansion/recipe/pine_litter.json
108
b89fb3ecc04b276a698181304e7fe7106147f5c1 data/floraexpansion/recipe/pine_nuts.json
119
418314e152b8a80893e8863687483d347fc2df2e data/floraexpansion/recipe/toasted_pine_nuts_from_campfire_cooking.json
1210
1ccd179d4855270b234a4d3531c596ebae283790 data/floraexpansion/recipe/toasted_pine_nuts_from_smelting.json
1311
181653fb0fdcce7d36a7eb6eb66bcb3c20ca3494 data/floraexpansion/recipe/toasted_pine_nuts_from_smoking.json
12+
bee48aae1bf36716cd1f154de58bc29f5d0f12ed data/minecraft/advancement/recipes/misc/stick.json
13+
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-10T19:49:31.5572004 Languages: en_us for mod: floraexpansion
2-
4e12803a418befc7da17c19f3d0b9d7ca67e33cc assets/floraexpansion/lang/en_us.json
1+
// 1.21.1 2025-10-11T17:07:50.1447081 Languages: en_us for mod: floraexpansion
2+
a2c45f147326e7a1f5504169fb1f6542c79de30b assets/floraexpansion/lang/en_us.json

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
2+
"block.floraexpansion.leaf_litter": "Leaf Litter",
23
"block.floraexpansion.pine_litter": "Pine Litter",
34
"floraexpansion.creative_tab": "Artemis' Flora Expansion",
45
"item.floraexpansion.pine_cone": "Pine Cone",
56
"item.floraexpansion.pine_nuts": "Pine Nuts",
6-
"item.floraexpansion.toasted_pine_nuts": "Toasted Pine Nuts"
7+
"item.floraexpansion.toasted_pine_nuts": "Toasted Pine Nuts",
8+
"item.floraexpansion.twig": "Twig"
79
}

‎src/generated/resources/assets/floraexpansion/models/item/twig.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/twig"
5+
}
6+
}

‎src/generated/resources/data/floraexpansion/advancement/recipes/misc/pine_litter.json‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎src/generated/resources/data/floraexpansion/recipe/pine_litter.json‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/generated/resources/data/floraexpansion/worldgen/configured_feature/pine_litter.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"Name": "floraexpansion:pine_litter",
1414
"Properties": {
1515
"facing": "north",
16-
"flower_amount": "1"
16+
"segment_amount": "1"
1717
}
1818
},
1919
"weight": 1
@@ -23,7 +23,7 @@
2323
"Name": "floraexpansion:pine_litter",
2424
"Properties": {
2525
"facing": "north",
26-
"flower_amount": "2"
26+
"segment_amount": "2"
2727
}
2828
},
2929
"weight": 1
@@ -33,7 +33,7 @@
3333
"Name": "floraexpansion:pine_litter",
3434
"Properties": {
3535
"facing": "north",
36-
"flower_amount": "3"
36+
"segment_amount": "3"
3737
}
3838
},
3939
"weight": 1
@@ -43,7 +43,7 @@
4343
"Name": "floraexpansion:pine_litter",
4444
"Properties": {
4545
"facing": "north",
46-
"flower_amount": "4"
46+
"segment_amount": "4"
4747
}
4848
},
4949
"weight": 1
@@ -53,7 +53,7 @@
5353
"Name": "floraexpansion:pine_litter",
5454
"Properties": {
5555
"facing": "east",
56-
"flower_amount": "1"
56+
"segment_amount": "1"
5757
}
5858
},
5959
"weight": 1
@@ -63,7 +63,7 @@
6363
"Name": "floraexpansion:pine_litter",
6464
"Properties": {
6565
"facing": "east",
66-
"flower_amount": "2"
66+
"segment_amount": "2"
6767
}
6868
},
6969
"weight": 1
@@ -73,7 +73,7 @@
7373
"Name": "floraexpansion:pine_litter",
7474
"Properties": {
7575
"facing": "east",
76-
"flower_amount": "3"
76+
"segment_amount": "3"
7777
}
7878
},
7979
"weight": 1
@@ -83,7 +83,7 @@
8383
"Name": "floraexpansion:pine_litter",
8484
"Properties": {
8585
"facing": "east",
86-
"flower_amount": "4"
86+
"segment_amount": "4"
8787
}
8888
},
8989
"weight": 1
@@ -93,7 +93,7 @@
9393
"Name": "floraexpansion:pine_litter",
9494
"Properties": {
9595
"facing": "south",
96-
"flower_amount": "1"
96+
"segment_amount": "1"
9797
}
9898
},
9999
"weight": 1
@@ -103,7 +103,7 @@
103103
"Name": "floraexpansion:pine_litter",
104104
"Properties": {
105105
"facing": "south",
106-
"flower_amount": "2"
106+
"segment_amount": "2"
107107
}
108108
},
109109
"weight": 1
@@ -113,7 +113,7 @@
113113
"Name": "floraexpansion:pine_litter",
114114
"Properties": {
115115
"facing": "south",
116-
"flower_amount": "3"
116+
"segment_amount": "3"
117117
}
118118
},
119119
"weight": 1
@@ -123,7 +123,7 @@
123123
"Name": "floraexpansion:pine_litter",
124124
"Properties": {
125125
"facing": "south",
126-
"flower_amount": "4"
126+
"segment_amount": "4"
127127
}
128128
},
129129
"weight": 1
@@ -133,7 +133,7 @@
133133
"Name": "floraexpansion:pine_litter",
134134
"Properties": {
135135
"facing": "west",
136-
"flower_amount": "1"
136+
"segment_amount": "1"
137137
}
138138
},
139139
"weight": 1
@@ -143,7 +143,7 @@
143143
"Name": "floraexpansion:pine_litter",
144144
"Properties": {
145145
"facing": "west",
146-
"flower_amount": "2"
146+
"segment_amount": "2"
147147
}
148148
},
149149
"weight": 1
@@ -153,7 +153,7 @@
153153
"Name": "floraexpansion:pine_litter",
154154
"Properties": {
155155
"facing": "west",
156-
"flower_amount": "3"
156+
"segment_amount": "3"
157157
}
158158
},
159159
"weight": 1
@@ -163,7 +163,7 @@
163163
"Name": "floraexpansion:pine_litter",
164164
"Properties": {
165165
"facing": "west",
166-
"flower_amount": "4"
166+
"segment_amount": "4"
167167
}
168168
},
169169
"weight": 1

‎src/generated/resources/data/minecraft/advancement/recipes/misc/stick.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_the_recipe": {
5+
"conditions": {
6+
"recipe": "minecraft:stick"
7+
},
8+
"trigger": "minecraft:recipe_unlocked"
9+
},
10+
"has_twig": {
11+
"conditions": {
12+
"items": [
13+
{
14+
"items": "floraexpansion:twig"
15+
}
16+
]
17+
},
18+
"trigger": "minecraft:inventory_changed"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_twig"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"minecraft:stick"
30+
]
31+
}
32+
}

0 commit comments

Comments
 (0)