Skip to content

Commit

Permalink
Add GarlandBlock
Browse files Browse the repository at this point in the history
  • Loading branch information
FirstMegaGame4 committed Jun 17, 2024
1 parent 550107b commit a42cb20
Show file tree
Hide file tree
Showing 21 changed files with 670 additions and 61 deletions.
88 changes: 45 additions & 43 deletions src/main/generated/.cache/97a4721ed155c6fdfa3ad558e447c8340a205f56

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions src/main/generated/.cache/d37a63a7993c504d0eaad0ecdd7aacdf9f76c455
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21 2024-06-17T00:01:49.8879779 Extravaganza!/Recipes
// 1.21 2024-06-17T23:04:13.0227123 Extravaganza!/Recipes
bd2e4393c47b28a8b8218e719d7c282e9ede79d8 data\extravaganza\recipe\purple_scratched_festive_rubber.json
21521f4eb0157c8b0d8b5b2fa64fddff24daf54f data\extravaganza\advancement\recipes\building_blocks\light_blue_festive_rubber_grate.json
f2bf9ea512a216af780810b0cdd6cfcaed8a3f4d data\extravaganza\advancement\recipes\building_blocks\lime_sharped_festive_rubber.json
Expand Down Expand Up @@ -36,8 +36,8 @@ fe3f44bd33789351d203b3974ceabe2d57d77115 data\extravaganza\advancement\recipes\b
10a20e09dad8491fcc956e282136128ad548c2a7 data\extravaganza\recipe\pink_scratched_festive_rubber.json
6676cc927d3e2a60cae0b377037b8bc95b35102c data\extravaganza\advancement\recipes\building_blocks\magenta_festive_rubber.json
a43b60afc43b793acf6637632d6967f9e9548f56 data\extravaganza\advancement\recipes\building_blocks\magenta_windowed_festive_rubber.json
1af3b2dc3466ab021761d34a7e73eea8d47703e6 data\extravaganza\recipe\magenta_perforated_festive_rubber.json
cdb7fa91a1c19f8d0a0b5bbfc29c797f25992bd5 data\extravaganza\recipe\lime_festive_rubber.json
1af3b2dc3466ab021761d34a7e73eea8d47703e6 data\extravaganza\recipe\magenta_perforated_festive_rubber.json
05c5425b9c36dc6cf06a773a3c86842eb673e4e3 data\extravaganza\advancement\recipes\building_blocks\black_barred_festive_rubber.json
6ed1524d8c0cda50755a55bfa3018ac88d292c2a data\extravaganza\advancement\recipes\building_blocks\tomato_slipped_festive_rubber.json
432949753566be6efaf368ddb895c60fdcabeb7f data\extravaganza\advancement\recipes\building_blocks\black_sharped_festive_rubber.json
Expand Down Expand Up @@ -101,8 +101,8 @@ ff7dc437fce94a18cea0449e988b84f81a5d771a data\extravaganza\advancement\recipes\b
6b86ffa457b1367a1735963dcee51ab8851c8664 data\extravaganza\advancement\recipes\building_blocks\lime_festive_rubber_grate.json
a827db198461a9f438ceb2ec4e286572adaf7af8 data\extravaganza\recipe\green_slipped_festive_rubber.json
e29b48aaae44f97c415789486e5ea4c3691e43dd data\extravaganza\recipe\white_striped_festive_rubber.json
6f78b584d1cd8ef5fce16453598fd675e8a614f2 data\extravaganza\advancement\recipes\building_blocks\brown_festive_rubber_grate.json
e1b60aca1725f800d15f248ec563949b03080b21 data\extravaganza\recipe\brown_curved_festive_rubber.json
6f78b584d1cd8ef5fce16453598fd675e8a614f2 data\extravaganza\advancement\recipes\building_blocks\brown_festive_rubber_grate.json
a3df349fe6c89b9c935f311832d17d12b42cdd10 data\extravaganza\recipe\blue_festive_rubber_grate.json
213da59d14fc58db396c1ace5e9e230265e38b7d data\extravaganza\recipe\green_windowed_festive_rubber.json
40cd7482b4a04d291e65f8cb2501c82d76a21931 data\extravaganza\recipe\tomato_split_festive_rubber.json
Expand All @@ -125,8 +125,8 @@ a50137a10063d83e91d1eea2b5a709539cf4e560 data\extravaganza\recipe\tear_tiled_fes
fbb989442cf83d633e79831ea7c1d77ec08a40e9 data\extravaganza\advancement\recipes\building_blocks\lime_tiled_festive_rubber.json
574483465a1c633c8eb507501ab84aaa309ba85e data\extravaganza\recipe\purple_sharped_festive_rubber.json
ccd0e519765283c11b3d4eb898a1b9d4ff23d932 data\extravaganza\advancement\recipes\building_blocks\blue_screwed_festive_rubber.json
cf7f4c052fe96bea2e9b2c8064f907c679b7c585 data\extravaganza\recipe\tomato_barred_festive_rubber.json
e17e25e5b7d84ee02b420d0000c66a0eafc179fe data\extravaganza\advancement\recipes\building_blocks\tomato_windowed_festive_rubber.json
cf7f4c052fe96bea2e9b2c8064f907c679b7c585 data\extravaganza\recipe\tomato_barred_festive_rubber.json
f796210b2f8759afdff1f15e466466c9de7f885d data\extravaganza\advancement\recipes\building_blocks\nymph_slipped_festive_rubber.json
066a7435919afa54ef8ea2eb955921df96de4afd data\extravaganza\advancement\recipes\building_blocks\orange_scratched_festive_rubber.json
bb11e200d025adb326174d7b47577b60289442f3 data\extravaganza\recipe\tear_curved_festive_rubber.json
Expand All @@ -141,8 +141,8 @@ bc1d5a417db0fc6ade10acb5cfba27ad4d00154b data\extravaganza\advancement\recipes\b
5e6e4ffaa724596cd8ee7edf45cd271578f0162c data\extravaganza\advancement\recipes\building_blocks\brown_padded_festive_rubber.json
07a5c0191f7bba4fc49c0cac5dcfea66289131ad data\extravaganza\recipe\black_striped_festive_rubber.json
28c2bc81d158f5cf96d71093c883b66ba9101934 data\extravaganza\advancement\recipes\building_blocks\nymph_scratched_festive_rubber.json
813c6038499be489a8446543a298742d5e8497eb data\extravaganza\recipe\cyan_poured_festive_rubber.json
1ba9ba30483ed1318bf85a98ef62c2b15d74f3bc data\extravaganza\recipe\brown_wooded_festive_rubber.json
813c6038499be489a8446543a298742d5e8497eb data\extravaganza\recipe\cyan_poured_festive_rubber.json
791dd51b0829e70f253688d016e06bc998ef0bfc data\extravaganza\recipe\brown_slipped_festive_rubber.json
f4079a84b126a6228244530afeb0e2915e77fca3 data\extravaganza\advancement\recipes\building_blocks\orange_tiled_festive_rubber.json
435dee86e8ef10a966e53e0edf7166d769980759 data\extravaganza\advancement\recipes\building_blocks\yellow_barred_festive_rubber.json
Expand Down Expand Up @@ -236,8 +236,8 @@ ef186ae8f0fa1630933e658f5371fa2550e41fc9 data\extravaganza\advancement\recipes\b
b150ae09bbfbc54d1c17bf9ea5df449e30b29b85 data\extravaganza\recipe\orange_padded_festive_rubber.json
6b89ebbcaf72e1da2215a4a8fc80bf44761d100a data\extravaganza\recipe\black_festive_rubber_grate.json
10da1365a63f43b09b2e671ab4487dca897aeca6 data\extravaganza\advancement\recipes\building_blocks\lime_dotted_festive_rubber.json
1f72c3cd3941763bd091d3a8528a564fc1891f89 data\extravaganza\recipe\nymph_dotted_festive_rubber.json
29bace3e5069325339eb72ca7b3a732668837019 data\extravaganza\recipe\nymph_tiled_festive_rubber.json
1f72c3cd3941763bd091d3a8528a564fc1891f89 data\extravaganza\recipe\nymph_dotted_festive_rubber.json
c232e7e3e6c0791ae268233d5a2a32e954d0ddf7 data\extravaganza\advancement\recipes\building_blocks\light_gray_sharped_festive_rubber.json
8293ee518b66d750436a2e74020cdb23035cf4c1 data\extravaganza\recipe\gray_slipped_festive_rubber.json
27b270b9661dd289d12eca5074f53955bf1344c0 data\extravaganza\advancement\recipes\building_blocks\light_blue_poured_festive_rubber.json
Expand Down Expand Up @@ -448,8 +448,8 @@ ebb9b1debdce7ec3973062dffbe2af56d23d8fc8 data\extravaganza\recipe\tear_barred_fe
0009817b0203d3d99dd6e16ca311e7a5ea505d34 data\extravaganza\advancement\recipes\building_blocks\light_blue_dotted_festive_rubber.json
211748dba3cd6ff9896fb1b52ef6a4862c488a73 data\extravaganza\recipe\lime_padded_festive_rubber.json
e9c8687686e54a1c700c8115b77ddead7b69bff5 data\extravaganza\advancement\recipes\building_blocks\cyan_screwed_festive_rubber.json
d456c679f8f187c23e2ca2acb316b139ae0ebdd7 data\extravaganza\advancement\recipes\building_blocks\light_gray_barred_festive_rubber.json
0a9567956b1dcfd90ecce83e5ccc4522fa9ecf4f data\extravaganza\advancement\recipes\building_blocks\light_gray_split_festive_rubber.json
d456c679f8f187c23e2ca2acb316b139ae0ebdd7 data\extravaganza\advancement\recipes\building_blocks\light_gray_barred_festive_rubber.json
74484a617231a71f821fd1e9ebb6066a4cd7bd48 data\extravaganza\advancement\recipes\building_blocks\magenta_dotted_festive_rubber.json
e2538d8bdd6f26fa35ac97d2be8c450fc98c9f11 data\extravaganza\advancement\recipes\building_blocks\tomato_padded_festive_rubber.json
7d5384935b94af14c992e591594beabfddb526a8 data\extravaganza\advancement\recipes\building_blocks\cyan_windowed_festive_rubber.json
Expand Down Expand Up @@ -524,16 +524,16 @@ d9109f345496f755810f629b9c8b031bc08a351a data\extravaganza\recipe\light_blue_spl
d7a04f9dbc378ef7f91483836ba7616c80472dfa data\extravaganza\recipe\green_festive_rubber_grate.json
acfd695fef5194e2894e49f307dde971450c382a data\extravaganza\advancement\recipes\building_blocks\tear_scratched_festive_rubber.json
448f972d54f235adcdfdeadc8fdd9e82af9578a7 data\extravaganza\recipe\blue_festive_rubber.json
1b98de179c1da2d45abaa95b1f10dc08a42e2f4b data\extravaganza\advancement\recipes\building_blocks\lime_perforated_festive_rubber.json
eebe10f7f398e6f19a6b4d264e877b0361021597 data\extravaganza\recipe\lime_windowed_festive_rubber.json
1b98de179c1da2d45abaa95b1f10dc08a42e2f4b data\extravaganza\advancement\recipes\building_blocks\lime_perforated_festive_rubber.json
9c320417f0705690e41fd177c56d455dbbb9e44e data\extravaganza\advancement\recipes\building_blocks\green_curved_festive_rubber.json
78dd7b8fdad82680b5b348bed7b637d45932adb6 data\extravaganza\recipe\plant_windowed_festive_rubber.json
dca71368987251f429e057dae0c77878d67b2f3f data\extravaganza\advancement\recipes\building_blocks\cyan_festive_rubber.json
4cda7e419abc57df9e7eca4ecdf31bd4ca19d498 data\extravaganza\recipe\light_gray_festive_rubber.json
7e395819c0e98da79ca174b84c3dba01f41c6592 data\extravaganza\advancement\recipes\building_blocks\blue_split_festive_rubber.json
905f7f0c41d95afbf819442d1dd9fac04e39e655 data\extravaganza\recipe\white_curved_festive_rubber.json
fee983a4083fb1dc28a0e5a3f9e98ef57dfb4874 data\extravaganza\advancement\recipes\building_blocks\orange_dotted_festive_rubber.json
001ddb7760ee1646658efe15125b3dadb60cbf06 data\extravaganza\advancement\recipes\building_blocks\orange_poured_festive_rubber.json
fee983a4083fb1dc28a0e5a3f9e98ef57dfb4874 data\extravaganza\advancement\recipes\building_blocks\orange_dotted_festive_rubber.json
bfa7ec87c4d198006960c8e1989dd43159018a94 data\extravaganza\advancement\recipes\building_blocks\orange_perforated_festive_rubber.json
0e63ec306397147ce34a3d73cb78e38e906f6877 data\extravaganza\advancement\recipes\building_blocks\plant_screwed_festive_rubber.json
5249ff4b060532359eaadcbe553bc66d03f0a4e1 data\extravaganza\advancement\recipes\building_blocks\blue_festive_rubber_grate.json
Expand All @@ -543,8 +543,8 @@ bfa7ec87c4d198006960c8e1989dd43159018a94 data\extravaganza\advancement\recipes\b
7501a7d684a8ecd24168661ea2c168aed74ccdad data\extravaganza\recipe\white_poured_festive_rubber.json
9f650ba0476631fa0380181b06557cb0dd3c3b1c data\extravaganza\recipe\light_blue_padded_festive_rubber.json
7bb4c7a1db771cf7bc3d52f0d43f25034b7fe037 data\extravaganza\advancement\recipes\building_blocks\yellow_poured_festive_rubber.json
da1abd6be70dcbd0fa4bad376b7940aaa3f9fab5 data\extravaganza\advancement\recipes\building_blocks\purple_barred_festive_rubber.json
ba74d995c7532622e3df8e04afcadeba2a84308a data\extravaganza\advancement\recipes\building_blocks\purple_split_festive_rubber.json
da1abd6be70dcbd0fa4bad376b7940aaa3f9fab5 data\extravaganza\advancement\recipes\building_blocks\purple_barred_festive_rubber.json
714361cff4ab2cc3e5b2302b38090bf0f9c0d640 data\extravaganza\advancement\recipes\building_blocks\brown_festive_rubber.json
3365bb6bd2c5eea95a450b348cd49dcfc1fa4d84 data\extravaganza\recipe\green_perforated_festive_rubber.json
89835ae1845cdb2a1f075303604580895629fbd6 data\extravaganza\advancement\recipes\building_blocks\purple_curved_festive_rubber.json
Expand Down Expand Up @@ -709,5 +709,5 @@ a96535299ad0b635596e9840ebb639a9c03a2029 data\extravaganza\advancement\recipes\b
d63fb69c1c3740a9c6269d3940618415a42560d1 data\extravaganza\recipe\purple_barred_festive_rubber.json
2d27fd9e5b23eee4fca3576b43e155ae55ec5552 data\extravaganza\recipe\green_curved_festive_rubber.json
8b8620d41e9aaa6b939c2ca5349c28b93d84d647 data\extravaganza\recipe\red_barred_festive_rubber.json
f3602d74259d7abedbddb81151b425148a13e737 data\extravaganza\recipe\lime_wooded_festive_rubber.json
c2537c50f7cb9ebea1462fcbf3e77f3621b1e3e4 data\extravaganza\advancement\recipes\building_blocks\lime_screwed_festive_rubber.json
f3602d74259d7abedbddb81151b425148a13e737 data\extravaganza\recipe\lime_wooded_festive_rubber.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21 2024-06-17T00:01:49.8869773 Extravaganza!/Language (en_us)
724452bbe679c89b0bda839b487d04fdda6a23a5 assets\extravaganza\lang\en_us.json
// 1.21 2024-06-17T23:04:13.0211809 Extravaganza!/Language (en_us)
124a09de090360547560443ecfb77a5d1e70dbf6 assets\extravaganza\lang\en_us.json
193 changes: 193 additions & 0 deletions src/main/generated/assets/extravaganza/blockstates/garland.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
{
"multipart": [
{
"apply": {
"model": "extravaganza:block/garland"
},
"when": {
"OR": [
{
"AND": [
{
"up": "false"
},
{
"down": "false"
},
{
"north": "false"
},
{
"south": "false"
},
{
"west": "false"
},
{
"east": "false"
}
]
},
{
"OR": [
{
"up": "true"
},
{
"down": "true"
},
{
"north": "true"
},
{
"south": "true"
}
]
}
]
}
},
{
"apply": {
"model": "extravaganza:block/garland_horizontal"
},
"when": {
"OR": [
{
"AND": [
{
"up": "false"
},
{
"down": "false"
},
{
"north": "false"
},
{
"south": "false"
},
{
"west": "false"
},
{
"east": "false"
}
]
},
{
"OR": [
{
"north": "true"
},
{
"south": "true"
},
{
"west": "true"
},
{
"east": "true"
}
]
}
]
}
},
{
"apply": {
"model": "extravaganza:block/garland_vertical"
},
"when": {
"OR": [
{
"AND": [
{
"up": "false"
},
{
"down": "false"
},
{
"north": "false"
},
{
"south": "false"
},
{
"west": "false"
},
{
"east": "false"
}
]
},
{
"OR": [
{
"up": "true"
},
{
"down": "true"
},
{
"west": "true"
},
{
"east": "true"
}
]
}
]
}
},
{
"apply": {
"model": "extravaganza:block/garland_up"
},
"when": {
"up": "true"
}
},
{
"apply": {
"model": "extravaganza:block/garland_down"
},
"when": {
"down": "true"
}
},
{
"apply": {
"model": "extravaganza:block/garland_north"
},
"when": {
"north": "true"
}
},
{
"apply": {
"model": "extravaganza:block/garland_south"
},
"when": {
"south": "true"
}
},
{
"apply": {
"model": "extravaganza:block/garland_west"
},
"when": {
"west": "true"
}
},
{
"apply": {
"model": "extravaganza:block/garland_east"
},
"when": {
"east": "true"
}
}
]
}
1 change: 1 addition & 0 deletions src/main/generated/assets/extravaganza/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@
"block.extravaganza.cyan_wooded_festive_rubber_slab": "Cyan Wooded Festive Rubber Slab",
"block.extravaganza.cyan_wooded_festive_rubber_stairs": "Cyan Wooded Festive Rubber Stairs",
"block.extravaganza.cyan_wooded_festive_rubber_wall": "Cyan Wooded Festive Rubber Wall",
"block.extravaganza.garland": "Garland",
"block.extravaganza.gray_barred_festive_rubber": "Gray Barred Festive Rubber",
"block.extravaganza.gray_barred_festive_rubber_slab": "Gray Barred Festive Rubber Slab",
"block.extravaganza.gray_barred_festive_rubber_stairs": "Gray Barred Festive Rubber Stairs",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "extravaganza:block/garland"
}
Loading

0 comments on commit a42cb20

Please sign in to comment.