diff --git a/gradle.properties b/gradle.properties index 842a5bce6..a71299cfe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ mod_version=0.1 mc_version=1.18.1 mc_version_weak=1.18 forge_gradle_version=5.1.27 -forge_version=39.0.14 +forge_version=39.0.64 jei_version=9.1.1.48 jupiter_version=5.8.2 diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ItemPortableGravitationStabilizer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/ItemPortableGravitationStabilizer.kt index a0110f0de..3f52673dd 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ItemPortableGravitationStabilizer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/ItemPortableGravitationStabilizer.kt @@ -28,13 +28,13 @@ private object GravitationStabilizerArmorMaterial : ArmorMaterial { } private object GravitationStabilizerArmorRenderProperties : IItemRenderProperties { - override fun > getArmorModel( + override fun getArmorModel( entityLiving: LivingEntity, itemStack: ItemStack, armorSlot: EquipmentSlot, - _default: A - ): A { - return GravitationStabilizerModel.getModel() as A + _default: HumanoidModel<*> + ): HumanoidModel<*> { + return GravitationStabilizerModel.getModel() } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ItemTritaniumArmor.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/ItemTritaniumArmor.kt index ab785c2c8..48d3c1b8f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ItemTritaniumArmor.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/ItemTritaniumArmor.kt @@ -53,17 +53,17 @@ private object TritaniumArmorMaterial : ArmorMaterial { } private object TritaniumArmorRenderProperties : IItemRenderProperties { - override fun > getArmorModel( + override fun getArmorModel( entityLiving: LivingEntity, itemStack: ItemStack, armorSlot: EquipmentSlot, - _default: A - ): A { + _default: HumanoidModel<*> + ): HumanoidModel<*> { if (armorSlot === EquipmentSlot.LEGS) { - return TritaniumArmorModel.getModelLegs() as A + return TritaniumArmorModel.getModelLegs() } - return TritaniumArmorModel.getModel() as A + return TritaniumArmorModel.getModel() } }