merge 1.19.x

build.gradle.kts

@@ -21,6 +21,7 @@ withKotlin()
 
 fabric {
     dataGen()
+    enableMixins()
     includesMod("com.possible-triangle:flightlib-fabric:${flightlib_version}")
 }
 

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.3
+flightlib_version=2.1.0
 kotlin_fabric_version=1.9.6+kotlin.1.8.22
 trinkets_version=3.7.1
 cca_version=5.2.0

src/main/java/com/possible_triangle/create_jetpack/mixin/NetheriteDivingHandlerMixin.java

@@ -0,0 +1,34 @@
+package com.possible_triangle.create_jetpack.mixin;
+
+import com.simibubi.create.content.equipment.armor.NetheriteDivingHandler;
+import com.tterrag.registrate.util.entry.ItemEntry;
+import net.minecraft.world.item.ArmorItem;
+import net.minecraft.world.item.ArmorMaterials;
+import net.minecraft.world.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.Slice;
+
+@Mixin(NetheriteDivingHandler.class)
+public class NetheriteDivingHandlerMixin {
+
+    @Redirect(
+            method = "onLivingEquipmentChange(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/EquipmentSlot;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)V",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lcom/tterrag/registrate/util/entry/ItemEntry;isIn(Lnet/minecraft/world/item/ItemStack;)Z"
+            ),
+            slice = @Slice(
+                    from = @At(
+                            value = "FIELD",
+                            target = "Lnet/minecraft/world/entity/EquipmentSlot;CHEST:Lnet/minecraft/world/entity/EquipmentSlot;"
+                    ),
+                    to = @At("TAIL")
+            )
+    )
+    private static boolean modifyNetheritePredicate(ItemEntry instance, ItemStack stack) {
+        return stack.getItem() instanceof ArmorItem armor && armor.getMaterial() == ArmorMaterials.NETHERITE;
+    }
+
+}

src/main/kotlin/com/possible_triangle/create_jetpack/config/ServerConfig.kt

@@ -10,7 +10,7 @@ interface IServerConfig {
     val acceleration: Double
     val hoverSpeed: Double
     val swimModifier: Double
-    val elytraBoostEnabled: Boolean
+    val elytraBoost: Double
 }
 
 data class SyncedConfig(
@@ -21,7 +21,7 @@ data class SyncedConfig(
     override val acceleration: Double,
     override val hoverSpeed: Double,
     override val swimModifier: Double,
-    override val elytraBoostEnabled: Boolean,
+    override val elytraBoost: Double,
 ) : IServerConfig
 
 class ServerConfig(builder: ForgeConfigSpec.Builder) : IServerConfig {
@@ -48,7 +48,7 @@ class ServerConfig(builder: ForgeConfigSpec.Builder) : IServerConfig {
     private val swimModifierValue = builder.defineInRange("speed.swim_modifier", 1.8, 0.0, 100.0)
     override val swimModifier get() = swimModifierValue.get()!!
 
-    private val elytraBoostEnabledValue = builder.define("features.elytra_boost", true)
-    override val elytraBoostEnabled get() = elytraBoostEnabledValue.get()!!
+    private val elytraBoostValue = builder.defineInRange("features.elytra_boost", 1.25, 1.0, 100.0)
+    override val elytraBoost get() = elytraBoostValue.get()!!
 
 }

src/main/kotlin/com/possible_triangle/create_jetpack/config/SyncConfigMessage.kt

@@ -16,7 +16,7 @@ class SyncConfigMessage(private val config: IServerConfig) {
                 acceleration = buf.readDouble(),
                 hoverSpeed = buf.readDouble(),
                 swimModifier = buf.readDouble(),
-                elytraBoostEnabled = buf.readBoolean(),
+                elytraBoost = buf.readDouble(),
             )
             return SyncConfigMessage(config)
         }
@@ -30,7 +30,7 @@ class SyncConfigMessage(private val config: IServerConfig) {
         buf.writeDouble(config.acceleration)
         buf.writeDouble(config.hoverSpeed)
         buf.writeDouble(config.swimModifier)
-        buf.writeBoolean(config.elytraBoostEnabled)
+        buf.writeDouble(config.elytraBoost)
     }
 
     fun handle() {

src/main/kotlin/com/possible_triangle/create_jetpack/item/JetpackItem.kt

@@ -4,8 +4,8 @@ import com.possible_triangle.create_jetpack.config.Configs
 import com.possible_triangle.flightlib.api.ControlType
 import com.possible_triangle.flightlib.api.IJetpack
 import com.possible_triangle.flightlib.api.IJetpack.Context
-import com.possible_triangle.flightlib.api.sources.CuriosSource
 import com.possible_triangle.flightlib.api.sources.EquipmentSource
+import com.possible_triangle.flightlib.api.sources.TrinketsSource
 import com.simibubi.create.content.equipment.armor.BacktankItem
 import com.simibubi.create.content.equipment.armor.BacktankUtil
 import com.simibubi.create.foundation.item.LayeredArmorItem
@@ -62,8 +62,8 @@ open class JetpackItem(
         return Configs.SERVER.swimModifier
     }
 
-    override fun boostsElytra(): Boolean {
-        return Configs.SERVER.elytraBoostEnabled
+    override fun elytraBoost(): Double {
+        return Configs.SERVER.elytraBoost
     }
 
     private val thrusters = listOf(-0.35, 0.35).map { offset ->
@@ -84,7 +84,7 @@ open class JetpackItem(
     override fun isValid(context: Context): Boolean {
         return when (val source = context.source) {
             is EquipmentSource -> source.slot == EquipmentSlot.CHEST
-            is CuriosSource -> true
+            is TrinketsSource -> true
             else -> false
         }
     }

src/main/resources/create_jetpack.mixins.json

@@ -0,0 +1,11 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "package": "com.possible_triangle.create_jetpack.mixin",
+  "compatibilityLevel": "JAVA_17",
+  "refmap": "${mod_id}.refmap.json",
+  "mixins": ["NetheriteDivingHandlerMixin"],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

src/main/resources/fabric.mod.json

@@ -24,6 +24,9 @@
       "com.possible_triangle.create_jetpack.CreateJetpackMod"
     ]
   },
+  "mixins": [
+    "${mod_id}.mixins.json"
+  ],
   "depends": {
     "fabricloader": ">=0.14",
     "fabric": "*",