merge 1.19.x

PssbleTrngle · Mar 15, 2024 · e1c6516 · e1c6516
2 parents bfde10d + 097b919
commit e1c6516
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 55 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,14 +14,13 @@ val trinkets_version: String by extra
 val cca_version: String by extra
 
 plugins {
-    id("com.possible-triangle.gradle") version ("0.1.4")
+    id("com.possible-triangle.gradle") version ("0.1.5")
 }
 
 withKotlin()
 
 fabric {
     dataGen()
-    enableMixins()
     includesMod("com.possible-triangle:flightlib-fabric:${flightlib_version}")
 }
 
@@ -30,7 +29,7 @@ base {
 }
 
 repositories {
-    apply(from = "https://raw.githubusercontent.com/PssbleTrngle/GradleHelper/main/repositories/create-fabric.build.kts")
+    apply(from = "https://raw.githubusercontent.com/PssbleTrngle/GradleHelper/4211a23d270fb542408dd363748fd52740953a82/repositories/create-fabric.build.kts")
 
     curseMaven()
     modrinthMaven()

diff --git a/gradle.properties b/gradle.properties
@@ -15,7 +15,7 @@ maven_group=com.possible-triangle
 
 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
+create_version=0.5.1-f-build.1335+mc1.20.1
 night_config_version=3.6.7
 flightlib_version=2.1.0
 kotlin_fabric_version=1.9.6+kotlin.1.8.22

diff --git a/src/main/java/com/possible_triangle/create_jetpack/mixin/NetheriteDivingHandlerMixin.java b/src/main/java/com/possible_triangle/create_jetpack/mixin/NetheriteDivingHandlerMixin.java
diff --git a/src/main/kotlin/com/possible_triangle/create_jetpack/Content.kt b/src/main/kotlin/com/possible_triangle/create_jetpack/Content.kt
@@ -165,7 +165,7 @@ object Content {
         }
         tag(AllItemTags.PRESSURIZED_AIR_SOURCES.tag)
         transform {
-            it.tab(AllCreativeModeTabs.MAIN_TAB.key) { mod ->
+            it.tab(AllCreativeModeTabs.BASE_CREATIVE_TAB.key) { mod ->
                 mod.accept(ItemStack(it.entry).apply {
                     orCreateTag.putFloat("Air", BacktankUtil.maxAir(this).toFloat())
                 })

diff --git a/src/main/resources/create_jetpack.mixins.json b/src/main/resources/create_jetpack.mixins.json
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -24,15 +24,12 @@
       "com.possible_triangle.create_jetpack.CreateJetpackMod"
     ]
   },
-  "mixins": [
-    "${mod_id}.mixins.json"
-  ],
   "depends": {
     "fabricloader": ">=0.14",
     "fabric": "*",
     "minecraft": "1.20.1",
     "java": ">=17",
-    "flightlib": ">=2.0.0",
-    "create": ">=0.5.1-d"
+    "flightlib": "*",
+    "create": ">=0.5.1-f"
   }
 }