fix jetpack loottable by applying nbt functions in the correct order

PssbleTrngle · Sep 20, 2024 · 6df8d13 · 6df8d13
1 parent 255a0e1
commit 6df8d13
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
@@ -9,6 +9,6 @@ e0bae5867d547956d13f7d044aa12cac27a7e1ff assets/create_jetpack/models/block/jetp
 a765123500d1e47eda40673e0b7d7b552ef3e03a assets/create_jetpack/models/item/netherite_jetpack.json
 3652f8f7b454940050f090ab32d38e04b93e14f8 assets/create_jetpack/models/item/netherite_jetpack_placeable.json
 b7af399e696578d85930f7533fb28d2bfcc9aadb data/create/tags/items/pressurized_air_sources.json
-9fecd2df067a7650535b262f7ef49152c0aee543 data/create_jetpack/loot_tables/blocks/jetpack.json
-64a9689f072509bc4fd73d8e1984638bbfdba582 data/create_jetpack/loot_tables/blocks/netherite_jetpack.json
+9f37968900dc751f4649772a20232f35ea367fb9 data/create_jetpack/loot_tables/blocks/jetpack.json
+59dc7a4ced7e4b35fb91bf4b18e10e798b563748 data/create_jetpack/loot_tables/blocks/netherite_jetpack.json
 b7af399e696578d85930f7533fb28d2bfcc9aadb data/minecraft/tags/blocks/mineable/pickaxe.json
diff --git a/src/generated/resources/data/create_jetpack/loot_tables/blocks/jetpack.json b/src/generated/resources/data/create_jetpack/loot_tables/blocks/jetpack.json
@@ -13,9 +13,9 @@
               "source": "block_entity",
               "ops": [
                 {
-                  "source": "Air",
-                  "target": "Air",
-                  "op": "replace"
+                  "source": "VanillaTag",
+                  "target": "{}",
+                  "op": "merge"
                 }
               ]
             },
@@ -24,9 +24,9 @@
               "source": "block_entity",
               "ops": [
                 {
-                  "source": "VanillaTag",
-                  "target": "{}",
-                  "op": "merge"
+                  "source": "Air",
+                  "target": "Air",
+                  "op": "replace"
                 }
               ]
             }

diff --git a/src/generated/resources/data/create_jetpack/loot_tables/blocks/netherite_jetpack.json b/src/generated/resources/data/create_jetpack/loot_tables/blocks/netherite_jetpack.json
@@ -13,9 +13,9 @@
               "source": "block_entity",
               "ops": [
                 {
-                  "source": "Air",
-                  "target": "Air",
-                  "op": "replace"
+                  "source": "VanillaTag",
+                  "target": "{}",
+                  "op": "merge"
                 }
               ]
             },
@@ -24,9 +24,9 @@
               "source": "block_entity",
               "ops": [
                 {
-                  "source": "VanillaTag",
-                  "target": "{}",
-                  "op": "merge"
+                  "source": "Air",
+                  "target": "Air",
+                  "op": "replace"
                 }
               ]
             }

diff --git a/src/main/kotlin/com/possible_triangle/create_jetpack/Content.kt b/src/main/kotlin/com/possible_triangle/create_jetpack/Content.kt
@@ -8,9 +8,7 @@ import com.possible_triangle.create_jetpack.item.JetpackItem
 import com.simibubi.create.AllCreativeModeTabs
 import com.simibubi.create.AllTags.AllItemTags
 import com.simibubi.create.Create
-import com.simibubi.create.content.equipment.armor.AllArmorMaterials
-import com.simibubi.create.content.equipment.armor.BacktankBlockEntity
-import com.simibubi.create.content.equipment.armor.BacktankInstance
+import com.simibubi.create.content.equipment.armor.*
 import com.simibubi.create.content.equipment.armor.BacktankItem.BacktankBlockItem
 import com.simibubi.create.content.equipment.armor.BacktankRenderer
 import com.simibubi.create.content.kinetics.BlockStressDefaults
@@ -126,11 +124,11 @@ object Content {
                             LootItem.lootTableItem(getItem())
                                 .apply(
                                     CopyNbtFunction.copyData(ContextNbtProvider.BLOCK_ENTITY)
-                                        .copy("Air", "Air")
+                                        .copy("VanillaTag", "{}", CopyNbtFunction.MergeStrategy.MERGE)
                                 )
                                 .apply(
                                     CopyNbtFunction.copyData(ContextNbtProvider.BLOCK_ENTITY)
-                                        .copy("VanillaTag", "{}", CopyNbtFunction.MergeStrategy.MERGE)
+                                        .copy("Air", "Air")
                                 )
                         )
                 )