Skip to content

Commit 6df8d13

Browse files
committed
fix jetpack loottable by applying nbt functions in the correct order
1 parent 255a0e1 commit 6df8d13

File tree

4 files changed

+17
-19
lines changed

4 files changed

+17
-19
lines changed

src/generated/resources/.cache/cache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ e0bae5867d547956d13f7d044aa12cac27a7e1ff assets/create_jetpack/models/block/jetp
99
a765123500d1e47eda40673e0b7d7b552ef3e03a assets/create_jetpack/models/item/netherite_jetpack.json
1010
3652f8f7b454940050f090ab32d38e04b93e14f8 assets/create_jetpack/models/item/netherite_jetpack_placeable.json
1111
b7af399e696578d85930f7533fb28d2bfcc9aadb data/create/tags/items/pressurized_air_sources.json
12-
9fecd2df067a7650535b262f7ef49152c0aee543 data/create_jetpack/loot_tables/blocks/jetpack.json
13-
64a9689f072509bc4fd73d8e1984638bbfdba582 data/create_jetpack/loot_tables/blocks/netherite_jetpack.json
12+
9f37968900dc751f4649772a20232f35ea367fb9 data/create_jetpack/loot_tables/blocks/jetpack.json
13+
59dc7a4ced7e4b35fb91bf4b18e10e798b563748 data/create_jetpack/loot_tables/blocks/netherite_jetpack.json
1414
b7af399e696578d85930f7533fb28d2bfcc9aadb 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
@@ -13,9 +13,9 @@
1313
"source": "block_entity",
1414
"ops": [
1515
{
16-
"source": "Air",
17-
"target": "Air",
18-
"op": "replace"
16+
"source": "VanillaTag",
17+
"target": "{}",
18+
"op": "merge"
1919
}
2020
]
2121
},
@@ -24,9 +24,9 @@
2424
"source": "block_entity",
2525
"ops": [
2626
{
27-
"source": "VanillaTag",
28-
"target": "{}",
29-
"op": "merge"
27+
"source": "Air",
28+
"target": "Air",
29+
"op": "replace"
3030
}
3131
]
3232
}

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
@@ -13,9 +13,9 @@
1313
"source": "block_entity",
1414
"ops": [
1515
{
16-
"source": "Air",
17-
"target": "Air",
18-
"op": "replace"
16+
"source": "VanillaTag",
17+
"target": "{}",
18+
"op": "merge"
1919
}
2020
]
2121
},
@@ -24,9 +24,9 @@
2424
"source": "block_entity",
2525
"ops": [
2626
{
27-
"source": "VanillaTag",
28-
"target": "{}",
29-
"op": "merge"
27+
"source": "Air",
28+
"target": "Air",
29+
"op": "replace"
3030
}
3131
]
3232
}

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
@@ -126,11 +124,11 @@ object Content {
126124
LootItem.lootTableItem(getItem())
127125
.apply(
128126
CopyNbtFunction.copyData(ContextNbtProvider.BLOCK_ENTITY)
129-
.copy("Air", "Air")
127+
.copy("VanillaTag", "{}", CopyNbtFunction.MergeStrategy.MERGE)
130128
)
131129
.apply(
132130
CopyNbtFunction.copyData(ContextNbtProvider.BLOCK_ENTITY)
133-
.copy("VanillaTag", "{}", CopyNbtFunction.MergeStrategy.MERGE)
131+
.copy("Air", "Air")
134132
)
135133
)
136134
)

0 commit comments

Comments
 (0)