Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Minecraft 1.21.3 #226

Open
wants to merge 21 commits into
base: main
Choose a base branch
from
Open

Update to Minecraft 1.21.3 #226

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift click to select a range
f62a394
Update YouDidThis pack to 1.20.5
Nincodedo Apr 24, 2024
7636230
Update Minecraft to 1.20.5
Nincodedo Apr 24, 2024
c229711
Update OCW advancements, first pass
Nincodedo Apr 24, 2024
9d30c7a
Update crafting recipes to 1.20.5
Nincodedo Apr 25, 2024
27dee49
Update override Minecraft loot tables for 1.20.5
Nincodedo Apr 25, 2024
da2dacd
Update OCW loot tables for 1.20.5, first pass
Nincodedo Apr 25, 2024
e9f3f98
Update Boat Compass to 1.20.5
Nincodedo Apr 25, 2024
9429c6e
Fix quotes for custom data checking
Nincodedo Apr 26, 2024
e2e76f0
Update Custom Compostables to 1.20.5
Nincodedo Apr 25, 2024
e72043d
Fix composter not filling
Nincodedo Apr 27, 2024
7bb8935
Add Bidoof banner pattern
Nincodedo Apr 30, 2024
97196a7
Update some functions to 1.20.6
Nincodedo Apr 30, 2024
4576205
Update Ascend to 1.20.6
Nincodedo May 1, 2024
1d0c32d
Fix item pickup advancements
Nincodedo May 1, 2024
a330861
Update Iridium Rod to 1.20.6
Nincodedo May 1, 2024
42cf630
Merge branch 'main' into feature/minecraft-1.20.5
Nincodedo May 31, 2024
e470337
Merge branch 'main' into feature/minecraft-1.20.5
Nincodedo Oct 1, 2024
6d9312a
Update Dockerfile-log-watcher curl 8.10.1-r0
Nincodedo Oct 1, 2024
5790dba
Merge branch 'main' into feature/minecraft-1.20.5
Nincodedo Oct 26, 2024
ca5da88
WIP: Update to Minecraft 1.21.3
Nincodedo Oct 26, 2024
6a6df77
Fix datapacks
Nincodedo Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update Iridium Rod to 1.20.6 
Closes #196
  • Loading branch information
