Skip to content

Commit 2d03cce

Browse files
committed
fix jetpack loottable by applying nbt functions in the correct order
1 parent ef3fe91 commit 2d03cce

File tree

4 files changed

+18
-20
lines changed

4 files changed

+18
-20
lines changed

src/generated/resources/.cache/8b3b6906bc374aa853f6af0a154d20a90a4fcadc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19.2 2024-09-13T10:11:00.3057364 Registrate Provider for create_jetpack [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
1+
// 1.19.2 2024-09-20T12:17:26.0068049 Registrate Provider for create_jetpack [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
22
673a48952547e61209ce76274272e9c4e05c8189 assets/create_jetpack/blockstates/jetpack.json
33
ba8e314e1e6dbb6c25dd5e837cef04f8d96412a1 assets/create_jetpack/blockstates/netherite_jetpack.json
44
a2f5d170a0eb9d1686d1c97de51bdb52eee864af assets/create_jetpack/lang/en_ud.json
@@ -10,6 +10,6 @@ a9f4853187ae09ad01356339f4acf9b3e8189ebd assets/create_jetpack/models/block/neth
1010
f01edd57ce03744767e9ab7b7e68c80d9834a50c assets/create_jetpack/models/item/netherite_jetpack.json
1111
6c53b1a6ed28929b7a0a090edf6101e610f842fc assets/create_jetpack/models/item/netherite_jetpack_placeable.json
1212
45715b49eb3f91a62054f6c2a9d82115b8e188fb data/create/tags/items/pressurized_air_sources.json
13-
a534ba17a2fe9e5574834839df9a09d4f07ec5dc data/create_jetpack/loot_tables/blocks/jetpack.json
14-
0a4090248710ced389ae503040a1ce0daf4be680 data/create_jetpack/loot_tables/blocks/netherite_jetpack.json
13+
a9a28f836ecf561ccd7e58e453717fb4729db0ee data/create_jetpack/loot_tables/blocks/jetpack.json
14+
9ce956f43a8f503888a7848e5ea9c215b45f245a data/create_jetpack/loot_tables/blocks/netherite_jetpack.json
1515
45715b49eb3f91a62054f6c2a9d82115b8e188fb data/minecraft/tags/blocks/mineable/pickaxe.json

src/generated/resources/data/create_jetpack/loot_tables/blocks/jetpack.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
"function": "minecraft:copy_nbt",
1717
"ops": [
1818
{
19-
"op": "replace",
20-
"source": "Air",
21-
"target": "Air"
19+
"op": "merge",
20+
"source": "VanillaTag",
21+
"target": "{}"
2222
}
2323
],
2424
"source": "block_entity"
@@ -27,9 +27,9 @@
2727
"function": "minecraft:copy_nbt",
2828
"ops": [
2929
{
30-
"op": "merge",
31-
"source": "VanillaTag",
32-
"target": "{}"
30+
"op": "replace",
31+
"source": "Air",
32+
"target": "Air"
3333
}
3434
],
3535
"source": "block_entity"

src/generated/resources/data/create_jetpack/loot_tables/blocks/netherite_jetpack.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
"function": "minecraft:copy_nbt",
1717
"ops": [
1818
{
19-
"op": "replace",
20-
"source": "Air",
21-
"target": "Air"
19+
"op": "merge",
20+
"source": "VanillaTag",
21+
"target": "{}"
2222
}
2323
],
2424
"source": "block_entity"
@@ -27,9 +27,9 @@
2727
"function": "minecraft:copy_nbt",
2828
"ops": [
2929
{
30-
"op": "merge",
31-
"source": "VanillaTag",
32-
"target": "{}"
30+
"op": "replace",
31+
"source": "Air",
32+
"target": "Air"
3333
}
3434
],
3535
"source": "block_entity"

src/main/kotlin/com/possible_triangle/create_jetpack/Content.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ import com.possible_triangle.create_jetpack.item.JetpackItem
88
import com.simibubi.create.AllCreativeModeTabs
99
import com.simibubi.create.AllTags.AllItemTags
1010
import com.simibubi.create.Create
11-
import com.simibubi.create.content.equipment.armor.AllArmorMaterials
12-
import com.simibubi.create.content.equipment.armor.BacktankBlockEntity
13-
import com.simibubi.create.content.equipment.armor.BacktankInstance
11+
import com.simibubi.create.content.equipment.armor.*
1412
import com.simibubi.create.content.equipment.armor.BacktankItem.BacktankBlockItem
1513
import com.simibubi.create.content.equipment.armor.BacktankRenderer
1614
import com.simibubi.create.content.kinetics.BlockStressDefaults
@@ -125,11 +123,11 @@ object Content {
125123
LootItem.lootTableItem(getItem())
126124
.apply(
127125
CopyNbtFunction.copyData(ContextNbtProvider.BLOCK_ENTITY)
128-
.copy("Air", "Air")
126+
.copy("VanillaTag", "{}", CopyNbtFunction.MergeStrategy.MERGE)
129127
)
130128
.apply(
131129
CopyNbtFunction.copyData(ContextNbtProvider.BLOCK_ENTITY)
132-
.copy("VanillaTag", "{}", CopyNbtFunction.MergeStrategy.MERGE)
130+
.copy("Air", "Air")
133131
)
134132
)
135133
)

0 commit comments

Comments
 (0)