Skip to content

Commit

Permalink
Fix configured and placed features
Browse files Browse the repository at this point in the history
  • Loading branch information
BluSpring committed Oct 8, 2024
1 parent 36f5530 commit 192e349
Show file tree
Hide file tree
Showing 27 changed files with 633 additions and 48 deletions.
13 changes: 13 additions & 0 deletions src/main/generated/.cache/1ae941217ce91c1874fbabd818cae16d4c1510bf
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// 1.21.1 2024-10-08T20:38:49.295845 Witches' Kitchen/Witches' Kitchen World Generator
e2492595f177dc6eee772138b607850d37bb6646 data\witcheskitchen\worldgen\placed_feature\juniper_tree.json
fc0f943c9033cdb89283fe7ee2d13d8063776656 data\witcheskitchen\worldgen\placed_feature\rowan_tree.json
efca93f1455f8eeadf8fb2f8542f28000d3b7918 data\witcheskitchen\worldgen\configured_feature\juniper_tree.json
e8f303d61eb791fdc4a3fab3fe17551a6cabb313 data\witcheskitchen\worldgen\placed_feature\blackthorn_tree.json
b5dff696b88e6dbd72404c108492e2d21ef39989 data\witcheskitchen\worldgen\configured_feature\elder_tree.json
ce33bba89504fe4e836a8f9b63a829aea0538d4f data\witcheskitchen\worldgen\configured_feature\blackthorn_tree.json
942ea816a0554eb472125ec7801c6ae7034d285a data\witcheskitchen\worldgen\placed_feature\sumac_tree.json
31b2e02a9f7f1044b33425fddf7fc0b64177442d data\witcheskitchen\worldgen\configured_feature\hawthorn_tree.json
f42249d9e8f826024c749949c4ee002c3bcd73e6 data\witcheskitchen\worldgen\configured_feature\sumac_tree.json
4ba35bab2cd93e7e09a35f57f8bb8c50f99cca92 data\witcheskitchen\worldgen\placed_feature\hawthorn_tree.json
f23a450083de6ce83852cfb15404e9265fed21f6 data\witcheskitchen\worldgen\configured_feature\rowan_tree.json
a32191dc9823ead60520cff097018f138d64f03c data\witcheskitchen\worldgen\placed_feature\elder_tree.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// 1.21.1 2024-10-08T19:46:16.4756767 Witches' Kitchen/Tags for minecraft:entity_type
// 1.21.1 2024-10-08T20:38:49.3019388 Witches' Kitchen/Tags for minecraft:entity_type
ec32a92581623c2e52125b2ab4eb2ab7f784f0b5 data\witcheskitchen\tags\entity_type\ghost.json
02b6a7799286f073bd43ecf20b3eab2e16d73deb data\witcheskitchen\tags\entity_type\taglock_blacklist.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\witcheskitchen\tags\entity_type\lesser_demon.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\witcheskitchen\tags\entity_type\left_hand_witch_summon.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\witcheskitchen\tags\entity_type\lesser_demon.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\witcheskitchen\tags\entity_type\greater_demon.json
ec32a92581623c2e52125b2ab4eb2ab7f784f0b5 data\minecraft\tags\entity_type\undead.json
a9baf338bbce5135f6fecadea03379c613576dd2 data\witcheskitchen\tags\entity_type\demonic.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-10-08T19:46:16.4691583 Witches' Kitchen/Model Definitions
// 1.21.1 2024-10-08T20:38:49.2963444 Witches' Kitchen/Model Definitions
afa595ea282f2be5b0b5121425a8df447b9caaab assets\witcheskitchen\models\block\rowan_door_bottom_left.json
86572424adb5e26b1865579a46eca3491d6b3a7f assets\witcheskitchen\models\block\hawthorn_pressure_plate_down.json
980abc35cf150292f1f9300a03e05be8f6254812 assets\witcheskitchen\models\block\elder_door_top_right.json
Expand Down Expand Up @@ -93,8 +93,8 @@ f71f08a2de90f061ca570bb6c225af01d772d212 assets\witcheskitchen\models\block\juni
8231be2913ab33333e90eb9a1b3a3f77a1104d12 assets\witcheskitchen\models\block\rowan_fence_gate_wall_open.json
2d12d9a4022d7539cfe2efc4cdf38f338a67b0ed assets\witcheskitchen\models\block\rowan_fence_gate_wall.json
4c4348cd8ad9d70ae9a3a5ee161e9baafe7761e1 assets\witcheskitchen\models\block\hawthorn_fence_gate_wall.json
49e8bf3bebc6b464dac901798e51a00e3550c185 assets\witcheskitchen\blockstates\juniper_fence_gate.json
9ed37606c52bb0758eb68e66105b15d914eefa39 assets\witcheskitchen\blockstates\hawthorn_fence.json
49e8bf3bebc6b464dac901798e51a00e3550c185 assets\witcheskitchen\blockstates\juniper_fence_gate.json
aa768aaac71316f81b98f5ec1b9747911ec6335a assets\witcheskitchen\models\item\curse_of_midas_bundle.json
644f217ae2c0419688dee8d50c420a5be4214172 assets\witcheskitchen\blockstates\hawthorn_fence_gate.json
3ea77efeff3398b49d9591a8a93728f4c37378cb assets\witcheskitchen\models\block\blackthorn_stairs_inner.json
Expand All @@ -117,8 +117,8 @@ bdc718785a16512e07f26c877a5f6348688a934d assets\witcheskitchen\models\block\blac
09b5c83f8d7623337c796613e2448847887e7835 assets\witcheskitchen\blockstates\elder_leaves.json
4fcb739acc77525912360595b9bc00628484e681 assets\witcheskitchen\models\item\st_johns_wort_seeds.json
b7d08890318995d75716ca8507485ff7e3f0ea84 assets\witcheskitchen\blockstates\sumac_sapling.json
9e65b635722eb6fb2c6be865cd8e8aa30bc272aa assets\witcheskitchen\models\item\misplacement_bundle.json
d66dc69b243824090eca067c0bfe5129bc207bba assets\witcheskitchen\blockstates\potted_rowan_sapling.json
9e65b635722eb6fb2c6be865cd8e8aa30bc272aa assets\witcheskitchen\models\item\misplacement_bundle.json
38b45b8ca2a036a33776c5c3d0d566921651bd59 assets\witcheskitchen\models\block\juniper_door_top_left.json
0367a91613e7ee4175e405be3a8a160a7d3ad363 assets\witcheskitchen\models\block\sumac_button_pressed.json
a0b3d977fcbba672d31040a9fb84df7a74e33ad2 assets\witcheskitchen\models\item\juniper_mead.json
Expand Down Expand Up @@ -240,8 +240,8 @@ b66f3ae5d94a1b0d548a85a2ef13e932b7c92987 assets\witcheskitchen\blockstates\sumac
91db997415d806bac4f8ad20df7078c695f6233c assets\witcheskitchen\models\block\blackthorn_door_top_right_open.json
9a0cd42b069f32835d09a1f6702e8a51ea2cbcd3 assets\witcheskitchen\models\block\rowan_slab_top.json
2239cfc19c81e243bb8ab066231266b505fca720 assets\witcheskitchen\models\item\tea_leaf.json
db62d8e7e4e5cacb4897cb062ea9d0e218565555 assets\witcheskitchen\blockstates\potted_elder_sapling.json
a15ef5821259fb3314fa7453867cc4c3a7908eb7 assets\witcheskitchen\blockstates\rowan_leaves.json
db62d8e7e4e5cacb4897cb062ea9d0e218565555 assets\witcheskitchen\blockstates\potted_elder_sapling.json
154576bda9a516751e00138d744bd527e792c769 assets\witcheskitchen\models\block\sumac_door_bottom_right.json
f4b0aec761967e98412f4f1c6d33a8f8691fe6b9 assets\witcheskitchen\models\item\hawthorn_berries.json
055ff5dfda3fff360ff61a5ea53d512580daacae assets\witcheskitchen\models\item\stripped_rowan_wood.json
Expand Down Expand Up @@ -277,8 +277,8 @@ b6c1bdc35ee111a961bbd9173d960e6935d8c946 assets\witcheskitchen\models\item\yarro
b7408989fb6ab12405d87530754943e8026d5d9c assets\witcheskitchen\models\item\elder_fence.json
a34efeeb1c9ed7cd3c1f33be998d08214c29bacc assets\witcheskitchen\models\block\blackthorn_pressure_plate.json
f16281e30780f994c36262d332e8d2bc51e29494 assets\witcheskitchen\models\block\stripped_rowan_log_horizontal.json
41c196559e53a2b0f6789c44c2fe9ec11308d8f8 assets\witcheskitchen\blockstates\rowan_sapling.json
d4f7c0bc4ccef5f000a3e4e1a1eaed521a73f5d8 assets\witcheskitchen\models\item\briar_hips.json
41c196559e53a2b0f6789c44c2fe9ec11308d8f8 assets\witcheskitchen\blockstates\rowan_sapling.json
b9e85b02dd5cfa12b2b7e99156e9489de6c9cddc assets\witcheskitchen\models\item\blackthorn_leaves.json
daac9b5f623871ba8b875073c5d2e43d673d7dec assets\witcheskitchen\models\block\stripped_sumac_log.json
fe5fbe1458a647e88d4f73da10867ae996a5483d assets\witcheskitchen\models\block\rowan_fence_post.json
Expand Down Expand Up @@ -308,8 +308,8 @@ d20221b3510709d77ed6c347472756682886a24d assets\witcheskitchen\models\block\elde
edd6fb671515b219899f26e2a6f07f5615e86898 assets\witcheskitchen\models\block\elder_stairs_inner.json
46ea2c06eb31ff4c96c5f212cff1e0bc37edd486 assets\witcheskitchen\models\block\elder_door_top_right_open.json
34fabb8df5e536bbd5356c6216a54ffe9a016b13 assets\witcheskitchen\models\item\sumac_stairs.json
1003912b27b2dc78b103d66ca4e0fc28f3bd6e60 assets\witcheskitchen\models\item\hawthorn_planks.json
f317c7ddca4e462d07d8957e4b8bdf1046d7fc02 assets\witcheskitchen\blockstates\sumac_leaves.json
1003912b27b2dc78b103d66ca4e0fc28f3bd6e60 assets\witcheskitchen\models\item\hawthorn_planks.json
0bc9159549269bcb9379f2d1872222cf33a943c0 assets\witcheskitchen\blockstates\sumac_fence_gate.json
9b33f9fcc53c3e5977f83a6ceaaf302fb3f78255 assets\witcheskitchen\models\block\rowan_fence_inventory.json
51c1a44418dcf25922b93ac9aaf92f6db79c2acf assets\witcheskitchen\models\item\amaranth_seeds.json
Expand Down Expand Up @@ -418,8 +418,8 @@ c1042c26247d4964bac682286fe841ef07d2d2df assets\witcheskitchen\blockstates\potte
caee79a4c41521ea9bbb8062e47698977d905b0a assets\witcheskitchen\blockstates\stripped_hawthorn_wood.json
e1996bb556097c7c1069b7c6cd37fb207323c349 assets\witcheskitchen\models\block\rowan_pressure_plate_down.json
e16ca645ab17af0c98cce8218580c258c9ae4da9 assets\witcheskitchen\models\item\hellebore_seeds.json
bc1f9326857f7eee4f83aa8dc44f4fa217662124 assets\witcheskitchen\blockstates\stripped_juniper_wood.json
ca0ae40050ad1b8befc6b6d9b7b5ce29ad48f596 assets\witcheskitchen\blockstates\blackthorn_wood.json
bc1f9326857f7eee4f83aa8dc44f4fa217662124 assets\witcheskitchen\blockstates\stripped_juniper_wood.json
852af9c41da79bfe9b41af9aba54de05b1d45f90 assets\witcheskitchen\models\item\belladonna_blossom.json
1a923bad06431c1080e2b80ecb94affb5fd63ccc assets\witcheskitchen\blockstates\blackthorn_planks.json
5e54161efb55db5d033c288cf64170e6dd9dc75d assets\witcheskitchen\blockstates\stripped_sumac_log.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21.1 2024-10-08T19:46:16.4691583 Witches' Kitchen/Advancements
// 1.21.1 2024-10-08T20:38:49.2953429 Witches' Kitchen/Advancements
9e9b2c685d8dc2e2c6d8d9a968060048c0b0ed0e data\witcheskitchen\advancement\witcheskitchen\root.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
// 1.21.1 2024-10-08T19:46:16.4691583 Witches' Kitchen/minecraft:entity Loot Table
// 1.21.1 2024-10-08T20:38:49.295845 Witches' Kitchen/minecraft:entity Loot Table
Original file line number Diff line number Diff line change
@@ -1 +1 @@
// 1.21.1 2024-10-08T19:46:16.4751766 Witches' Kitchen/Recipes
// 1.21.1 2024-10-08T20:38:49.3004263 Witches' Kitchen/Recipes
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-10-08T19:46:16.4751766 Witches' Kitchen/Tags for minecraft:item
// 1.21.1 2024-10-08T20:38:49.3019388 Witches' Kitchen/Tags for minecraft:item
119505af436fca5784bb5847cefd09b10cd6aa62 data\witcheskitchen\tags\item\barrel_blacklist.json
f470b0889459fb2d48176e69995c70ce18aa66ea data\witcheskitchen\tags\item\resets_cauldron.json
76dcda69909e8a61917464444183968364df5046 data\minecraft\tags\item\planks.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21.1 2024-10-08T19:46:16.4741764 Witches' Kitchen/Language (en_us)
// 1.21.1 2024-10-08T20:38:49.3004263 Witches' Kitchen/Language (en_us)
596c86d9f4597897cd56162918cb4dbf5aa7fa10 assets\witcheskitchen\lang\en_us.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
// 1.21.1 2024-10-08T19:46:16.4686577 Witches' Kitchen/Block Loot Tables
// 1.21.1 2024-10-08T20:38:49.2948438 Witches' Kitchen/Block Loot Tables
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-10-08T19:46:16.4751766 Witches' Kitchen/Tags for minecraft:block
// 1.21.1 2024-10-08T20:38:49.3014311 Witches' Kitchen/Tags for minecraft:block
8dd843e7fc8a32c4d8133f4ece5677b748bffaf2 data\minecraft\tags\block\leaves.json
b9b5856834f1471f60d0531fdcdd6d7ee474e65b data\minecraft\tags\block\mineable\axe.json
8b216aa440251a8eca91705ff9a7afefeade602f data\minecraft\tags\block\mineable\pickaxe.json
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"type": "minecraft:tree",
"config": {
"decorators": [],
"dirt_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:dirt"
}
},
"foliage_placer": {
"type": "minecraft:blob_foliage_placer",
"height": 3,
"offset": 0,
"radius": 2
},
"foliage_provider": {
"type": "minecraft:weighted_state_provider",
"entries": [
{
"data": {
"Name": "witcheskitchen:blackthorn_leaves",
"Properties": {
"distance": "7",
"persistent": "false",
"waterlogged": "false"
}
},
"weight": 1
}
]
},
"force_dirt": false,
"ignore_vines": true,
"minimum_size": {
"type": "minecraft:two_layers_feature_size",
"limit": 1,
"lower_size": 0,
"upper_size": 1
},
"trunk_placer": {
"type": "minecraft:straight_trunk_placer",
"base_height": 4,
"height_rand_a": 2,
"height_rand_b": 0
},
"trunk_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "witcheskitchen:blackthorn_log",
"Properties": {
"axis": "y"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"type": "minecraft:tree",
"config": {
"decorators": [],
"dirt_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:dirt"
}
},
"foliage_placer": {
"type": "minecraft:blob_foliage_placer",
"height": 3,
"offset": 0,
"radius": 2
},
"foliage_provider": {
"type": "minecraft:weighted_state_provider",
"entries": [
{
"data": {
"Name": "witcheskitchen:elder_leaves",
"Properties": {
"distance": "7",
"persistent": "false",
"waterlogged": "false"
}
},
"weight": 1
}
]
},
"force_dirt": false,
"ignore_vines": true,
"minimum_size": {
"type": "minecraft:two_layers_feature_size",
"limit": 1,
"lower_size": 0,
"upper_size": 1
},
"trunk_placer": {
"type": "minecraft:straight_trunk_placer",
"base_height": 8,
"height_rand_a": 4,
"height_rand_b": 0
},
"trunk_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "witcheskitchen:elder_log",
"Properties": {
"axis": "y"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"type": "minecraft:tree",
"config": {
"decorators": [],
"dirt_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:dirt"
}
},
"foliage_placer": {
"type": "minecraft:random_spread_foliage_placer",
"foliage_height": 2,
"leaf_placement_attempts": 50,
"offset": 0,
"radius": 3
},
"foliage_provider": {
"type": "minecraft:weighted_state_provider",
"entries": [
{
"data": {
"Name": "witcheskitchen:hawthorn_leaves",
"Properties": {
"distance": "7",
"persistent": "false",
"waterlogged": "false"
}
},
"weight": 1
}
]
},
"force_dirt": false,
"ignore_vines": true,
"minimum_size": {
"type": "minecraft:two_layers_feature_size",
"limit": 1,
"lower_size": 0,
"upper_size": 1
},
"trunk_placer": {
"type": "minecraft:bending_trunk_placer",
"base_height": 5,
"bend_length": {
"type": "minecraft:uniform",
"max_inclusive": 2,
"min_inclusive": 1
},
"height_rand_a": 2,
"height_rand_b": 0,
"min_height_for_leaves": 3
},
"trunk_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "witcheskitchen:hawthorn_log",
"Properties": {
"axis": "y"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"type": "minecraft:tree",
"config": {
"decorators": [],
"dirt_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "minecraft:dirt"
}
},
"foliage_placer": {
"type": "minecraft:blob_foliage_placer",
"height": 3,
"offset": 0,
"radius": 2
},
"foliage_provider": {
"type": "minecraft:weighted_state_provider",
"entries": [
{
"data": {
"Name": "witcheskitchen:juniper_leaves",
"Properties": {
"distance": "7",
"persistent": "false",
"waterlogged": "false"
}
},
"weight": 1
}
]
},
"force_dirt": false,
"ignore_vines": true,
"minimum_size": {
"type": "minecraft:two_layers_feature_size",
"limit": 2,
"lower_size": 0,
"upper_size": 1
},
"trunk_placer": {
"type": "minecraft:straight_trunk_placer",
"base_height": 4,
"height_rand_a": 8,
"height_rand_b": 0
},
"trunk_provider": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "witcheskitchen:juniper_log",
"Properties": {
"axis": "y"
}
}
}
}
}
Loading

0 comments on commit 192e349

Please sign in to comment.