@Nincodedo
Nincodedo committed May 1, 2024
commit a330861f7c6ab0b1920a2dda13f940739bb48879
4 changes: 2 additions & 2 deletions datapacks/ocw-stuff/data/minecraft/loot_tables/gameplay/fishing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 90,8 @@
"predicate": {
"components": {
"minecraft:custom_data": {
"NinUnique":"NR",
"NinPowered":1
"nincodedo:unique_item":"NR",
"nincodedo:powered":1
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/iridium_rod/any.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 6,11 @@
"conditions": {
"items": [
{
"nbt": "{NinUnique:\"NR\"}"
"predicates": {
"minecraft:custom_data": {
"nincodedo:unique_item": "NR"
}
}
}
]
}
Expand Down
10 changes: 7 additions & 3 deletions datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/iridium_rod/initial.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 1,12 @@
{
"display": {
"icon": {
"item": "minecraft:player_head",
"nbt": "{SkullOwner:Nincodedo}"
"id": "minecraft:player_head",
"components": {
"minecraft:profile": {
"name": "Nincodedo"
}
}
},
"title": "Need some better fishins?",
"description": "Don't fall into a cave while you're lookin",
Expand All @@ -20,7 24,7 @@
{
"condition": "minecraft:location_check",
"predicate": {
"structure": "nincodedo:cave_base_roof"
"structures": "nincodedo:cave_base_roof"
}
}
]
Expand Down
13 changes: 10 additions & 3 deletions datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/iridium_rod/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 1,11 @@
{
"display": {
"icon": {
"item": "minecraft:fishing_rod",
"nbt": "{CustomModelData:1010101,Enchantments:[{}]}"
"id": "minecraft:fishing_rod",
"components": {
"minecraft:custom_model_data": 1010101,
"minecraft:enchantment_glint_override": true
}
},
"title": "Nin's Iridium Fishing Rod",
"description": "Imported from Pelican Town",
Expand All @@ -18,7 21,11 @@
"conditions": {
"items": [
{
"nbt": "{NinUnique:\"NR\"}"
"predicates": {
"minecraft:custom_data": {
"nincodedo:unique_item": "NR"
}
}
}
]
}
Expand Down
8 changes: 6 additions & 2 deletions datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/root.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 1,7 @@
{
"display": {
"icon": {
"item": "minecraft:enchanted_book"
"id": "minecraft:enchanted_book"
},
"title": "Unique Items",
"description": "Powerful rare items",
Expand All @@ -28,7 28,11 @@
"conditions": {
"items": [
{
"nbt": "{NinUnique:\"OCWMap\"}"
"predicates": {
"minecraft:custom_data": {
"nincodedo:unique_item": "OCWMap"
}
}
}
]
}
Expand Down
19 changes: 17 additions & 2 deletions datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/rumors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 1,23 @@
{
"display": {
"icon": {
"item": "minecraft:player_head",
"nbt": "{SkullOwner:{Id:[I;682268746,544686284,-1914182079,-1376598889],Properties:{textures:[{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDZiYTYzMzQ0ZjQ5ZGQxYzRmNTQ4OGU5MjZiZjNkOWUyYjI5OTE2YTZjNTBkNjEwYmI0MGE1MjczZGM4YzgyIn19fQ==\"}]}}}"
"id": "minecraft:player_head",
"components": {
"minecraft:profile": {
"id": [
682268746,
544686284,
-1914182079,
-1376598889
],
"properties": [
{
"name": "textures",
"value": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDZiYTYzMzQ0ZjQ5ZGQxYzRmNTQ4OGU5MjZiZjNkOWUyYjI5OTE2YTZjNTBkNjEwYmI0MGE1MjczZGM4YzgyIn19fQ=="
}
]
}
}
},
"title": "Rumors about the Ancient Ruins",
"description": "Supposedly the Ancient OCW structures hold unique and powerful items...",
Expand Down
39 changes: 39 additions & 0 deletions ...ocw-stuff/data/nincodedo/functions/uniqueitems/abilities/iridiumrod/power_down.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 1,39 @@
tellraw @a[tag=debug_logging] {"text": "[Debug] Powering down Iridium Rod"}
item modify entity @s hotbar.0 nincodedo:powerdownnr
item modify entity @s hotbar.1 nincodedo:powerdownnr
item modify entity @s hotbar.2 nincodedo:powerdownnr
item modify entity @s hotbar.3 nincodedo:powerdownnr
item modify entity @s hotbar.4 nincodedo:powerdownnr
item modify entity @s hotbar.5 nincodedo:powerdownnr
item modify entity @s hotbar.6 nincodedo:powerdownnr
item modify entity @s hotbar.7 nincodedo:powerdownnr
item modify entity @s hotbar.8 nincodedo:powerdownnr
item modify entity @s inventory.0 nincodedo:powerdownnr
item modify entity @s inventory.1 nincodedo:powerdownnr
item modify entity @s inventory.2 nincodedo:powerdownnr
item modify entity @s inventory.3 nincodedo:powerdownnr
item modify entity @s inventory.4 nincodedo:powerdownnr
item modify entity @s inventory.5 nincodedo:powerdownnr
item modify entity @s inventory.6 nincodedo:powerdownnr
item modify entity @s inventory.7 nincodedo:powerdownnr
item modify entity @s inventory.8 nincodedo:powerdownnr
item modify entity @s inventory.9 nincodedo:powerdownnr
item modify entity @s inventory.10 nincodedo:powerdownnr
item modify entity @s inventory.11 nincodedo:powerdownnr
item modify entity @s inventory.12 nincodedo:powerdownnr
item modify entity @s inventory.13 nincodedo:powerdownnr
item modify entity @s inventory.14 nincodedo:powerdownnr
item modify entity @s inventory.15 nincodedo:powerdownnr
item modify entity @s inventory.16 nincodedo:powerdownnr
item modify entity @s inventory.17 nincodedo:powerdownnr
item modify entity @s inventory.18 nincodedo:powerdownnr
item modify entity @s inventory.19 nincodedo:powerdownnr
item modify entity @s inventory.20 nincodedo:powerdownnr
item modify entity @s inventory.21 nincodedo:powerdownnr
item modify entity @s inventory.22 nincodedo:powerdownnr
item modify entity @s inventory.23 nincodedo:powerdownnr
item modify entity @s inventory.24 nincodedo:powerdownnr
item modify entity @s inventory.25 nincodedo:powerdownnr
item modify entity @s inventory.26 nincodedo:powerdownnr
item modify entity @s armor.head nincodedo:powerdownnr
item modify entity @s weapon.offhand nincodedo:powerdownnr
39 changes: 39 additions & 0 deletions ...s/ocw-stuff/data/nincodedo/functions/uniqueitems/abilities/iridiumrod/power_up.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 1,39 @@
tellraw @a[tag=debug_logging] {"text": "[Debug] Powering up Iridium Rod"}
item modify entity @s hotbar.0 nincodedo:powerupnr
item modify entity @s hotbar.1 nincodedo:powerupnr
item modify entity @s hotbar.2 nincodedo:powerupnr
item modify entity @s hotbar.3 nincodedo:powerupnr
item modify entity @s hotbar.4 nincodedo:powerupnr
item modify entity @s hotbar.5 nincodedo:powerupnr
item modify entity @s hotbar.6 nincodedo:powerupnr
item modify entity @s hotbar.7 nincodedo:powerupnr
item modify entity @s hotbar.8 nincodedo:powerupnr
item modify entity @s inventory.0 nincodedo:powerupnr
item modify entity @s inventory.1 nincodedo:powerupnr
item modify entity @s inventory.2 nincodedo:powerupnr
item modify entity @s inventory.3 nincodedo:powerupnr
item modify entity @s inventory.4 nincodedo:powerupnr
item modify entity @s inventory.5 nincodedo:powerupnr
item modify entity @s inventory.6 nincodedo:powerupnr
item modify entity @s inventory.7 nincodedo:powerupnr
item modify entity @s inventory.8 nincodedo:powerupnr
item modify entity @s inventory.9 nincodedo:powerupnr
item modify entity @s inventory.10 nincodedo:powerupnr
item modify entity @s inventory.11 nincodedo:powerupnr
item modify entity @s inventory.12 nincodedo:powerupnr
item modify entity @s inventory.13 nincodedo:powerupnr
item modify entity @s inventory.14 nincodedo:powerupnr
item modify entity @s inventory.15 nincodedo:powerupnr
item modify entity @s inventory.16 nincodedo:powerupnr
item modify entity @s inventory.17 nincodedo:powerupnr
item modify entity @s inventory.18 nincodedo:powerupnr
item modify entity @s inventory.19 nincodedo:powerupnr
item modify entity @s inventory.20 nincodedo:powerupnr
item modify entity @s inventory.21 nincodedo:powerupnr
item modify entity @s inventory.22 nincodedo:powerupnr
item modify entity @s inventory.23 nincodedo:powerupnr
item modify entity @s inventory.24 nincodedo:powerupnr
item modify entity @s inventory.25 nincodedo:powerupnr
item modify entity @s inventory.26 nincodedo:powerupnr
item modify entity @s armor.head nincodedo:powerupnr
item modify entity @s weapon.offhand nincodedo:powerupnr
Loading