Merge branch '1.18.x' into 1.19.x

PssbleTrngle · Sep 13, 2024 · ef3fe91 · ef3fe91
2 parents 26e00fa + 0e2a6e6
commit ef3fe91
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 38 deletions.
diff --git a/src/generated/resources/.cache/8b3b6906bc374aa853f6af0a154d20a90a4fcadc b/src/generated/resources/.cache/8b3b6906bc374aa853f6af0a154d20a90a4fcadc
@@ -1,15 +1,15 @@
-// 1.19.2	2023-12-14T22:45:10.4577564	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.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)]
 673a48952547e61209ce76274272e9c4e05c8189 assets/create_jetpack/blockstates/jetpack.json
 ba8e314e1e6dbb6c25dd5e837cef04f8d96412a1 assets/create_jetpack/blockstates/netherite_jetpack.json
-8fc46b31bb026ff32b7fd81282d80fe74294d823 assets/create_jetpack/lang/en_ud.json
-48f8d6961c693a1d279b084961196134511d7874 assets/create_jetpack/lang/en_us.json
+a2f5d170a0eb9d1686d1c97de51bdb52eee864af assets/create_jetpack/lang/en_ud.json
+6ddfd5b5dd3936d400790105f3eb7aca1572d326 assets/create_jetpack/lang/en_us.json
 bd5c42a96cb08087f0d25032556133e56a265410 assets/create_jetpack/models/block/jetpack.json
 a9f4853187ae09ad01356339f4acf9b3e8189ebd assets/create_jetpack/models/block/netherite_jetpack.json
 0ce5da71b5721fc16e0368dd0e1214de5a56fab3 assets/create_jetpack/models/item/jetpack.json
 6c53b1a6ed28929b7a0a090edf6101e610f842fc assets/create_jetpack/models/item/jetpack_placeable.json
 f01edd57ce03744767e9ab7b7e68c80d9834a50c assets/create_jetpack/models/item/netherite_jetpack.json
 6c53b1a6ed28929b7a0a090edf6101e610f842fc assets/create_jetpack/models/item/netherite_jetpack_placeable.json
 45715b49eb3f91a62054f6c2a9d82115b8e188fb data/create/tags/items/pressurized_air_sources.json
-944162d5bb5a004902a07d2f149e6d2d5de91340 data/create_jetpack/loot_tables/blocks/jetpack.json
-dadd4d1712072a63e01431df3d1c87467e33bf7c data/create_jetpack/loot_tables/blocks/netherite_jetpack.json
+a534ba17a2fe9e5574834839df9a09d4f07ec5dc data/create_jetpack/loot_tables/blocks/jetpack.json
+0a4090248710ced389ae503040a1ce0daf4be680 data/create_jetpack/loot_tables/blocks/netherite_jetpack.json
 45715b49eb3f91a62054f6c2a9d82115b8e188fb data/minecraft/tags/blocks/mineable/pickaxe.json
diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
diff --git a/src/generated/resources/assets/create_jetpack/lang/en_ud.json b/src/generated/resources/assets/create_jetpack/lang/en_ud.json
@@ -24,5 +24,6 @@
   "item.create_jetpack.netherite_jetpack.tooltip.control3": "]⅁[ ssǝɹԀ",
   "item.create_jetpack.netherite_jetpack.tooltip.control4": "]H[ ssǝɹԀ",
   "item.create_jetpack.netherite_jetpack.tooltip.summary": "ɹıɐ pǝzıɹnssǝɹd buısn uoıʇɐʇıʌǝן sʍoןןⱯ",
-  "item.create_jetpack.netherite_jetpack_placeable": "ǝןqɐǝɔɐןԀ ʞɔɐdʇǝſ ǝʇıɹǝɥʇǝN"
+  "item.create_jetpack.netherite_jetpack_placeable": "ǝןqɐǝɔɐןԀ ʞɔɐdʇǝſ ǝʇıɹǝɥʇǝN",
+  "key.categories.movement.jetpack": "ʞɔɐdʇǝſ ǝʇɐǝɹƆ"
 }
