add netherite jetpack & update flight lib

PssbleTrngle · Dec 14, 2023 · e4acad2 · e4acad2
1 parent 377b6e1
commit e4acad2
Show file tree

Hide file tree

Showing 28 changed files with 471 additions and 93 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,7 +11,7 @@ val elytra_slot_version: String by extra
 val jei_version: String by extra
 
 plugins {
-    id("com.possible-triangle.gradle") version("0.1.1")
+    id("com.possible-triangle.gradle") version("0.1.4")
 }
 
 withKotlin()
@@ -27,6 +27,7 @@ base {
 
 repositories {
     curseMaven()
+    localMaven(project)
 
     maven {
         url = uri("https://maven.blamejared.com/")

diff --git a/gradle.properties b/gradle.properties
@@ -15,10 +15,10 @@ maven_group=com.possible-triangle
 
 kotlin_forge_version=3.12.0
 jei_version=11.6.0.1015
-flywheel_version=0.6.9-18
+flywheel_version=0.6.10-20
 create_version=0.5.1.e-44
 registrate_version=MC1.19-1.1.5
-flightlib_version=1.1.1
+flightlib_version=1.1.2
 
 curios_version=1.19.2-5.1.4.1
 caelus_version=1.19.2-3.0.0.6

diff --git a/src/generated/resources/.cache/8b3b6906bc374aa853f6af0a154d20a90a4fcadc b/src/generated/resources/.cache/8b3b6906bc374aa853f6af0a154d20a90a4fcadc
@@ -1,9 +1,15 @@
-// 1.19.2	2023-07-17T12:15:43.50981	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)]
-cadbee1695bd0c25e4ddbe0a655ac4648385d095 assets/create_jetpack/blockstates/jetpack.json
-242057465f541b30848281de53211183f8009de4 assets/create_jetpack/lang/en_ud.json
-71008b8a719a648a64c69966c23a65c1fe2643ec assets/create_jetpack/lang/en_us.json
-99c74b76c8cdc441d609b2209d8223879b4dd684 assets/create_jetpack/models/item/jetpack.json
+// 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)]
+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
+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
-dc9e57446ca7d7201c66ea086e105d8c95df698a data/create/tags/items/pressurized_air_sources.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
-dc9e57446ca7d7201c66ea086e105d8c95df698a data/minecraft/tags/blocks/mineable/pickaxe.json
+dadd4d1712072a63e01431df3d1c87467e33bf7c data/create_jetpack/loot_tables/blocks/netherite_jetpack.json
+45715b49eb3f91a62054f6c2a9d82115b8e188fb data/minecraft/tags/blocks/mineable/pickaxe.json
diff --git a/src/generated/resources/assets/create_jetpack/blockstates/jetpack.json b/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
     }
   }

diff --git a/src/generated/resources/assets/create_jetpack/blockstates/netherite_jetpack.json b/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
+    }
+  }
+}
diff --git a/src/generated/resources/assets/create_jetpack/lang/en_ud.json b/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"
 }
diff --git a/src/generated/resources/assets/create_jetpack/lang/en_us.json b/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"
+}
diff --git a/src/generated/resources/assets/create_jetpack/models/block/jetpack.json b/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"
+  }
+}
diff --git a/src/generated/resources/assets/create_jetpack/models/block/netherite_jetpack.json b/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"
+  }
+}
diff --git a/src/generated/resources/assets/create_jetpack/models/item/jetpack.json b/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"
+  }
 }
diff --git a/src/generated/resources/assets/create_jetpack/models/item/netherite_jetpack.json b/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"
+  }
+}
diff --git a/src/generated/resources/assets/create_jetpack/models/item/netherite_jetpack_placeable.json b/src/generated/resources/assets/create_jetpack/models/item/netherite_jetpack_placeable.json
@@ -0,0 +1,3 @@
+{
+  "parent": "minecraft:item/barrier"
+}
diff --git a/src/generated/resources/data/create/tags/items/pressurized_air_sources.json b/src/generated/resources/data/create/tags/items/pressurized_air_sources.json
@@ -1,5 +1,6 @@
 {
   "values": [
-    "create_jetpack:jetpack"
+    "create_jetpack:jetpack",
+    "create_jetpack:netherite_jetpack"
   ]
 }
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
@@ -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
+    }
+  ]
+}
diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
@@ -1,5 +1,6 @@
 {
   "values": [
-    "create_jetpack:jetpack"
+    "create_jetpack:jetpack",
+    "create_jetpack:netherite_jetpack"
   ]
 }