Skip to content

Commit 98ea85d

Browse files
committed
4.0 finished i think
1 parent cdf7a5d commit 98ea85d

33 files changed

+214
-67
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21 2025-01-21T12:32:58.3810941 PooSMP Mod/
1+
// 1.21 2025-01-22T12:34:18.5213867 PooSMP Mod/
22
57275e39669502ecbbceb027479807c905561876 data\poosmp\worldgen\configured_feature\pale_moss_vegetation.json
33
e2fe5530afa33c4b4a453c992f769de0a5f1d13a data\poosmp\worldgen\configured_feature\pale_moss_patch_bonemeal.json
44
d3fb16fb5604e8b0e4bba6bd08ca3f279f873859 data\poosmp\worldgen\configured_feature\pale_oak.json

src/main/generated/.cache/698cf1bacd22dabd3bdf00cd17201a304fc9aadc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// 1.21 2025-01-21T12:32:58.3779305 PooSMP Mod/Recipes
1+
// 1.21 2025-01-22T12:34:18.5184077 PooSMP Mod/Recipes
22
2cc91effa28b45bea6c0fba4e3dbc4bdbb788e28 data\poosmp\advancement\recipes\redstone\pale_oak_fence_gate.json
33
809f1f9c6556e993d5ffd22d80d592bf369ced6c data\poosmp\recipe\stripped_pale_oak_wood.json
44
6d13aec7b4b4dd58ed40771a5812a86565b6d586 data\poosmp\advancement\recipes\building_blocks\pale_oak_wood.json
55
3ed1ec38aa36ae618483f0f40654184a9a40868c data\poosmp\advancement\recipes\building_blocks\resin_brick_stairs_from_resin_bricks_stonecutting.json
66
8a2d99e925a8d618c35c6a1410fb8340d06fa37e data\poosmp\recipe\pale_oak_slab.json
7+
710def615c2ae6285d961133ad19b42ee993eb66 data\poosmp\recipe\pale_oak_button.json
78
78beafa930fc252dd6d829b4398af888a739e509 data\poosmp\advancement\recipes\building_blocks\pale_oak_planks.json
89
ee17332df304d39c84d12c5c27396e0f987238b3 data\poosmp\advancement\recipes\building_blocks\resin_brick_stairs.json
910
de5c4aec3039cc4e3920b732afb05ad552c5698c data\poosmp\recipe\pale_oak_stairs.json
@@ -14,10 +15,12 @@ be521db7b6105d1379ec3e035bab5db87c321edf data\poosmp\recipe\resin_brick_stairs.j
1415
4dc38e958b12a9da393874471350499a9a797d0c data\poosmp\advancement\recipes\building_blocks\poop_brick_slab.json
1516
affa77662d6f3d5be3b41c54f2bde42b9d461f0f data\poosmp\advancement\recipes\building_blocks\poop_brick_stairs.json
1617
2f89b4e486fd122f7d9633b9092626ec49ebb5b2 data\poosmp\advancement\recipes\redstone\pale_oak_trapdoor.json
17-
c272617732072ce6eaa6ab5515a400f31f386fac data\poosmp\recipe\chiseled_resin_bricks.json
1818
8e33f736a5327b7259433ec490c8424a856c3944 data\poosmp\recipe\resin_brick_slab.json
19+
c272617732072ce6eaa6ab5515a400f31f386fac data\poosmp\recipe\chiseled_resin_bricks.json
1920
6482108d120cbee02efda3f87985ffde51185382 data\poosmp\recipe\resin_brick_wall_from_resin_bricks_stonecutting.json
21+
b7d298cf845960e019fd213fe184e1074210c3ea data\poosmp\advancement\recipes\redstone\pale_oak_button.json
2022
81115f4a4ea5ec638d01a6bb8076a0b06791517f data\poosmp\advancement\recipes\building_blocks\chiseled_resin_bricks_from_resin_bricks_stonecutting.json
23+
b813a25151985c39c818459b153621bd453b8293 data\poosmp\advancement\recipes\redstone\pale_oak_pressure_plate.json
2124
81a35a4577a7128df7dcbbca75663b59d43f8c06 data\poosmp\advancement\recipes\building_blocks\pale_oak_slab.json
2225
a39377e8b49bee60dc1d25478c9b0e251bc303cf data\poosmp\advancement\recipes\redstone\pale_oak_door.json
2326
0f53e2d35de3f33378e1296637277b320cb6d12b data\poosmp\recipe\resin_brick_stairs_from_resin_bricks_stonecutting.json
@@ -31,6 +34,7 @@ e8f986a41c69c82a655a3a68a2665506ebab84f0 data\poosmp\advancement\recipes\buildin
3134
8183a7b3d2733692ffd0f650b6ca774a0bf0f61c data\poosmp\advancement\recipes\building_blocks\resin_brick_wall.json
3235
b9dca973ddadc55452bcbe820387ade842fb2a18 data\poosmp\recipe\pale_oak_fence.json
3336
f8f9dc53c9c03e90d9a17be007841a009c52930e data\poosmp\advancement\recipes\building_blocks\pale_oak_stairs.json
37+
5d968d613a7a6bbacc20f6a879d160c0b075f188 data\poosmp\recipe\pale_oak_pressure_plate.json
3438
14db7986a05be5dd26d1e45a6f3d500881770460 data\poosmp\advancement\recipes\building_blocks\poop_brick_stairs_from_poop_bricks_stonecutting.json
3539
de48c79f438087ab099132c018cdb74bb8f9a4bb data\poosmp\recipe\pale_oak_planks.json
3640
44d9836f69e12e6a30a02a84bd656d345a1b8810 data\poosmp\recipe\poop_brick_wall.json

