Skip to content

Commit ac57f62

Browse files
authored
Merge pull request #2 from NotEmbin/pr_1.21.11
Update to 1.21.11
2 parents 976ba3c + 04e4c36 commit ac57f62

File tree

747 files changed

+8312
-8515
lines changed

Some content is hidden

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

747 files changed

+8312
-8515
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version '1.8-SNAPSHOT'
2+
id 'net.fabricmc.fabric-loom-remap' version '1.14-SNAPSHOT'
33
id 'maven-publish'
44
}
55

@@ -25,7 +25,7 @@ fabricApi {
2525
dependencies {
2626
// To change the versions see the gradle.properties file
2727
minecraft "com.mojang:minecraft:${project.minecraft_version}"
28-
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
28+
mappings loom.officialMojangMappings()
2929
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
3030

3131
// Fabric API. This is technically optional, but you probably want it anyway.

gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ org.gradle.parallel=true
44

55
# Fabric Properties
66
# check these on https://fabricmc.net/develop
7-
minecraft_version=1.21
8-
yarn_mappings=1.21+build.9
9-
loader_version=0.15.11
7+
minecraft_version=1.21.11
8+
yarn_mappings=1.21.11+build.1
9+
loader_version=0.18.1
1010

1111
# Mod Properties
12-
mod_version=5.0.0
12+
mod_version=6.0.0
1313
maven_group=embin.poosmp
1414
archives_base_name=poosmp
1515

1616
# Dependencies
17-
fabric_version=0.116.7+1.21.1
17+
fabric_version=0.140.0+1.21.11

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

src/main/generated/.cache/4bf60aa3e4015ac92a785c8ab65e0b73c28ddd1a

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

src/main/generated/.cache/698cf1bacd22dabd3bdf00cd17201a304fc9aadc

Lines changed: 0 additions & 53 deletions
This file was deleted.
Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
// 1.21 2025-01-22T12:34:18.5198752 PooSMP Mod/Block Loot Tables
2-
0c4f9db680a8a55f22d819ce1c9ed3a6a1b13706 data\poosmp\loot_table\blocks\red_nether_brick_fence.json
3-
cbc5cf344f1da161e766a6968d5f464d608a3897 data\poosmp\loot_table\blocks\poop_brick_slab.json
4-
be8a11340e5e3dfa04c22d31ba2b1dbff4161874 data\poosmp\loot_table\blocks\poop_brick_wall.json
5-
97136d6e5413cc00b8f2d9503d835eb5a73c3e4e data\poosmp\loot_table\blocks\poop_brick_stairs.json
1+
// 1.21.11 -999999999-01-01T00:00:00 PooSMP Mod/Block Loot Tables
2+
b43b03f6da137b470269b829786f48abd0f285da data/poosmp/loot_table/blocks/fake_dirt.json
3+
a2df997f8312cf60cf629cc97c273ffa701c8b22 data/poosmp/loot_table/blocks/fake_grass_block.json
4+
bb4d76902da4c4f529e96bcbd553eea06c129cb2 data/poosmp/loot_table/blocks/fake_stone.json
5+
cbc5cf344f1da161e766a6968d5f464d608a3897 data/poosmp/loot_table/blocks/poop_brick_slab.json
6+
97136d6e5413cc00b8f2d9503d835eb5a73c3e4e data/poosmp/loot_table/blocks/poop_brick_stairs.json
7+
be8a11340e5e3dfa04c22d31ba2b1dbff4161874 data/poosmp/loot_table/blocks/poop_brick_wall.json
8+
0c4f9db680a8a55f22d819ce1c9ed3a6a1b13706 data/poosmp/loot_table/blocks/red_nether_brick_fence.json
9+
6c2e3ecd312a87fd831b1d850701f5a5fe818c5e data/poosmp/loot_table/blocks/red_poo_block.json
10+
5e5b89510f610b259795a0add81d3d451661de18 data/poosmp/loot_table/blocks/rigged_stone.json
Lines changed: 74 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,74 @@
1-
// 1.21 2025-01-22T12:34:18.5203786 PooSMP Mod/Model Definitions
2-
0c5f7505b2b1e1edb6bc0c2cd635ea8d7635dbdf assets\minecraft\models\block\resin_brick_wall_post.json
3-
92ad36761498db0fc86f11b3063af6429a5c3e1a assets\poosmp\models\item\one_dollar_bill.json
4-
075ec04538b3ee14a314263152e0b09b6eb70027 assets\poosmp\models\item\two_dollar_bill.json
5-
7cc78ffeb8b5cc8b54fd48663bc5e265ece57e02 assets\poosmp\blockstates\red_nether_brick_fence.json
6-
5d4d297bc2ea1659d135aae83c4bd1ee14b1b573 assets\minecraft\models\block\resin_bricks.json
7-
e6ee13c4571bff4b83b3afba5684a3233043a27e assets\minecraft\models\block\resin_brick_wall_inventory.json
8-
0494ebc2a03d13b626e2722296f2dcce5139a073 assets\poosmp\blockstates\poop_brick_wall.json
9-
cd02776b0412cfac87fd7af7c9f06b7134a3d4d7 assets\poosmp\models\block\poop_brick_wall_inventory.json
10-
551738f9ea92cd38e510d27803c59bff56e3da71 assets\poosmp\models\item\red_nether_brick_fence.json
11-
3f18d8470e3999331af3fdc8676939311dceb2b0 assets\poosmp\models\item\poop_brick_slab.json
12-
b3463dbcf2743cb6feb9b7fdaec7988959236909 assets\poosmp\models\block\poop_brick_wall_side.json
13-
88588c6d1d2e38cecd45f9edb09093ead35feb6a assets\minecraft\models\block\resin_brick_stairs_inner.json
14-
861ac148c86c362be53e59ba9c9a6429bedbd551 assets\poosmp\blockstates\poop_brick_stairs.json
15-
2dff6e9d65976ceba578346d2048585a39546c54 assets\poosmp\models\block\poop_brick_slab_top.json
16-
13fb5c8da657d925c64cd61e6f77debd788117c5 assets\minecraft\models\block\resin_brick_slab.json
17-
03ece29d38c46433737ae6b4c47f2accbb2896aa assets\minecraft\blockstates\resin_brick_wall.json
18-
50d8cee94fd78e0650971226bb22726da37e5d7f assets\minecraft\blockstates\resin_bricks.json
19-
c874caa1499d2f7cde57ec279e86c293bf34fc52 assets\minecraft\models\block\resin_brick_slab_top.json
20-
039b7f779f64e523f056ec5b2ef4e45dea0fd65e assets\minecraft\models\block\resin_brick_wall_side_tall.json
21-
6d0176db8578d5be76c2a2889a7b221d59492240 assets\minecraft\blockstates\red_nether_bricks.json
22-
01760ed80bc9323009d63d47a751249825ec1557 assets\poosmp\models\block\poop_brick_stairs_outer.json
23-
03d2a229fe465449c63acb93cc0c35cb8df303de assets\minecraft\blockstates\resin_brick_stairs.json
24-
f0bf68d18ed9e149ffbae29e1cc6a427a75ca9d4 assets\poosmp\blockstates\poop_bricks.json
25-
eaae3fa075cfacae2fc9c07d189ba75648e0d42d assets\minecraft\blockstates\chiseled_resin_bricks.json
26-
03372d38412c310f82479619088a437692037064 assets\poosmp\models\block\red_nether_brick_fence_post.json
27-
b4b1b268752a47ada8b8f41f0a6710793363df7f assets\minecraft\models\block\resin_brick_stairs_outer.json
28-
b3adf8a6a79a1eb4abaeb08c395c21c1264170a9 assets\minecraft\models\block\resin_brick_stairs.json
29-
8c45a670ace76745d9e0adc7da4ce988ef053bb3 assets\poosmp\models\item\twenty_five_dollar_bill.json
30-
c97db4468da718e4410b6fac5b3edb3e53804ee8 assets\poosmp\models\item\fifty_dollar_bill.json
31-
0948cf0aea5cbfd603d17f233f38c88b77574125 assets\poosmp\models\block\poop_brick_wall_side_tall.json
32-
0dfa0e338d1814601e1bc8228e3297f5b9e5560a assets\poosmp\models\block\poop_brick_wall_post.json
33-
d5f9a66cc072b855653a64868f9071df92b1b064 assets\minecraft\models\item\resin_brick_slab.json
34-
6140fb625e8baa406159d8bb96eec76af5e3bfcd assets\minecraft\models\block\resin_block.json
35-
02219993cfc7fd5da91be83495f539e0d22c9cfa assets\minecraft\models\block\resin_brick_wall_side.json
36-
2caec345b117b93e7831fbaff47bad77a05bd17a assets\poosmp\models\block\poop_brick_stairs_inner.json
37-
ca89d894019faf306909d4c77839d5bd06c6059f assets\minecraft\blockstates\resin_brick_slab.json
38-
4af4dfd39b6929467c4ebbfa9292e0694ad1cab7 assets\poosmp\models\block\red_nether_brick_fence_side.json
39-
f4dce4f1becdeacaab032d4dc125cb05e53148e8 assets\minecraft\models\block\red_nether_bricks.json
40-
228b467626a84f759eb1e3070976b3e2f0856651 assets\poosmp\models\block\poop_bricks.json
41-
eeb723191a87178bafc4627d81fcf84d5ab9c57b assets\poosmp\models\item\poop_brick_stairs.json
42-
13e3f900fa8769a96fc8f4ceb8dcfc0cc561c404 assets\minecraft\blockstates\resin_block.json
43-
c8433767e1eaacc8683a5db32548c930935758a0 assets\poosmp\models\item\poop_bricks.json
44-
0e387fe6cd5361a5c9afef0cdf59b31907ba56af assets\poosmp\models\item\ten_dollar_bill.json
45-
581df0104797f3328c938db7000f996e0d09b61a assets\poosmp\models\item\poop_brick_wall.json
46-
e54b6cc3b2744821e69cea9b782cfaae9bb1d9fd assets\poosmp\models\block\red_nether_brick_fence_inventory.json
47-
869a6f53cb87e3c1aff1f43333bba9727cf48534 assets\poosmp\blockstates\poop_brick_slab.json
48-
9f1b5f56dfcc9db195ba21bb60cad0c6219b8f15 assets\poosmp\models\item\bacon_bucket.json
49-
41d3600cb911d5ae51b503afd273935355aec860 assets\minecraft\models\item\resin_brick_stairs.json
50-
dc40a10e622bb378973e1df26c28b34ca69f2910 assets\poosmp\models\block\poop_brick_slab.json
51-
ce1b72457393083bf33721bcbaa383d709e19501 assets\poosmp\models\item\hundred_dollar_bill.json
52-
b6962bb7f213d210f33cc38209c3698ee385f4f1 assets\poosmp\models\block\poop_brick_stairs.json
53-
513bee8d9eb186b82fb3e44c318dec6c4e3c2676 assets\minecraft\models\item\resin_brick_wall.json
54-
61b730182c39f3b2930ba15aa49a3d970d398043 assets\poosmp\models\item\five_dollar_bill.json
55-
a876eb42182ca7735ce1eccefc0e211046ea9f36 assets\minecraft\models\block\chiseled_resin_bricks.json
1+
// 1.21.11 -999999999-01-01T00:00:00 PooSMP Mod/Model Definitions
2+
f31207ab393fed062326c62c5b8b1f9dce2dfaf5 assets/poosmp/items/bacon_bucket.json
3+
e515b03e2c40fbbd51c54f26f6d6384aa88266ff assets/poosmp/items/banana.json
4+
44ec10d73958bf496ce98dc0425de41dc487cbad assets/poosmp/items/bankers_table.json
5+
6dc04272b9f7c46c1628ee3bc742109bd0a4bfd2 assets/poosmp/items/biome_stick.json
6+
5fec9373497d0032cf21d658ac33b34c8f75d281 assets/poosmp/items/blank_music_disc.json
7+
3777544ef0bd0ee9f8c1656e696b8e8b2a9ef442 assets/poosmp/items/boom_stick.json
8+
fab4556c13add7061ff069e64b8ad89f252b4ac0 assets/poosmp/items/cow_stick.json
9+
add90f139e25ab3697839b00ee9ea43515130271 assets/poosmp/items/cube_pottery_sherd.json
10+
82ad300c79a008b2d0b1a78ed03cc8584b6af7ca assets/poosmp/items/ddededodediamante_block.json
11+
b670174304d706c6afecb381652ea612dd631a11 assets/poosmp/items/diamond_shard.json
12+
e6f16dfdc9d9da5f62e9aa8dae597ee8c20aecac assets/poosmp/items/ear_destroyer_9000.json
13+
19e66acfb284e3fd8637c37095572fd68f1a029b assets/poosmp/items/enchanted_totem_of_health.json
14+
45ae8d3da66422ef2f3ae5b1f9bbab9e5db550d6 assets/poosmp/items/enchanted_totem_of_reach.json
15+
6aa4701e23f5f96c4e3e2efde035fb1f97732c9c assets/poosmp/items/fake_dirt.json
16+
048964f54fe719c13321828fb245385de76a6d6d assets/poosmp/items/fake_grass_block.json
17+
9474a3ce74d82e47113439957f38e4228a32ac9d assets/poosmp/items/fake_stone.json
18+
2ffeba511fe8923d0da7ee3fd8eabcf73423f8c5 assets/poosmp/items/fifty_dollar_bill.json
19+
78d3c4878a69f83ee1bc198911f5b2b9fe49f053 assets/poosmp/items/fill_armor_trim_smithing_template.json
20+
eef106927a1a279e387c30fb6d4941f4372a7401 assets/poosmp/items/five_dollar_bill.json
21+
a864d626ad36f3be82b51f862240303684c4cfb1 assets/poosmp/items/gear.json
22+
ec0ceca04c481d34a96053b6bb487a2dd9e346a6 assets/poosmp/items/glass_shard.json
23+
d3afcdcad45b5c0b94f8f52afc1b9e172b34f5ac assets/poosmp/items/hundred_dollar_bill.json
24+
1cb4bb20fa8867609897e9bd0525ee6142519a5c assets/poosmp/items/lightning_stick.json
25+
6ce643b950c08241b40384d2a28daadda6f505d5 assets/poosmp/items/magic_device.json
26+
84256ffcf5c8e8fa92e8c91259aed67aa6034281 assets/poosmp/items/missingno.json
27+
b626506fdea380ff17d079352b725a5970b84cf5 assets/poosmp/items/music_disc/bliss_instrumental.json
28+
65b2e84b1ab70d8948b3e945abe8b3c76e13a49e assets/poosmp/items/music_disc/buddy_holly.json
29+
5e3796376dd07d453c555c19ba2e9e923fdc2f98 assets/poosmp/items/music_disc/butterflies_and_hurricanes_instrumental.json
30+
c16bbff95dd6d42bf9bdcdd3f44ce0f62d86b9c5 assets/poosmp/items/music_disc/endlessly.json
31+
9fce9536b76fb484f706e58320e5eb08e0f95d69 assets/poosmp/items/music_disc/endlessly_instrumental.json
32+
fe177f6e13b50f399be14c12b654a3b294dd72a5 assets/poosmp/items/music_disc/endlessly_stereo.json
33+
19b76d6bc333958b6066527fe2f54b5665fb99fa assets/poosmp/items/music_disc/not_like_us.json
34+
3d299be9af8ee41d52d70e28d948e0274d6dba1d assets/poosmp/items/music_disc/resistance_instrumental.json
35+
e5757a6f503f6d95ba471955e16956f803c54320 assets/poosmp/items/music_disc/stereo_madness.json
36+
ffff3cd05b3e5b36b0f08aeaab3844e3610d42e6 assets/poosmp/items/music_disc/story_of_undertale.json
37+
bad5b607df5aa26d348ea54aea4efc5b9ebdba35 assets/poosmp/items/music_disc/trifecta_cap.json
38+
dde046936958587114a686a56c0f3286365c6d74 assets/poosmp/items/null_shard.json
39+
884025fdc20fc4ba3ad244ba998b2978bfb4dc85 assets/poosmp/items/one_dollar_bill.json
40+
79ae50e4baf6c0be5a94dd97131b0d1192f07c3a assets/poosmp/items/poo_pottery_sherd.json
41+
ac3ac519884a2262ae1baca9909d13edd345444e assets/poosmp/items/poop_block.json
42+
a2de784b27910da167b97fb6908d1ea0e47aec30 assets/poosmp/items/poop_brick.json
43+
9da3461560f971eff69b69cc2a516b9908d9cbab assets/poosmp/items/poop_brick_slab.json
44+
96580737339d5ee4f531e07ecc39350c7ce59196 assets/poosmp/items/poop_brick_stairs.json
45+
b2d94fd876b346ac2a8cf824ed62908dfa75e21d assets/poosmp/items/poop_bricks.json
46+
1bc0d2320bb6962afe62eb54d2d28d793fbdcf61 assets/poosmp/items/poop_stick.json
47+
9e93050a2703cbc05586dcb9e4d813b89f9a75c5 assets/poosmp/items/pooplet.json
48+
638805b6698d9c6042d4c99035f80d2310278aab assets/poosmp/items/raw_red_poo.json
49+
c59a1bf67fad069a218650675519d713af758af8 assets/poosmp/items/red_nether_brick.json
50+
931fc9680ef9c3ca9d522217344f79b41c1c7c17 assets/poosmp/items/red_poo_axe.json
51+
ce0af50aa545fd7926435334387c5304691d5184 assets/poosmp/items/red_poo_block.json
52+
411099e20ba9dcf328a68dd85d1d642f4d62b419 assets/poosmp/items/red_poo_boots.json
53+
1134ac5b0498301be9c4baec90f0831204ff4911 assets/poosmp/items/red_poo_chestplate.json
54+
c4175e47fbe3e82c2c6ec498cd76983f6888395f assets/poosmp/items/red_poo_helmet.json
55+
5497289c20e528df18818f9b24a431dc7f964dc4 assets/poosmp/items/red_poo_hoe.json
56+
104be8034df08c0b121b4ad10c9a22a551d9f8dd assets/poosmp/items/red_poo_ingot.json
57+
a248301582832b6fff7d79f0f71a482d007e3a41 assets/poosmp/items/red_poo_leggings.json
58+
157eaaeb0b1b6661f4b23306dc12dfa69ef7cc4e assets/poosmp/items/red_poo_pickaxe.json
59+
b0a7b34a6f08608cb699fd34a9ef86535a034c95 assets/poosmp/items/red_poo_shovel.json
60+
460f4f0c5ade5051eb8c821ba8e615c2e40fa834 assets/poosmp/items/red_poo_sword.json
61+
d3c40305947190ac1ca122305abb60124bee9977 assets/poosmp/items/red_poo_upgrade_smithing_template.json
62+
c1e93293e194072fe511d70d4f51a73ead371b5e assets/poosmp/items/rigged_stone.json
63+
b5f931b45082cab79ec4d5a9a1cadce1ee9640b3 assets/poosmp/items/ring.json
64+
33cfbadbedc89c9e785386ee60ff462d038cc9a4 assets/poosmp/items/screw.json
65+
2c2ae86755581b36553d86ef35bb39330ffeb069 assets/poosmp/items/server_says_what_stick.json
66+
f5f7106122379d4fe7faedeed72bf9b330e0b7f2 assets/poosmp/items/ten_dollar_bill.json
67+
0e21c876c6b7d8297298538e0275a64a5427ab22 assets/poosmp/items/totem_of_health.json
68+
98d583ed27354b7e489239b534aff9164e3bfe3b assets/poosmp/items/totem_of_reach.json
69+
7582cd4cf93059ed8ece3b669c45928833343fb2 assets/poosmp/items/twenty_five_dollar_bill.json
70+
a53fb79792643b619ede0f9290094e2ef6f9099e assets/poosmp/items/two_dollar_bill.json
71+
d5be8589fe70a03e485ab446002752c877c85c7e assets/poosmp/items/villager_stick.json
72+
c23a8fa69195bd16ffed4619b15214a065d939d8 assets/poosmp/items/warp_stick.json
73+
72d9638a6308ee3f5abb6f2325d5a9d48ea8c3ec assets/poosmp/items/wedding_ring.json
74+
0eb0334b86d254266bfc5f2daf204b82bba9aa9b assets/poosmp/items/zombie_stick.json

src/main/generated/assets/minecraft/blockstates/chiseled_resin_bricks.json

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

src/main/generated/assets/minecraft/blockstates/red_nether_bricks.json

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

0 commit comments

Comments
 (0)