diff --git a/src/main/generated/.cache/255077b0edcd375a36194e341290090413149a04 b/src/main/generated/.cache/255077b0edcd375a36194e341290090413149a04 index 2f2eede..6086546 100644 --- a/src/main/generated/.cache/255077b0edcd375a36194e341290090413149a04 +++ b/src/main/generated/.cache/255077b0edcd375a36194e341290090413149a04 @@ -1,9 +1,9 @@ -// 1.20.1 2024-03-07T17:05:30.627422228 Hollow/Model Definitions +// 1.20.1 2024-03-08T12:54:43.074554591 Hollow/Model Definitions 957f8f0186bb09ed323faac324b5df5f8671b02d assets/hollow/models/block/stripped_cherry_hollow_log.json dc39eb275cecfb4cdd0b15185f9a6f45ac57d158 assets/hollow/models/block/oak_hollow_log.json 551b73de8d5dab1b2e575497400b9e3fc400ba3d assets/hollow/models/block/stripped_crimson_hollow_stem_horizontal_mossy.json -fd8d6b93e356a2632b8db7a846273ab9b1737db7 assets/hollow/models/block/crimson_hollow_stem_horizontal.json f8fb852412b3e022334aacc6795077144483f412 assets/hollow/models/block/cherry_hollow_log_horizontal.json +fd8d6b93e356a2632b8db7a846273ab9b1737db7 assets/hollow/models/block/crimson_hollow_stem_horizontal.json 9d0a94b76c0c7b6b3f75db387a75890d0e11aee0 assets/hollow/models/block/oak_hollow_log_horizontal.json cfa99e86586606b530f9f5681cd0844f44c1f463 assets/hollow/models/block/stripped_dark_oak_hollow_log_horizontal_mossy.json f48c02690796da2328b2afb51a6e64ae76c8fcb2 assets/hollow/models/item/oak_hollow_log.json @@ -26,9 +26,9 @@ c8dddd382d7b95465f1bad6d39b574936c761c2e assets/hollow/blockstates/crimson_hollo eccde5d9fc0a51d3456d1cbbd861e16fe7a2ae81 assets/hollow/models/block/dark_oak_hollow_log_horizontal.json cc8a9a697fce263135c4235b3670fa87e01cb576 assets/hollow/models/item/cherry_hollow_log.json 26b0e7415c223877d641d90537bd4fe0b49d9cc6 assets/hollow/models/block/mangrove_hollow_log_horizontal.json -49c39f50a7348608a7c478d87f9459c9f951f7fc assets/hollow/models/block/dark_oak_hollow_log.json a70d2f5e26a3b6c46e7de183d8aa0b5a569065e9 assets/hollow/models/block/stripped_mangrove_hollow_log.json a9423afcf70352085e44cb7ef99081a4ae18ef2f assets/hollow/blockstates/spruce_hollow_log.json +49c39f50a7348608a7c478d87f9459c9f951f7fc assets/hollow/models/block/dark_oak_hollow_log.json 966fac768c68e11db000550af53f7777145c3356 assets/hollow/models/block/mangrove_hollow_log_horizontal_mossy.json d2b27363f222a836291843499134c1c713d8b9ce assets/hollow/models/item/stripped_acacia_hollow_log.json 82865629b9d5c538884c048ed41add5144f69959 assets/hollow/models/block/stripped_cherry_hollow_log_horizontal_mossy.json @@ -64,8 +64,8 @@ cd86780107176222b343cf348219985ea09f15eb assets/hollow/blockstates/stripped_warp 652fd2c7cb9feaa4e44ab11c54f20f4b5457a4ef assets/hollow/models/block/stripped_warped_hollow_stem.json 4bcc1729adf4485f63e9d8c2c2bc8c3142802136 assets/hollow/models/block/stripped_spruce_hollow_log_horizontal_mossy.json 05ed0b409f2fbcb0d33e8fd1d02f6366b2f5fb47 assets/hollow/models/item/stripped_birch_hollow_log.json -9cc082ce576466e8b6eba5cd3d588b4bd3bbb1f9 assets/hollow/models/block/warped_hollow_stem_horizontal.json 6d8bdfcc1c2ac268077ee949cf817556d43e1172 assets/hollow/models/block/stripped_birch_hollow_log_horizontal.json +9cc082ce576466e8b6eba5cd3d588b4bd3bbb1f9 assets/hollow/models/block/warped_hollow_stem_horizontal.json 33aa307da29031c37d791db36d04d3812dcf6910 assets/hollow/models/block/crimson_hollow_stem.json 5d63607f1d02d86294a9931e2ebc4852e2c2ba4c assets/hollow/blockstates/mangrove_hollow_log.json d7608766795e53cddecea7a956a97cc24794b895 assets/hollow/blockstates/jungle_hollow_log.json @@ -77,8 +77,8 @@ adf1da65084b7a6ff863997bc07f754171e58dca assets/hollow/models/block/stripped_war 8db731ec79548ebe7a5aa3fea3ff245e4a160377 assets/hollow/models/block/acacia_hollow_log_horizontal_mossy.json 836578f3c86b198f1ceba95c8e1141341f8c6b90 assets/hollow/models/item/jungle_hollow_log.json 61592e06109b7294c04f553a970f46a2506ae4f3 assets/hollow/models/item/stripped_dark_oak_hollow_log.json -d0178037159c2345805fb7dd255a30543bfa3cb3 assets/hollow/models/block/stripped_acacia_hollow_log_horizontal_mossy.json a21ff2ad94b2112f95c1bb9925c5e4757c3b0d59 assets/hollow/models/block/acacia_hollow_log.json +d0178037159c2345805fb7dd255a30543bfa3cb3 assets/hollow/models/block/stripped_acacia_hollow_log_horizontal_mossy.json d37c24fa00564bc4f804814d0bb9956d8e46ea1e assets/hollow/models/block/stripped_birch_hollow_log.json 11da09224c8985ed063a448b3d12ba008357a389 assets/hollow/blockstates/oak_hollow_log.json 38d91c14c8ba0e4cb7f2a10d03ddcf7d957fdae6 assets/hollow/blockstates/stripped_jungle_hollow_log.json diff --git a/src/main/generated/.cache/5163085fef8843a4e98d2aafe818dd824ef06389 b/src/main/generated/.cache/5163085fef8843a4e98d2aafe818dd824ef06389 index cfbbcf2..9421e89 100644 --- a/src/main/generated/.cache/5163085fef8843a4e98d2aafe818dd824ef06389 +++ b/src/main/generated/.cache/5163085fef8843a4e98d2aafe818dd824ef06389 @@ -1,4 +1,4 @@ -// 1.20.1 2024-03-07T17:05:30.629865198 Hollow/Block Loot Tables +// 1.20.1 2024-03-08T12:54:43.076047995 Hollow/Block Loot Tables c90504ecf85f2caac3b369f9d1d858efa61d9423 data/hollow/loot_tables/blocks/crimson_hollow_stem.json e2c52e219bd102fafe6c7ee376f05dc00a70ac46 data/hollow/loot_tables/blocks/stripped_crimson_hollow_stem.json ee5b1774f2b84542ba3a63ccf9eb0fccfaa9dc8a data/hollow/loot_tables/blocks/stripped_acacia_hollow_log.json diff --git a/src/main/generated/.cache/aaca6ffdcfde4974b2614ff416e90ad315b623dd b/src/main/generated/.cache/aaca6ffdcfde4974b2614ff416e90ad315b623dd new file mode 100644 index 0000000..27ecded --- /dev/null +++ b/src/main/generated/.cache/aaca6ffdcfde4974b2614ff416e90ad315b623dd @@ -0,0 +1,21 @@ +// 1.20.1 2024-03-08T12:54:43.076295864 Hollow/Recipes +0b3df8fc09291b1f2b14eb145201fc55b56a2e4a data/hollow/advancements/recipes/decorations/mangrove_hollow_log.json +689145296a1bdcce023a5fdbaf3f3c2b6dc0fbec data/hollow/recipes/jungle_hollow_log.json +92e83d727e60e17db788d9ae6afe9def0a100aab data/hollow/advancements/recipes/decorations/birch_hollow_log.json +abf06b668cb9e9bf36438a37efc6de0e734695ef data/hollow/advancements/recipes/decorations/acacia_hollow_log.json +7b5799e7631464a36711546b463c47d1161a48e4 data/hollow/recipes/oak_hollow_log.json +33088f2a8bfa861d2d579570821e8c4f7e61e43d data/hollow/recipes/dark_oak_hollow_log.json +85c5637f0a49ddbe39c9a5329f1ec462ea754eaf data/hollow/advancements/recipes/decorations/dark_oak_hollow_log.json +cae6219aa30560643ab69437c80ff286ddf684a6 data/hollow/recipes/warped_hollow_stem.json +7e411907b3b8902ddd1f81e1c22a16e4682a110d data/hollow/recipes/cherry_hollow_log.json +98989f3511fdd7112aa417c743a8f0a62e930859 data/hollow/recipes/birch_hollow_log.json +1bb2752afa3d97dd0dbfae1c5cf97e690a852085 data/hollow/advancements/recipes/decorations/oak_hollow_log.json +4540081a7605c5233f2b18114a21a032735f22a2 data/hollow/advancements/recipes/decorations/spruce_hollow_log.json +df39e420973087d71aab09c7037caa8c655e1fe7 data/hollow/recipes/acacia_hollow_log.json +d01e1d5778fe28f9fdb0b5302ab85d5bda97a76e data/hollow/recipes/mangrove_hollow_log.json +bdd8f6c07a5d5b6562d96b80d3c487ea7a7f599c data/hollow/advancements/recipes/decorations/crimson_hollow_stem.json +63c0a931b57db9a14446e217df0529d0c1627264 data/hollow/advancements/recipes/decorations/warped_hollow_stem.json +23c8bf8ad29a11d6eaa7b23b53e46b3ea578ed99 data/hollow/recipes/spruce_hollow_log.json +febb00bbf595008cd5aafbf8d49792a0ff8c430c data/hollow/advancements/recipes/decorations/jungle_hollow_log.json +9c4a1487380246aba5ed14b1d46bc2ffe8a1c927 data/hollow/advancements/recipes/decorations/cherry_hollow_log.json +3121705b00fb684b3b991d2306573b7ae669ea3a data/hollow/recipes/crimson_hollow_stem.json diff --git a/src/main/generated/data/hollow/advancements/recipes/decorations/acacia_hollow_log.json b/src/main/generated/data/hollow/advancements/recipes/decorations/acacia_hollow_log.json new file mode 100644 index 0000000..2cfbcaa --- /dev/null +++ b/src/main/generated/data/hollow/advancements/recipes/decorations/acacia_hollow_log.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_logs": { + "conditions": { + "items": [ + { + "tag": "minecraft:acacia_logs" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hollow:acacia_hollow_log" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hollow:acacia_hollow_log" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/hollow/advancements/recipes/decorations/birch_hollow_log.json b/src/main/generated/data/hollow/advancements/recipes/decorations/birch_hollow_log.json new file mode 100644 index 0000000..04ceb1b --- /dev/null +++ b/src/main/generated/data/hollow/advancements/recipes/decorations/birch_hollow_log.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_logs": { + "conditions": { + "items": [ + { + "tag": "minecraft:birch_logs" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hollow:birch_hollow_log" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hollow:birch_hollow_log" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/hollow/advancements/recipes/decorations/cherry_hollow_log.json b/src/main/generated/data/hollow/advancements/recipes/decorations/cherry_hollow_log.json new file mode 100644 index 0000000..ff3844d --- /dev/null +++ b/src/main/generated/data/hollow/advancements/recipes/decorations/cherry_hollow_log.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_logs": { + "conditions": { + "items": [ + { + "tag": "minecraft:cherry_logs" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hollow:cherry_hollow_log" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hollow:cherry_hollow_log" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/hollow/advancements/recipes/decorations/crimson_hollow_stem.json b/src/main/generated/data/hollow/advancements/recipes/decorations/crimson_hollow_stem.json new file mode 100644 index 0000000..8fa0c76 --- /dev/null +++ b/src/main/generated/data/hollow/advancements/recipes/decorations/crimson_hollow_stem.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_logs": { + "conditions": { + "items": [ + { + "tag": "minecraft:crimson_stems" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hollow:crimson_hollow_stem" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hollow:crimson_hollow_stem" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/hollow/advancements/recipes/decorations/dark_oak_hollow_log.json b/src/main/generated/data/hollow/advancements/recipes/decorations/dark_oak_hollow_log.json new file mode 100644 index 0000000..c9bd938 --- /dev/null +++ b/src/main/generated/data/hollow/advancements/recipes/decorations/dark_oak_hollow_log.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_logs": { + "conditions": { + "items": [ + { + "tag": "minecraft:dark_oak_logs" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hollow:dark_oak_hollow_log" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hollow:dark_oak_hollow_log" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/hollow/advancements/recipes/decorations/jungle_hollow_log.json b/src/main/generated/data/hollow/advancements/recipes/decorations/jungle_hollow_log.json new file mode 100644 index 0000000..fdc7c13 --- /dev/null +++ b/src/main/generated/data/hollow/advancements/recipes/decorations/jungle_hollow_log.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_logs": { + "conditions": { + "items": [ + { + "tag": "minecraft:jungle_logs" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hollow:jungle_hollow_log" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hollow:jungle_hollow_log" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/hollow/advancements/recipes/decorations/mangrove_hollow_log.json b/src/main/generated/data/hollow/advancements/recipes/decorations/mangrove_hollow_log.json new file mode 100644 index 0000000..e04784c --- /dev/null +++ b/src/main/generated/data/hollow/advancements/recipes/decorations/mangrove_hollow_log.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_logs": { + "conditions": { + "items": [ + { + "tag": "minecraft:mangrove_logs" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hollow:mangrove_hollow_log" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hollow:mangrove_hollow_log" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/hollow/advancements/recipes/decorations/oak_hollow_log.json b/src/main/generated/data/hollow/advancements/recipes/decorations/oak_hollow_log.json new file mode 100644 index 0000000..da37504 --- /dev/null +++ b/src/main/generated/data/hollow/advancements/recipes/decorations/oak_hollow_log.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_logs": { + "conditions": { + "items": [ + { + "tag": "minecraft:oak_logs" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hollow:oak_hollow_log" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hollow:oak_hollow_log" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/hollow/advancements/recipes/decorations/spruce_hollow_log.json b/src/main/generated/data/hollow/advancements/recipes/decorations/spruce_hollow_log.json new file mode 100644 index 0000000..5276196 --- /dev/null +++ b/src/main/generated/data/hollow/advancements/recipes/decorations/spruce_hollow_log.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_logs": { + "conditions": { + "items": [ + { + "tag": "minecraft:spruce_logs" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hollow:spruce_hollow_log" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hollow:spruce_hollow_log" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/hollow/advancements/recipes/decorations/warped_hollow_stem.json b/src/main/generated/data/hollow/advancements/recipes/decorations/warped_hollow_stem.json new file mode 100644 index 0000000..9ccb1bb --- /dev/null +++ b/src/main/generated/data/hollow/advancements/recipes/decorations/warped_hollow_stem.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_logs": { + "conditions": { + "items": [ + { + "tag": "minecraft:warped_stems" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hollow:warped_hollow_stem" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hollow:warped_hollow_stem" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/hollow/recipes/acacia_hollow_log.json b/src/main/generated/data/hollow/recipes/acacia_hollow_log.json new file mode 100644 index 0000000..0a48ac3 --- /dev/null +++ b/src/main/generated/data/hollow/recipes/acacia_hollow_log.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "tag": "minecraft:acacia_logs" + } + }, + "pattern": [ + "###", + "# #", + "###" + ], + "result": { + "count": 8, + "item": "hollow:acacia_hollow_log" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/hollow/recipes/birch_hollow_log.json b/src/main/generated/data/hollow/recipes/birch_hollow_log.json new file mode 100644 index 0000000..a98fce8 --- /dev/null +++ b/src/main/generated/data/hollow/recipes/birch_hollow_log.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "tag": "minecraft:birch_logs" + } + }, + "pattern": [ + "###", + "# #", + "###" + ], + "result": { + "count": 8, + "item": "hollow:birch_hollow_log" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/hollow/recipes/cherry_hollow_log.json b/src/main/generated/data/hollow/recipes/cherry_hollow_log.json new file mode 100644 index 0000000..ff8a250 --- /dev/null +++ b/src/main/generated/data/hollow/recipes/cherry_hollow_log.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "tag": "minecraft:cherry_logs" + } + }, + "pattern": [ + "###", + "# #", + "###" + ], + "result": { + "count": 8, + "item": "hollow:cherry_hollow_log" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/hollow/recipes/crimson_hollow_stem.json b/src/main/generated/data/hollow/recipes/crimson_hollow_stem.json new file mode 100644 index 0000000..873e819 --- /dev/null +++ b/src/main/generated/data/hollow/recipes/crimson_hollow_stem.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "tag": "minecraft:crimson_stems" + } + }, + "pattern": [ + "###", + "# #", + "###" + ], + "result": { + "count": 8, + "item": "hollow:crimson_hollow_stem" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/hollow/recipes/dark_oak_hollow_log.json b/src/main/generated/data/hollow/recipes/dark_oak_hollow_log.json new file mode 100644 index 0000000..5d4fb47 --- /dev/null +++ b/src/main/generated/data/hollow/recipes/dark_oak_hollow_log.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "tag": "minecraft:dark_oak_logs" + } + }, + "pattern": [ + "###", + "# #", + "###" + ], + "result": { + "count": 8, + "item": "hollow:dark_oak_hollow_log" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/hollow/recipes/jungle_hollow_log.json b/src/main/generated/data/hollow/recipes/jungle_hollow_log.json new file mode 100644 index 0000000..874befd --- /dev/null +++ b/src/main/generated/data/hollow/recipes/jungle_hollow_log.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "tag": "minecraft:jungle_logs" + } + }, + "pattern": [ + "###", + "# #", + "###" + ], + "result": { + "count": 8, + "item": "hollow:jungle_hollow_log" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/hollow/recipes/mangrove_hollow_log.json b/src/main/generated/data/hollow/recipes/mangrove_hollow_log.json new file mode 100644 index 0000000..2e74232 --- /dev/null +++ b/src/main/generated/data/hollow/recipes/mangrove_hollow_log.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "tag": "minecraft:mangrove_logs" + } + }, + "pattern": [ + "###", + "# #", + "###" + ], + "result": { + "count": 8, + "item": "hollow:mangrove_hollow_log" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/hollow/recipes/oak_hollow_log.json b/src/main/generated/data/hollow/recipes/oak_hollow_log.json new file mode 100644 index 0000000..17bc51b --- /dev/null +++ b/src/main/generated/data/hollow/recipes/oak_hollow_log.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "tag": "minecraft:oak_logs" + } + }, + "pattern": [ + "###", + "# #", + "###" + ], + "result": { + "count": 8, + "item": "hollow:oak_hollow_log" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/hollow/recipes/spruce_hollow_log.json b/src/main/generated/data/hollow/recipes/spruce_hollow_log.json new file mode 100644 index 0000000..f425d14 --- /dev/null +++ b/src/main/generated/data/hollow/recipes/spruce_hollow_log.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "tag": "minecraft:spruce_logs" + } + }, + "pattern": [ + "###", + "# #", + "###" + ], + "result": { + "count": 8, + "item": "hollow:spruce_hollow_log" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/hollow/recipes/warped_hollow_stem.json b/src/main/generated/data/hollow/recipes/warped_hollow_stem.json new file mode 100644 index 0000000..e2083ae --- /dev/null +++ b/src/main/generated/data/hollow/recipes/warped_hollow_stem.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "tag": "minecraft:warped_stems" + } + }, + "pattern": [ + "###", + "# #", + "###" + ], + "result": { + "count": 8, + "item": "hollow:warped_hollow_stem" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/java/dev/callmeecho/hollow/datagen/HollowDatagen.java b/src/main/java/dev/callmeecho/hollow/datagen/HollowDatagen.java index 3c9ad49..73664b7 100644 --- a/src/main/java/dev/callmeecho/hollow/datagen/HollowDatagen.java +++ b/src/main/java/dev/callmeecho/hollow/datagen/HollowDatagen.java @@ -10,5 +10,6 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { pack.addProvider(ModelProvider::new); pack.addProvider(LootTableProvider::new); + pack.addProvider(RecipeProvider::new); } } diff --git a/src/main/java/dev/callmeecho/hollow/datagen/RecipeProvider.java b/src/main/java/dev/callmeecho/hollow/datagen/RecipeProvider.java new file mode 100644 index 0000000..f5b22bd --- /dev/null +++ b/src/main/java/dev/callmeecho/hollow/datagen/RecipeProvider.java @@ -0,0 +1,46 @@ +package dev.callmeecho.hollow.datagen; + +import dev.callmeecho.cabinetapi.registry.RegistrarHandler; +import dev.callmeecho.hollow.main.block.HollowLogBlock; +import dev.callmeecho.hollow.main.registry.HollowBlockRegistry; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; +import net.minecraft.block.Block; +import net.minecraft.data.server.recipe.RecipeJsonProvider; +import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; +import net.minecraft.item.Item; +import net.minecraft.recipe.book.RecipeCategory; +import net.minecraft.registry.tag.ItemTags; +import net.minecraft.registry.tag.TagKey; + +import java.util.function.Consumer; + +public class RecipeProvider extends FabricRecipeProvider { + public RecipeProvider(FabricDataOutput output) { + super(output); + } + + @Override + public void generate(Consumer exporter) { + createHollowLogRecipe(exporter, HollowBlockRegistry.OAK_HOLLOW_LOG, ItemTags.OAK_LOGS); + createHollowLogRecipe(exporter, HollowBlockRegistry.SPRUCE_HOLLOW_LOG, ItemTags.SPRUCE_LOGS); + createHollowLogRecipe(exporter, HollowBlockRegistry.BIRCH_HOLLOW_LOG, ItemTags.BIRCH_LOGS); + createHollowLogRecipe(exporter, HollowBlockRegistry.JUNGLE_HOLLOW_LOG, ItemTags.JUNGLE_LOGS); + createHollowLogRecipe(exporter, HollowBlockRegistry.ACACIA_HOLLOW_LOG, ItemTags.ACACIA_LOGS); + createHollowLogRecipe(exporter, HollowBlockRegistry.DARK_OAK_HOLLOW_LOG, ItemTags.DARK_OAK_LOGS); + createHollowLogRecipe(exporter, HollowBlockRegistry.CRIMSON_HOLLOW_STEM, ItemTags.CRIMSON_STEMS); + createHollowLogRecipe(exporter, HollowBlockRegistry.WARPED_HOLLOW_STEM, ItemTags.WARPED_STEMS); + createHollowLogRecipe(exporter, HollowBlockRegistry.MANGROVE_HOLLOW_LOG, ItemTags.MANGROVE_LOGS); + createHollowLogRecipe(exporter, HollowBlockRegistry.CHERRY_HOLLOW_LOG, ItemTags.CHERRY_LOGS); + } + + public void createHollowLogRecipe(Consumer exporter, HollowLogBlock block, TagKey LogBlock) { + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, block, 8) + .criterion("has_logs", FabricRecipeProvider.conditionsFromTag(LogBlock)) + .input('#', LogBlock) + .pattern("###") + .pattern("# #") + .pattern("###") + .offerTo(exporter); + } +} diff --git a/src/main/java/dev/callmeecho/hollow/main/block/PolyporeBlock.java b/src/main/java/dev/callmeecho/hollow/main/block/PolyporeBlock.java index 4e25c68..3ab63e1 100644 --- a/src/main/java/dev/callmeecho/hollow/main/block/PolyporeBlock.java +++ b/src/main/java/dev/callmeecho/hollow/main/block/PolyporeBlock.java @@ -1,10 +1,7 @@ package dev.callmeecho.hollow.main.block; import dev.callmeecho.hollow.HollowTags; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Fertilizable; -import net.minecraft.block.PlantBlock; +import net.minecraft.block.*; import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemStack; import net.minecraft.registry.tag.BlockTags; @@ -15,6 +12,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.random.Random; +import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldView; @@ -23,6 +21,11 @@ public class PolyporeBlock extends PlantBlock implements Fertilizable { public static final IntProperty POLYPORE_AMOUNT = IntProperty.of("amount", 1, 3); + public static final VoxelShape SHAPE_NORTH = Block.createCuboidShape(1, 1, 8, 15, 15, 16); + public static final VoxelShape SHAPE_SOUTH = Block.createCuboidShape(1, 1, 0, 15, 15, 8); + public static final VoxelShape SHAPE_EAST = Block.createCuboidShape(0, 1, 1, 8, 15, 15); + public static final VoxelShape SHAPE_WEST = Block.createCuboidShape(8, 1, 1, 16, 15, 15); + public PolyporeBlock(Settings settings) { super(settings); setDefaultState(getDefaultState() @@ -76,6 +79,18 @@ public void grow(ServerWorld world, Random random, BlockPos pos, BlockState stat else dropStack(world, pos, new ItemStack(this)); } + @SuppressWarnings("deprecation") + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + return switch (state.get(Properties.HORIZONTAL_FACING)) { + case NORTH -> SHAPE_NORTH; + case EAST -> SHAPE_EAST; + case SOUTH -> SHAPE_SOUTH; + case WEST -> SHAPE_WEST; + default -> super.getOutlineShape(state, world, pos, context); + }; + } + @Override public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { Direction direction = state.get(Properties.HORIZONTAL_FACING); diff --git a/src/main/resources/assets/hollow/icon.png b/src/main/resources/assets/hollow/icon.png deleted file mode 100644 index 3f293d3..0000000 Binary files a/src/main/resources/assets/hollow/icon.png and /dev/null differ diff --git a/src/main/resources/assets/hollow/models/item/polypore.json b/src/main/resources/assets/hollow/models/item/polypore.json new file mode 100644 index 0000000..36ec930 --- /dev/null +++ b/src/main/resources/assets/hollow/models/item/polypore.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "hollow:item/polypore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hollow/textures/item/polypores.png b/src/main/resources/assets/hollow/textures/item/polypore.png similarity index 100% rename from src/main/resources/assets/hollow/textures/item/polypores.png rename to src/main/resources/assets/hollow/textures/item/polypore.png