Skip to content

Commit 738cf7d

Browse files
TheWiiTheWii
committed
Bug fixes and reorganization
1 parent f32e137 commit 738cf7d

File tree

73 files changed

+313
-232
lines changed

Some content is hidden

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

73 files changed

+313
-232
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
Improved Apiculture is a datapack for Minecraft 1.16 or above which aims to add new features to expand the vanilla bees functionalities and utilities. It's inspired by a couple of mods with the same purpose, but as a datapack, being 100% vanilla compatible.
44

5-
For detailed information about the datapack read the [wiki](https://github.com/TheWii/improved-apiculture/wiki).
5+
For detailed information about the datapack additions, read the [wiki](https://github.com/TheWii/improved-apiculture/wiki).

‎improved-apiculture-datapack/data/global/advancements/root.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"display": {
3+
"title": "Installed Datapacks",
4+
"description": "",
5+
"icon": {
6+
"item": "minecraft:knowledge_book"
7+
},
8+
"background": "minecraft:textures/block/gray_concrete.png",
9+
"show_toast": false,
10+
"announce_to_chat": false
11+
},
12+
"criteria": {
13+
"trigger": {
14+
"trigger": "minecraft:tick"
15+
}
16+
}
17+
}

‎improved-apiculture-datapack/data/global/advancements/thewii.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"display": {
3+
"title": "TheWii",
4+
"description": "",
5+
"icon": {
6+
"item": "minecraft:player_head",
7+
"nbt": "{SkullOwner: 'Daniel842349'}"
8+
},
9+
"show_toast": false,
10+
"announce_to_chat": false
11+
},
12+
"parent": "global:root",
13+
"criteria": {
14+
"trigger": {
15+
"trigger": "minecraft:tick"
16+
}
17+
}
18+
}

‎improved-apiculture-datapack/data/minecraft/loot_tables/blocks/yellow_shulker_box.json

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
11
{
2-
"type": "minecraft:block",
3-
"pools": [
4-
{
5-
"rolls": 1,
6-
"entries": [
7-
{
8-
"type": "minecraft:alternatives",
9-
"children": [
10-
{
11-
"type": "minecraft:dynamic",
12-
"name": "minecraft:contents",
13-
"conditions": [
14-
{
15-
"condition": "minecraft:match_tool",
16-
"predicate": {
17-
"nbt": "{drop_contents: 1b}"
18-
}
19-
}
20-
]
21-
},
22-
{
23-
"type": "minecraft:item",
24-
"functions": [
25-
{
26-
"function": "minecraft:copy_name",
27-
"source": "block_entity"
28-
},
29-
{
30-
"function": "minecraft:copy_nbt",
31-
"source": "block_entity",
32-
"ops": [
33-
{
34-
"source": "Lock",
35-
"target": "BlockEntityTag.Lock",
36-
"op": "replace"
37-
},
38-
{
39-
"source": "LootTable",
40-
"target": "BlockEntityTag.LootTable",
41-
"op": "replace"
42-
},
43-
{
44-
"source": "LootTableSeed",
45-
"target": "BlockEntityTag.LootTableSeed",
46-
"op": "replace"
47-
}
48-
]
49-
},
50-
{
51-
"function": "minecraft:set_contents",
52-
"entries": [
53-
{
54-
"type": "minecraft:dynamic",
55-
"name": "minecraft:contents"
56-
}
57-
]
2+
"type": "minecraft:block",
3+
"pools": [
4+
{
5+
"rolls": 1,
6+
"entries": [
7+
{
8+
"type": "minecraft:alternatives",
9+
"children": [
10+
{
11+
"type": "minecraft:dynamic",
12+
"name": "minecraft:contents",
13+
"conditions": [
14+
{
15+
"condition": "minecraft:match_tool",
16+
"predicate": {
17+
"nbt": "{drop_contents: 1b}"
5818
}
59-
],
60-
"name": "minecraft:yellow_shulker_box"
61-
}
62-
]
63-
}
64-
]
65-
}
66-
]
67-
}
19+
}
20+
]
21+
},
22+
{
23+
"type": "minecraft:item",
24+
"functions": [
25+
{
26+
"function": "minecraft:copy_name",
27+
"source": "block_entity"
28+
},
29+
{
30+
"function": "minecraft:copy_nbt",
31+
"source": "block_entity",
32+
"ops": [
33+
{
34+
"source": "Lock",
35+
"target": "BlockEntityTag.Lock",
36+
"op": "replace"
37+
},
38+
{
39+
"source": "LootTable",
40+
"target": "BlockEntityTag.LootTable",
41+
"op": "replace"
42+
},
43+
{
44+
"source": "LootTableSeed",
45+
"target": "BlockEntityTag.LootTableSeed",
46+
"op": "replace"
47+
}
48+
]
49+
},
50+
{
51+
"function": "minecraft:set_contents",
52+
"entries": [
53+
{
54+
"type": "minecraft:dynamic",
55+
"name": "minecraft:contents"
56+
}
57+
]
58+
}
59+
],
60+
"name": "minecraft:yellow_shulker_box"
61+
}
62+
]
63+
}
64+
]
65+
}
66+
]
67+
}