diff --git a/src/generated/resources/assets/create_jetpack/lang/en_us.json b/src/generated/resources/assets/create_jetpack/lang/en_us.json
@@ -24,5 +24,6 @@
   "item.create_jetpack.netherite_jetpack.tooltip.control3": "Press [G]",
   "item.create_jetpack.netherite_jetpack.tooltip.control4": "Press [H]",
   "item.create_jetpack.netherite_jetpack.tooltip.summary": "Allows levitation using pressurized air",
-  "item.create_jetpack.netherite_jetpack_placeable": "Netherite Jetpack Placeable"
+  "item.create_jetpack.netherite_jetpack_placeable": "Netherite Jetpack Placeable",
+  "key.categories.movement.jetpack": "Create Jetpack"
 }
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
@@ -12,10 +12,6 @@
         {
           "type": "minecraft:item",
           "functions": [
-            {
-              "function": "minecraft:copy_name",
-              "source": "block_entity"
-            },
             {
               "function": "minecraft:copy_nbt",
               "ops": [
@@ -31,9 +27,9 @@
               "function": "minecraft:copy_nbt",
               "ops": [
                 {
-                  "op": "replace",
-                  "source": "Enchantments",
-                  "target": "Enchantments"
+                  "op": "merge",
+                  "source": "VanillaTag",
+                  "target": "{}"
                 }
               ],
               "source": "block_entity"

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
@@ -12,10 +12,6 @@
         {
           "type": "minecraft:item",
           "functions": [
-            {
-              "function": "minecraft:copy_name",
-              "source": "block_entity"
-            },
             {
               "function": "minecraft:copy_nbt",
               "ops": [
@@ -31,9 +27,9 @@
               "function": "minecraft:copy_nbt",
               "ops": [
                 {
-                  "op": "replace",
-                  "source": "Enchantments",
-                  "target": "Enchantments"
+                  "op": "merge",
+                  "source": "VanillaTag",
+                  "target": "{}"
                 }
               ],
               "source": "block_entity"

diff --git a/src/main/kotlin/com/possible_triangle/create_jetpack/Content.kt b/src/main/kotlin/com/possible_triangle/create_jetpack/Content.kt
@@ -40,7 +40,6 @@ import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.storage.loot.LootPool
 import net.minecraft.world.level.storage.loot.LootTable
 import net.minecraft.world.level.storage.loot.entries.LootItem
-import net.minecraft.world.level.storage.loot.functions.CopyNameFunction
 import net.minecraft.world.level.storage.loot.functions.CopyNbtFunction
 import net.minecraft.world.level.storage.loot.predicates.ExplosionCondition
 import net.minecraft.world.level.storage.loot.providers.nbt.ContextNbtProvider
@@ -124,14 +123,13 @@ object Content {
                         .setRolls(ConstantValue.exactly(1F))
                         .add(
                             LootItem.lootTableItem(getItem())
-                                .apply(CopyNameFunction.copyName(CopyNameFunction.NameSource.BLOCK_ENTITY))
                                 .apply(
                                     CopyNbtFunction.copyData(ContextNbtProvider.BLOCK_ENTITY)
                                         .copy("Air", "Air")
                                 )
                                 .apply(
                                     CopyNbtFunction.copyData(ContextNbtProvider.BLOCK_ENTITY)
-                                        .copy("Enchantments", "Enchantments")
+                                        .copy("VanillaTag", "{}", CopyNbtFunction.MergeStrategy.MERGE)
                                 )
                         )
                 )
@@ -181,6 +179,8 @@ object Content {
     fun register(modBus: IEventBus) {
         REGISTRATE.registerEventListeners(modBus)
 
+        REGISTRATE.addRawLang("key.categories.movement.jetpack", "Create Jetpack")
+
         LOADING_CONTEXT.registerConfig(ModConfig.Type.COMMON, Configs.SERVER_SPEC)
         LOADING_CONTEXT.registerConfig(ModConfig.Type.CLIENT, Configs.CLIENT_SPEC)