Skip to content

Commit cdd9ae4

Browse files
authored
Merge pull request #140 from Jiingy/base-1.21.4
Updated master branch from 1.21.4
2 parents bb4e241 + 50d197d commit cdd9ae4

File tree

230 files changed

+1312
-690
lines changed

Some content is hidden

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

230 files changed

+1312
-690
lines changed

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ archives_base_name = jineric
1111
# Fabric Properties
1212
# https://fabricmc.net/develop/
1313
minecraft_version=1.21.4
14-
yarn_mappings=1.21.4+build.1
15-
loader_version=0.16.9
14+
yarn_mappings=1.21.4+build.8
15+
loader_version=0.16.10
1616

1717
# Fabric API
18-
fabric_version=0.111.0+1.21.4
18+
fabric_version=0.118.0+1.21.4
1919

2020
# Dependencies
2121
# https://modrinth.com/mod/terrablender/versions

src/main/generated/data/jineric/advancement/recipes/building_blocks/acacia_bookshelf.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@
1111
},
1212
"trigger": "minecraft:inventory_changed"
1313
},
14+
"has_planks": {
15+
"conditions": {
16+
"items": [
17+
{
18+
"items": "minecraft:acacia_planks"
19+
}
20+
]
21+
},
22+
"trigger": "minecraft:inventory_changed"
23+
},
1424
"has_the_recipe": {
1525
"conditions": {
1626
"recipe": "jineric:acacia_bookshelf"
@@ -21,7 +31,8 @@
2131
"requirements": [
2232
[
2333
"has_the_recipe",
24-
"has_book"
34+
"has_book",
35+
"has_planks"
2536
]
2637
],
2738
"rewards": {

src/main/generated/data/jineric/advancement/recipes/building_blocks/bamboo_bookshelf.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@
1111
},
1212
"trigger": "minecraft:inventory_changed"
1313
},
14+
"has_planks": {
15+
"conditions": {
16+
"items": [
17+
{
18+
"items": "minecraft:bamboo_planks"
19+
}
20+
]
21+
},
22+
"trigger": "minecraft:inventory_changed"
23+
},
1424
"has_the_recipe": {
1525
"conditions": {
1626
"recipe": "jineric:bamboo_bookshelf"
@@ -21,7 +31,8 @@
2131
"requirements": [
2232
[
2333
"has_the_recipe",
24-
"has_book"
34+
"has_book",
35+
"has_planks"
2536
]
2637
],
2738
"rewards": {

src/main/generated/data/jineric/advancement/recipes/building_blocks/birch_bookshelf.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@
1111
},
1212
"trigger": "minecraft:inventory_changed"
1313
},
14+
"has_planks": {
15+
"conditions": {
16+
"items": [
17+
{
18+
"items": "minecraft:birch_planks"
19+
}
20+
]
21+
},
22+
"trigger": "minecraft:inventory_changed"
23+
},
1424
"has_the_recipe": {
1525
"conditions": {
1626
"recipe": "jineric:birch_bookshelf"
@@ -21,7 +31,8 @@
2131
"requirements": [
2232
[
2333
"has_the_recipe",
24-
"has_book"
34+
"has_book",
35+
"has_planks"
2536
]
2637
],
2738
"rewards": {

src/main/generated/data/jineric/advancement/recipes/decorations/calcite_wall.json renamed to src/main/generated/data/jineric/advancement/recipes/building_blocks/calcite_wall.json

File renamed without changes.

src/main/generated/data/jineric/advancement/recipes/building_blocks/cherry_bookshelf.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@
1111
},
1212
"trigger": "minecraft:inventory_changed"
1313
},
14+
"has_planks": {
15+
"conditions": {
16+
"items": [
17+
{
18+
"items": "minecraft:cherry_planks"
19+
}
20+
]
21+
},
22+
"trigger": "minecraft:inventory_changed"
23+
},
1424
"has_the_recipe": {
1525
"conditions": {
1626
"recipe": "jineric:cherry_bookshelf"
@@ -21,7 +31,8 @@
2131
"requirements": [
2232
[
2333
"has_the_recipe",
24-
"has_book"
34+
"has_book",
35+
"has_planks"
2536
]
2637
],
2738
"rewards": {

src/main/generated/data/jineric/advancement/recipes/decorations/cracked_deepslate_brick_wall.json renamed to src/main/generated/data/jineric/advancement/recipes/building_blocks/cracked_deepslate_brick_wall.json

File renamed without changes.

src/main/generated/data/jineric/advancement/recipes/decorations/cracked_deepslate_tile_wall.json renamed to src/main/generated/data/jineric/advancement/recipes/building_blocks/cracked_deepslate_tile_wall.json

File renamed without changes.

src/main/generated/data/jineric/advancement/recipes/decorations/cracked_dripstone_brick_wall.json renamed to src/main/generated/data/jineric/advancement/recipes/building_blocks/cracked_dripstone_brick_wall.json

File renamed without changes.

src/main/generated/data/jineric/advancement/recipes/decorations/cracked_dripstone_tile_wall.json renamed to src/main/generated/data/jineric/advancement/recipes/building_blocks/cracked_dripstone_tile_wall.json

File renamed without changes.

0 commit comments

Comments
 (0)