‎improved-apiculture-datapack/data/minecraft/tags/functions/tick.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"values": [
3-
"thewii:apiculture/core/tick_0"
3+
"thewii:apiculture/core/tick/0"
44
]
55
}

‎improved-apiculture-datapack/data/thewii/advancements/apiculture/core/improved-apiculture.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"display": {
3+
"title": [{"text":"[v0.1.0] ","color":"#EBAD02"},{"text":"Improved Apiculture","color":"#FFE017"}],
4+
"description": [{"text":"Improving vanilla bees.","color":"#F8FF91"},{"translate":"\nResource Pack is missing.","color":"#E04C4C"}],
5+
"icon": {
6+
"item": "minecraft:honeycomb",
7+
"nbt": "{Enchantments:[{id:\"thewii:apiculture/logo\",lvl:1s}]}"
8+
},
9+
"announce_to_chat": false,
10+
"show_toast": false
11+
},
12+
"parent": "global:thewii",
13+
"criteria": {
14+
"trigger": {
15+
"trigger": "minecraft:tick"
16+
}
17+
}
18+
}

‎improved-apiculture-datapack/data/thewii/advancements/apiculture/player/placed/beehive.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
]
1414
],
1515
"rewards": {
16-
"function": "thewii:apiculture/player/placed/hive/start"
16+
"function": "thewii:apiculture/player/placed/beehive/start"
1717
}
1818
}

‎improved-apiculture-datapack/data/thewii/functions/apiculture/block/candle/destroyed.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
scoreboard players set #max_age twvp.temp 1
33
data modify storage thewii:vp_library/temp item set from storage thewii:apiculture/data item.candle
44

5-
execute as @e[type=minecraft:item,distance=..1,sort=nearest,limit=1,nbt={Item:{id:"minecraft:lantern",Count:1b}}] run function thewii:apiculture/general/entity/dropped_item/find_item
5+
execute as @e[type=minecraft:item,tag=!global.ignore,distance=..1,sort=nearest,limit=1,nbt={Item:{id:"minecraft:lantern",Count:1b}}] run function thewii:apiculture/general/entity/dropped_item/find_item
66
execute as @e[type=minecraft:item,tag=twia.matched_item,limit=1] run function thewii:apiculture/block/candle/drop_item
77

88
# Sound

‎improved-apiculture-datapack/data/thewii/functions/apiculture/block/candle/drop_item.mcfunction

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#> thewii:apiculture/block/candle/drop_item
2+
13
# Store item data
24
data modify entity @s Item set from storage thewii:vp_library/temp item
35

‎improved-apiculture-datapack/data/thewii/functions/apiculture/block/hive/drop_frame.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ execute if entity @s[tag=twia.hive.jungle] run loot spawn ~ ~ ~ loot thewii:apic
1414
execute if entity @s[tag=twia.hive.acacia] run loot spawn ~ ~ ~ loot thewii:apiculture/block/acacia_beehive
1515
execute if entity @s[tag=twia.hive.dark_oak] run loot spawn ~ ~ ~ loot thewii:apiculture/block/dark_oak_beehive
1616

17-
execute as @e[type=minecraft:item,limit=1,sort=nearest,nbt={Age:0s}] run function thewii:apiculture/block/hive/drop_frame2
17+
execute as @e[type=minecraft:item,tag=!global.ignore,distance=..1,limit=1,sort=nearest,nbt={Age:0s}] run function thewii:apiculture/block/hive/drop_frame2

0 commit comments

Comments
 (0)