src/main/generated/.cache/9cd593ddb47f3bd6d0f1c9c0e73a30c1637f742c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21 2025-01-21T12:32:58.3799599 PooSMP Mod/Block Loot Tables
1+
// 1.21 2025-01-22T12:34:18.5198752 PooSMP Mod/Block Loot Tables
22
0c4f9db680a8a55f22d819ce1c9ed3a6a1b13706 data\poosmp\loot_table\blocks\red_nether_brick_fence.json
33
cbc5cf344f1da161e766a6968d5f464d608a3897 data\poosmp\loot_table\blocks\poop_brick_slab.json
44
be8a11340e5e3dfa04c22d31ba2b1dbff4161874 data\poosmp\loot_table\blocks\poop_brick_wall.json

src/main/generated/.cache/f9d1424df93996d6df6c679d27e1d995a2d55ad4

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
// 1.21 2025-01-21T12:32:58.3799599 PooSMP Mod/Model Definitions
1+
// 1.21 2025-01-22T12:34:18.5203786 PooSMP Mod/Model Definitions
22
0c5f7505b2b1e1edb6bc0c2cd635ea8d7635dbdf assets\minecraft\models\block\resin_brick_wall_post.json
33
92ad36761498db0fc86f11b3063af6429a5c3e1a assets\poosmp\models\item\one_dollar_bill.json
4-
ad28fd4be67d2c8bdd3f145a2169c36882422031 assets\poosmp\models\item\one_cent_coin.json
54
075ec04538b3ee14a314263152e0b09b6eb70027 assets\poosmp\models\item\two_dollar_bill.json
65
7cc78ffeb8b5cc8b54fd48663bc5e265ece57e02 assets\poosmp\blockstates\red_nether_brick_fence.json
6+
5d4d297bc2ea1659d135aae83c4bd1ee14b1b573 assets\minecraft\models\block\resin_bricks.json
77
e6ee13c4571bff4b83b3afba5684a3233043a27e assets\minecraft\models\block\resin_brick_wall_inventory.json
88
0494ebc2a03d13b626e2722296f2dcce5139a073 assets\poosmp\blockstates\poop_brick_wall.json
9-
5d4d297bc2ea1659d135aae83c4bd1ee14b1b573 assets\minecraft\models\block\resin_bricks.json
109
cd02776b0412cfac87fd7af7c9f06b7134a3d4d7 assets\poosmp\models\block\poop_brick_wall_inventory.json
1110
551738f9ea92cd38e510d27803c59bff56e3da71 assets\poosmp\models\item\red_nether_brick_fence.json
1211
3f18d8470e3999331af3fdc8676939311dceb2b0 assets\poosmp\models\item\poop_brick_slab.json
@@ -20,14 +19,11 @@ b3463dbcf2743cb6feb9b7fdaec7988959236909 assets\poosmp\models\block\poop_brick_w
2019
c874caa1499d2f7cde57ec279e86c293bf34fc52 assets\minecraft\models\block\resin_brick_slab_top.json
2120
039b7f779f64e523f056ec5b2ef4e45dea0fd65e assets\minecraft\models\block\resin_brick_wall_side_tall.json
2221
6d0176db8578d5be76c2a2889a7b221d59492240 assets\minecraft\blockstates\red_nether_bricks.json
23-
1f22524b18d29e637d4a49668c20def0adb1146a assets\poosmp\models\item\ten_cent_coin.json
24-
6cfbfd4d85119677c56c1b22e4eba0d83e4f3642 assets\poosmp\models\item\twenty_five_cent_coin.json
2522
01760ed80bc9323009d63d47a751249825ec1557 assets\poosmp\models\block\poop_brick_stairs_outer.json
2623
03d2a229fe465449c63acb93cc0c35cb8df303de assets\minecraft\blockstates\resin_brick_stairs.json
2724
f0bf68d18ed9e149ffbae29e1cc6a427a75ca9d4 assets\poosmp\blockstates\poop_bricks.json
28-
03372d38412c310f82479619088a437692037064 assets\poosmp\models\block\red_nether_brick_fence_post.json
2925
eaae3fa075cfacae2fc9c07d189ba75648e0d42d assets\minecraft\blockstates\chiseled_resin_bricks.json
30-
77005d9b3b8d5cfd1cd3ce5b219e5cdd766ab0af assets\poosmp\models\item\five_cent_coin.json
26+
03372d38412c310f82479619088a437692037064 assets\poosmp\models\block\red_nether_brick_fence_post.json
3127
b4b1b268752a47ada8b8f41f0a6710793363df7f assets\minecraft\models\block\resin_brick_stairs_outer.json
3228
b3adf8a6a79a1eb4abaeb08c395c21c1264170a9 assets\minecraft\models\block\resin_brick_stairs.json
3329
8c45a670ace76745d9e0adc7da4ce988ef053bb3 assets\poosmp\models\item\twenty_five_dollar_bill.json
@@ -44,17 +40,16 @@ f4dce4f1becdeacaab032d4dc125cb05e53148e8 assets\minecraft\models\block\red_nethe
4440
228b467626a84f759eb1e3070976b3e2f0856651 assets\poosmp\models\block\poop_bricks.json
4541
eeb723191a87178bafc4627d81fcf84d5ab9c57b assets\poosmp\models\item\poop_brick_stairs.json
4642
13e3f900fa8769a96fc8f4ceb8dcfc0cc561c404 assets\minecraft\blockstates\resin_block.json
47-
0e387fe6cd5361a5c9afef0cdf59b31907ba56af assets\poosmp\models\item\ten_dollar_bill.json
4843
c8433767e1eaacc8683a5db32548c930935758a0 assets\poosmp\models\item\poop_bricks.json
49-
e54b6cc3b2744821e69cea9b782cfaae9bb1d9fd assets\poosmp\models\block\red_nether_brick_fence_inventory.json
44+
0e387fe6cd5361a5c9afef0cdf59b31907ba56af assets\poosmp\models\item\ten_dollar_bill.json
5045
581df0104797f3328c938db7000f996e0d09b61a assets\poosmp\models\item\poop_brick_wall.json
46+
e54b6cc3b2744821e69cea9b782cfaae9bb1d9fd assets\poosmp\models\block\red_nether_brick_fence_inventory.json
5147
869a6f53cb87e3c1aff1f43333bba9727cf48534 assets\poosmp\blockstates\poop_brick_slab.json
5248
9f1b5f56dfcc9db195ba21bb60cad0c6219b8f15 assets\poosmp\models\item\bacon_bucket.json
5349
41d3600cb911d5ae51b503afd273935355aec860 assets\minecraft\models\item\resin_brick_stairs.json
5450
dc40a10e622bb378973e1df26c28b34ca69f2910 assets\poosmp\models\block\poop_brick_slab.json
5551
ce1b72457393083bf33721bcbaa383d709e19501 assets\poosmp\models\item\hundred_dollar_bill.json
5652
b6962bb7f213d210f33cc38209c3698ee385f4f1 assets\poosmp\models\block\poop_brick_stairs.json
5753
513bee8d9eb186b82fb3e44c318dec6c4e3c2676 assets\minecraft\models\item\resin_brick_wall.json
58-
ecbd158589a6a0048764db859743620f9cad03f8 assets\poosmp\models\item\one_dollar_coin.json
5954
61b730182c39f3b2930ba15aa49a3d970d398043 assets\poosmp\models\item\five_dollar_bill.json
6055
a876eb42182ca7735ce1eccefc0e211046ea9f36 assets\minecraft\models\block\chiseled_resin_bricks.json

src/main/generated/assets/poosmp/models/item/five_cent_coin.json

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

src/main/generated/assets/poosmp/models/item/one_cent_coin.json

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

src/main/generated/assets/poosmp/models/item/one_dollar_coin.json

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

src/main/generated/assets/poosmp/models/item/ten_cent_coin.json

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

src/main/generated/assets/poosmp/models/item/twenty_five_cent_coin.json

Lines changed: 0 additions & 6 deletions
This file was deleted.
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_pale_oak_planks": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "minecraft:pale_oak_planks"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "minecraft:pale_oak_button"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_pale_oak_planks"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"minecraft:pale_oak_button"
30+
]
31+
}
32+
}

0 commit comments

Comments
 (0)