update flightlib & port over netherite jetpack, ru_ru translation & s…

…maller features

build.gradle.kts

@@ -14,14 +14,14 @@ val trinkets_version: String by extra
 val cca_version: String by extra
 
 plugins {
-    id("com.possible-triangle.gradle") version ("0.1.0")
+    id("com.possible-triangle.gradle") version ("0.1.4")
 }
 
 withKotlin()
 
 fabric {
     dataGen()
-    includesMod("com.possible_triangle:flightlib-fabric:${flightlib_version}")
+    includesMod("com.possible-triangle:flightlib-fabric:${flightlib_version}")
 }
 
 base {
@@ -33,6 +33,7 @@ repositories {
 
     curseMaven()
     modrinthMaven()
+    localMaven(project)
 
     maven {
         url = uri("https://maven.blamejared.com/")
@@ -48,7 +49,7 @@ repositories {
             password = env["GITHUB_TOKEN"]
         }
         content {
-            includeGroup("com.possible_triangle")
+            includeGroup("com.possible-triangle")
         }
     }
 
@@ -76,13 +77,11 @@ dependencies {
         //modRuntimeOnly("com.electronwill.night-config:toml:${night_config_version}")
     }
 
-    modCompileOnly("com.possible_triangle:flightlib-api:${flightlib_version}")
+    modCompileOnly("com.possible-triangle:flightlib-api:${flightlib_version}")
 }
 
 enablePublishing {
-    repositories {
-        githubPackages(project)
-    }
+    githubPackages()
 }
 
 uploadToCurseforge {

gradle.properties

@@ -17,7 +17,7 @@ jei_version=15.2.0.27
 emi_version=1.0.19+1.20.1
 create_version=0.5.1-d-build.1161+mc1.20.1
 night_config_version=3.6.7
-flightlib_version=2.0.0
+flightlib_version=2.0.3
 kotlin_fabric_version=1.9.6+kotlin.1.8.22
 trinkets_version=3.7.1
 cca_version=5.2.0

src/generated/resources/.cache/8b3b6906bc374aa853f6af0a154d20a90a4fcadc

@@ -1,9 +1,15 @@
-// 1.19.2	2023-07-17T19:05:48.0357538	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)]
-99c74b76c8cdc441d609b2209d8223879b4dd684 assets\create_jetpack\models\item\jetpack.json
-242057465f541b30848281de53211183f8009de4 assets\create_jetpack\lang\en_ud.json
-cadbee1695bd0c25e4ddbe0a655ac4648385d095 assets\create_jetpack\blockstates\jetpack.json
-6c53b1a6ed28929b7a0a090edf6101e610f842fc assets\create_jetpack\models\item\jetpack_placeable.json
+// 1.19.2	2023-12-14T23:26:35.6438771	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)]
+0ce5da71b5721fc16e0368dd0e1214de5a56fab3 assets\create_jetpack\models\item\jetpack.json
+a9f4853187ae09ad01356339f4acf9b3e8189ebd assets\create_jetpack\models\block\netherite_jetpack.json
+673a48952547e61209ce76274272e9c4e05c8189 assets\create_jetpack\blockstates\jetpack.json
 944162d5bb5a004902a07d2f149e6d2d5de91340 data\create_jetpack\loot_tables\blocks\jetpack.json
-71008b8a719a648a64c69966c23a65c1fe2643ec assets\create_jetpack\lang\en_us.json
-a4e0d7c60ae58e017ae032a45fbd03c49e6880e1 data\minecraft\tags\blocks\mineable\pickaxe.json
-a4e0d7c60ae58e017ae032a45fbd03c49e6880e1 data\create\tags\items\pressurized_air_sources.json
+dadd4d1712072a63e01431df3d1c87467e33bf7c data\create_jetpack\loot_tables\blocks\netherite_jetpack.json
+ba646e7fbcf74f90e9695a777bbcd88b4460e74a data\minecraft\tags\blocks\mineable\pickaxe.json
+8fc46b31bb026ff32b7fd81282d80fe74294d823 assets\create_jetpack\lang\en_ud.json
+f01edd57ce03744767e9ab7b7e68c80d9834a50c assets\create_jetpack\models\item\netherite_jetpack.json
+6c53b1a6ed28929b7a0a090edf6101e610f842fc assets\create_jetpack\models\item\jetpack_placeable.json
+48f8d6961c693a1d279b084961196134511d7874 assets\create_jetpack\lang\en_us.json
+bd5c42a96cb08087f0d25032556133e56a265410 assets\create_jetpack\models\block\jetpack.json
+ba8e314e1e6dbb6c25dd5e837cef04f8d96412a1 assets\create_jetpack\blockstates\netherite_jetpack.json
+6c53b1a6ed28929b7a0a090edf6101e610f842fc assets\create_jetpack\models\item\netherite_jetpack_placeable.json
+ba646e7fbcf74f90e9695a777bbcd88b4460e74a data\create\tags\items\pressurized_air_sources.json

src/generated/resources/assets/create_jetpack/blockstates/jetpack.json

@@ -1,33 +1,33 @@
 {
   "variants": {
     "facing=east,waterlogged=false": {
-      "model": "create_jetpack:block/jetpack/block",
+      "model": "create_jetpack:block/jetpack",
       "y": 90
     },
     "facing=east,waterlogged=true": {
-      "model": "create_jetpack:block/jetpack/block",
+      "model": "create_jetpack:block/jetpack",
       "y": 90
     },
     "facing=north,waterlogged=false": {
-      "model": "create_jetpack:block/jetpack/block"
+      "model": "create_jetpack:block/jetpack"
     },
     "facing=north,waterlogged=true": {
-      "model": "create_jetpack:block/jetpack/block"
+      "model": "create_jetpack:block/jetpack"
     },
     "facing=south,waterlogged=false": {
-      "model": "create_jetpack:block/jetpack/block",
+      "model": "create_jetpack:block/jetpack",
       "y": 180
     },
     "facing=south,waterlogged=true": {
-      "model": "create_jetpack:block/jetpack/block",
+      "model": "create_jetpack:block/jetpack",
       "y": 180
     },
     "facing=west,waterlogged=false": {
-      "model": "create_jetpack:block/jetpack/block",
+      "model": "create_jetpack:block/jetpack",
       "y": 270
     },
     "facing=west,waterlogged=true": {
-      "model": "create_jetpack:block/jetpack/block",
+      "model": "create_jetpack:block/jetpack",
       "y": 270
     }
   }

src/generated/resources/assets/create_jetpack/blockstates/netherite_jetpack.json

@@ -0,0 +1,34 @@
+{
+  "variants": {
+    "facing=east,waterlogged=false": {
+      "model": "create_jetpack:block/netherite_jetpack",
+      "y": 90
+    },
+    "facing=east,waterlogged=true": {
+      "model": "create_jetpack:block/netherite_jetpack",
+      "y": 90
+    },
+    "facing=north,waterlogged=false": {
+      "model": "create_jetpack:block/netherite_jetpack"
+    },
+    "facing=north,waterlogged=true": {
+      "model": "create_jetpack:block/netherite_jetpack"
+    },
+    "facing=south,waterlogged=false": {
+      "model": "create_jetpack:block/netherite_jetpack",
+      "y": 180
+    },
+    "facing=south,waterlogged=true": {
+      "model": "create_jetpack:block/netherite_jetpack",
+      "y": 180
+    },
+    "facing=west,waterlogged=false": {
+      "model": "create_jetpack:block/netherite_jetpack",
+      "y": 270
+    },
+    "facing=west,waterlogged=true": {
+      "model": "create_jetpack:block/netherite_jetpack",
+      "y": 270
+    }
+  }
+}

src/generated/resources/assets/create_jetpack/lang/en_ud.json

@@ -1,5 +1,28 @@
 {
   "block.create_jetpack.jetpack": "ʞɔɐdʇǝſ",
+  "block.create_jetpack.netherite_jetpack": "ʞɔɐdʇǝſ ǝʇıɹǝɥʇǝN",
   "item.create_jetpack.jetpack": "ʞɔɐdʇǝſ",
-  "item.create_jetpack.jetpack_placeable": "ǝןqɐǝɔɐןԀ ʞɔɐdʇǝſ"
+  "item.create_jetpack.jetpack.tooltip": "",
+  "item.create_jetpack.jetpack.tooltip.action1": "spɹɐʍdn ʎןℲ",
+  "item.create_jetpack.jetpack.tooltip.action2": "spɹɐʍuʍop ʎןℲ",
+  "item.create_jetpack.jetpack.tooltip.action3": "ɟɟo/uo ǝuıbuǝ uɹn⟘",
+  "item.create_jetpack.jetpack.tooltip.action4": "ɟɟo/uo ǝpoɯ ɹǝʌoɥ uɹn⟘",
+  "item.create_jetpack.jetpack.tooltip.control1": "]ԀW∩ſ[ ssǝɹԀ",
+  "item.create_jetpack.jetpack.tooltip.control2": "]⟘ℲIHS[ ssǝɹԀ",
+  "item.create_jetpack.jetpack.tooltip.control3": "]⅁[ ssǝɹԀ",
+  "item.create_jetpack.jetpack.tooltip.control4": "]H[ ssǝɹԀ",
+  "item.create_jetpack.jetpack.tooltip.summary": "ɹıɐ pǝzıɹnssǝɹd buısn uoıʇɐʇıʌǝן sʍoןןⱯ",
+  "item.create_jetpack.jetpack_placeable": "ǝןqɐǝɔɐןԀ ʞɔɐdʇǝſ",
+  "item.create_jetpack.netherite_jetpack": "ʞɔɐdʇǝſ ǝʇıɹǝɥʇǝN",
+  "item.create_jetpack.netherite_jetpack.tooltip": "",
+  "item.create_jetpack.netherite_jetpack.tooltip.action1": "spɹɐʍdn ʎןℲ",
+  "item.create_jetpack.netherite_jetpack.tooltip.action2": "spɹɐʍuʍop ʎןℲ",
+  "item.create_jetpack.netherite_jetpack.tooltip.action3": "ɟɟo/uo ǝuıbuǝ uɹn⟘",
+  "item.create_jetpack.netherite_jetpack.tooltip.action4": "ɟɟo/uo ǝpoɯ ɹǝʌoɥ uɹn⟘",
+  "item.create_jetpack.netherite_jetpack.tooltip.control1": "]ԀW∩ſ[ ssǝɹԀ",
+  "item.create_jetpack.netherite_jetpack.tooltip.control2": "]⟘ℲIHS[ ssǝɹԀ",
+  "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"
 }

src/generated/resources/assets/create_jetpack/lang/en_us.json

@@ -0,0 +1,28 @@
+{
+  "block.create_jetpack.jetpack": "Jetpack",
+  "block.create_jetpack.netherite_jetpack": "Netherite Jetpack",
+  "item.create_jetpack.jetpack": "Jetpack",
+  "item.create_jetpack.jetpack.tooltip": "",
+  "item.create_jetpack.jetpack.tooltip.action1": "Fly upwards",
+  "item.create_jetpack.jetpack.tooltip.action2": "Fly downwards",
+  "item.create_jetpack.jetpack.tooltip.action3": "Turn engine on/off",
+  "item.create_jetpack.jetpack.tooltip.action4": "Turn hover mode on/off",
+  "item.create_jetpack.jetpack.tooltip.control1": "Press [JUMP]",
+  "item.create_jetpack.jetpack.tooltip.control2": "Press [SHIFT]",
+  "item.create_jetpack.jetpack.tooltip.control3": "Press [G]",
+  "item.create_jetpack.jetpack.tooltip.control4": "Press [H]",
+  "item.create_jetpack.jetpack.tooltip.summary": "Allows levitation using pressurized air",
+  "item.create_jetpack.jetpack_placeable": "Jetpack Placeable",
+  "item.create_jetpack.netherite_jetpack": "Netherite Jetpack",
+  "item.create_jetpack.netherite_jetpack.tooltip": "",
+  "item.create_jetpack.netherite_jetpack.tooltip.action1": "Fly upwards",
+  "item.create_jetpack.netherite_jetpack.tooltip.action2": "Fly downwards",
+  "item.create_jetpack.netherite_jetpack.tooltip.action3": "Turn engine on/off",
+  "item.create_jetpack.netherite_jetpack.tooltip.action4": "Turn hover mode on/off",
+  "item.create_jetpack.netherite_jetpack.tooltip.control1": "Press [JUMP]",
+  "item.create_jetpack.netherite_jetpack.tooltip.control2": "Press [SHIFT]",
+  "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"
+}

src/generated/resources/assets/create_jetpack/models/block/jetpack.json

@@ -0,0 +1,6 @@
+{
+  "parent": "create_jetpack:block/jetpack/block",
+  "textures": {
+    "0": "create_jetpack:block/jetpack"
+  }
+}

src/generated/resources/assets/create_jetpack/models/block/netherite_jetpack.json

@@ -0,0 +1,6 @@
+{
+  "parent": "create_jetpack:block/jetpack/block",
+  "textures": {
+    "0": "create_jetpack:block/netherite_jetpack"
+  }
+}

src/generated/resources/assets/create_jetpack/models/item/jetpack.json

@@ -1,3 +1,6 @@
 {
-  "parent": "create_jetpack:block/jetpack/item"
+  "parent": "create_jetpack:block/jetpack/item",
+  "textures": {
+    "0": "create_jetpack:block/jetpack"
+  }
 }

src/generated/resources/assets/create_jetpack/models/item/netherite_jetpack.json

@@ -0,0 +1,6 @@
+{
+  "parent": "create_jetpack:block/jetpack/item",
+  "textures": {
+    "0": "create_jetpack:block/netherite_jetpack"
+  }
+}

src/generated/resources/assets/create_jetpack/models/item/netherite_jetpack_placeable.json

@@ -0,0 +1,3 @@
+{
+  "parent": "minecraft:item/barrier"
+}

src/generated/resources/data/create/tags/items/pressurized_air_sources.json

@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
-    "create_jetpack:jetpack"
+    "create_jetpack:jetpack",
+    "create_jetpack:netherite_jetpack"
   ]
 }

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

@@ -0,0 +1,48 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_name",
+              "source": "block_entity"
+            },
+            {
+              "function": "minecraft:copy_nbt",
+              "ops": [
+                {
+                  "op": "replace",
+                  "source": "Air",
+                  "target": "Air"
+                }
+              ],
+              "source": "block_entity"
+            },
+            {
+              "function": "minecraft:copy_nbt",
+              "ops": [
+                {
+                  "op": "replace",
+                  "source": "Enchantments",
+                  "target": "Enchantments"
+                }
+              ],
+              "source": "block_entity"
+            }
+          ],
+          "name": "create_jetpack:netherite_jetpack"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
-    "create_jetpack:jetpack"
+    "create_jetpack:jetpack",
+    "create_jetpack:netherite_jetpack"
   ]
 }